X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=4ea8cd73b6eaf12ea23da9e363f8b8a2220ee4cd;hb=11cbb401c412f7403d236b35dce6869dd44eaa91;hp=4843b0cd3fff65519d2eaea3243c9eb69dd64271;hpb=9c824f7164eeecaa1aa904d69c5bb64fb3a6a27b;p=nageru diff --git a/theme.cpp b/theme.cpp index 4843b0c..4ea8cd7 100644 --- a/theme.cpp +++ b/theme.cpp @@ -1,20 +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 -#include "theme.h" +namespace movit { +class ResourcePool; +} // namespace movit #define WIDTH 1280 // FIXME #define HEIGHT 720 // FIXME @@ -123,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; - output_ycbcr_format.luma_coefficients = YCBCR_REC_709; + + // 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); @@ -222,6 +249,24 @@ int Effect_set_int(lua_State *L) return 0; } +int Effect_set_vec3(lua_State *L) +{ + assert(lua_gettop(L) == 5); + Effect *effect = (Effect *)get_effect(L, 1); + size_t len; + const char* cstr = lua_tolstring(L, 2, &len); + std::string key(cstr, len); + float v[3]; + v[0] = luaL_checknumber(L, 3); + v[1] = luaL_checknumber(L, 4); + v[2] = luaL_checknumber(L, 5); + if (!effect->set_vec3(key, v)) { + luaL_error(L, "Effect refused set_vec3(\"%s\", %f, %f, %f) (invalid key?)", cstr, + v[0], v[1], v[2]); + } + return 0; +} + int Effect_set_vec4(lua_State *L) { assert(lua_gettop(L) == 6); @@ -258,6 +303,7 @@ const luaL_Reg WhiteBalanceEffect_funcs[] = { { "new", WhiteBalanceEffect_new }, { "set_float", Effect_set_float }, { "set_int", Effect_set_int }, + { "set_vec3", Effect_set_vec3 }, { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; @@ -266,6 +312,7 @@ const luaL_Reg ResampleEffect_funcs[] = { { "new", ResampleEffect_new }, { "set_float", Effect_set_float }, { "set_int", Effect_set_int }, + { "set_vec3", Effect_set_vec3 }, { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; @@ -274,6 +321,7 @@ const luaL_Reg PaddingEffect_funcs[] = { { "new", PaddingEffect_new }, { "set_float", Effect_set_float }, { "set_int", Effect_set_int }, + { "set_vec3", Effect_set_vec3 }, { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; @@ -282,6 +330,7 @@ const luaL_Reg IntegralPaddingEffect_funcs[] = { { "new", IntegralPaddingEffect_new }, { "set_float", Effect_set_float }, { "set_int", Effect_set_int }, + { "set_vec3", Effect_set_vec3 }, { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; @@ -290,6 +339,7 @@ const luaL_Reg OverlayEffect_funcs[] = { { "new", OverlayEffect_new }, { "set_float", Effect_set_float }, { "set_int", Effect_set_int }, + { "set_vec3", Effect_set_vec3 }, { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; @@ -298,6 +348,7 @@ const luaL_Reg ResizeEffect_funcs[] = { { "new", ResizeEffect_new }, { "set_float", Effect_set_float }, { "set_int", Effect_set_int }, + { "set_vec3", Effect_set_vec3 }, { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; @@ -306,6 +357,7 @@ const luaL_Reg MixEffect_funcs[] = { { "new", MixEffect_new }, { "set_float", Effect_set_float }, { "set_int", Effect_set_int }, + { "set_vec3", Effect_set_vec3 }, { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; @@ -317,8 +369,20 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool overri { 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; @@ -326,7 +390,7 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool overri 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; if (override_bounce) { @@ -342,8 +406,8 @@ 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); @@ -376,22 +440,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); @@ -411,6 +480,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); @@ -420,9 +490,58 @@ 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); }); } +std::string Theme::get_channel_name(unsigned channel) +{ + unique_lock lock(m); + lua_getglobal(L, "channel_name"); + lua_pushnumber(L, channel); + if (lua_pcall(L, 1, 1, 0) != 0) { + fprintf(stderr, "error running function `channel_nam': %s\n", lua_tostring(L, -1)); + exit(1); + } + + std::string ret = lua_tostring(L, -1); + lua_pop(L, 1); + assert(lua_gettop(L) == 0); + return ret; +} + +bool Theme::get_supports_set_wb(unsigned channel) +{ + unique_lock lock(m); + lua_getglobal(L, "supports_set_wb"); + lua_pushnumber(L, channel); + if (lua_pcall(L, 1, 1, 0) != 0) { + fprintf(stderr, "error running function `supports_set_wb': %s\n", lua_tostring(L, -1)); + exit(1); + } + + bool ret = checkbool(L, -1); + lua_pop(L, 1); + assert(lua_gettop(L) == 0); + return ret; +} + +void Theme::set_wb(unsigned channel, double r, double g, double b) +{ + unique_lock lock(m); + lua_getglobal(L, "set_wb"); + lua_pushnumber(L, channel); + lua_pushnumber(L, r); + lua_pushnumber(L, g); + lua_pushnumber(L, b); + if (lua_pcall(L, 4, 0, 0) != 0) { + fprintf(stderr, "error running function `set_wb': %s\n", lua_tostring(L, -1)); + exit(1); + } + + assert(lua_gettop(L) == 0); +} + std::vector Theme::get_transition_names(float t) { unique_lock lock(m); @@ -439,11 +558,20 @@ 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)) { + if (signals_warned_about.insert(signal_num).second) { + 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); } @@ -459,6 +587,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) @@ -471,4 +600,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); }