jyapayne/moonlight-qt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass the maximum frame rate into FFmpeg renderers

Browse source
This commit is contained in:
Cameron Gutman 2018-08-15 20:41:19 -07:00
commit f171588616
11 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/streaming/video/ffmpeg-renderers/dxva2.cpp
View file

@ -430,7 +430,7 @@ bool DXVA2Renderer::isDecoderBlacklisted()
return result;
}
bool DXVA2Renderer::initialize(SDL_Window* window, int videoFormat, int width, int height)
bool DXVA2Renderer::initialize(SDL_Window* window, int videoFormat, int width, int height, int)
{
m_VideoFormat = videoFormat;
m_VideoWidth = width;

3
app/streaming/video/ffmpeg-renderers/dxva2.h
View file

@ -17,7 +17,8 @@ public:
virtual bool initialize(SDL_Window* window,
int videoFormat,
int width,
int height);
int height,
int maxFps);
virtual bool prepareDecoderContext(AVCodecContext* context);
virtual void renderFrame(AVFrame* frame);

6
app/streaming/video/ffmpeg-renderers/renderer.h
View file

@ -12,7 +12,8 @@ public:
virtual bool initialize(SDL_Window* window,
int videoFormat,
int width,
int height) = 0;
int height,
int maxFps) = 0;
virtual bool prepareDecoderContext(AVCodecContext* context) = 0;
virtual void renderFrame(AVFrame* frame) = 0;
};
@ -24,7 +25,8 @@ public:
virtual bool initialize(SDL_Window* window,
int videoFormat,
int width,
int height);
int height,
int maxFps);
virtual bool prepareDecoderContext(AVCodecContext* context);
virtual void renderFrame(AVFrame* frame);

3
app/streaming/video/ffmpeg-renderers/sdl.cpp
View file

@ -33,7 +33,8 @@ bool SdlRenderer::prepareDecoderContext(AVCodecContext*)
bool SdlRenderer::initialize(SDL_Window* window,
int,
int width,
int height)
int height,
int)
{
m_Renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
if (!m_Renderer) {

2
app/streaming/video/ffmpeg-renderers/vaapi.cpp
View file

@ -27,7 +27,7 @@ VAAPIRenderer::~VAAPIRenderer()
}
bool
VAAPIRenderer::initialize(SDL_Window* window, int, int width, int height)
VAAPIRenderer::initialize(SDL_Window* window, int, int width, int height, int)
{
int err;
SDL_SysWMinfo info;

3
app/streaming/video/ffmpeg-renderers/vaapi.h
View file

@ -33,7 +33,8 @@ public:
virtual bool initialize(SDL_Window* window,
int videoFormat,
int width,
int height);
int height,
int maxFps);
virtual bool prepareDecoderContext(AVCodecContext* context);
virtual void renderFrame(AVFrame* frame);

2
app/streaming/video/ffmpeg-renderers/vdpau.cpp
View file

@ -54,7 +54,7 @@ VDPAURenderer::~VDPAURenderer()
}
}
bool VDPAURenderer::initialize(SDL_Window* window, int, int width, int height)
bool VDPAURenderer::initialize(SDL_Window* window, int, int width, int height, int)
{
int err;
VdpStatus status;

3
app/streaming/video/ffmpeg-renderers/vdpau.h
View file

@ -16,7 +16,8 @@ public:
virtual bool initialize(SDL_Window* window,
int videoFormat,
int width,
int height);
int height,
int maxFps);
virtual bool prepareDecoderContext(AVCodecContext* context);
virtual void renderFrame(AVFrame* frame);

1
app/streaming/video/ffmpeg-renderers/vt.mm
View file

@ -130,6 +130,7 @@ public:
virtual bool initialize(SDL_Window* window,
int videoFormat,
int,
int,
int) override
{
int err;

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

@ -218,7 +218,7 @@ bool FFmpegVideoDecoder::initialize(
int videoFormat,
int width,
int height,
int)
int maxFps)
{
AVCodec* decoder;
@ -253,7 +253,7 @@ bool FFmpegVideoDecoder::initialize(
m_HwDecodeCfg = nullptr;
m_Renderer = new SdlRenderer();
if (vds != StreamingPreferences::VDS_FORCE_HARDWARE &&
m_Renderer->initialize(window, videoFormat, width, height) &&
m_Renderer->initialize(window, videoFormat, width, height, maxFps) &&
completeInitialization(decoder, videoFormat, width, height, false)) {
return true;
}
@ -270,12 +270,12 @@ bool FFmpegVideoDecoder::initialize(
m_HwDecodeCfg = config;
// Submit test frame to ensure this codec really works
if (m_Renderer->initialize(window, videoFormat, width, height) &&
if (m_Renderer->initialize(window, videoFormat, width, height, maxFps) &&
completeInitialization(decoder, videoFormat, width, height, true)) {
// OK, it worked, so now let's initialize it for real
reset();
if ((m_Renderer = createAcceleratedRenderer(config)) != nullptr &&
m_Renderer->initialize(window, videoFormat, width, height) &&
m_Renderer->initialize(window, videoFormat, width, height, maxFps) &&
completeInitialization(decoder, videoFormat, width, height, false)) {
return true;
}

2
app/streaming/video/ffmpeg.h
View file

@ -16,7 +16,7 @@ public:
int videoFormat,
int width,
int height,
int frameRate) override;
int maxFps) override;
virtual bool isHardwareAccelerated() override;
virtual int submitDecodeUnit(PDECODE_UNIT du) override;
virtual void renderFrame(SDL_UserEvent* event) override;