Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2024-12-13 04:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Always submit frames to Pacer if it's using a frame queue

Browse source
This commit is contained in:
Cameron Gutman 2018-08-16 17:59:33 -07:00
parent 404eaa44e4
commit 345e800abd
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/streaming/video/ffmpeg-renderers/pacer/pacer.cpp
View file

@ -137,7 +137,7 @@ void Pacer::submitFrame(AVFrame* frame)
// Queue the frame until the V-sync callback if
// we have a V-sync source, otherwise deliver it
// immediately and hope for the best.
if (m_VsyncSource != nullptr) {
if (isUsingFrameQueue()) {
SDL_AtomicLock(&m_FrameQueueLock);
m_FrameQueue.enqueue(frame);
SDL_AtomicUnlock(&m_FrameQueueLock);
@ -147,3 +147,8 @@ void Pacer::submitFrame(AVFrame* frame)
av_frame_free(&frame);
}
}
bool Pacer::isUsingFrameQueue()
{
return m_VsyncSource != nullptr;
}

2
app/streaming/video/ffmpeg-renderers/pacer/pacer.h
View file

@ -23,6 +23,8 @@ public:
void vsyncCallback();
bool isUsingFrameQueue();
private:
QQueue<AVFrame*> m_FrameQueue;
QQueue<int> m_FrameQueueHistory;

14
app/streaming/video/ffmpeg.cpp
View file

@ -399,9 +399,15 @@ void FFmpegVideoDecoder::renderFrame(SDL_UserEvent* event)
void FFmpegVideoDecoder::dropFrame(SDL_UserEvent* event)
{
AVFrame* frame = reinterpret_cast<AVFrame*>(event->data1);
// We should really call Pacer::submitFrame() here and let it
// take care of it, but that will regress frame dropping for
// clients without an IVsyncSource implementation.
av_frame_free(&frame);
// If Pacer is using a frame queue, we can just queue the
// frame and let it decide whether to drop or not. If Pacer
// is submitting directly for rendering, we drop the frame
// ourselves.
if (m_Pacer->isUsingFrameQueue()) {
m_Pacer->submitFrame(frame);
}
else {
av_frame_free(&frame);
}
SDL_AtomicDecRef(&m_QueuedFrames);
}