X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=f32f637c03cb0aa683cece7d1fbaa4ed1cf60433;hb=d7bba4abb3d56893399578f0540b9ded0a28380f;hp=5d42c3d661d8a05d99f05613bb18c1eb2470e4c7;hpb=1e4d9085b0fd09607c8da23008cbee3be8ff119d;p=nageru

diff --git a/theme.cpp b/theme.cpp
index 5d42c3d..f32f637 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -1,15 +1,29 @@
-#include <stdio.h>
+#include "theme.h"
+
+#include <assert.h>
+#include <lauxlib.h>
 #include <lua.h>
 #include <lualib.h>
-#include <lauxlib.h>
-#include <new>
-#include <utility>
-
+#include <movit/effect.h>
 #include <movit/effect_chain.h>
-#include <movit/ycbcr_input.h>
+#include <movit/image_format.h>
+#include <movit/mix_effect.h>
+#include <movit/overlay_effect.h>
+#include <movit/padding_effect.h>
+#include <movit/resample_effect.h>
+#include <movit/resize_effect.h>
 #include <movit/white_balance_effect.h>
+#include <movit/ycbcr.h>
+#include <movit/ycbcr_input.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <cstddef>
+#include <new>
+#include <utility>
 
-#include "theme.h"
+namespace movit {
+class ResourcePool;
+}  // namespace movit
 
 #define WIDTH 1280  // FIXME
 #define HEIGHT 720  // FIXME
@@ -41,6 +55,21 @@ Theme *get_theme_updata(lua_State* L)
 	return (Theme *)lua_touserdata(L, lua_upvalueindex(1));
 }
 
+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, "OverlayEffect") ||
+	    luaL_testudata(L, idx, "ResizeEffect") ||
+	    luaL_testudata(L, idx, "MixEffect")) {
+		return (Effect *)lua_touserdata(L, idx);
+	}
+	luaL_error(L, "Error: Index #%d was not an Effect type\n", idx);
+	return nullptr;
+}
+
 bool checkbool(lua_State* L, int idx)
 {
 	luaL_checktype(L, idx, LUA_TBOOLEAN);
@@ -58,23 +87,41 @@ int EffectChain_new(lua_State* L)
 
 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)
 {
-	assert(lua_gettop(L) == 3);
+	assert(lua_gettop(L) >= 2);
 	EffectChain *chain = (EffectChain *)luaL_checkudata(L, 1, "EffectChain");
 
-	// FIXME: This needs a lot of work.
-	Effect *effect1 = (Effect *)luaL_checkudata(L, 2, "WhiteBalanceEffect");
-	LiveInputWrapper *effect2 = (LiveInputWrapper *)luaL_checkudata(L, 3, "LiveInputWrapper");
-	chain->add_effect(effect1, effect2->get_input());
+	// TODO: Better error reporting.
+	Effect *effect = get_effect(L, 2);
+	if (lua_gettop(L) == 2) {
+		chain->add_effect(effect);
+	} else {
+		vector<Effect *> 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);  // Return the effect itself.
+
+	// Make sure Lua doesn't garbage-collect it away.
+	lua_pushvalue(L, -1);
+	luaL_ref(L, LUA_REGISTRYINDEX);  // TODO: leak?
 
-	lua_settop(L, 2);	
 	return 1;
 }
 
@@ -85,15 +132,33 @@ int EffectChain_finalize(lua_State* L)
 	bool is_main_chain = checkbool(L, 2);
 
 	// Add outputs as needed.
+	// NOTE: If you change any details about the output format, you will need to
+	// also update what's given to the muxer (HTTPD::Mux constructor) and
+	// what's put in the H.264 stream (sps_rbsp()).
 	ImageFormat inout_format;
-	inout_format.color_space = COLORSPACE_sRGB;
+	inout_format.color_space = COLORSPACE_REC_709;
+
+	// Output gamma is tricky. We should output Rec. 709 for TV, except that
+	// we expect to run with web players and others that don't really care and
+	// just output with no conversion. So that means we'll need to output sRGB,
+	// even though H.264 has no setting for that (we use “unspecified”).
 	inout_format.gamma_curve = GAMMA_sRGB;
