Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 06:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Putting the computer to sleep while a video was playing will no longer result in a massive fast-forward on resume

Browse source
This commit is contained in:
Leon Styhre 2024-02-07 21:53:15 +01:00
parent 5386fecf7d
commit 2822cadc1f
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
es-core/src/components/VideoFFmpegComponent.cpp
View file

@ -310,6 +310,24 @@ void VideoFFmpegComponent::updatePlayer()
if (mPaused || !mFormatContext) if (mPaused || !mFormatContext)
return; return;
const long double deltaTime {
static_cast<long double>(std::chrono::duration_cast<std::chrono::nanoseconds>(
std::chrono::high_resolution_clock::now() - mTimeReference)
.count()) /
1000000000.0l};
// If there were more than 2 seconds since the last update then it's not a normal delay, for
// example the application may have been suspended or the computer was resumed from sleep.
// In this case don't proceed and instead wait for the next update. This avoids a massive
// fast-forward as the frame processing would otherwise have tried to catch up. This may
// not result in perfect video and sound synchronization on some platforms, for example
// on Android the audio buffers are emptied before suspending the application after the
// video processing has already been halted.
if (deltaTime > 2.0) {
mTimeReference = std::chrono::high_resolution_clock::now();
return;
}
// Output any audio that has been added by the processing thread. // Output any audio that has been added by the processing thread.
std::unique_lock<std::mutex> audioLock {mAudioMutex}; std::unique_lock<std::mutex> audioLock {mAudioMutex};
if (mOutputAudio.size()) { if (mOutputAudio.size()) {
@ -318,14 +336,8 @@ void VideoFFmpegComponent::updatePlayer()
mOutputAudio.clear(); mOutputAudio.clear();
} }
if (mIsActuallyPlaying && mStartTimeAccumulation) { if (mIsActuallyPlaying && mStartTimeAccumulation)
mAccumulatedTime = mAccumulatedTime = mAccumulatedTime + static_cast<double>(deltaTime);
mAccumulatedTime +
static_cast<double>(std::chrono::duration_cast<std::chrono::nanoseconds>(
std::chrono::high_resolution_clock::now() - mTimeReference)
.count()) /
1000000000.0l;
}
mTimeReference = std::chrono::high_resolution_clock::now(); mTimeReference = std::chrono::high_resolution_clock::now();