X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=166dcb577dfa0bd6de2ef45378b99b01c527bede;hb=5546fa27f69dad8ec5872b9cc3eac0a0b043e369;hp=4ea8cd73b6eaf12ea23da9e363f8b8a2220ee4cd;hpb=9f1e8fb59e1b68b68b4bb1a05e1f4ee37ea47471;p=nageru diff --git a/theme.cpp b/theme.cpp index 4ea8cd7..166dcb5 100644 --- a/theme.cpp +++ b/theme.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -20,20 +21,65 @@ #include #include #include +#include + +#include "defs.h" +#include "image_input.h" +#include "mixer.h" namespace movit { class ResourcePool; } // namespace movit -#define WIDTH 1280 // FIXME -#define HEIGHT 720 // FIXME - using namespace std; using namespace movit; +extern Mixer *global_mixer; + namespace { -vector live_inputs; +// Contains basically the same data as InputState, but does not hold on to +// a reference to the frames. This is important so that we can release them +// without having to wait for Lua's GC. +struct InputStateInfo { + InputStateInfo(const InputState& input_state); + + unsigned last_width[MAX_CARDS], last_height[MAX_CARDS]; + bool last_interlaced[MAX_CARDS]; +}; + +InputStateInfo::InputStateInfo(const InputState &input_state) +{ + for (unsigned signal_num = 0; signal_num < MAX_CARDS; ++signal_num) { + BufferedFrame frame = input_state.buffered_frames[signal_num][0]; + if (frame.frame == nullptr) { + last_width[signal_num] = last_height[signal_num] = 0; + last_interlaced[signal_num] = false; + continue; + } + const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata; + last_width[signal_num] = userdata->last_width[frame.field_number]; + last_height[signal_num] = userdata->last_height[frame.field_number]; + last_interlaced[signal_num] = userdata->last_interlaced; + } +} + +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) @@ -63,19 +109,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; } +InputStateInfo *get_input_state_info(lua_State *L, int idx) +{ + if (luaL_testudata(L, idx, "InputStateInfo")) { + return (InputStateInfo *)lua_touserdata(L, idx); + } + luaL_error(L, "Error: Index #%d was not InputStateInfo\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); @@ -87,11 +150,12 @@ int EffectChain_new(lua_State* L) int EffectChain_add_live_input(lua_State* L) { - assert(lua_gettop(L) == 2); + assert(lua_gettop(L) == 3); Theme *theme = get_theme_updata(L); EffectChain *chain = (EffectChain *)luaL_checkudata(L, 1, "EffectChain"); bool override_bounce = checkbool(L, 2); - return wrap_lua_object(L, "LiveInputWrapper", theme, chain, override_bounce); + bool deinterlace = checkbool(L, 3); + return wrap_lua_object(L, "LiveInputWrapper", theme, chain, override_bounce, deinterlace); } int EffectChain_add_effect(lua_State* L) @@ -102,13 +166,17 @@ 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) { if (luaL_testudata(L, idx, "LiveInputWrapper")) { LiveInputWrapper *input = (LiveInputWrapper *)lua_touserdata(L, idx); - inputs.push_back(input->get_input()); + inputs.push_back(input->get_effect()); } else { inputs.push_back(get_effect(L, idx)); } @@ -179,6 +247,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); @@ -221,16 +296,44 @@ int MixEffect_new(lua_State* L) return wrap_lua_object(L, "MixEffect"); } +int InputStateInfo_get_width(lua_State* L) +{ + assert(lua_gettop(L) == 2); + InputStateInfo *input_state_info = get_input_state_info(L, 1); + Theme *theme = get_theme_updata(L); + int signal_num = theme->map_signal(luaL_checknumber(L, 2)); + lua_pushnumber(L, input_state_info->last_width[signal_num]); + return 1; +} + +int InputStateInfo_get_height(lua_State* L) +{ + assert(lua_gettop(L) == 2); + InputStateInfo *input_state_info = get_input_state_info(L, 1); + Theme *theme = get_theme_updata(L); + int signal_num = theme->map_signal(luaL_checknumber(L, 2)); + lua_pushnumber(L, input_state_info->last_height[signal_num]); + return 1; +} + +int InputStateInfo_get_interlaced(lua_State* L) +{ + assert(lua_gettop(L) == 2); + InputStateInfo *input_state_info = get_input_state_info(L, 1); + Theme *theme = get_theme_updata(L); + int signal_num = theme->map_signal(luaL_checknumber(L, 2)); + lua_pushboolean(L, input_state_info->last_interlaced[signal_num]); + 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; } @@ -239,12 +342,10 @@ 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; } @@ -253,15 +354,13 @@ 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); + 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?)", cstr, + luaL_error(L, "Effect refused set_vec3(\"%s\", %f, %f, %f) (invalid key?)", key.c_str(), v[0], v[1], v[2]); } return 0; @@ -271,16 +370,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; @@ -299,6 +396,15 @@ 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 }, @@ -362,10 +468,18 @@ const luaL_Reg MixEffect_funcs[] = { { NULL, NULL } }; +const luaL_Reg InputStateInfo_funcs[] = { + { "get_width", InputStateInfo_get_width }, + { "get_height", InputStateInfo_get_height }, + { "get_interlaced", InputStateInfo_get_interlaced }, + { NULL, NULL } +}; + } // namespace -LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool override_bounce) - : theme(theme) +LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool override_bounce, bool deinterlace) + : theme(theme), + deinterlace(deinterlace) { ImageFormat inout_format; inout_format.color_space = COLORSPACE_sRGB; @@ -393,17 +507,86 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool overri input_ycbcr_format.luma_coefficients = YCBCR_REC_709; input_ycbcr_format.full_range = false; - if (override_bounce) { - input = new NonBouncingYCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR); + unsigned num_inputs; + if (deinterlace) { + deinterlace_effect = new movit::DeinterlaceEffect(); + + // As per the comments in deinterlace_effect.h, we turn this off. + // The most likely interlaced input for us is either a camera + // (where it's fine to turn it off) or a laptop (where it _should_ + // be turned off). + CHECK(deinterlace_effect->set_int("enable_spatial_interlacing_check", 0)); + + num_inputs = deinterlace_effect->num_inputs(); + assert(num_inputs == FRAME_HISTORY_LENGTH); } else { - input = new YCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR); + num_inputs = 1; + } + for (unsigned i = 0; i < num_inputs; ++i) { + if (override_bounce) { + inputs.push_back(new NonBouncingYCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR)); + } else { + inputs.push_back(new YCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR)); + } + chain->add_input(inputs.back()); + } + + if (deinterlace) { + vector reverse_inputs(inputs.rbegin(), inputs.rend()); + chain->add_effect(deinterlace_effect, reverse_inputs); } - chain->add_input(input); } 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 first_frame = theme->input_state->buffered_frames[signal_num][0]; + if (first_frame.frame == nullptr) { + // No data yet. + return; + } + unsigned width, height; + { + const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)first_frame.frame->userdata; + width = userdata->last_width[first_frame.field_number]; + height = userdata->last_height[first_frame.field_number]; + } + + BufferedFrame last_good_frame = first_frame; + for (unsigned i = 0; i < inputs.size(); ++i) { + BufferedFrame frame = theme->input_state->buffered_frames[signal_num][i]; + if (frame.frame == nullptr) { + // Not enough data; reuse last frame (well, field). + // This is suboptimal, but we have nothing better. + frame = last_good_frame; + } + const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata; + + if (userdata->last_width[frame.field_number] != width || + userdata->last_height[frame.field_number] != height) { + // Resolution changed; reuse last frame/field. + frame = last_good_frame; + userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata; + } + + inputs[i]->set_texture_num(0, userdata->tex_y[frame.field_number]); + inputs[i]->set_texture_num(1, userdata->tex_cbcr[frame.field_number]); + inputs[i]->set_width(userdata->last_width[frame.field_number]); + inputs[i]->set_height(userdata->last_height[frame.field_number]); + + last_good_frame = frame; + } + + if (deinterlace) { + BufferedFrame frame = theme->input_state->buffered_frames[signal_num][0]; + CHECK(deinterlace_effect->set_int("current_field_position", frame.field_number)); + } } Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_cards) @@ -414,6 +597,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_car 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); @@ -421,6 +605,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_car register_class("OverlayEffect", OverlayEffect_funcs); register_class("ResizeEffect", ResizeEffect_funcs); register_class("MixEffect", MixEffect_funcs); + register_class("InputStateInfo", InputStateInfo_funcs); // Run script. lua_settop(L, 0); @@ -447,18 +632,19 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_car 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 */ @@ -466,32 +652,46 @@ 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, "InputStateInfo", 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) @@ -563,7 +763,7 @@ 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) { if (signal_num >= int(num_cards)) { if (signals_warned_about.insert(signal_num).second) { @@ -572,8 +772,7 @@ void Theme::connect_signal(YCbCrInput *input, int signal_num) } 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); + return signal_num; } void Theme::transition_clicked(int transition_num, float t)