+
 	if (is_main_chain) {
 		YCbCrFormat output_ycbcr_format;
+		// We actually output 4:2:0 in the end, but chroma subsampling
+		// happens in a pass not run by Movit (see Mixer::subsample_chroma()).
 		output_ycbcr_format.chroma_subsampling_x = 1;
 		output_ycbcr_format.chroma_subsampling_y = 1;
+
+		// Rec. 709 would be the sane thing to do, but it seems many players
+		// (e.g. MPlayer and VLC) just default to BT.601 coefficients no matter
+		// what (see discussions in e.g. https://trac.ffmpeg.org/ticket/4978).
+		// We _do_ set the right flags, though, so that a player that works
+		// properly doesn't have to guess.
 		output_ycbcr_format.luma_coefficients = YCBCR_REC_601;
 		output_ycbcr_format.full_range = false;
+		output_ycbcr_format.num_levels = 256;
 
 		chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_SPLIT_Y_AND_CBCR);
 		chain->set_dither_bits(8);
@@ -120,15 +185,86 @@ int WhiteBalanceEffect_new(lua_State* L)
 	return wrap_lua_object<WhiteBalanceEffect>(L, "WhiteBalanceEffect");
 }
 
-int WhiteBalanceEffect_set_float(lua_State *L)
+int ResampleEffect_new(lua_State* L)
+{
+	assert(lua_gettop(L) == 0);
+	return wrap_lua_object<ResampleEffect>(L, "ResampleEffect");
+}
+
+int PaddingEffect_new(lua_State* L)
+{
+	assert(lua_gettop(L) == 0);
+	return wrap_lua_object<PaddingEffect>(L, "PaddingEffect");
+}
+
+int IntegralPaddingEffect_new(lua_State* L)
+{
+	assert(lua_gettop(L) == 0);
+	return wrap_lua_object<IntegralPaddingEffect>(L, "IntegralPaddingEffect");
+}
+
+int OverlayEffect_new(lua_State* L)
+{
+	assert(lua_gettop(L) == 0);
+	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);
-	WhiteBalanceEffect *effect = (WhiteBalanceEffect *)luaL_checkudata(L, 1, "WhiteBalanceEffect");
+	Effect *effect = (Effect *)get_effect(L, 1);
 	size_t len;
 	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;
+}
+
+int Effect_set_int(lua_State *L)
+{
+	assert(lua_gettop(L) == 3);
+	Effect *effect = (Effect *)get_effect(L, 1);
+	size_t len;
+	const char* cstr = lua_tolstring(L, 2, &len);
+	std::string key(cstr, len);
+	float value = luaL_checknumber(L, 3);
+	if (!effect->set_int(key, value)) {
+		luaL_error(L, "Effect refused set_int(\"%s\", %d) (invalid key?)", cstr, int(value));
+	}
+	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);
+	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;
 }
 
@@ -147,19 +283,81 @@ const luaL_Reg LiveInputWrapper_funcs[] = {
 
 const luaL_Reg WhiteBalanceEffect_funcs[] = {
 	{ "new", WhiteBalanceEffect_new },
-	{ "set_float", WhiteBalanceEffect_set_float },
+	{ "set_float", Effect_set_float },
+	{ "set_int", Effect_set_int },
+	{ "set_vec4", Effect_set_vec4 },
+	{ NULL, NULL }
+};
+
+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 }
+};
+
+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 }
+};
+
+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 }
 };
 
 }  // namespace
 
-LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain)
+LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool override_bounce)
 	: theme(theme)
 {
 	ImageFormat inout_format;
 	inout_format.color_space = COLORSPACE_sRGB;
+
+	// Gamma curve depends on the input signal, and we don't really get any
+	// indications. A camera would be expected to do Rec. 709, but
+	// I haven't checked if any do in practice. However, computers _do_ output
+	// in sRGB gamma (ie., they don't convert from sRGB to Rec. 709), and
+	// I wouldn't really be surprised if most non-professional cameras do, too.
+	// So we pick sRGB as the least evil here.
 	inout_format.gamma_curve = GAMMA_sRGB;
 
+	// The Blackmagic driver docs claim that the device outputs Y'CbCr
+	// according to Rec. 601, but practical testing indicates it definitely
+	// is Rec. 709 (at least up to errors attributable to rounding errors).
+	// Perhaps 601 was only to indicate the subsampling positions, not the
+	// colorspace itself? Tested with a Lenovo X1 gen 3 as input.
 	YCbCrFormat input_ycbcr_format;
 	input_ycbcr_format.chroma_subsampling_x = 2;
 	input_ycbcr_format.chroma_subsampling_y = 1;
@@ -167,10 +365,14 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain)
 	input_ycbcr_format.cr_x_position = 0.0;
 	input_ycbcr_format.cb_y_position = 0.5;
 	input_ycbcr_format.cr_y_position = 0.5;
