X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=767abac0389f98ea318513c583bd11c8f24f3067;hb=77717b38c14df84b13146506da891ced604c53a2;hp=410ac746c4f713f8b43dc32d0174483b8a682f25;hpb=75a3248d6a6ec01c45cb706dfbcec9f2e0e58f33;p=nageru diff --git a/theme.cpp b/theme.cpp index 410ac74..767abac 100644 --- a/theme.cpp +++ b/theme.cpp @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include "theme.h" @@ -50,11 +52,13 @@ Effect *get_effect(lua_State *L, int idx) luaL_testudata(L, idx, "ResampleEffect") || luaL_testudata(L, idx, "PaddingEffect") || luaL_testudata(L, idx, "IntegralPaddingEffect") || - luaL_testudata(L, idx, "OverlayEffect")) { + luaL_testudata(L, idx, "OverlayEffect") || + 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) @@ -74,10 +78,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) @@ -87,18 +92,27 @@ int EffectChain_add_effect(lua_State* L) // TODO: Better error reporting. Effect *effect = get_effect(L, 2); - 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)); + if (lua_gettop(L) == 2) { + 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()); + } else { + inputs.push_back(get_effect(L, idx)); + } } + chain->add_effect(effect, inputs); } - chain->add_effect(effect, inputs); 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; } @@ -116,7 +130,7 @@ int EffectChain_finalize(lua_State* L) YCbCrFormat output_ycbcr_format; output_ycbcr_format.chroma_subsampling_x = 1; output_ycbcr_format.chroma_subsampling_y = 1; - output_ycbcr_format.luma_coefficients = YCBCR_REC_601; + output_ycbcr_format.luma_coefficients = YCBCR_REC_709; output_ycbcr_format.full_range = false; chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_SPLIT_Y_AND_CBCR); @@ -168,6 +182,18 @@ int OverlayEffect_new(lua_State* L) 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); @@ -176,7 +202,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; } @@ -188,7 +216,28 @@ 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; +} + +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); + 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, + v[0], v[1], v[2], v[3]); + } return 0; } @@ -209,6 +258,7 @@ const luaL_Reg WhiteBalanceEffect_funcs[] = { { "new", WhiteBalanceEffect_new }, { "set_float", Effect_set_float }, { "set_int", Effect_set_int }, + { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; @@ -216,6 +266,7 @@ const luaL_Reg ResampleEffect_funcs[] = { { "new", ResampleEffect_new }, { "set_float", Effect_set_float }, { "set_int", Effect_set_int }, + { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; @@ -223,6 +274,7 @@ const luaL_Reg PaddingEffect_funcs[] = { { "new", PaddingEffect_new }, { "set_float", Effect_set_float }, { "set_int", Effect_set_int }, + { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; @@ -230,6 +282,7 @@ const luaL_Reg IntegralPaddingEffect_funcs[] = { { "new", IntegralPaddingEffect_new }, { "set_float", Effect_set_float }, { "set_int", Effect_set_int }, + { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; @@ -237,12 +290,29 @@ const luaL_Reg OverlayEffect_funcs[] = { { "new", OverlayEffect_new }, { "set_float", Effect_set_float }, { "set_int", Effect_set_int }, + { "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_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_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; @@ -259,7 +329,11 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain) input_ycbcr_format.luma_coefficients = YCBCR_REC_601; 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); } @@ -274,8 +348,6 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool) 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); @@ -283,6 +355,8 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool) 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); @@ -297,27 +371,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); @@ -325,7 +404,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); } @@ -337,15 +416,41 @@ 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); // Set up state, including connecting signals. lua_rawgeti(L, LUA_REGISTRYINDEX, funcref); - lua_pcall(L, 0, 0, 0); + 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::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) { input->set_texture_num(0, input_textures[signal_num].tex_y); @@ -360,7 +465,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); }