X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fscene.cpp;h=8506c9b20b68a5290ea0a8a258afe2ec23f94118;hb=0478d360a9aa0f816b21b0c6b1df91c1426c35d6;hp=a44c9a856316d2cf1f3296365b69862498a4e188;hpb=5225e714d1c55d2afde256acaf607d53ea21723b;p=nageru

diff --git a/nageru/scene.cpp b/nageru/scene.cpp
index a44c9a8..8506c9b 100644
--- a/nageru/scene.cpp
+++ b/nageru/scene.cpp
@@ -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));
@@ -521,14 +526,22 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
 	InputStateInfo info(input_state);
 	for (Block *block : blocks) {
 		if (block->is_input && block->signal_type_to_connect == Block::CONNECT_SIGNAL) {
-			EffectType chosen_type = current_type(block);
-			assert(chosen_type == LIVE_INPUT_YCBCR || chosen_type == LIVE_INPUT_YCBCR_WITH_DEINTERLACE);
 			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();
+			}
 		}
 	}