-	input_ycbcr_format.luma_coefficients = YCBCR_REC_601;
+	input_ycbcr_format.luma_coefficients = YCBCR_REC_709;
 	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);
 }
 
@@ -179,42 +381,61 @@ void LiveInputWrapper::connect_signal(int signal_num)
 	theme->connect_signal(input, signal_num);
 }
 
-Theme::Theme(const char *filename, ResourcePool *resource_pool)
-	: resource_pool(resource_pool)
+Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_cards)
+	: resource_pool(resource_pool), num_cards(num_cards)
 {
 	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); 
-
-        // Run script.
-        lua_settop(L, 0);
-        if (luaL_dofile(L, filename)) {
-                fprintf(stderr, "error: %s\n", lua_tostring(L, -1));
-                lua_pop(L, 1);
-                exit(1);
-        }
-        assert(lua_gettop(L) == 0); 
+	register_class("WhiteBalanceEffect", WhiteBalanceEffect_funcs);
+	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);
+	if (luaL_dofile(L, filename)) {
+		fprintf(stderr, "error: %s\n", lua_tostring(L, -1));
+		lua_pop(L, 1);
+		exit(1);
+	}
+	assert(lua_gettop(L) == 0);
+
+	// Ask it for the number of channels.
+	lua_getglobal(L, "num_channels");
+
+	if (lua_pcall(L, 0, 1, 0) != 0) {
+		fprintf(stderr, "error running function `num_channels': %s\n", lua_tostring(L, -1));
+		exit(1);
+	}
+
+	num_channels = luaL_checknumber(L, 1);
+	lua_pop(L, 1);
+	assert(lua_gettop(L) == 0);
 }
 
 void Theme::register_class(const char *class_name, const luaL_Reg *funcs)
 {
+	assert(lua_gettop(L) == 0);
 	luaL_newmetatable(L, class_name);
 	lua_pushlightuserdata(L, this);
 	luaL_setfuncs(L, funcs, 1);
 	lua_pushvalue(L, -1);
 	lua_setfield(L, -2, "__index");
 	lua_setglobal(L, class_name);
+	assert(lua_gettop(L) == 0);
 }
 
 pair<EffectChain *, function<void()>>
 Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
 {
 	unique_lock<mutex> lock(m);
+	assert(lua_gettop(L) == 0);
 	lua_getglobal(L, "get_chain");  /* function to be called */
 	lua_pushnumber(L, num);
 	lua_pushnumber(L, t);
@@ -222,7 +443,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);
 	}
 
@@ -234,17 +455,48 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
 	lua_pushvalue(L, -1);
 	int funcref = luaL_ref(L, LUA_REGISTRYINDEX);  // TODO: leak!
 	lua_pop(L, 2);
+	assert(lua_gettop(L) == 0);
 	return make_pair(chain, [this, funcref]{
 		unique_lock<mutex> lock(m);
 
 		// 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);
+		}
+		assert(lua_gettop(L) == 0);
 	});
 }
 
+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);
+	}
+	lua_pop(L, 1);
+	assert(lua_gettop(L) == 0);
+	return ret;
+}	
+
 void Theme::connect_signal(YCbCrInput *input, int signal_num)
 {
+	if (signal_num >= int(num_cards)) {
+		fprintf(stderr, "WARNING: Theme asked for input %d, but we only have %u card(s).\n", signal_num, num_cards);
+		fprintf(stderr, "Mapping to card %d instead.\n", signal_num % num_cards);
+		signal_num %= num_cards;
+	}
 	input->set_texture_num(0, input_textures[signal_num].tex_y);
 	input->set_texture_num(1, input_textures[signal_num].tex_cbcr);
 }
@@ -257,7 +509,21 @@ 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);
 	}
+	assert(lua_gettop(L) == 0);
+}
+
+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);
+	}
+	assert(lua_gettop(L) == 0);
 }