X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=71970c90f3ac4e849f3c0252172cb558f65544bc;hb=f1ce3c5618f769b1388b39c637877d242c8ddeed;hp=ed34faed2c9a1411ce7417c06da9ab68f5e1fd40;hpb=fa0b850bb90894ae9686e0ad7a17ed1b2aafb5d1;p=nageru

diff --git a/theme.cpp b/theme.cpp
index ed34fae..71970c9 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -28,6 +28,7 @@
 #include <utility>
 
 #include "defs.h"
+#include "cef_capture.h"
 #include "ffmpeg_capture.h"
 #include "flags.h"
 #include "image_input.h"
@@ -227,7 +228,29 @@ int EffectChain_add_video_input(lua_State* L)
 	if (ret == 1) {
 		Theme *theme = get_theme_updata(L);
 		LiveInputWrapper **live_input = (LiveInputWrapper **)lua_touserdata(L, -1);
-		theme->register_signal_connection(*live_input, *capture);
+		theme->register_video_signal_connection(*live_input, *capture);
+	}
+	return ret;
+}
+
+int EffectChain_add_html_input(lua_State* L)
+{
+	assert(lua_gettop(L) == 2);
+	Theme *theme = get_theme_updata(L);
+	EffectChain *chain = (EffectChain *)luaL_checkudata(L, 1, "EffectChain");
+	CEFCapture **capture = (CEFCapture **)luaL_checkudata(L, 2, "HTMLInput");
+
+	// These need to be nonowned, so that the LiveInputWrapper still exists
+	// and can feed frames to the right EffectChain even if the Lua code
+	// doesn't care about the object anymore. (If we change this, we'd need
+	// 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);
+	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);
 	}
 	return ret;
 }
@@ -386,6 +409,53 @@ int VideoInput_get_signal_num(lua_State* L)
 	return 1;
 }
 
+int HTMLInput_new(lua_State* L)
+{
+	assert(lua_gettop(L) == 1);
+	string url = checkstdstring(L, 1);
+	int ret = wrap_lua_object_nonowned<CEFCapture>(L, "HTMLInput", url, global_flags.width, global_flags.height);
+	if (ret == 1) {
+		CEFCapture **capture = (CEFCapture **)lua_touserdata(L, -1);
+		Theme *theme = get_theme_updata(L);
+		theme->register_html_input(*capture);
+	}
+	return ret;
+}
+
+int HTMLInput_set_url(lua_State* L)
+{
+	assert(lua_gettop(L) == 2);
+	CEFCapture **video_input = (CEFCapture **)luaL_checkudata(L, 1, "HTMLInput");
+	string new_url = checkstdstring(L, 2);
+	(*video_input)->set_url(new_url);
+	return 0;
+}
+
+int HTMLInput_reload(lua_State* L)
+{
+	assert(lua_gettop(L) == 1);
+	CEFCapture **video_input = (CEFCapture **)luaL_checkudata(L, 1, "HTMLInput");
+	(*video_input)->reload();
+	return 0;
+}
+
+int HTMLInput_set_max_fps(lua_State* L)
+{
+	assert(lua_gettop(L) == 2);
+	CEFCapture **video_input = (CEFCapture **)luaL_checkudata(L, 1, "HTMLInput");
+	int max_fps = lrint(luaL_checknumber(L, 2));
+	(*video_input)->set_max_fps(max_fps);
+	return 0;
+}
+
+int HTMLInput_get_signal_num(lua_State* L)
+{
+	assert(lua_gettop(L) == 1);
+	CEFCapture **video_input = (CEFCapture **)luaL_checkudata(L, 1, "HTMLInput");
+	lua_pushnumber(L, -1 - (*video_input)->get_card_index());
+	return 1;
+}
+
 int WhiteBalanceEffect_new(lua_State* L)
 {
 	assert(lua_gettop(L) == 0);
@@ -566,6 +636,7 @@ const luaL_Reg EffectChain_funcs[] = {
 	{ "__gc", EffectChain_gc },
 	{ "add_live_input", EffectChain_add_live_input },
 	{ "add_video_input", EffectChain_add_video_input },
+	{ "add_html_input", EffectChain_add_html_input },
 	{ "add_effect", EffectChain_add_effect },
 	{ "finalize", EffectChain_finalize },
 	{ NULL, NULL }
@@ -593,6 +664,16 @@ const luaL_Reg VideoInput_funcs[] = {
 	{ NULL, NULL }
 };
 
+const luaL_Reg HTMLInput_funcs[] = {
+	// TODO: execute_javascript
+	{ "new", HTMLInput_new },
+	{ "set_url", HTMLInput_set_url },
+	{ "reload", HTMLInput_reload },
+	{ "set_max_fps", HTMLInput_set_max_fps },
+	{ "get_signal_num", HTMLInput_get_signal_num },
+	{ NULL, NULL }
+};
+
 const luaL_Reg WhiteBalanceEffect_funcs[] = {
 	{ "new", WhiteBalanceEffect_new },
 	{ "set_float", Effect_set_float },
@@ -906,6 +987,7 @@ Theme::Theme(const string &filename, const vector<string> &search_dirs, Resource
 	register_class("LiveInputWrapper", LiveInputWrapper_funcs); 
 	register_class("ImageInput", ImageInput_funcs);
 	register_class("VideoInput", VideoInput_funcs);
+	register_class("HTMLInput", HTMLInput_funcs);
 	register_class("WhiteBalanceEffect", WhiteBalanceEffect_funcs);
 	register_class("ResampleEffect", ResampleEffect_funcs);
 	register_class("PaddingEffect", PaddingEffect_funcs);
@@ -1043,6 +1125,7 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
 
 	// 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?
+	chain.input_frames.reserve(num_cards * FRAME_HISTORY_LENGTH);
 	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);