frodovdr
/
vdr-plugin-softhddevice
mirror of https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Debug, if vaapi putsurface is too slow.

This commit is contained in:
Johns 2012-01-16 23:54:48 +01:00
parent 6efe558f78
commit 2cacdc6c90
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
video.c
View File

@ -1038,7 +1038,7 @@ static void VaapiCreateSurfaces(VaapiDecoder * decoder, int width, int height)
Warning(_("video/vaapi: no osd subpicture yet\n")); Warning(_("video/vaapi: no osd subpicture yet\n"));
return; return;
} }
// FIXME: associate only if osd is displayed
if (VaapiUnscaledOsd) { if (VaapiUnscaledOsd) {
if (vaAssociateSubpicture(VaDisplay, VaOsdSubpicture, if (vaAssociateSubpicture(VaDisplay, VaOsdSubpicture,
decoder->SurfacesFree, decoder->SurfaceFreeN, 0, 0, decoder->SurfacesFree, decoder->SurfaceFreeN, 0, 0,
@ -2237,6 +2237,7 @@ static void VaapiQueueSurface(VaapiDecoder * decoder, VASurfaceID surface,
#if 1 #if 1
// FIXME: intel seems to forget this, nvidia GT 210 has speed problems here // FIXME: intel seems to forget this, nvidia GT 210 has speed problems here
if (VaapiBuggyIntel && VaOsdSubpicture != VA_INVALID_ID) { if (VaapiBuggyIntel && VaOsdSubpicture != VA_INVALID_ID) {
// FIXME: associate only if osd is displayed
// //
// associate the OSD with surface // associate the OSD with surface
@ -2817,9 +2818,7 @@ static void VaapiDisplayFrame(void)
start = GetMsTicks(); start = GetMsTicks();
// deinterlace and full frame rate // VDPAU driver + INTEL driver does no v-sync with 1080
// VDPAU driver only display a frame, if a full frame is put
// INTEL driver does the same, but only with 1080i
if (0 && decoder->Interlaced if (0 && decoder->Interlaced
// FIXME: buggy libva-driver-vdpau, buggy libva-driver-intel // FIXME: buggy libva-driver-vdpau, buggy libva-driver-intel
&& (VaapiBuggyVdpau || (0 && VaapiBuggyIntel && (VaapiBuggyVdpau || (0 && VaapiBuggyIntel
@ -2839,10 +2838,9 @@ static void VaapiDisplayFrame(void)
put2 = put1; put2 = put1;
} }
clock_gettime(CLOCK_REALTIME, &nowtime); clock_gettime(CLOCK_REALTIME, &nowtime);
#ifdef noDEBUG
if ((nowtime.tv_sec - decoder->FrameTime.tv_sec) if ((nowtime.tv_sec - decoder->FrameTime.tv_sec)
* 1000 * 1000 * 1000 + (nowtime.tv_nsec - * 1000 * 1000 * 1000 + (nowtime.tv_nsec -
decoder->FrameTime.tv_nsec) > 21 * 1000 * 1000) { decoder->FrameTime.tv_nsec) > 30 * 1000 * 1000) {
Debug(3, "video/vaapi: time/frame too long %ld ms\n", Debug(3, "video/vaapi: time/frame too long %ld ms\n",
((nowtime.tv_sec - decoder->FrameTime.tv_sec) ((nowtime.tv_sec - decoder->FrameTime.tv_sec)
* 1000 * 1000 * 1000 + (nowtime.tv_nsec - * 1000 * 1000 * 1000 + (nowtime.tv_nsec -
@ -2850,6 +2848,11 @@ static void VaapiDisplayFrame(void)
Debug(4, "video/vaapi: put1 %2u put2 %2u\n", put1 - start, Debug(4, "video/vaapi: put1 %2u put2 %2u\n", put1 - start,
put2 - put1); put2 - put1);
} }
#ifdef noDEBUG
Debug(3, "video/vaapi: time/frame %ld ms\n",
((nowtime.tv_sec - decoder->FrameTime.tv_sec)
* 1000 * 1000 * 1000 + (nowtime.tv_nsec -
decoder->FrameTime.tv_nsec)) / (1000 * 1000));
if (put2 > start + 20) { if (put2 > start + 20) {
Debug(3, "video/vaapi: putsurface too long %u ms\n", put2 - start); Debug(3, "video/vaapi: putsurface too long %u ms\n", put2 - start);
} }
@ -2908,7 +2911,7 @@ static void VaapiSyncDisplayFrame(VaapiDecoder * decoder)
if (abs(video_clock - audio_clock) > 5000 * 90) { if (abs(video_clock - audio_clock) > 5000 * 90) {
Debug(3, "video: pts difference too big\n"); Debug(3, "video: pts difference too big\n");
} else if (video_clock > audio_clock + VideoAudioDelay + 30 * 90) { } else if (video_clock > audio_clock + VideoAudioDelay + 40 * 90) {
Debug(3, "video: slow down video\n"); Debug(3, "video: slow down video\n");
decoder->DupNextFrame = 1; decoder->DupNextFrame = 1;
} else if (audio_clock + VideoAudioDelay > video_clock + 50 * 90 } else if (audio_clock + VideoAudioDelay > video_clock + 50 * 90