Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2024-11-10 13:44:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Wake up main thread immediately after new frame is pushed"

Browse source 
This reverts commit aab7191a44.
This commit is contained in:
Cameron Gutman 2019-01-21 20:10:13 -08:00
parent aab7191a44
commit 7747624c80
5 changed files with 11 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/app.pro
View file

@ -126,8 +126,7 @@ SOURCES += \
path.cpp \
settings/mappingmanager.cpp \
gui/sdlgamepadkeynavigation.cpp \
streaming/video/overlaymanager.cpp \
streaming/sdlhelper.cpp
streaming/video/overlaymanager.cpp
HEADERS += \
utils.h \
@ -154,8 +153,7 @@ HEADERS += \
path.h \
settings/mappingmanager.h \
gui/sdlgamepadkeynavigation.h \
streaming/video/overlaymanager.h \
streaming/sdlhelper.h
streaming/video/overlaymanager.h
# Platform-specific renderers and decoders
ffmpeg {

45
app/streaming/sdlhelper.cpp
View file

@ -1,45 +0,0 @@
#include "sdlhelper.h"
SDL_cond* SDLHelper::s_EventCond;
SDL_mutex* SDLHelper::s_EventMutex;
void SDLHelper::initializeIfNeeded()
{
if (!s_EventCond) {
s_EventCond = SDL_CreateCond();
}
if (!s_EventMutex) {
s_EventMutex = SDL_CreateMutex();
}
}
void SDLHelper::waitEvent(SDL_Event* event)
{
initializeIfNeeded();
// We explicitly use SDL_PollEvent() and SDL_Delay() because
// SDL_WaitEventTimeout() has an internal SDL_Delay(10) inside which
// blocks this thread too long for high polling rate mice and high
// refresh rate displays.
while (!SDL_PollEvent(event)) {
// Sleep for up to 1 ms or until we are woken up by
// SDLHelper::pushEvent().
// FIXME: SDL should do this internally
SDL_LockMutex(s_EventMutex);
SDL_CondWaitTimeout(s_EventCond, s_EventMutex, 1);
SDL_UnlockMutex(s_EventMutex);
continue;
}
}
void SDLHelper::pushEvent(SDL_Event* event)
{
initializeIfNeeded();
SDL_PushEvent(event);
// Immediately wake up the other waiting thread
SDL_LockMutex(s_EventMutex);
SDL_CondSignal(s_EventCond);
SDL_UnlockMutex(s_EventMutex);
}

16
app/streaming/sdlhelper.h
View file

@ -1,16 +0,0 @@
#pragma once
#include <SDL.h>
class SDLHelper
{
public:
static void waitEvent(SDL_Event* event);
static void pushEvent(SDL_Event* event);
private:
static void initializeIfNeeded();
static SDL_cond* s_EventCond;
static SDL_mutex* s_EventMutex;
};

11
app/streaming/session.cpp
View file

@ -1,7 +1,6 @@
#include "session.h"
#include "settings/streamingpreferences.h"
#include "streaming/streamutils.h"
#include "streaming/sdlhelper.h"
#include <Limelight.h>
#include <SDL.h>
@ -982,8 +981,14 @@ void Session::exec(int displayOriginX, int displayOriginY)
// because we want to suspend all Qt processing until the stream is over.
SDL_Event event;
for (;;) {
SDLHelper::waitEvent(&event);
// We explicitly use SDL_PollEvent() and SDL_Delay() because
// SDL_WaitEvent() has an internal SDL_Delay(10) inside which
// blocks this thread too long for high polling rate mice and high
// refresh rate displays.
if (!SDL_PollEvent(&event)) {
SDL_Delay(1);
continue;
}
switch (event.type) {
case SDL_QUIT:
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,

3
app/streaming/video/decoder.h
View file

@ -3,7 +3,6 @@
#include <Limelight.h>
#include <SDL.h>
#include "settings/streamingpreferences.h"
#include "streaming/sdlhelper.h"
#define SDL_CODE_FRAME_READY 0
@ -54,6 +53,6 @@ public:
event.user.data1 = data1;
event.user.data2 = data2;
SDLHelper::pushEvent(&event);
SDL_PushEvent(&event);
}
};