X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=theme.cpp;h=50adca52c770c856792c2fcb0fdb78aad2b4255c;hb=f815bbab16b716011ce5efa8d577e1e9786a48c0;hp=882890641831a22d8862927a881bacdafe66ab0d;hpb=03c9fd45ea3cdef9abde113b4840d8f7ed0d33d1;p=nageru diff --git a/theme.cpp b/theme.cpp index 8828906..50adca5 100644 --- a/theme.cpp +++ b/theme.cpp @@ -10,6 +10,9 @@ #include #include #include +#include +#include +#include #include "theme.h" @@ -48,7 +51,10 @@ Effect *get_effect(lua_State *L, int idx) if (luaL_testudata(L, idx, "WhiteBalanceEffect") || luaL_testudata(L, idx, "ResampleEffect") || luaL_testudata(L, idx, "PaddingEffect") || - luaL_testudata(L, idx, "IntegralPaddingEffect")) { + luaL_testudata(L, idx, "IntegralPaddingEffect") || + 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); @@ -80,20 +86,32 @@ int EffectChain_add_live_input(lua_State* L) 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) { + 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; } @@ -111,7 +129,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); @@ -157,6 +175,24 @@ int IntegralPaddingEffect_new(lua_State* L) 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); @@ -181,6 +217,22 @@ int Effect_set_int(lua_State *L) 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); + (void)effect->set_vec4(key, v); + return 0; +} + const luaL_Reg EffectChain_funcs[] = { { "new", EffectChain_new }, { "add_live_input", EffectChain_add_live_input }, @@ -198,6 +250,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 } }; @@ -205,6 +258,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 } }; @@ -212,6 +266,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 } }; @@ -219,6 +274,31 @@ 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 } +}; + +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 } }; @@ -264,6 +344,9 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool) 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); @@ -278,7 +361,7 @@ 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); } @@ -306,7 +389,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); } @@ -323,10 +406,32 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height) // 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); + } }); } +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); + } + return ret; +} + void Theme::connect_signal(YCbCrInput *input, int signal_num) { input->set_texture_num(0, input_textures[signal_num].tex_y); @@ -341,7 +446,19 @@ 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); + } +} + +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); } }