Make output full-range, which seems to fix the issues with (at least) MPlayer/VLC...

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index c1a25bab8171c06ae0fded9f563b0186fc8cab0a..5573c5562c0abce6cb651cfa1fb56690fa86f760 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -78,10 +78,11 @@ int EffectChain_new(lua_State* L)
 
 int EffectChain_add_live_input(lua_State* L)
 {
-       assert(lua_gettop(L) == 1);
+       assert(lua_gettop(L) == 2);
        Theme *theme = get_theme_updata(L);
        EffectChain *chain = (EffectChain *)luaL_checkudata(L, 1, "EffectChain");
-       return wrap_lua_object<LiveInputWrapper>(L, "LiveInputWrapper", theme, chain);
+       bool override_bounce = checkbool(L, 2);
+       return wrap_lua_object<LiveInputWrapper>(L, "LiveInputWrapper", theme, chain, override_bounce);
 }
 
 int EffectChain_add_effect(lua_State* L)
@@ -122,15 +123,21 @@ int EffectChain_finalize(lua_State* L)
        bool is_main_chain = checkbool(L, 2);
 
        // Add outputs as needed.
+       // NOTE: If you change any details about the output format, you will need to
+       // also update what's given to the muxer (HTTPD::Mux constructor) and
+       // what's put in the H.264 stream (sps_rbsp()).
        ImageFormat inout_format;
-       inout_format.color_space = COLORSPACE_sRGB;
-       inout_format.gamma_curve = GAMMA_sRGB;
+       inout_format.color_space = COLORSPACE_REC_709;
+       inout_format.gamma_curve = GAMMA_REC_709;
        if (is_main_chain) {
                YCbCrFormat output_ycbcr_format;
+               // We actually output 4:2:0 in the end, but chroma subsampling
+               // happens in a pass not run by Movit (see Mixer::subsample_chroma()).
                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);
                chain->set_dither_bits(8);
@@ -311,13 +318,18 @@ const luaL_Reg MixEffect_funcs[] = {
 
 }  // namespace
 
-LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain)
+LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool override_bounce)
        : theme(theme)
 {
        ImageFormat inout_format;
        inout_format.color_space = COLORSPACE_sRGB;
        inout_format.gamma_curve = GAMMA_sRGB;
 
+       // The Blackmagic driver docs claim that the device outputs Y'CbCr
+       // according to Rec. 601, but practical testing indicates it definitely
+       // is Rec. 709 (at least up to errors attributable to rounding errors).
+       // Perhaps 601 was only to indicate the subsampling positions, not the
+       // colorspace itself? Tested with a Lenovo X1 gen 3 as input.
        YCbCrFormat input_ycbcr_format;
        input_ycbcr_format.chroma_subsampling_x = 2;
        input_ycbcr_format.chroma_subsampling_y = 1;
@@ -325,10 +337,14 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain)
        input_ycbcr_format.cr_x_position = 0.0;
        input_ycbcr_format.cb_y_position = 0.5;
        input_ycbcr_format.cr_y_position = 0.5;
-       input_ycbcr_format.luma_coefficients = YCBCR_REC_601;
+       input_ycbcr_format.luma_coefficients = YCBCR_REC_709;
        input_ycbcr_format.full_range = false;
 
-       input = new YCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR);
+       if (override_bounce) {
+               input = new NonBouncingYCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR);
+       } else {
+               input = new YCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR);
+       }
        chain->add_input(input);
 }
 
@@ -371,22 +387,27 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool)
        }
 
        num_channels = luaL_checknumber(L, 1);
+       lua_pop(L, 1);
+       assert(lua_gettop(L) == 0);
 }
 
 void Theme::register_class(const char *class_name, const luaL_Reg *funcs)
 {
+       assert(lua_gettop(L) == 0);
        luaL_newmetatable(L, class_name);
        lua_pushlightuserdata(L, this);
        luaL_setfuncs(L, funcs, 1);
        lua_pushvalue(L, -1);
        lua_setfield(L, -2, "__index");
        lua_setglobal(L, class_name);
+       assert(lua_gettop(L) == 0);
 }
 
 pair<EffectChain *, function<void()>>
 Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
 {
        unique_lock<mutex> lock(m);
+       assert(lua_gettop(L) == 0);
        lua_getglobal(L, "get_chain");  /* function to be called */
        lua_pushnumber(L, num);
        lua_pushnumber(L, t);
@@ -406,6 +427,7 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
        lua_pushvalue(L, -1);
        int funcref = luaL_ref(L, LUA_REGISTRYINDEX);  // TODO: leak!
        lua_pop(L, 2);
+       assert(lua_gettop(L) == 0);
        return make_pair(chain, [this, funcref]{
                unique_lock<mutex> lock(m);
 
@@ -415,6 +437,7 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
                        fprintf(stderr, "error running chain setup callback: %s\n", lua_tostring(L, -1));
                        exit(1);
                }
+               assert(lua_gettop(L) == 0);
        });
 }
 
@@ -434,6 +457,8 @@ std::vector<std::string> Theme::get_transition_names(float t)
                ret.push_back(lua_tostring(L, -1));
                lua_pop(L, 1);
        }
+       lua_pop(L, 1);
+       assert(lua_gettop(L) == 0);
        return ret;
 }      
 
@@ -454,6 +479,7 @@ void Theme::transition_clicked(int transition_num, float t)
                fprintf(stderr, "error running function `transition_clicked': %s\n", lua_tostring(L, -1));
                exit(1);
        }
+       assert(lua_gettop(L) == 0);
 }
 
 void Theme::channel_clicked(int preview_num)
@@ -466,4 +492,5 @@ void Theme::channel_clicked(int preview_num)
                fprintf(stderr, "error running function `channel_clicked': %s\n", lua_tostring(L, -1));
                exit(1);
        }
+       assert(lua_gettop(L) == 0);
 }