#include <movit/effect_chain.h>
#include <movit/image_format.h>
#include <movit/input.h>
+#include <movit/lift_gamma_gain_effect.h>
#include <movit/mix_effect.h>
#include <movit/multiply_effect.h>
#include <movit/overlay_effect.h>
luaL_testudata(L, idx, "ResizeEffect") ||
luaL_testudata(L, idx, "MultiplyEffect") ||
luaL_testudata(L, idx, "MixEffect") ||
+ luaL_testudata(L, idx, "LiftGammaGainEffect") ||
luaL_testudata(L, idx, "ImageInput")) {
return *(Effect **)lua_touserdata(L, idx);
}
bmusb::PixelFormat pixel_format = global_flags.ten_bit_input ? bmusb::PixelFormat_10BitYCbCr : bmusb::PixelFormat_8BitYCbCr;
// Needs to be nonowned to match add_video_input (see below).
- return wrap_lua_object_nonowned<LiveInputWrapper>(L, "LiveInputWrapper", theme, chain, pixel_format, override_bounce, deinterlace);
+ return wrap_lua_object_nonowned<LiveInputWrapper>(L, "LiveInputWrapper", theme, chain, pixel_format, override_bounce, deinterlace, /*user_connectable=*/true);
}
int EffectChain_add_video_input(lua_State* L)
// to also unregister the signal connection on __gc.)
int ret = wrap_lua_object_nonowned<LiveInputWrapper>(
L, "LiveInputWrapper", theme, chain, (*capture)->get_current_pixel_format(),
- /*override_bounce=*/false, deinterlace);
+ /*override_bounce=*/false, deinterlace, /*user_connectable=*/false);
if (ret == 1) {
Theme *theme = get_theme_updata(L);
LiveInputWrapper **live_input = (LiveInputWrapper **)lua_touserdata(L, -1);
- theme->register_video_signal_connection(*live_input, *capture);
+ theme->register_video_signal_connection(chain, *live_input, *capture);
}
return ret;
}
// to also unregister the signal connection on __gc.)
int ret = wrap_lua_object_nonowned<LiveInputWrapper>(
L, "LiveInputWrapper", theme, chain, (*capture)->get_current_pixel_format(),
- /*override_bounce=*/false, /*deinterlace=*/false);
+ /*override_bounce=*/false, /*deinterlace=*/false, /*user_connectable=*/false);
if (ret == 1) {
Theme *theme = get_theme_updata(L);
LiveInputWrapper **live_input = (LiveInputWrapper **)lua_touserdata(L, -1);
- theme->register_html_signal_connection(*live_input, *capture);
+ theme->register_html_signal_connection(chain, *live_input, *capture);
}
return ret;
}
assert(lua_gettop(L) == 2);
LiveInputWrapper **input = (LiveInputWrapper **)luaL_checkudata(L, 1, "LiveInputWrapper");
int signal_num = luaL_checknumber(L, 2);
- (*input)->connect_signal(signal_num);
+ bool success = (*input)->connect_signal(signal_num);
+ if (!success) {
+ lua_Debug ar;
+ lua_getstack(L, 1, &ar);
+ lua_getinfo(L, "nSl", &ar);
+ fprintf(stderr, "ERROR: %s:%d: Calling connect_signal() on a video or HTML input. Ignoring.\n",
+ ar.source, ar.currentline);
+ }
return 0;
}
return 0;
}
+int VideoInput_disconnect(lua_State* L)
+{
+ assert(lua_gettop(L) == 1);
+ FFmpegCapture **video_input = (FFmpegCapture **)luaL_checkudata(L, 1, "VideoInput");
+ (*video_input)->disconnect();
+ return 0;
+}
+
int VideoInput_change_rate(lua_State* L)
{
assert(lua_gettop(L) == 2);
return wrap_lua_object_nonowned<MixEffect>(L, "MixEffect");
}
+int LiftGammaGainEffect_new(lua_State* L)
+{
+ assert(lua_gettop(L) == 0);
+ return wrap_lua_object_nonowned<LiftGammaGainEffect>(L, "LiftGammaGainEffect");
+}
+
int InputStateInfo_get_width(lua_State* L)
{
assert(lua_gettop(L) == 2);
const luaL_Reg VideoInput_funcs[] = {
{ "new", VideoInput_new },
{ "rewind", VideoInput_rewind },
+ { "disconnect", VideoInput_disconnect },
{ "change_rate", VideoInput_change_rate },
{ "get_signal_num", VideoInput_get_signal_num },
{ NULL, NULL }
{ NULL, NULL }
};
+const luaL_Reg LiftGammaGainEffect_funcs[] = {
+ { "new", LiftGammaGainEffect_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 InputStateInfo_funcs[] = {
{ "get_width", InputStateInfo_get_width },
{ "get_height", InputStateInfo_get_height },
} // namespace
-LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bmusb::PixelFormat pixel_format, bool override_bounce, bool deinterlace)
+LiveInputWrapper::LiveInputWrapper(
+ Theme *theme,
+ EffectChain *chain,
+ bmusb::PixelFormat pixel_format,
+ bool override_bounce,
+ bool deinterlace,
+ bool user_connectable)
: theme(theme),
pixel_format(pixel_format),
- deinterlace(deinterlace)
+ deinterlace(deinterlace),
+ user_connectable(user_connectable)
{
ImageFormat inout_format;
inout_format.color_space = COLORSPACE_sRGB;
}
}
-void LiveInputWrapper::connect_signal(int signal_num)
+bool LiveInputWrapper::connect_signal(int signal_num)
{
+ if (!user_connectable) {
+ return false;
+ }
+
if (global_mixer == nullptr) {
// No data yet.
- return;
+ return true;
}
signal_num = theme->map_signal(signal_num);
connect_signal_raw(signal_num, *theme->input_state);
+ return true;
}
void LiveInputWrapper::connect_signal_raw(int signal_num, const InputState &input_state)
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];
+ if (userdata->last_interlaced) {
+ height *= 2;
+ }
}
movit::YCbCrLumaCoefficients ycbcr_coefficients = input_state.ycbcr_coefficients[signal_num];
register_class("ResizeEffect", ResizeEffect_funcs);
register_class("MultiplyEffect", MultiplyEffect_funcs);
register_class("MixEffect", MixEffect_funcs);
+ register_class("LiftGammaGainEffect", LiftGammaGainEffect_funcs);
register_class("InputStateInfo", InputStateInfo_funcs);
register_class("ThemeMenu", ThemeMenu_funcs);
exit(1);
}
- chain.chain = (EffectChain *)luaL_testudata(L, -2, "EffectChain");
- if (chain.chain == nullptr) {
+ EffectChain *effect_chain = (EffectChain *)luaL_testudata(L, -2, "EffectChain");
+ if (effect_chain == nullptr) {
fprintf(stderr, "get_chain() for chain number %d did not return an EffectChain\n",
num);
exit(1);
}
+ chain.chain = effect_chain;
if (!lua_isfunction(L, -1)) {
fprintf(stderr, "Argument #-1 should be a function\n");
exit(1);
lua_pop(L, 2);
assert(lua_gettop(L) == 0);
- chain.setup_chain = [this, funcref, input_state]{
+ chain.setup_chain = [this, funcref, input_state, effect_chain]{
unique_lock<mutex> lock(m);
assert(this->input_state == nullptr);
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);
+ // The theme can't (or at least shouldn't!) call connect_signal() on
+ // each FFmpeg or CEF input, so we'll do it here.
+ if (video_signal_connections.count(effect_chain)) {
+ for (const VideoSignalConnection &conn : video_signal_connections[effect_chain]) {
+ conn.wrapper->connect_signal_raw(conn.source->get_card_index(), input_state);
+ }
+ }
+#ifdef HAVE_CEF
+ if (html_signal_connections.count(effect_chain)) {
+ for (const CEFSignalConnection &conn : html_signal_connections[effect_chain]) {
+ conn.wrapper->connect_signal_raw(conn.source->get_card_index(), input_state);
+ }
+ }
+#endif
+
this->input_state = nullptr;
};