X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=61e2aedf743002c3784bebb63bc21a784f937efe;hb=c3003b00fa5281e2905a9e2f204d7b31893d01fc;hp=006149dec24a3c3b5fbb49b3b5335d9bcffc8313;hpb=5a27e30cfbb38ebb450b82ca28199e06d93ca78f;p=nageru diff --git a/theme.cpp b/theme.cpp index 006149d..61e2aed 100644 --- a/theme.cpp +++ b/theme.cpp @@ -1,19 +1,33 @@ -#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 "theme.h" +#include "defs.h" +#include "image_input.h" -#define WIDTH 1280 // FIXME -#define HEIGHT 720 // FIXME +namespace movit { +class ResourcePool; +} // namespace movit using namespace std; using namespace movit; @@ -22,6 +36,23 @@ namespace { vector live_inputs; +class LuaRefWithDeleter { +public: + LuaRefWithDeleter(mutex *m, lua_State *L, int ref) : m(m), L(L), ref(ref) {} + ~LuaRefWithDeleter() { + unique_lock lock(*m); + luaL_unref(L, LUA_REGISTRYINDEX, ref); + } + int get() const { return ref; } + +private: + LuaRefWithDeleter(const LuaRefWithDeleter &) = delete; + + mutex *m; + lua_State *L; + int ref; +}; + template int wrap_lua_object(lua_State* L, const char *class_name, Args&&... args) { @@ -45,11 +76,17 @@ Theme *get_theme_updata(lua_State* L) Effect *get_effect(lua_State *L, int idx) { if (luaL_testudata(L, idx, "WhiteBalanceEffect") || - luaL_testudata(L, idx, "ResampleEffect")) { + luaL_testudata(L, idx, "ResampleEffect") || + luaL_testudata(L, idx, "PaddingEffect") || + luaL_testudata(L, idx, "IntegralPaddingEffect") || + luaL_testudata(L, idx, "OverlayEffect") || + luaL_testudata(L, idx, "ResizeEffect") || + luaL_testudata(L, idx, "MixEffect") || + luaL_testudata(L, idx, "ImageInput")) { 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) @@ -58,6 +95,13 @@ bool checkbool(lua_State* L, int idx) return lua_toboolean(L, idx); } +std::string checkstdstring(lua_State *L, int index) +{ + size_t len; + const char* cstr = lua_tolstring(L, index, &len); + return std::string(cstr, len); +} + int EffectChain_new(lua_State* L) { assert(lua_gettop(L) == 2); @@ -69,28 +113,45 @@ 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) { - assert(lua_gettop(L) == 3); + assert(lua_gettop(L) >= 2); EffectChain *chain = (EffectChain *)luaL_checkudata(L, 1, "EffectChain"); // TODO: Better error reporting. - Effect *effect1 = get_effect(L, 2); - if (luaL_testudata(L, 3, "LiveInputWrapper")) { - LiveInputWrapper *effect2 = (LiveInputWrapper *)lua_touserdata(L, 3); - chain->add_effect(effect1, effect2->get_input()); + Effect *effect = get_effect(L, 2); + if (lua_gettop(L) == 2) { + if (effect->num_inputs() == 0) { + chain->add_input((Input *)effect); + } else { + chain->add_effect(effect); + } } else { - Effect *effect2 = get_effect(L, 3); - chain->add_effect(effect1, effect2); + vector inputs; + for (int idx = 3; idx <= lua_gettop(L); ++idx) { + if (luaL_testudata(L, idx, "LiveInputWrapper")) { + LiveInputWrapper *input = (LiveInputWrapper *)lua_touserdata(L, idx); + inputs.push_back(input->get_input()); + } else { + inputs.push_back(get_effect(L, idx)); + } + } + chain->add_effect(effect, inputs); } - lua_settop(L, 2); + lua_settop(L, 2); // Return the effect itself. + + // Make sure Lua doesn't garbage-collect it away. + lua_pushvalue(L, -1); + luaL_ref(L, LUA_REGISTRYINDEX); // TODO: leak? + return 1; } @@ -101,15 +162,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); @@ -130,6 +209,13 @@ int LiveInputWrapper_connect_signal(lua_State* L) return 0; } +int ImageInput_new(lua_State* L) +{ + assert(lua_gettop(L) == 1); + std::string filename = checkstdstring(L, 1); + return wrap_lua_object(L, "ImageInput", filename); +} + int WhiteBalanceEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); @@ -142,15 +228,45 @@ int ResampleEffect_new(lua_State* L) return wrap_lua_object(L, "ResampleEffect"); } +int PaddingEffect_new(lua_State* L) +{ + assert(lua_gettop(L) == 0); + return wrap_lua_object(L, "PaddingEffect"); +} + +int IntegralPaddingEffect_new(lua_State* L) +{ + assert(lua_gettop(L) == 0); + return wrap_lua_object(L, "IntegralPaddingEffect"); +} + +int OverlayEffect_new(lua_State* L) +{ + assert(lua_gettop(L) == 0); + return wrap_lua_object(L, "OverlayEffect"); +} + +int ResizeEffect_new(lua_State* L) +{ + assert(lua_gettop(L) == 0); + 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); Effect *effect = (Effect *)get_effect(L, 1); - size_t len; - const char* cstr = lua_tolstring(L, 2, &len); - std::string key(cstr, len); + std::string key = checkstdstring(L, 2); 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?)", key.c_str(), int(value)); + } return 0; } @@ -158,11 +274,44 @@ int Effect_set_int(lua_State *L) { assert(lua_gettop(L) == 3); Effect *effect = (Effect *)get_effect(L, 1); - size_t len; - const char* cstr = lua_tolstring(L, 2, &len); - std::string key(cstr, len); + std::string key = checkstdstring(L, 2); 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?)", key.c_str(), int(value)); + } + return 0; +} + +int Effect_set_vec3(lua_State *L) +{ + assert(lua_gettop(L) == 5); + Effect *effect = (Effect *)get_effect(L, 1); + std::string key = checkstdstring(L, 2); + 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?)", key.c_str(), + v[0], v[1], v[2]); + } + return 0; +} + +int Effect_set_vec4(lua_State *L) +{ + assert(lua_gettop(L) == 6); + Effect *effect = (Effect *)get_effect(L, 1); + std::string key = checkstdstring(L, 2); + float v[4]; + v[0] = luaL_checknumber(L, 3); + v[1] = luaL_checknumber(L, 4); + v[2] = luaL_checknumber(L, 5); + v[3] = luaL_checknumber(L, 6); + if (!effect->set_vec4(key, v)) { + luaL_error(L, "Effect refused set_vec4(\"%s\", %f, %f, %f, %f) (invalid key?)", key.c_str(), + v[0], v[1], v[2], v[3]); + } return 0; } @@ -179,10 +328,21 @@ const luaL_Reg LiveInputWrapper_funcs[] = { { NULL, NULL } }; +const luaL_Reg ImageInput_funcs[] = { + { "new", ImageInput_new }, + { "set_float", Effect_set_float }, + { "set_int", Effect_set_int }, + { "set_vec3", Effect_set_vec3 }, + { "set_vec4", Effect_set_vec4 }, + { NULL, NULL } +}; + 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 } }; @@ -190,18 +350,77 @@ 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 } +}; + +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 } +}; + +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 } +}; + +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 } +}; + +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 } +}; + +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 } }; } // 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; @@ -209,10 +428,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); } @@ -221,18 +444,22 @@ 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("ImageInput", ImageInput_funcs); register_class("WhiteBalanceEffect", WhiteBalanceEffect_funcs); register_class("ResampleEffect", ResampleEffect_funcs); + register_class("PaddingEffect", PaddingEffect_funcs); + 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); @@ -247,27 +474,32 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool) lua_getglobal(L, "num_channels"); if (lua_pcall(L, 0, 1, 0) != 0) { - fprintf(stderr, "error running function `num_channels': %s", lua_tostring(L, -1)); + fprintf(stderr, "error running function `num_channels': %s\n", lua_tostring(L, -1)); exit(1); } 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); @@ -275,7 +507,7 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height) lua_pushnumber(L, height); if (lua_pcall(L, 4, 2, 0) != 0) { - fprintf(stderr, "error running function `get_chain': %s", lua_tostring(L, -1)); + fprintf(stderr, "error running function `get_chain': %s\n", lua_tostring(L, -1)); exit(1); } @@ -285,19 +517,100 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height) exit(1); } lua_pushvalue(L, -1); - int funcref = luaL_ref(L, LUA_REGISTRYINDEX); // TODO: leak! + shared_ptr funcref(new LuaRefWithDeleter(&m, L, luaL_ref(L, LUA_REGISTRYINDEX))); lua_pop(L, 2); + assert(lua_gettop(L) == 0); return make_pair(chain, [this, funcref]{ unique_lock lock(m); // Set up state, including connecting signals. - lua_rawgeti(L, LUA_REGISTRYINDEX, funcref); - lua_pcall(L, 0, 0, 0); + lua_rawgeti(L, LUA_REGISTRYINDEX, funcref->get()); + if (lua_pcall(L, 0, 0, 0) != 0) { + 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); + lua_getglobal(L, "get_transitions"); + lua_pushnumber(L, t); + if (lua_pcall(L, 1, 1, 0) != 0) { + fprintf(stderr, "error running function `get_transitions': %s\n", lua_tostring(L, -1)); + exit(1); + } + + std::vector ret; + lua_pushnil(L); + while (lua_next(L, -2) != 0) { + 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); } @@ -310,7 +623,21 @@ void Theme::transition_clicked(int transition_num, float t) lua_pushnumber(L, t); if (lua_pcall(L, 2, 0, 0) != 0) { - fprintf(stderr, "error running function `transition_clicked': %s", lua_tostring(L, -1)); + 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) +{ + unique_lock lock(m); + lua_getglobal(L, "channel_clicked"); + lua_pushnumber(L, preview_num); + + if (lua_pcall(L, 1, 0, 0) != 0) { + fprintf(stderr, "error running function `channel_clicked': %s\n", lua_tostring(L, -1)); + exit(1); + } + assert(lua_gettop(L) == 0); }