Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2024-12-17 14:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a decoder/renderer callback to specify the desired color range

Browse source
This commit is contained in:
Cameron Gutman 2022-10-12 23:59:01 -05:00
parent 7a39daf179
commit c55af7fff3
7 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/streaming/session.cpp
View file

@ -426,8 +426,7 @@ bool Session::populateDecoderProperties(SDL_Window* window)
m_StreamConfig.colorRange);
}
else {
// Limited is the default for GFE
m_StreamConfig.colorRange = COLOR_RANGE_LIMITED;
m_StreamConfig.colorRange = decoder->getDecoderColorRange();
}
}

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

@ -68,6 +68,7 @@ public:
virtual bool isHdrSupported() = 0;
virtual int getDecoderCapabilities() = 0;
virtual int getDecoderColorspace() = 0;
virtual int getDecoderColorRange() = 0;
virtual QSize getDecoderMaxResolution() = 0;
virtual int submitDecodeUnit(PDECODE_UNIT du) = 0;
virtual void renderFrameOnMainThread() = 0;

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

@ -158,6 +158,11 @@ public:
return COLORSPACE_REC_601;
}
virtual int getDecoderColorRange() {
// Limited is the default
return COLOR_RANGE_LIMITED;
}
virtual int getFrameColorspace(const AVFrame* frame) {
// Prefer the colorspace field on the AVFrame itself
switch (frame->colorspace) {

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

@ -92,6 +92,11 @@ int FFmpegVideoDecoder::getDecoderColorspace()
return m_FrontendRenderer->getDecoderColorspace();
}
int FFmpegVideoDecoder::getDecoderColorRange()
{
return m_FrontendRenderer->getDecoderColorRange();
}
QSize FFmpegVideoDecoder::getDecoderMaxResolution()
{
if (m_BackendRenderer->getRendererAttributes() & RENDERER_ATTRIBUTE_1080P_MAX) {

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

@ -21,6 +21,7 @@ public:
virtual bool isHdrSupported() override;
virtual int getDecoderCapabilities() override;
virtual int getDecoderColorspace() override;
virtual int getDecoderColorRange() override;
virtual QSize getDecoderMaxResolution() override;
virtual int submitDecodeUnit(PDECODE_UNIT du) override;
virtual void renderFrameOnMainThread() override;

6
app/streaming/video/slvid.cpp
View file

@ -68,6 +68,12 @@ SLVideoDecoder::getDecoderColorspace()
return COLORSPACE_REC_709;
}
int
SLVideoDecoder::getDecoderColorRange()
{
return COLOR_RANGE_LIMITED;
}
QSize SLVideoDecoder::getDecoderMaxResolution()
{
return QSize(1920, 1080);

1
app/streaming/video/slvid.h
View file

@ -15,6 +15,7 @@ public:
virtual bool isAlwaysFullScreen() override;
virtual int getDecoderCapabilities() override;
virtual int getDecoderColorspace() override;
virtual int getDecoderColorRange() override;
virtual QSize getDecoderMaxResolution() override;
virtual int submitDecodeUnit(PDECODE_UNIT du) override;
virtual void notifyOverlayUpdated(Overlay::OverlayType) override;