moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-18 02:22:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit the number of queued frames in Pacer to prevent excessive memory consumption if the renderer gets blocked for a while

Browse Source
This commit is contained in:
Cameron Gutman 2019-02-18 12:13:45 -08:00
parent b6872456cd
commit e5a8b49c93
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/streaming/video/ffmpeg-renderers/pacer/pacer.cpp
View File

@ -14,6 +14,10 @@
#include "dxvsyncsource.h" #include "dxvsyncsource.h"
#endif #endif
// Limit the number of queued frames to prevent excessive memory consumption
// if the V-Sync source or renderer is blocked for a while.
#define MAX_QUEUED_FRAMES 8
// We may be woken up slightly late so don't go all the way // We may be woken up slightly late so don't go all the way
// up to the next V-sync since we may accidentally step into // up to the next V-sync since we may accidentally step into
// the next V-sync period. It also takes some amount of time // the next V-sync period. It also takes some amount of time
@ -162,6 +166,7 @@ void Pacer::vsyncCallback(int timeUntilNextVsyncMillis)
} }
// Place the first frame on the render queue // Place the first frame on the render queue
dropFrameForEnqueue(m_RenderQueue);
m_RenderQueue.enqueue(m_PacingQueue.dequeue()); m_RenderQueue.enqueue(m_PacingQueue.dequeue());
m_FrameQueueLock.unlock(); m_FrameQueueLock.unlock();
m_RenderQueueNotEmpty.wakeOne(); m_RenderQueueNotEmpty.wakeOne();
@ -253,6 +258,15 @@ void Pacer::renderFrame(AVFrame* frame)
m_FrameQueueLock.unlock(); m_FrameQueueLock.unlock();
} }
void Pacer::dropFrameForEnqueue(QQueue<AVFrame*>& queue)
{
SDL_assert(queue.size() <= MAX_QUEUED_FRAMES);
if (queue.size() == MAX_QUEUED_FRAMES) {
AVFrame* frame = queue.dequeue();
av_frame_free(&frame);
}
}
void Pacer::submitFrame(AVFrame* frame) void Pacer::submitFrame(AVFrame* frame)
{ {
// Make sure initialize() has been called // Make sure initialize() has been called
@ -261,9 +275,11 @@ void Pacer::submitFrame(AVFrame* frame)
// Queue the frame and possibly wake up the render thread // Queue the frame and possibly wake up the render thread
m_FrameQueueLock.lock(); m_FrameQueueLock.lock();
if (m_VsyncSource != nullptr) { if (m_VsyncSource != nullptr) {
dropFrameForEnqueue(m_PacingQueue);
m_PacingQueue.enqueue(frame); m_PacingQueue.enqueue(frame);
} }
else { else {
dropFrameForEnqueue(m_RenderQueue);
m_RenderQueue.enqueue(frame); m_RenderQueue.enqueue(frame);
} }
m_FrameQueueLock.unlock(); m_FrameQueueLock.unlock();

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

@ -31,6 +31,8 @@ private:
void renderFrame(AVFrame* frame); void renderFrame(AVFrame* frame);
void dropFrameForEnqueue(QQueue<AVFrame*>& queue);
QQueue<AVFrame*> m_RenderQueue; QQueue<AVFrame*> m_RenderQueue;
QQueue<AVFrame*> m_PacingQueue; QQueue<AVFrame*> m_PacingQueue;
QQueue<int> m_PacingQueueHistory; QQueue<int> m_PacingQueueHistory;