Switch default gamma input curve to Rec. 709.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index 56d5f84553c5d00bcbb0406c6548ec703fecd059..1536503adcece94f4ba20b7e2d626eb1604b86c0 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -128,7 +128,15 @@ int EffectChain_finalize(lua_State* L)
        // what's put in the H.264 stream (sps_rbsp()).
        ImageFormat inout_format;
        inout_format.color_space = COLORSPACE_REC_709;
-       inout_format.gamma_curve = GAMMA_REC_709;
+
+       // Gamma curve depends on the input signal, and we don't really get any
+       // indications. A camera would be expected to do Rec. 709, but
+       // I haven't checked if any do in practice. However, computers _do_ output
+       // in sRGB gamma (ie., they don't convert from sRGB to Rec. 709), and
+       // I wouldn't really be surprised if most non-professional cameras do, too.
+       // So we pick sRGB as the least evil here.
+       inout_format.gamma_curve = GAMMA_sRGB;
+
        if (is_main_chain) {
                YCbCrFormat output_ycbcr_format;
                // We actually output 4:2:0 in the end, but chroma subsampling
@@ -136,7 +144,7 @@ int EffectChain_finalize(lua_State* L)
                output_ycbcr_format.chroma_subsampling_x = 1;
                output_ycbcr_format.chroma_subsampling_y = 1;
                output_ycbcr_format.luma_coefficients = YCBCR_REC_709;
-               output_ycbcr_format.full_range = false;
+               output_ycbcr_format.full_range = true;
                output_ycbcr_format.num_levels = 256;
 
                chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_SPLIT_Y_AND_CBCR);