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

VideoFFmpegComponent now prioritizes audio by dropping video frames if the computer can't keep up.

Browse source
This commit is contained in:
Leon Styhre 2021-07-09 19:47:33 +02:00
parent e4ee4855df
commit 3b4bb74ac0
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -239,8 +239,8 @@ void VideoFFmpegComponent::frameProcessing()
{ {
mWindow->increaseVideoPlayerCount(); mWindow->increaseVideoPlayerCount();
bool videoFilter; bool videoFilter = false;
bool audioFilter; bool audioFilter = false;
videoFilter = setupVideoFilters(); videoFilter = setupVideoFilters();
@ -527,9 +527,22 @@ void VideoFFmpegComponent::readFrames()
if (!avcodec_send_packet(mVideoCodecContext, mPacket) && if (!avcodec_send_packet(mVideoCodecContext, mPacket) &&
!avcodec_receive_frame(mVideoCodecContext, mVideoFrame)) { !avcodec_receive_frame(mVideoCodecContext, mVideoFrame)) {
int returnValue = 0;
// We have a video frame that needs conversion to RGBA format. // We have a video frame that needs conversion to RGBA format.
int returnValue = av_buffersrc_add_frame_flags( // Prioritize audio by dropping video frames if the audio frame queue
mVBufferSrcContext, mVideoFrame, AV_BUFFERSRC_FLAG_KEEP_REF); // gets too small, i.e. if the computer can't keep up the processing.
if ((!mAudioCodecContext || !mDecodedFrame ||
mAudioFrameCount < mAudioTargetQueueSize) ||
mAudioFrameQueue.size() > 3) {
returnValue = av_buffersrc_add_frame_flags(
mVBufferSrcContext, mVideoFrame, AV_BUFFERSRC_FLAG_KEEP_REF);
}
else {
LOG(LogDebug)
<< "VideoFFmpegComponent::readFrames(): Dropped video frame as "
"the audio buffer was too small";
}
if (returnValue < 0) { if (returnValue < 0) {
LOG(LogError) << "VideoFFmpegComponent::readFrames(): " LOG(LogError) << "VideoFFmpegComponent::readFrames(): "

7
es-core/src/components/VideoFFmpegComponent.h
View file

@ -145,14 +145,13 @@ private:
// Used for audio and video synchronization. // Used for audio and video synchronization.
std::chrono::high_resolution_clock::time_point mTimeReference; std::chrono::high_resolution_clock::time_point mTimeReference;
int mAudioFrameCount;
int mVideoFrameCount;
double mAccumulatedTime; double mAccumulatedTime;
bool mStartTimeAccumulation; bool mStartTimeAccumulation;
bool mDecodedFrame; bool mDecodedFrame;
bool mEndOfVideo; bool mEndOfVideo;
// These are only used for debugging.
int mAudioFrameCount;
int mVideoFrameCount;
}; };
#endif // ES_CORE_COMPONENTS_VIDEO_FFMPEG_COMPONENT_H #endif // ES_CORE_COMPONENTS_VIDEO_FFMPEG_COMPONENT_H