X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=4680dedd378ff6896f0245cbb1e6318eba16104d;hb=7455834be5e9ff5818a270bf1408ebd7b2d018f9;hp=2c9af01cf69b36cc150d0f98c6140cefa814b650;hpb=08cf2c37c4178cf5dd029f960f1553ff111bb48e;p=nageru diff --git a/theme.cpp b/theme.cpp index 2c9af01..4680ded 100644 --- a/theme.cpp +++ b/theme.cpp @@ -1,30 +1,58 @@ -#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 -#include "theme.h" +#include "defs.h" +#include "image_input.h" +#include "mixer.h" -#define WIDTH 1280 // FIXME -#define HEIGHT 720 // FIXME +namespace movit { +class ResourcePool; +} // namespace movit using namespace std; using namespace movit; +extern Mixer *global_mixer; + 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) @@ -54,19 +82,36 @@ Effect *get_effect(lua_State *L, int idx) luaL_testudata(L, idx, "IntegralPaddingEffect") || luaL_testudata(L, idx, "OverlayEffect") || luaL_testudata(L, idx, "ResizeEffect") || - luaL_testudata(L, idx, "MixEffect")) { + luaL_testudata(L, idx, "MixEffect") || + luaL_testudata(L, idx, "ImageInput")) { return (Effect *)lua_touserdata(L, idx); } luaL_error(L, "Error: Index #%d was not an Effect type\n", idx); return nullptr; } +InputState *get_input_state(lua_State *L, int idx) +{ + if (luaL_testudata(L, idx, "InputState")) { + return (InputState *)lua_touserdata(L, idx); + } + luaL_error(L, "Error: Index #%d was not InputState\n", idx); + return nullptr; +} + bool checkbool(lua_State* L, int idx) { luaL_checktype(L, idx, LUA_TBOOLEAN); 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); @@ -93,7 +138,11 @@ int EffectChain_add_effect(lua_State* L) // TODO: Better error reporting. Effect *effect = get_effect(L, 2); if (lua_gettop(L) == 2) { - chain->add_effect(effect); + if (effect->num_inputs() == 0) { + chain->add_input((Input *)effect); + } else { + chain->add_effect(effect); + } } else { vector inputs; for (int idx = 3; idx <= lua_gettop(L); ++idx) { @@ -129,12 +178,10 @@ int EffectChain_finalize(lua_State* L) ImageFormat inout_format; inout_format.color_space = COLORSPACE_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. + // 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) { @@ -172,6 +219,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); @@ -214,16 +268,46 @@ int MixEffect_new(lua_State* L) return wrap_lua_object(L, "MixEffect"); } +int InputState_gc(lua_State* L) +{ + assert(lua_gettop(L) == 1); + InputState *input_state = get_input_state(L, 1); + input_state->~InputState(); + return 0; +} + +int InputState_get_width(lua_State* L) +{ + assert(lua_gettop(L) == 2); + InputState *input_state = (InputState *)lua_touserdata(L, 1); + Theme *theme = get_theme_updata(L); + int signal_num = theme->map_signal(luaL_checknumber(L, 2)); + BufferedFrame frame = input_state->buffered_frames[signal_num][0]; + const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata; + lua_pushnumber(L, userdata->last_width[frame.field_number]); + return 1; +} + +int InputState_get_height(lua_State* L) +{ + assert(lua_gettop(L) == 2); + InputState *input_state = (InputState *)lua_touserdata(L, 1); + Theme *theme = get_theme_updata(L); + int signal_num = theme->map_signal(luaL_checknumber(L, 2)); + BufferedFrame frame = input_state->buffered_frames[signal_num][0]; + const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata; + lua_pushnumber(L, userdata->last_height[frame.field_number]); + return 1; +} + 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); if (!effect->set_float(key, value)) { - luaL_error(L, "Effect refused set_float(\"%s\", %d) (invalid key?)", cstr, int(value)); + luaL_error(L, "Effect refused set_float(\"%s\", %d) (invalid key?)", key.c_str(), int(value)); } return 0; } @@ -232,12 +316,26 @@ 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); if (!effect->set_int(key, value)) { - luaL_error(L, "Effect refused set_int(\"%s\", %d) (invalid key?)", cstr, int(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; } @@ -246,16 +344,14 @@ int Effect_set_vec4(lua_State *L) { assert(lua_gettop(L) == 6); 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 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?)", cstr, + 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; @@ -274,10 +370,20 @@ 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 } }; @@ -286,6 +392,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 } }; @@ -294,6 +401,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 } }; @@ -302,6 +410,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 } }; @@ -310,6 +419,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 } }; @@ -318,6 +428,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 } }; @@ -326,10 +437,18 @@ 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 } }; +const luaL_Reg InputState_funcs[] = { + { "__gc", InputState_gc }, + { "get_width", InputState_get_width }, + { "get_height", InputState_get_height }, + { NULL, NULL } +}; + } // namespace LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool override_bounce) @@ -337,6 +456,13 @@ 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 @@ -364,17 +490,31 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool overri void LiveInputWrapper::connect_signal(int signal_num) { - theme->connect_signal(input, signal_num); + if (global_mixer == nullptr) { + // No data yet. + return; + } + + signal_num = theme->map_signal(signal_num); + + BufferedFrame frame = theme->input_state->buffered_frames[signal_num][0]; + const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata; + + input->set_texture_num(0, userdata->tex_y[frame.field_number]); + input->set_texture_num(1, userdata->tex_cbcr[frame.field_number]); + input->set_width(userdata->last_width[frame.field_number]); + input->set_height(userdata->last_height[frame.field_number]); } -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); 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); @@ -382,6 +522,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool) register_class("OverlayEffect", OverlayEffect_funcs); register_class("ResizeEffect", ResizeEffect_funcs); register_class("MixEffect", MixEffect_funcs); + register_class("InputState", InputState_funcs); // Run script. lua_settop(L, 0); @@ -408,18 +549,19 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool) void Theme::register_class(const char *class_name, const luaL_Reg *funcs) { assert(lua_gettop(L) == 0); - luaL_newmetatable(L, class_name); + luaL_newmetatable(L, class_name); // mt = {} lua_pushlightuserdata(L, this); - luaL_setfuncs(L, funcs, 1); + luaL_setfuncs(L, funcs, 1); // for (name,f in funcs) { mt[name] = f, with upvalue {theme} } lua_pushvalue(L, -1); - lua_setfield(L, -2, "__index"); - lua_setglobal(L, class_name); + lua_setfield(L, -2, "__index"); // mt.__index = mt + lua_setglobal(L, class_name); // ClassName = mt assert(lua_gettop(L) == 0); } -pair> -Theme::get_chain(unsigned num, float t, unsigned width, unsigned height) +Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned height, InputState input_state) { + Chain chain; + unique_lock lock(m); assert(lua_gettop(L) == 0); lua_getglobal(L, "get_chain"); /* function to be called */ @@ -427,32 +569,94 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height) lua_pushnumber(L, t); lua_pushnumber(L, width); lua_pushnumber(L, height); + wrap_lua_object(L, "InputState", input_state); - if (lua_pcall(L, 4, 2, 0) != 0) { + if (lua_pcall(L, 5, 2, 0) != 0) { fprintf(stderr, "error running function `get_chain': %s\n", lua_tostring(L, -1)); exit(1); } - EffectChain *chain = (EffectChain *)luaL_checkudata(L, -2, "EffectChain"); + chain.chain = (EffectChain *)luaL_checkudata(L, -2, "EffectChain"); if (!lua_isfunction(L, -1)) { fprintf(stderr, "Argument #-1 should be a function\n"); 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]{ + + chain.setup_chain = [this, funcref, input_state]{ unique_lock lock(m); + this->input_state = &input_state; + // Set up state, including connecting signals. - lua_rawgeti(L, LUA_REGISTRYINDEX, funcref); + 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); - }); + }; + + // TODO: Can we do better, e.g. by running setup_chain() and seeing what it references? + // Actually, setup_chain does maybe hold all the references we need now anyway? + for (unsigned card_index = 0; card_index < num_cards; ++card_index) { + for (unsigned frame_num = 0; frame_num < FRAME_HISTORY_LENGTH; ++frame_num) { + chain.input_frames.push_back(input_state.buffered_frames[card_index][frame_num].frame); + } + } + + return chain; +} + +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) @@ -476,10 +680,16 @@ std::vector Theme::get_transition_names(float t) return ret; } -void Theme::connect_signal(YCbCrInput *input, int signal_num) +int Theme::map_signal(int signal_num) { - input->set_texture_num(0, input_textures[signal_num].tex_y); - input->set_texture_num(1, input_textures[signal_num].tex_cbcr); + 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; + } + return signal_num; } void Theme::transition_clicked(int transition_num, float t)