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

Sync to audio only with the first video stream.

Browse Source
This commit is contained in:
Johns 2013-01-04 18:04:53 +01:00
parent 78100cba00
commit 1a744a8eb8
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
video.c
View File

@ -1398,6 +1398,7 @@ struct _vaapi_decoder_
struct timespec FrameTime; ///< time of last display struct timespec FrameTime; ///< time of last display
VideoStream *Stream; ///< video stream VideoStream *Stream; ///< video stream
int Closing; ///< flag about closing current stream int Closing; ///< flag about closing current stream
int SyncOnAudio; ///< flag sync to audio
int64_t PTS; ///< video PTS clock int64_t PTS; ///< video PTS clock
int SyncCounter; ///< counter to sync frames int SyncCounter; ///< counter to sync frames
@ -5233,6 +5234,7 @@ typedef struct _vdpau_decoder_
struct timespec FrameTime; ///< time of last display struct timespec FrameTime; ///< time of last display
VideoStream *Stream; ///< video stream VideoStream *Stream; ///< video stream
int Closing; ///< flag about closing current stream int Closing; ///< flag about closing current stream
int SyncOnAudio; ///< flag sync to audio
int64_t PTS; ///< video PTS clock int64_t PTS; ///< video PTS clock
int SyncCounter; ///< counter to sync frames int SyncCounter; ///< counter to sync frames
@ -5910,6 +5912,9 @@ static VdpauDecoder *VdpauNewHwDecoder(VideoStream * stream)
decoder->OutputHeight = VideoWindowHeight; decoder->OutputHeight = VideoWindowHeight;
decoder->Stream = stream; decoder->Stream = stream;
if (!VdpauDecoderN) { // 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;
@ -8041,10 +8046,16 @@ static void VdpauSyncDecoder(VdpauDecoder * decoder)
int64_t video_clock; int64_t video_clock;
err = 0; err = 0;
audio_clock = AudioGetClock();
video_clock = VdpauGetClock(decoder); video_clock = VdpauGetClock(decoder);
filled = atomic_read(&decoder->SurfacesFilled); filled = atomic_read(&decoder->SurfacesFilled);
if (!decoder->SyncOnAudio) {
audio_clock = AV_NOPTS_VALUE;
// FIXME: 60Hz Mode
goto skip_sync;
}
audio_clock = AudioGetClock();
// 60Hz: repeat every 5th field // 60Hz: repeat every 5th field
if (Video60HzMode && !(decoder->FramesDisplayed % 6)) { if (Video60HzMode && !(decoder->FramesDisplayed % 6)) {
if (audio_clock == (int64_t) AV_NOPTS_VALUE if (audio_clock == (int64_t) AV_NOPTS_VALUE