diff options
| author | Markus Pfau <pfau@peak3d.de> | 2020-05-31 12:21:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-31 12:21:31 +0200 |
| commit | 5a2cc4704965b566eba1fd7f12ab4813457ac82b (patch) | |
| tree | 2e9bcd32f7364e4d0a7d1c5ac9260cbff82c05d6 | |
| parent | 9d9894e3367ccf7431111beb628ee658fea66b2c (diff) | |
| parent | 4aa000296c27a94cbb5c938ab9fda1eeab04af6e (diff) | |
Merge pull request #17971 from peak3d/leia_shortchapter
[Backport][VP] Fix short stream changes
| -rw-r--r-- | xbmc/cores/VideoPlayer/VideoPlayer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp index 459d2aacc0..4f9cb28646 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -2009,7 +2009,8 @@ void CVideoPlayer::HandlePlaySpeed() m_VideoPlayerAudio->SendMessage(new CDVDMsgDouble(CDVDMsg::GENERAL_RESYNC, m_clock.GetClock()), 1); } else if (m_CurrentVideo.syncState == IDVDStreamPlayer::SYNC_WAITSYNC && - m_CurrentVideo.avsync == CCurrentStream::AV_SYNC_CONT) + (m_CurrentVideo.avsync == CCurrentStream::AV_SYNC_CONT || + m_CurrentAudio.syncState == IDVDStreamPlayer::SYNC_INSYNC)) { m_CurrentVideo.syncState = IDVDStreamPlayer::SYNC_INSYNC; m_CurrentVideo.avsync = CCurrentStream::AV_SYNC_NONE; @@ -2336,6 +2337,8 @@ bool CVideoPlayer::CheckContinuity(CCurrentStream& current, DemuxPacket* pPacket UpdateCorrection(pPacket, correction); lastdts = pPacket->dts; CLog::Log(LOGDEBUG, "CVideoPlayer::CheckContinuity - update correction: %f", correction); + if (current.avsync == CCurrentStream::AV_SYNC_CHECK) + current.avsync = CCurrentStream::AV_SYNC_CONT; } else { |