Skip to content

Commit bdbbdae

Browse files
authored
Merge pull request #172 from kenmcgaugh/ffmpeg_colour_fix
FFmpeg colour fixes
2 parents 07163d0 + bd4e5ef commit bdbbdae

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,24 +130,25 @@ void set_shader_pix_format_info(
130130
Imath::M33f yuv_to_rgb;
131131

132132
switch (colorspace) {
133-
case AVCOL_SPC_BT470BG:
134-
case AVCOL_SPC_SMPTE170M:
135-
yuv_to_rgb = YCbCr_to_RGB_601;
136-
break;
137133
case AVCOL_SPC_BT2020_NCL:
138134
case AVCOL_SPC_BT2020_CL:
139135
// TODO: ColSci
140136
// Handle BT2020 CL
141137
yuv_to_rgb = YCbCr_to_RGB_2020;
142138
break;
143139
case AVCOL_SPC_BT709:
144-
default:
145140
yuv_to_rgb = YCbCr_to_RGB_709;
141+
break;
142+
case AVCOL_SPC_BT470BG:
143+
case AVCOL_SPC_SMPTE170M:
144+
default:
145+
yuv_to_rgb = YCbCr_to_RGB_601;
146+
break;
146147
}
147148

148149
switch (color_range) {
149150
case AVCOL_RANGE_JPEG: {
150-
Imath::V3f offset(1, 128, 128);
151+
Imath::V3f offset(0, 128, 128);
151152
offset *= std::pow(2.0f, float(bitdepth - 8));
152153
jsn["yuv_offsets"] = {"ivec3", 1, offset[0], offset[1], offset[2]};
153154
} break;

0 commit comments

Comments
 (0)