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

Set Colorspace connector property when streaming HDR

Browse source
This commit is contained in:
Cameron Gutman 2023-08-09 23:02:43 -05:00
parent c8b9fda258
commit 50255dd896
2 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/streaming/video/ffmpeg-renderers/drm.cpp
View file

@ -31,6 +31,14 @@ extern "C" {
#define DRM_FORMAT_P010 fourcc_code('P', '0', '1', '0') #define DRM_FORMAT_P010 fourcc_code('P', '0', '1', '0')
#endif #endif
// Values for "Colorspace" connector property
#ifndef DRM_MODE_COLORIMETRY_DEFAULT
#define DRM_MODE_COLORIMETRY_DEFAULT 0
#endif
#ifndef DRM_MODE_COLORIMETRY_BT2020_RGB
#define DRM_MODE_COLORIMETRY_BT2020_RGB 9
#endif
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
@ -69,6 +77,7 @@ DrmRenderer::DrmRenderer(bool hwaccel, IFFmpegRenderer *backendRenderer)
m_ColorEncodingProp(nullptr), m_ColorEncodingProp(nullptr),
m_ColorRangeProp(nullptr), m_ColorRangeProp(nullptr),
m_HdrOutputMetadataProp(nullptr), m_HdrOutputMetadataProp(nullptr),
m_ColorspaceProp(nullptr),
m_HdrOutputMetadataBlobId(0), m_HdrOutputMetadataBlobId(0),
m_SwFrameMapper(this), m_SwFrameMapper(this),
m_CurrentSwFrameIdx(0) m_CurrentSwFrameIdx(0)
@ -125,6 +134,10 @@ DrmRenderer::~DrmRenderer()
drmModeFreeProperty(m_HdrOutputMetadataProp); drmModeFreeProperty(m_HdrOutputMetadataProp);
} }
if (m_ColorspaceProp != nullptr) {
drmModeFreeProperty(m_ColorspaceProp);
}
if (m_HwContext != nullptr) { if (m_HwContext != nullptr) {
av_buffer_unref(&m_HwContext); av_buffer_unref(&m_HwContext);
} }
@ -459,6 +472,9 @@ bool DrmRenderer::initialize(PDECODER_PARAMETERS params)
if (!strcmp(prop->name, "HDR_OUTPUT_METADATA")) { if (!strcmp(prop->name, "HDR_OUTPUT_METADATA")) {
m_HdrOutputMetadataProp = prop; m_HdrOutputMetadataProp = prop;
} }
else if (!strcmp(prop->name, "Colorspace")) {
m_ColorspaceProp = prop;
}
else if (!strcmp(prop->name, "max bpc") && m_Main10Hdr) { else if (!strcmp(prop->name, "max bpc") && m_Main10Hdr) {
if (drmModeObjectSetProperty(m_DrmFd, m_ConnectorId, DRM_MODE_OBJECT_CONNECTOR, prop->prop_id, 16) == 0) { if (drmModeObjectSetProperty(m_DrmFd, m_ConnectorId, DRM_MODE_OBJECT_CONNECTOR, prop->prop_id, 16) == 0) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
@ -553,6 +569,24 @@ int DrmRenderer::getRendererAttributes()
void DrmRenderer::setHdrMode(bool enabled) void DrmRenderer::setHdrMode(bool enabled)
{ {
if (m_ColorspaceProp != nullptr) {
int err = drmModeObjectSetProperty(m_DrmFd, m_ConnectorId, DRM_MODE_OBJECT_CONNECTOR,
m_ColorspaceProp->prop_id,
enabled ? DRM_MODE_COLORIMETRY_BT2020_RGB : DRM_MODE_COLORIMETRY_DEFAULT);
if (err == 0) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Set HDMI Colorspace: %s",
enabled ? "BT.2020 RGB" : "Default");
}
else {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"drmModeObjectSetProperty(%s) failed: %d",
m_ColorspaceProp->name,
errno);
// Non-fatal
}
}
if (m_HdrOutputMetadataProp != nullptr) { if (m_HdrOutputMetadataProp != nullptr) {
if (m_HdrOutputMetadataBlobId != 0) { if (m_HdrOutputMetadataBlobId != 0) {
drmModeDestroyPropertyBlob(m_DrmFd, m_HdrOutputMetadataBlobId); drmModeDestroyPropertyBlob(m_DrmFd, m_HdrOutputMetadataBlobId);

1
app/streaming/video/ffmpeg-renderers/drm.h
View file

@ -88,6 +88,7 @@ private:
drmModePropertyPtr m_ColorEncodingProp; drmModePropertyPtr m_ColorEncodingProp;
drmModePropertyPtr m_ColorRangeProp; drmModePropertyPtr m_ColorRangeProp;
drmModePropertyPtr m_HdrOutputMetadataProp; drmModePropertyPtr m_HdrOutputMetadataProp;
drmModePropertyPtr m_ColorspaceProp;
uint32_t m_HdrOutputMetadataBlobId; uint32_t m_HdrOutputMetadataBlobId;
SDL_Rect m_OutputRect; SDL_Rect m_OutputRect;