X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=f32f637c03cb0aa683cece7d1fbaa4ed1cf60433;hb=d7bba4abb3d56893399578f0540b9ded0a28380f;hp=28218f6d5d1cb3cdd48f8fca84b34247369017b6;hpb=92d7d0f49eca3378714670843f244a8d7ae8b05d;p=nageru diff --git a/theme.cpp b/theme.cpp index 28218f6..f32f637 100644 --- a/theme.cpp +++ b/theme.cpp @@ -1,19 +1,29 @@ -#include +#include "theme.h" + +#include +#include #include #include -#include -#include -#include - +#include #include -#include -#include -#include -#include +#include +#include #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include -#include "theme.h" +namespace movit { +class ResourcePool; +} // namespace movit #define WIDTH 1280 // FIXME #define HEIGHT 720 // FIXME @@ -52,11 +62,12 @@ Effect *get_effect(lua_State *L, int idx) luaL_testudata(L, idx, "PaddingEffect") || luaL_testudata(L, idx, "IntegralPaddingEffect") || luaL_testudata(L, idx, "OverlayEffect") || - luaL_testudata(L, idx, "ResizeEffect")) { + luaL_testudata(L, idx, "ResizeEffect") || + luaL_testudata(L, idx, "MixEffect")) { return (Effect *)lua_touserdata(L, idx); } - fprintf(stderr, "Error: Index #%d was not an Effect type\n", idx); - exit(1); + luaL_error(L, "Error: Index #%d was not an Effect type\n", idx); + return nullptr; } bool checkbool(lua_State* L, int idx) @@ -76,10 +87,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(L, "LiveInputWrapper", theme, chain); + bool override_bounce = checkbool(L, 2); + return wrap_lua_object(L, "LiveInputWrapper", theme, chain, override_bounce); } int EffectChain_add_effect(lua_State* L) @@ -120,15 +132,33 @@ 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.color_space = COLORSPACE_REC_709; + + // Output gamma is tricky. We should output Rec. 709 for TV, except that + // we expect to run with web players and others that don't really care and + // just output with no conversion. So that means we'll need to output sRGB, + // even though H.264 has no setting for that (we use “unspecified”). 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 + // 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; + + // Rec. 709 would be the sane thing to do, but it seems many players + // (e.g. MPlayer and VLC) just default to BT.601 coefficients no matter + // what (see discussions in e.g. https://trac.ffmpeg.org/ticket/4978). + // We _do_ set the right flags, though, so that a player that works + // properly doesn't have to guess. output_ycbcr_format.luma_coefficients = YCBCR_REC_601; output_ycbcr_format.full_range = false; + 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); @@ -185,6 +215,12 @@ int ResizeEffect_new(lua_State* L) return wrap_lua_object(L, "ResizeEffect"); } +int MixEffect_new(lua_State* L) +{ + assert(lua_gettop(L) == 0); + return wrap_lua_object(L, "MixEffect"); +} + int Effect_set_float(lua_State *L) { assert(lua_gettop(L) == 3); @@ -193,7 +229,9 @@ int Effect_set_float(lua_State *L) const char* cstr = lua_tolstring(L, 2, &len); std::string key(cstr, len); float value = luaL_checknumber(L, 3); - (void)effect->set_float(key, value); + if (!effect->set_float(key, value)) { + luaL_error(L, "Effect refused set_float(\"%s\", %d) (invalid key?)", cstr, int(value)); + } return 0; } @@ -205,7 +243,9 @@ int Effect_set_int(lua_State *L) const char* cstr = lua_tolstring(L, 2, &len); std::string key(cstr, len); float value = luaL_checknumber(L, 3); - (void)effect->set_int(key, value); + if (!effect->set_int(key, value)) { + luaL_error(L, "Effect refused set_int(\"%s\", %d) (invalid key?)", cstr, int(value)); + } return 0; } @@ -221,7 +261,10 @@ int Effect_set_vec4(lua_State *L) v[1] = luaL_checknumber(L, 4); v[2] = luaL_checknumber(L, 5); v[3] = luaL_checknumber(L, 6); - (void)effect->set_vec4(key, v); + if (!effect->set_vec4(key, v)) { + luaL_error(L, "Effect refused set_vec4(\"%s\", %f, %f, %f, %f) (invalid key?)", cstr, + v[0], v[1], v[2], v[3]); + } return 0; } @@ -286,15 +329,35 @@ const luaL_Reg ResizeEffect_funcs[] = { { NULL, NULL } }; +const luaL_Reg MixEffect_funcs[] = { + { "new", MixEffect_new }, + { "set_float", Effect_set_float }, + { "set_int", Effect_set_int }, + { "set_vec4", Effect_set_vec4 }, + { NULL, NULL } +}; + } // 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; + + // 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; + // 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; @@ -302,10 +365,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); } @@ -314,14 +381,12 @@ void LiveInputWrapper::connect_signal(int signal_num) theme->connect_signal(input, signal_num); } -Theme::Theme(const char *filename, ResourcePool *resource_pool) - : resource_pool(resource_pool) +Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_cards) + : resource_pool(resource_pool), num_cards(num_cards) { L = luaL_newstate(); luaL_openlibs(L); - printf("constructing, this=%p\n", this); - register_class("EffectChain", EffectChain_funcs); register_class("LiveInputWrapper", LiveInputWrapper_funcs); register_class("WhiteBalanceEffect", WhiteBalanceEffect_funcs); @@ -330,6 +395,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool) register_class("IntegralPaddingEffect", IntegralPaddingEffect_funcs); register_class("OverlayEffect", OverlayEffect_funcs); register_class("ResizeEffect", ResizeEffect_funcs); + register_class("MixEffect", MixEffect_funcs); // Run script. lua_settop(L, 0); @@ -349,22 +415,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> Theme::get_chain(unsigned num, float t, unsigned width, unsigned height) { unique_lock lock(m); + assert(lua_gettop(L) == 0); lua_getglobal(L, "get_chain"); /* function to be called */ lua_pushnumber(L, num); lua_pushnumber(L, t); @@ -384,6 +455,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 lock(m); @@ -393,6 +465,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); }); } @@ -412,11 +485,18 @@ std::vector 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; } void Theme::connect_signal(YCbCrInput *input, int signal_num) { + if (signal_num >= int(num_cards)) { + fprintf(stderr, "WARNING: Theme asked for input %d, but we only have %u card(s).\n", signal_num, num_cards); + fprintf(stderr, "Mapping to card %d instead.\n", signal_num % num_cards); + signal_num %= num_cards; + } input->set_texture_num(0, input_textures[signal_num].tex_y); input->set_texture_num(1, input_textures[signal_num].tex_cbcr); } @@ -432,6 +512,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) @@ -444,4 +525,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); }