moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-03 08:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix assert failure when using v4l2m2m with EGL

Browse Source
This commit is contained in:
Cameron Gutman 2021-02-04 20:38:18 -06:00
parent d790313221
commit 36dd6c83e0
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/streaming/video/ffmpeg-renderers/eglvid.cpp
View File

@ -648,7 +648,18 @@ const float *EGLRenderer::getColorMatrix() {
case AVCOL_SPC_BT2020_CL: case AVCOL_SPC_BT2020_CL:
return m_ColorFull ? bt2020Full : bt2020Lim; return m_ColorFull ? bt2020Full : bt2020Lim;
default: default:
SDL_assert(false); // Some backends don't populate this, so we'll assume
// the host gave us what we asked for by default.
switch (getDecoderColorspace()) {
case COLORSPACE_REC_601:
return m_ColorFull ? bt601Full : bt601Lim;
case COLORSPACE_REC_709:
return m_ColorFull ? bt709Full : bt709Lim;
case COLORSPACE_REC_2020:
return m_ColorFull ? bt2020Full : bt2020Lim;
default:
SDL_assert(false);
}
}; };
return bt601Lim; return bt601Lim;
@ -729,6 +740,10 @@ void EGLRenderer::renderFrame(AVFrame* frame)
SDL_assert(m_EGLImagePixelFormat != AV_PIX_FMT_NONE); SDL_assert(m_EGLImagePixelFormat != AV_PIX_FMT_NONE);
m_ColorSpace = frame->colorspace; m_ColorSpace = frame->colorspace;
// This handles the case where the color range is unknown,
// so that we use Limited color range which is the default
// behavior for Moonlight.
m_ColorFull = frame->color_range == AVCOL_RANGE_JPEG; m_ColorFull = frame->color_range == AVCOL_RANGE_JPEG;
if (!specialize()) { if (!specialize()) {