X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fscene.cpp;h=11a3d2171de11851f89bf4e3f663a2f7b51780f6;hb=f34a3e1bbc207541842e0b54d5418d95bafc8e5b;hp=53a64a02c381176b560bb3a4d6b626673c18c382;hpb=1bf2b3e600dc5485f4957a419459b997d721e5fa;p=nageru

diff --git a/nageru/scene.cpp b/nageru/scene.cpp
index 53a64a0..11a3d21 100644
--- a/nageru/scene.cpp
+++ b/nageru/scene.cpp
@@ -18,7 +18,7 @@ extern "C" {
 using namespace movit;
 using namespace std;
 
-bool display(Block *block, lua_State *L, int idx);
+static bool display(Block *block, lua_State *L, int idx);
 
 EffectType current_type(const Block *block)
 {
@@ -209,6 +209,11 @@ int Scene::add_input(lua_State* L)
 		if (lua_isnumber(L, 2)) {
 			block->alternatives.emplace_back(new EffectBlueprint(LIVE_INPUT_YCBCR));
 			block->alternatives.emplace_back(new EffectBlueprint(LIVE_INPUT_YCBCR_WITH_DEINTERLACE));
+#ifdef HAVE_SRT
+			if (global_flags.srt_port >= 0) {
+				block->alternatives.emplace_back(new EffectBlueprint(LIVE_INPUT_YCBCR_PLANAR));
+			}
+#endif
 #ifdef HAVE_CEF
 		} else if (luaL_testudata(L, 2, "HTMLInput")) {
 			block->alternatives.emplace_back(new EffectBlueprint(LIVE_INPUT_BGRA));
@@ -339,7 +344,7 @@ const Block *Scene::find_root_input_block(lua_State *L, const Block *block)
 		const Block *parent = find_root_input_block(L, blocks[input_idx]);
 		if (parent != nullptr) {
 			if (ret != nullptr) {
-				luaL_error(L, "add_auto_white_balance() was connected to more than one input");
+				luaL_error(L, "add_white_balance() was connected to more than one input");
 			}
 			ret = parent;
 		}
@@ -347,7 +352,7 @@ const Block *Scene::find_root_input_block(lua_State *L, const Block *block)
 	return ret;
 }
 
-int Scene::add_auto_white_balance(lua_State* L)
+int Scene::add_white_balance(lua_State* L)
 {
 	assert(lua_gettop(L) >= 1);
 	Scene *scene = (Scene *)luaL_checkudata(L, 1, "Scene");
@@ -375,10 +380,10 @@ int Scene::add_auto_white_balance(lua_State* L)
 		block->inputs.push_back(find_block_from_arg(L, scene, 2)->idx);
 		block->white_balance_controller_block = find_block_from_arg(L, scene, 3);
 	} else {
-		luaL_error(L, "add_auto_white_balance([input], [white_balance_controller]) takes zero, one or two arguments");
+		luaL_error(L, "add_white_balance([input], [white_balance_controller]) takes zero, one or two arguments");
 	}
 	if (block->white_balance_controller_block == nullptr || !block->white_balance_controller_block->is_input) {
-		luaL_error(L, "add_auto_white_balance() does not get its white balance from an input");
+		luaL_error(L, "add_white_balance() does not get its white balance from an input");
 	}
 
 	scene->blocks.push_back(block);
@@ -417,7 +422,7 @@ Effect *Scene::instantiate_effects(const Block *block, size_t chain_idx, Scene::
 			pixel_format = bmusb::PixelFormat_8BitBGRA;
 		} else if (chosen_type == LIVE_INPUT_YCBCR_PLANAR) {
 			pixel_format = bmusb::PixelFormat_8BitYCbCrPlanar;
-		} else if (global_flags.ten_bit_input) {
+		} else if (global_flags.bit_depth > 8) {
 			pixel_format = bmusb::PixelFormat_10BitYCbCr;
 		} else {
 			pixel_format = bmusb::PixelFormat_8BitYCbCr;
@@ -495,10 +500,10 @@ int Scene::finalize(lua_State* L)
 	return 0;
 }
 
-int find_card_to_connect(lua_State *L, const Block *block)
+int find_card_to_connect(Theme *theme, lua_State *L, const Block *block)
 {
-	if (block->signal_type_to_connect == Block::CONNECT_CARD) {
-		return block->card_to_connect;
+	if (block->signal_type_to_connect == Block::CONNECT_SIGNAL) {
+		return theme->map_signal_to_card(block->signal_to_connect);
 #ifdef HAVE_CEF
 	} else if (block->signal_type_to_connect == Block::CONNECT_CEF) {
 		return block->cef_to_connect->get_card_index();
@@ -520,14 +525,23 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
 	// based on the current state of the signals.
 	InputStateInfo info(input_state);
 	for (Block *block : blocks) {
-		if (block->is_input && block->signal_type_to_connect == Block::CONNECT_CARD) {
-			EffectType chosen_type = current_type(block);
-			assert(chosen_type == LIVE_INPUT_YCBCR || chosen_type == LIVE_INPUT_YCBCR_WITH_DEINTERLACE);
-			if (info.last_interlaced[block->card_to_connect]) {
+		if (block->is_input && block->signal_type_to_connect == Block::CONNECT_SIGNAL) {
+			int card_index = theme->map_signal_to_card(block->signal_to_connect);
+			if (info.last_interlaced[card_index]) {
+				assert(info.last_pixel_format[card_index] == bmusb::PixelFormat_8BitYCbCr ||
+				       info.last_pixel_format[card_index] == bmusb::PixelFormat_10BitYCbCr);
 				block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR_WITH_DEINTERLACE);
+			} else if (info.last_pixel_format[card_index] == bmusb::PixelFormat_8BitYCbCrPlanar) {
+				block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR_PLANAR);
+			} else if (info.last_pixel_format[card_index] == bmusb::PixelFormat_8BitBGRA) {
+				block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_BGRA);
 			} else {
 				block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR);
 			}
+			if (block->currently_chosen_alternative == -1) {
+				fprintf(stderr, "ERROR: Input connected to a video card pixel format that it was not ready for.\n");
+				abort();
+			}
 		}
 	}
 
@@ -552,7 +566,7 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
 		       chosen_type == LIVE_INPUT_YCBCR_WITH_DEINTERLACE ||
 		       chosen_type == LIVE_INPUT_YCBCR_PLANAR ||
 		       chosen_type == LIVE_INPUT_BGRA);
-		int card_idx = find_card_to_connect(L, input);
+		int card_idx = find_card_to_connect(theme, L, input);
 		RGBTriplet wb = theme->get_white_balance_for_card(card_idx);
 		if (fabs(wb.r - 1.0) < 1e-3 && fabs(wb.g - 1.0) < 1e-3 && fabs(wb.b - 1.0) < 1e-3) {
 			// Neutral white balance.
@@ -603,7 +617,7 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
 		    chosen_type == LIVE_INPUT_YCBCR_PLANAR ||
 		    chosen_type == LIVE_INPUT_BGRA) {
 			LiveInputWrapper *input = index_and_input.second;
-			cards_to_connect.emplace(input, find_card_to_connect(L, block));
+			cards_to_connect.emplace(input, find_card_to_connect(theme, L, block));
 		}
 	}
 	for (const auto &index_and_input : instantiation.image_inputs) {
@@ -734,10 +748,9 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
 bool display(Block *block, lua_State *L, int idx)
 {
 	if (lua_isnumber(L, idx)) {
-		Theme *theme = get_theme_updata(L);
 		int signal_idx = luaL_checknumber(L, idx);
-		block->signal_type_to_connect = Block::CONNECT_CARD;
-		block->card_to_connect = theme->map_signal_to_card(signal_idx);
+		block->signal_type_to_connect = Block::CONNECT_SIGNAL;
+		block->signal_to_connect = signal_idx;
 		block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR);  // Will be changed to deinterlaced at get_chain() time if needed.
 		return true;
 #ifdef HAVE_CEF