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

Softer audio/video sync.

This commit is contained in:
Johns 2013-09-30 20:54:27 +02:00
parent a13c25d309
commit 58a76439ee
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
User johns User johns
Date: Date:
Softer audio/video sync.
Add function GetStats to the video output module. Add function GetStats to the video output module.
Add function ResetStart to the video output module. Add function ResetStart to the video output module.
Add function SetClosing to the video output module. Add function SetClosing to the video output module.

34
video.c
View File

@ -1537,6 +1537,7 @@ struct _vaapi_decoder_
int SyncOnAudio; ///< flag sync to audio int SyncOnAudio; ///< flag sync to audio
int64_t PTS; ///< video PTS clock int64_t PTS; ///< video PTS clock
int LastAVDiff; ///< last audio - video difference
int SyncCounter; ///< counter to sync frames int SyncCounter; ///< counter to sync frames
int StartCounter; ///< counter for video start int StartCounter; ///< counter for video start
int FramesDuped; ///< number of frames duplicated int FramesDuped; ///< number of frames duplicated
@ -4893,7 +4894,7 @@ static void VaapiSyncDecoder(VaapiDecoder * decoder)
goto out; goto out;
} }
// both clocks are known // both clocks are known
if (audio_clock + VideoAudioDelay <= video_clock + 15 * 90) { if (audio_clock + VideoAudioDelay <= video_clock + 25 * 90) {
goto out; goto out;
} }
// out of sync: audio before video // out of sync: audio before video
@ -4928,22 +4929,26 @@ static void VaapiSyncDecoder(VaapiDecoder * decoder)
if (audio_clock != (int64_t) AV_NOPTS_VALUE if (audio_clock != (int64_t) AV_NOPTS_VALUE
&& video_clock != (int64_t) AV_NOPTS_VALUE) { && video_clock != (int64_t) AV_NOPTS_VALUE) {
// both clocks are known // both clocks are known
int diff;
if (abs(video_clock - audio_clock + VideoAudioDelay) > 5000 * 90) { diff = video_clock - audio_clock - VideoAudioDelay;
diff = (decoder->LastAVDiff + diff) / 2;
decoder->LastAVDiff = diff;
if (abs(diff) > 5000 * 90) { // more than 5s
err = VaapiMessage(2, "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 (diff > 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(2, "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 (diff > 55 * 90) {
err = VaapiMessage(2, "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 (diff < -25 * 90 && filled > 1 + 2 * decoder->Interlaced) {
&& filled > 1 + 2 * decoder->Interlaced) {
err = VaapiMessage(2, "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);
@ -5563,6 +5568,7 @@ typedef struct _vdpau_decoder_
int SyncOnAudio; ///< flag sync to audio int SyncOnAudio; ///< flag sync to audio
int64_t PTS; ///< video PTS clock int64_t PTS; ///< video PTS clock
int LastAVDiff; ///< last audio - video difference
int SyncCounter; ///< counter to sync frames int SyncCounter; ///< counter to sync frames
int StartCounter; ///< counter for video start int StartCounter; ///< counter for video start
int FramesDuped; ///< number of frames duplicated int FramesDuped; ///< number of frames duplicated
@ -8519,7 +8525,7 @@ static void VdpauSyncDecoder(VdpauDecoder * decoder)
goto out; goto out;
} }
// both clocks are known // both clocks are known
if (audio_clock + VideoAudioDelay <= video_clock + 15 * 90) { if (audio_clock + VideoAudioDelay <= video_clock + 25 * 90) {
goto out; goto out;
} }
// out of sync: audio before video // out of sync: audio before video
@ -8553,22 +8559,26 @@ static void VdpauSyncDecoder(VdpauDecoder * decoder)
if (audio_clock != (int64_t) AV_NOPTS_VALUE if (audio_clock != (int64_t) AV_NOPTS_VALUE
&& video_clock != (int64_t) AV_NOPTS_VALUE) { && video_clock != (int64_t) AV_NOPTS_VALUE) {
// both clocks are known // both clocks are known
int diff;
if (abs(video_clock - audio_clock + VideoAudioDelay) > 5000 * 90) { diff = video_clock - audio_clock - VideoAudioDelay;
diff = (decoder->LastAVDiff + diff) / 2;
decoder->LastAVDiff = diff;
if (abs(diff) > 5000 * 90) { // more than 5s
err = VdpauMessage(2, "video: audio/video difference too big\n"); err = VdpauMessage(2, "video: audio/video difference too big\n");
} else if (video_clock > audio_clock + VideoAudioDelay + 100 * 90) { } else if (diff > 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 = VdpauMessage(2, "video: slow down video, duping frame\n"); err = VdpauMessage(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 (diff > 55 * 90) {
err = VdpauMessage(2, "video: slow down video, duping frame\n"); err = VdpauMessage(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 (diff < -25 * 90 && filled > 1 + 2 * decoder->Interlaced) {
&& filled > 1 + 2 * decoder->Interlaced) {
err = VdpauMessage(2, "video: speed up video, droping frame\n"); err = VdpauMessage(2, "video: speed up video, droping frame\n");
++decoder->FramesDropped; ++decoder->FramesDropped;
VdpauAdvanceDecoderFrame(decoder); VdpauAdvanceDecoderFrame(decoder);