automatically selects better color space if possible

mariotaku · Apr 19, 2024 · 1e38ecb · 1e38ecb
1 parent d321dfa
commit 1e38ecb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/app/stream/session.c b/src/app/stream/session.c
@@ -280,7 +280,14 @@ void session_config_init(app_t *app, session_config_t *config, const SERVER_DATA
     if (config->stream.supportedVideoFormats == 0) {
         config->stream.supportedVideoFormats = VIDEO_FORMAT_H264;
     }
-    config->stream.colorSpace = COLORSPACE_REC_709/* TODO: get from video capabilities */;
+    if (video_cap.colorSpace & SS4S_VIDEO_CAP_COLORSPACE_BT2020 &&
+        (config->stream.supportedVideoFormats & ~VIDEO_FORMAT_MASK_H264)) {
+        config->stream.colorSpace = COLORSPACE_REC_2020;
+    } else if (video_cap.colorSpace & SS4S_VIDEO_CAP_COLORSPACE_BT709) {
+        config->stream.colorSpace = COLORSPACE_REC_709;
+    } else {
+        config->stream.colorSpace = COLORSPACE_REC_601;
+    }
     config->stream.colorRange = video_cap.fullColorRange ? COLOR_RANGE_FULL : COLOR_RANGE_LIMITED;
 #if FEATURE_SURROUND_SOUND
     if (audio_cap.maxChannels < CHANNEL_COUNT_FROM_AUDIO_CONFIGURATION(config->stream.audioConfiguration)) {

diff --git a/third_party/ss4s b/third_party/ss4s
+5 −0		include/ss4s/video.h
+4 −1		modules/mmal/mmalvid.c
+4 −1		modules/steamlink/sl_video.c
+2 −0		modules/webos/lgnc/lgnc_video.c
+2 −0		modules/webos/ndl/webos4/ndl_video.c
+1 −0		modules/webos/ndl/webos5/ndl_video.c
+3 −3		modules/webos/smp/CMakeLists.txt
+2 −0		modules/webos/smp/src/smp_video.c