X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=2b5c5b4257eeef1b0270e5dfc862702e11af0b89;hb=5c6163ad5daa01b486e44c394dd7cc9878ec5df5;hp=0c74a8b88c76b1acdb0b779440371c7f51eef0c8;hpb=f245cb0d0453e0e8bd5c7d40720bd0a5b50454ee;p=nageru

diff --git a/theme.cpp b/theme.cpp
index 0c74a8b..2b5c5b4 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -2,8 +2,7 @@
 
 #include <assert.h>
 #include <lauxlib.h>
-#include <lua.h>
-#include <lualib.h>
+#include <lua.hpp>
 #include <movit/effect.h>
 #include <movit/effect_chain.h>
 #include <movit/image_format.h>
@@ -12,6 +11,7 @@
 #include <movit/padding_effect.h>
 #include <movit/resample_effect.h>
 #include <movit/resize_effect.h>
+#include <movit/multiply_effect.h>
 #include <movit/util.h>
 #include <movit/white_balance_effect.h>
 #include <movit/ycbcr.h>
@@ -24,6 +24,7 @@
 #include <memory>
 
 #include "defs.h"
+#include "flags.h"
 #include "image_input.h"
 #include "mixer.h"
 
@@ -45,7 +46,7 @@ struct InputStateInfo {
 	InputStateInfo(const InputState& input_state);
 
 	unsigned last_width[MAX_CARDS], last_height[MAX_CARDS];
-	bool last_interlaced[MAX_CARDS];
+	bool last_interlaced[MAX_CARDS], last_has_signal[MAX_CARDS];
 	unsigned last_frame_rate_nom[MAX_CARDS], last_frame_rate_den[MAX_CARDS];
 };
 
@@ -56,12 +57,14 @@ InputStateInfo::InputStateInfo(const InputState &input_state)
 		if (frame.frame == nullptr) {
 			last_width[signal_num] = last_height[signal_num] = 0;
 			last_interlaced[signal_num] = false;
+			last_has_signal[signal_num] = false;
 			continue;
 		}
 		const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata;
 		last_width[signal_num] = userdata->last_width[frame.field_number];
 		last_height[signal_num] = userdata->last_height[frame.field_number];
 		last_interlaced[signal_num] = userdata->last_interlaced;
+		last_has_signal[signal_num] = userdata->last_has_signal;
 		last_frame_rate_nom[signal_num] = userdata->last_frame_rate_nom;
 		last_frame_rate_den[signal_num] = userdata->last_frame_rate_den;
 	}
@@ -134,6 +137,7 @@ Effect *get_effect(lua_State *L, int idx)
 	    luaL_testudata(L, idx, "IntegralPaddingEffect") ||
 	    luaL_testudata(L, idx, "OverlayEffect") ||
 	    luaL_testudata(L, idx, "ResizeEffect") ||
+	    luaL_testudata(L, idx, "MultiplyEffect") ||
 	    luaL_testudata(L, idx, "MixEffect") ||
 	    luaL_testudata(L, idx, "ImageInput")) {
 		return *(Effect **)lua_touserdata(L, idx);
@@ -324,6 +328,12 @@ int ResizeEffect_new(lua_State* L)
 	return wrap_lua_object_nonowned<ResizeEffect>(L, "ResizeEffect");
 }
 
+int MultiplyEffect_new(lua_State* L)
+{
+	assert(lua_gettop(L) == 0);
+	return wrap_lua_object_nonowned<MultiplyEffect>(L, "MultiplyEffect");
+}
+
 int MixEffect_new(lua_State* L)
 {
 	assert(lua_gettop(L) == 0);
@@ -360,6 +370,16 @@ int InputStateInfo_get_interlaced(lua_State* L)
 	return 1;
 }
 
+int InputStateInfo_get_has_signal(lua_State* L)
+{
+	assert(lua_gettop(L) == 2);
+	InputStateInfo *input_state_info = get_input_state_info(L, 1);
+	Theme *theme = get_theme_updata(L);
+	int signal_num = theme->map_signal(luaL_checknumber(L, 2));
+	lua_pushboolean(L, input_state_info->last_has_signal[signal_num]);
+	return 1;
+}
+
 int InputStateInfo_get_frame_rate_nom(lua_State* L)
 {
 	assert(lua_gettop(L) == 2);
@@ -514,6 +534,15 @@ const luaL_Reg ResizeEffect_funcs[] = {
 	{ NULL, NULL }
 };
 
+const luaL_Reg MultiplyEffect_funcs[] = {
+	{ "new", MultiplyEffect_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 MixEffect_funcs[] = {
 	{ "new", MixEffect_new },
 	{ "set_float", Effect_set_float },
@@ -527,6 +556,7 @@ const luaL_Reg InputStateInfo_funcs[] = {
 	{ "get_width", InputStateInfo_get_width },
 	{ "get_height", InputStateInfo_get_height },
 	{ "get_interlaced", InputStateInfo_get_interlaced },
+	{ "get_has_signal", InputStateInfo_get_has_signal },
 	{ "get_frame_rate_nom", InputStateInfo_get_frame_rate_nom },
 	{ "get_frame_rate_den", InputStateInfo_get_frame_rate_den },
 	{ NULL, NULL }
@@ -666,7 +696,7 @@ int call_num_channels(lua_State *L)
 }  // namespace
 
 Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_cards)
-	: resource_pool(resource_pool), num_cards(num_cards)
+	: resource_pool(resource_pool), num_cards(num_cards), signal_to_card_mapping(global_flags.default_stream_mapping)
 {
 	L = luaL_newstate();
         luaL_openlibs(L);
@@ -680,6 +710,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_car
 	register_class("IntegralPaddingEffect", IntegralPaddingEffect_funcs);
 	register_class("OverlayEffect", OverlayEffect_funcs);
 	register_class("ResizeEffect", ResizeEffect_funcs);
+	register_class("MultiplyEffect", MultiplyEffect_funcs);
 	register_class("MixEffect", MixEffect_funcs);
 	register_class("InputStateInfo", InputStateInfo_funcs);
 
@@ -731,7 +762,12 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
 		exit(1);
 	}
 
-	chain.chain = (EffectChain *)luaL_checkudata(L, -2, "EffectChain");
+	chain.chain = (EffectChain *)luaL_testudata(L, -2, "EffectChain");
+	if (chain.chain == nullptr) {
+		fprintf(stderr, "get_chain() for chain number %d did not return an EffectChain\n",
+			num);
+		exit(1);
+	}
 	if (!lua_isfunction(L, -1)) {
 		fprintf(stderr, "Argument #-1 should be a function\n");
 		exit(1);
@@ -798,6 +834,22 @@ int Theme::get_channel_signal(unsigned channel)
 	return ret;
 }
 
+std::string Theme::get_channel_color(unsigned channel)
+{
+	unique_lock<mutex> lock(m);
+	lua_getglobal(L, "channel_color");
+	lua_pushnumber(L, channel);
+	if (lua_pcall(L, 1, 1, 0) != 0) {
+		fprintf(stderr, "error running function `channel_color': %s\n", lua_tostring(L, -1));
+		exit(1);
+	}
+
+	std::string ret = checkstdstring(L, -1);
+	lua_pop(L, 1);
+	assert(lua_gettop(L) == 0);
+	return ret;
+}
+
 bool Theme::get_supports_set_wb(unsigned channel)
 {
 	unique_lock<mutex> lock(m);