X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.cpp;h=bb7613c9871e71df19db23feb39baccabf6ae993;hb=ecaec75dd52d076ba53cafa1fed716ebc0d93da6;hp=d63c853ff2fef227e0d620fe66ddc5511d3c3575;hpb=1bf2b3e600dc5485f4957a419459b997d721e5fa;p=nageru

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index d63c853..bb7613c 100644
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -102,6 +102,7 @@ InputStateInfo::InputStateInfo(const InputState &input_state)
 		last_is_connected[signal_num] = userdata->last_is_connected;
 		last_frame_rate_nom[signal_num] = userdata->last_frame_rate_nom;
 		last_frame_rate_den[signal_num] = userdata->last_frame_rate_den;
+		last_pixel_format[signal_num] = userdata->pixel_format;
 		has_last_subtitle[signal_num] = userdata->has_last_subtitle;
 		last_subtitle[signal_num] = userdata->last_subtitle;
 	}
@@ -866,7 +867,7 @@ const luaL_Reg Scene_funcs[] = {
 	{ "new", Scene_new },
 	{ "__gc", Scene_gc },
 	{ "add_input", Scene::add_input },
-	{ "add_auto_white_balance", Scene::add_auto_white_balance },
+	{ "add_white_balance", Scene::add_white_balance },
 	{ "add_effect", Scene::add_effect },
 	{ "add_optional_effect", Scene::add_optional_effect },
 	{ "finalize", Scene::finalize },
@@ -1201,7 +1202,14 @@ void LiveInputWrapper::connect_card(int card_idx, const InputState &input_state)
 			ycbcr_inputs[i]->set_texture_num(0, userdata->tex_y[frame.field_number]);
 			ycbcr_inputs[i]->set_texture_num(1, userdata->tex_cb[frame.field_number]);
 			ycbcr_inputs[i]->set_texture_num(2, userdata->tex_cr[frame.field_number]);
-			ycbcr_inputs[i]->change_ycbcr_format(userdata->ycbcr_format);
+			// YCbCrPlanar is used for video streams, where we can have metadata from the mux.
+			// Prefer that if there's no override. (Overrides are only available when using
+			// video as SRT cards.)
+			if (input_state.ycbcr_coefficients_auto[card_idx]) {
+				ycbcr_inputs[i]->change_ycbcr_format(userdata->ycbcr_format);
+			} else {
+				ycbcr_inputs[i]->change_ycbcr_format(input_ycbcr_format);
+			}
 			ycbcr_inputs[i]->set_width(width);
 			ycbcr_inputs[i]->set_height(height);
 			break;
@@ -1458,8 +1466,8 @@ int Nageru_set_audio_bus_eq_level_db(lua_State *L)
 	return 0;
 }
 
-Theme::Theme(const string &filename, const vector<string> &search_dirs, ResourcePool *resource_pool, unsigned num_cards)
-	: resource_pool(resource_pool), num_cards(num_cards), signal_to_card_mapping(global_flags.default_stream_mapping)
+Theme::Theme(const string &filename, const vector<string> &search_dirs, ResourcePool *resource_pool)
+	: resource_pool(resource_pool), signal_to_card_mapping(global_flags.default_stream_mapping)
 {
 	// Defaults.
 	channel_names[0] = "Live";
@@ -1740,8 +1748,8 @@ 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) {
+	chain.input_frames.reserve(MAX_VIDEO_CARDS * FRAME_HISTORY_LENGTH);
+	for (unsigned card_index = 0; card_index < MAX_VIDEO_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);
 		}
@@ -1951,24 +1959,25 @@ int Theme::map_signal_to_card(int signal_num)
 	}
 
 	int card_index;
-	if (global_flags.output_card != -1 && num_cards > 1) {
+	if (global_flags.output_card != -1) {
 		// Try to exclude the output card from the default card_index.
-		card_index = signal_num % (num_cards - 1);
+		card_index = signal_num % (global_flags.max_num_cards - 1);
 		if (card_index >= global_flags.output_card) {
 			 ++card_index;
 		}
-		if (signal_num >= int(num_cards - 1)) {
+		if (signal_num >= int(global_flags.max_num_cards - 1)) {
 			print_warning(L, "Theme asked for input %d, but we only have %u input card(s) (card %d is busy with output).\n",
-				signal_num, num_cards - 1, global_flags.output_card);
+				signal_num, global_flags.max_num_cards - 1, global_flags.output_card);
 			fprintf(stderr, "Mapping to card %d instead.\n", card_index);
 		}
 	} else {
-		card_index = signal_num % num_cards;
-		if (signal_num >= int(num_cards)) {
-			print_warning(L, "Theme asked for input %d, but we only have %u card(s).\n", signal_num, num_cards);
+		card_index = signal_num % global_flags.max_num_cards;
+		if (signal_num >= int(global_flags.max_num_cards)) {
+			print_warning(L, "Theme asked for input %d, but we only have %u card(s).\n", signal_num, global_flags.max_num_cards);
 			fprintf(stderr, "Mapping to card %d instead.\n", card_index);
 		}
 	}
+	global_mixer->force_card_active(card_index);
 	signal_to_card_mapping[signal_num] = card_index;
 	return card_index;
 }
@@ -1976,7 +1985,7 @@ int Theme::map_signal_to_card(int signal_num)
 void Theme::set_signal_mapping(int signal_num, int card_idx)
 {
 	lock_guard<mutex> lock(map_m);
-	assert(card_idx < int(num_cards));
+	assert(card_idx < MAX_VIDEO_CARDS);
 	signal_to_card_mapping[signal_num] = card_idx;
 }