When encoding video without specifying any colorspace info, ffmpeg defaults to Rec.601. However xSTUDIO was defaulting to Rec.709 when decoding video with unspecified colourspace info. This fixes that discrepancy and and now round-trips with ffmpeg and also matches the behaviour of OpenRV.

Signed-off-by: Ken McGaugh <[email protected]>
Signed-off-by: Ted Waine <[email protected]>

Author: kenmcgaugh

src/plugin/media_reader/ffmpeg/src/ffmpeg_stream.cpp

@@ -130,19 +130,20 @@ void set_shader_pix_format_info(
     Imath::M33f yuv_to_rgb;
 
     switch (colorspace) {
-    case AVCOL_SPC_BT470BG:
-    case AVCOL_SPC_SMPTE170M:
-        yuv_to_rgb = YCbCr_to_RGB_601;
-        break;
     case AVCOL_SPC_BT2020_NCL:
     case AVCOL_SPC_BT2020_CL:
         // TODO: ColSci
         // Handle BT2020 CL
         yuv_to_rgb = YCbCr_to_RGB_2020;
         break;
     case AVCOL_SPC_BT709:
-    default:
         yuv_to_rgb = YCbCr_to_RGB_709;
+        break;
+    case AVCOL_SPC_BT470BG:
+    case AVCOL_SPC_SMPTE170M:
+    default:
+        yuv_to_rgb = YCbCr_to_RGB_601;
+        break;
     }
 
     switch (color_range) {