frodovdr/vdr-plugin-softhddevice
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

Show vaapi droped/missed messages with info level.

Browse Source
This commit is contained in:
Johns 2013-02-23 15:56:24 +01:00
parent d6f557c6f7
commit 936566c642
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
video.c
View File

@ -1852,7 +1852,12 @@ static VaapiDecoder *VaapiNewHwDecoder(VideoStream * stream)
decoder->OutputWidth = VideoWindowWidth; decoder->OutputWidth = VideoWindowWidth;
decoder->OutputHeight = VideoWindowHeight; decoder->OutputHeight = VideoWindowHeight;
decoder->PixFmt = PIX_FMT_NONE;
decoder->Stream = stream; decoder->Stream = stream;
if (!VaapiDecoderN) { // FIXME: hack sync on audio
decoder->SyncOnAudio = 1;
}
decoder->Closing = -300 - 1; decoder->Closing = -300 - 1;
decoder->PTS = AV_NOPTS_VALUE; decoder->PTS = AV_NOPTS_VALUE;
@ -2526,8 +2531,6 @@ static enum PixelFormat Vaapi_get_format(VaapiDecoder * decoder,
int e; int e;
VAConfigAttrib attrib; VAConfigAttrib attrib;
Debug(3, "video: new stream format %dms\n", GetMsTicks() - VideoSwitch);
if (!VideoHardwareDecoder || (video_ctx->codec_id == CODEC_ID_MPEG2VIDEO if (!VideoHardwareDecoder || (video_ctx->codec_id == CODEC_ID_MPEG2VIDEO
&& VideoHardwareDecoder == 1) && VideoHardwareDecoder == 1)
) { // hardware disabled by config ) { // hardware disabled by config
@ -4710,21 +4713,21 @@ static void VaapiSyncDecoder(VaapiDecoder * decoder)
// both clocks are known // both clocks are known
if (abs(video_clock - audio_clock + VideoAudioDelay) > 5000 * 90) { if (abs(video_clock - audio_clock + VideoAudioDelay) > 5000 * 90) {
err = VaapiMessage(3, "video: audio/video difference too big\n"); err = VaapiMessage(2, "video: audio/video difference too big\n");
} else if (video_clock > audio_clock + VideoAudioDelay + 100 * 90) { } else if (video_clock > audio_clock + VideoAudioDelay + 100 * 90) {
// FIXME: this quicker sync step, did not work with new code! // FIXME: this quicker sync step, did not work with new code!
err = VaapiMessage(3, "video: slow down video, duping frame\n"); err = VaapiMessage(2, "video: slow down video, duping frame\n");
++decoder->FramesDuped; ++decoder->FramesDuped;
decoder->SyncCounter = 1; decoder->SyncCounter = 1;
goto out; goto out;
} else if (video_clock > audio_clock + VideoAudioDelay + 45 * 90) { } else if (video_clock > audio_clock + VideoAudioDelay + 45 * 90) {
err = VaapiMessage(3, "video: slow down video, duping frame\n"); err = VaapiMessage(2, "video: slow down video, duping frame\n");
++decoder->FramesDuped; ++decoder->FramesDuped;
decoder->SyncCounter = 1; decoder->SyncCounter = 1;
goto out; goto out;
} else if (audio_clock + VideoAudioDelay > video_clock + 15 * 90 } else if (audio_clock + VideoAudioDelay > video_clock + 15 * 90
&& filled > 1 + 2 * decoder->Interlaced) { && filled > 1 + 2 * decoder->Interlaced) {
err = VaapiMessage(3, "video: speed up video, droping frame\n"); err = VaapiMessage(2, "video: speed up video, droping frame\n");
++decoder->FramesDropped; ++decoder->FramesDropped;
VaapiAdvanceDecoderFrame(decoder); VaapiAdvanceDecoderFrame(decoder);
decoder->SyncCounter = 1; decoder->SyncCounter = 1;
@ -5965,6 +5968,8 @@ static VdpauDecoder *VdpauNewHwDecoder(VideoStream * stream)
decoder->OutputWidth = VideoWindowWidth; decoder->OutputWidth = VideoWindowWidth;
decoder->OutputHeight = VideoWindowHeight; decoder->OutputHeight = VideoWindowHeight;
decoder->PixFmt = PIX_FMT_NONE;
decoder->Stream = stream; decoder->Stream = stream;
if (!VdpauDecoderN) { // FIXME: hack sync on audio if (!VdpauDecoderN) { // FIXME: hack sync on audio
decoder->SyncOnAudio = 1; decoder->SyncOnAudio = 1;
@ -6809,8 +6814,6 @@ static enum PixelFormat Vdpau_get_format(VdpauDecoder * decoder,
VdpDecoderProfile profile; VdpDecoderProfile profile;
int max_refs; int max_refs;
Debug(3, "video: new stream format %dms\n", GetMsTicks() - VideoSwitch);
if (!VideoHardwareDecoder || (video_ctx->codec_id == CODEC_ID_MPEG2VIDEO if (!VideoHardwareDecoder || (video_ctx->codec_id == CODEC_ID_MPEG2VIDEO
&& VideoHardwareDecoder == 1) && VideoHardwareDecoder == 1)
) { // hardware disabled by config ) { // hardware disabled by config
@ -9657,8 +9660,9 @@ enum PixelFormat Video_get_format(VideoHwDecoder * hw_decoder,
ms_delay = (1000 * video_ctx->time_base.num * video_ctx->ticks_per_frame) ms_delay = (1000 * video_ctx->time_base.num * video_ctx->ticks_per_frame)
/ video_ctx->time_base.den; / video_ctx->time_base.den;
Debug(3, "video: ready %s %dms/frame\n", Debug(3, "video: ready %s %2dms/frame %dms\n",
Timestamp2String(VideoGetClock(hw_decoder)), ms_delay); Timestamp2String(VideoGetClock(hw_decoder)), ms_delay,
GetMsTicks() - VideoSwitch);
#endif #endif
return VideoUsedModule->get_format(hw_decoder, video_ctx, fmt); return VideoUsedModule->get_format(hw_decoder, video_ctx, fmt);