#include <movit/resample_effect.h>
#include <movit/padding_effect.h>
#include <movit/overlay_effect.h>
+#include <movit/resize_effect.h>
+#include <movit/mix_effect.h>
#include "theme.h"
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)
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<LiveInputWrapper>(L, "LiveInputWrapper", theme, chain);
+ bool override_bounce = checkbool(L, 2);
+ return wrap_lua_object<LiveInputWrapper>(L, "LiveInputWrapper", theme, chain, override_bounce);
}
int EffectChain_add_effect(lua_State* L)
}
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;
}
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);
return wrap_lua_object<OverlayEffect>(L, "OverlayEffect");
}
+int ResizeEffect_new(lua_State* L)
+{
+ assert(lua_gettop(L) == 0);
+ return wrap_lua_object<ResizeEffect>(L, "ResizeEffect");
+}
+
+int MixEffect_new(lua_State* L)
+{
+ assert(lua_gettop(L) == 0);
+ return wrap_lua_object<MixEffect>(L, "MixEffect");
+}
+
int Effect_set_float(lua_State *L)
{
assert(lua_gettop(L) == 3);
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;
}
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;
}
v[1] = luaL_checknumber(L, 4);
v[2] = luaL_checknumber(L, 5);
v[3] = luaL_checknumber(L, 6);
- (void)effect->set_vec4(key, v);
+ 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;
}
{ 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;
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);
}
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);
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);
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);
}
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);
}
// 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<std::string> Theme::get_transition_names(float t)
+{
+ unique_lock<mutex> 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<std::string> 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);
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<mutex> 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);
}
}
projects / nageru / blobdiff