X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmixer.cpp;h=9d3b12cfd90d4bbad29f1d1bae3f54b2446a5fb6;hb=f34a3e1bbc207541842e0b54d5418d95bafc8e5b;hp=80fcb64a054bf3c2c3c8047dfb28de321e4e3604;hpb=f2c703f883d511cdf850de0d69902a820f371237;p=nageru

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 80fcb64..9d3b12c 100644
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -124,7 +124,7 @@ void ensure_texture_resolution(PBOFrameAllocator::Userdata *userdata, unsigned f
 		cbcr_width != userdata->last_cbcr_width[field] ||
 		cbcr_height != userdata->last_cbcr_height[field];
 	const bool recreate_v210_texture =
-		global_flags.ten_bit_input &&
+		global_flags.bit_depth > 8 &&
 		(first || v210_width != userdata->last_v210_width[field] || height != userdata->last_height[field]);
 
 	if (recreate_main_texture) {
@@ -234,6 +234,16 @@ void JitterHistory::unregister_metrics(const vector<pair<string, string>> &label
 
 void JitterHistory::frame_arrived(steady_clock::time_point now, int64_t frame_duration, size_t dropped_frames)
 {
+	if (frame_duration != last_duration) {
+		// If the frame rate changed, the input clock is also going to change,
+		// so our historical data doesn't make much sense anymore.
+		// Also, format changes typically introduce blips that are not representative
+		// of the typical frame stream. (We make the assumption that format changes
+		// don't happen all the time in regular use; if they did, we should probably
+		// rather keep the history so that we take jitter they may introduce into account.)
+		clear();
+		last_duration = frame_duration;
+	}
 	if (expected_timestamp > steady_clock::time_point::min()) {
 		expected_timestamp += dropped_frames * nanoseconds(frame_duration * 1000000000 / TIMEBASE);
 		double jitter_seconds = fabs(duration<double>(expected_timestamp - now).count());
@@ -277,7 +287,7 @@ void QueueLengthPolicy::unregister_metrics(const vector<pair<string, string>> &l
 }
 
 void QueueLengthPolicy::update_policy(steady_clock::time_point now,
-                                      steady_clock::time_point expected_next_frame,
+                                      steady_clock::time_point expected_next_input_frame,
                                       int64_t input_frame_duration,
                                       int64_t master_frame_duration,
                                       double max_input_card_jitter_seconds,
@@ -288,7 +298,7 @@ void QueueLengthPolicy::update_policy(steady_clock::time_point now,
 
 	// Figure out when we can expect the next frame for this card, assuming
 	// worst-case jitter (ie., the frame is maximally late).
-	double seconds_until_next_frame = max(duration<double>(expected_next_frame - now).count() + max_input_card_jitter_seconds, 0.0);
+	double seconds_until_next_frame = max(duration<double>(expected_next_input_frame - now).count() + max_input_card_jitter_seconds, 0.0);
 
 	// How many times are the master card expected to tick in that time?
 	// We assume the master clock has worst-case jitter but not any rate
@@ -354,7 +364,7 @@ Mixer::Mixer(const QSurfaceFormat &format)
 		ycbcr_format.luma_coefficients = YCBCR_REC_601;
 	}
 	ycbcr_format.full_range = false;
-	ycbcr_format.num_levels = 1 << global_flags.x264_bit_depth;
+	ycbcr_format.num_levels = 1 << global_flags.bit_depth;
 	ycbcr_format.cb_x_position = 0.0f;
 	ycbcr_format.cr_x_position = 0.0f;
 	ycbcr_format.cb_y_position = 0.5f;
@@ -368,7 +378,7 @@ Mixer::Mixer(const QSurfaceFormat &format)
 	// Display chain; shows the live output produced by the main chain (or rather, a copy of it).
 	display_chain.reset(new EffectChain(global_flags.width, global_flags.height, resource_pool.get()));
 	check_error();
-	GLenum type = global_flags.x264_bit_depth > 8 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE;
+	GLenum type = global_flags.bit_depth > 8 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE;
 	display_input = new YCbCrInput(inout_format, ycbcr_format, global_flags.width, global_flags.height, YCBCR_INPUT_SPLIT_Y_AND_CBCR, type);
 	display_chain->add_input(display_input);
 	display_chain->add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
@@ -419,7 +429,7 @@ Mixer::Mixer(const QSurfaceFormat &format)
 
 				DeckLinkCapture *capture = new DeckLinkCapture(decklink, card_index);
 				DeckLinkOutput *output = new DeckLinkOutput(resource_pool.get(), decklink_output_surface, global_flags.width, global_flags.height, card_index);
-				if (!output->set_device(decklink)) {
+				if (!output->set_device(decklink, capture->get_input())) {
 					delete output;
 					output = nullptr;
 				}
@@ -499,13 +509,9 @@ Mixer::Mixer(const QSurfaceFormat &format)
 	}
 #endif
 
-	for (unsigned card_index = 0; card_index < MAX_VIDEO_CARDS; ++card_index) {
-		cards[card_index].queue_length_policy.reset(card_index);
-	}
-
 	chroma_subsampler.reset(new ChromaSubsampler(resource_pool.get()));
 
-	if (global_flags.ten_bit_input) {
+	if (global_flags.bit_depth > 8) {
 		if (!v210Converter::has_hardware_support()) {
 			fprintf(stderr, "ERROR: --ten-bit-input requires support for OpenGL compute shaders\n");
 			fprintf(stderr, "       (OpenGL 4.3, or GL_ARB_compute_shader + GL_ARB_shader_image_load_store).\n");
@@ -522,7 +528,7 @@ Mixer::Mixer(const QSurfaceFormat &format)
 		v210_converter->precompile_shader(3840);
 		v210_converter->precompile_shader(4096);
 	}
-	if (global_flags.ten_bit_output) {
+	if (global_flags.bit_depth > 8) {
 		if (!v210Converter::has_hardware_support()) {
 			fprintf(stderr, "ERROR: --ten-bit-output requires support for OpenGL compute shaders\n");
 			fprintf(stderr, "       (OpenGL 4.3, or GL_ARB_compute_shader + GL_ARB_shader_image_load_store).\n");
@@ -537,6 +543,7 @@ Mixer::Mixer(const QSurfaceFormat &format)
 	if (global_flags.enable_alsa_output) {
 		alsa.reset(new ALSAOutput(OUTPUT_FREQUENCY, /*num_channels=*/2));
 	}
+	output_card_is_master = global_flags.output_card_is_master;
 	if (global_flags.output_card != -1) {
 		desired_output_card_index = global_flags.output_card;
 		set_output_card_internal(global_flags.output_card);
@@ -602,7 +609,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
 		pixel_format = capture->get_current_pixel_format();
 	} else if (card_type == CardType::CEF_INPUT) {
 		pixel_format = PixelFormat_8BitBGRA;
-	} else if (global_flags.ten_bit_input) {
+	} else if (global_flags.bit_depth > 8) {
 		pixel_format = PixelFormat_10BitYCbCr;
 	} else {
 		pixel_format = PixelFormat_8BitYCbCr;
@@ -890,10 +897,10 @@ void Mixer::set_output_card_internal(int card_index)
 		card->parked_capture = move(card->capture);
 		CaptureInterface *fake_capture = new FakeCapture(global_flags.width, global_flags.height, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio);
 		configure_card(card_index, fake_capture, CardType::FAKE_CAPTURE, card->output.release(), /*is_srt_card=*/false);
-		card->queue_length_policy.reset(card_index);
+		card->jitter_history.clear();
 		card->capture->start_bm_capture();
 		desired_output_video_mode = output_video_mode = card->output->pick_video_mode(desired_output_video_mode);
-		card->output->start_output(desired_output_video_mode, pts_int);
+		card->output->start_output(desired_output_video_mode, pts_int, /*is_master_card=*/output_card_is_master);
 	}
 	output_card_index = card_index;
 	output_jitter_history.clear();
@@ -1280,7 +1287,7 @@ void Mixer::thread_func()
 			DeckLinkOutput *output = cards[output_card_index].output.get();
 			output->end_output();
 			desired_output_video_mode = output_video_mode = output->pick_video_mode(desired_output_video_mode);
-			output->start_output(desired_output_video_mode, pts_int);
+			output->start_output(desired_output_video_mode, pts_int, /*is_master_card=*/output_card_is_master);
 		}
 
 		{
@@ -1293,7 +1300,7 @@ void Mixer::thread_func()
 
 		bool master_card_is_output;
 		unsigned master_card_index;
-		if (output_card_index != -1) {
+		if (output_card_index != -1 && output_card_is_master) {
 			master_card_is_output = true;
 			master_card_index = output_card_index;
 		} else {
@@ -1400,7 +1407,7 @@ void Mixer::thread_func()
 
 bool Mixer::input_card_is_master_clock(unsigned card_index, unsigned master_card_index) const
 {
-	if (output_card_index != -1) {
+	if (output_card_index != -1 && output_card_is_master) {
 		// The output card (ie., cards[output_card_index].output) is the master clock,
 		// so no input card (ie., cards[card_index].capture) is.
 		return false;
@@ -1608,7 +1615,7 @@ void Mixer::handle_hotplugged_cards()
 				fprintf(stderr, "Card %u went away, replacing with a fake card.\n", card_index);
 				FakeCapture *capture = new FakeCapture(global_flags.width, global_flags.height, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio);
 				configure_card(card_index, capture, CardType::FAKE_CAPTURE, /*output=*/nullptr, /*is_srt_card=*/false);
-				card->queue_length_policy.reset(card_index);
+				card->jitter_history.clear();
 				card->capture->start_bm_capture();
 			} else {
 				// NOTE: The theme might end up forcing the card back at some later point
@@ -1618,7 +1625,7 @@ void Mixer::handle_hotplugged_cards()
 				fprintf(stderr, "Card %u went away, removing. (To keep a fake card, increase --num-cards.)\n", card_index);
 				theme->remove_card(card_index);
 				configure_card(card_index, /*capture=*/nullptr, CardType::FAKE_CAPTURE, /*output=*/nullptr, /*is_srt_card=*/false);
-				card->queue_length_policy.reset(card_index);
+				card->jitter_history.clear();
 			}
 		}
 	}
@@ -1665,7 +1672,7 @@ void Mixer::handle_hotplugged_cards()
 			CaptureCard *card = &cards[free_card_index];
 			BMUSBCapture *capture = new BMUSBCapture(free_card_index, new_dev);
 			configure_card(free_card_index, capture, CardType::LIVE_CARD, /*output=*/nullptr, /*is_srt_card=*/false);
-			card->queue_length_policy.reset(free_card_index);
+			card->jitter_history.clear();
 			capture->set_card_disconnected_callback(bind(&Mixer::bm_hotplug_remove, this, free_card_index));
 			capture->start_bm_capture();
 		}
@@ -1721,7 +1728,7 @@ void Mixer::handle_hotplugged_cards()
 			configure_card(free_card_index, capture, CardType::FFMPEG_INPUT, /*output=*/nullptr, /*is_srt_card=*/true);
 			update_srt_stats(sock, card);  // Initial zero stats.
 			card->last_srt_stream_id = stream_id;
-			card->queue_length_policy.reset(free_card_index);
+			card->jitter_history.clear();
 			capture->set_card_disconnected_callback(bind(&Mixer::bm_hotplug_remove, this, free_card_index));
 			capture->start_bm_capture();
 		}
@@ -1734,7 +1741,7 @@ void Mixer::handle_hotplugged_cards()
 		if (card->capture == nullptr && card->force_active) {
 			FakeCapture *capture = new FakeCapture(global_flags.width, global_flags.height, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio);
 			configure_card(card_index, capture, CardType::FAKE_CAPTURE, /*output=*/nullptr, /*is_srt_card=*/false);
-			card->queue_length_policy.reset(card_index);
+			card->jitter_history.clear();
 			card->capture->start_bm_capture();
 		}
 	}
@@ -1814,7 +1821,7 @@ void Mixer::render_one_frame(int64_t duration)
 	output_ycbcr_format.chroma_subsampling_y = 1;
 	output_ycbcr_format.luma_coefficients = ycbcr_output_coefficients;
 	output_ycbcr_format.full_range = false;
-	output_ycbcr_format.num_levels = 1 << global_flags.x264_bit_depth;
+	output_ycbcr_format.num_levels = 1 << global_flags.bit_depth;
 	chain->change_ycbcr_output_format(output_ycbcr_format);
 
 	// Render main chain. If we're using zerocopy Quick Sync encoding
@@ -1827,8 +1834,8 @@ void Mixer::render_one_frame(int64_t duration)
 	GLuint y_tex, cbcr_full_tex, cbcr_tex;
 	GLuint y_copy_tex, cbcr_copy_tex = 0;
 	GLuint y_display_tex, cbcr_display_tex;
-	GLenum y_type = (global_flags.x264_bit_depth > 8) ? GL_R16 : GL_R8;
-	GLenum cbcr_type = (global_flags.x264_bit_depth > 8) ? GL_RG16 : GL_RG8;
+	GLenum y_type = (global_flags.bit_depth > 8) ? GL_R16 : GL_R8;
+	GLenum cbcr_type = (global_flags.bit_depth > 8) ? GL_RG16 : GL_RG8;
 	const bool is_zerocopy = video_encoder->is_zerocopy();
 	if (is_zerocopy) {
 		cbcr_full_tex = resource_pool->create_2d_texture(cbcr_type, global_flags.width, global_flags.height);
@@ -1980,7 +1987,7 @@ void Mixer::quit()
 	if (global_flags.srt_port >= 0) {
 		// There's seemingly no other reasonable way to wake up the thread
 		// (libsrt's epoll equivalent is busy-waiting).
-		int sock = srt_socket(AF_INET6, 0, 0);
+		int sock = srt_create_socket();
 		if (sock != -1) {
 			sockaddr_in6 addr;
 			memset(&addr, 0, sizeof(addr));
@@ -2020,7 +2027,7 @@ void Mixer::set_input_ycbcr_interpretation(unsigned card_index, const YCbCrInter
 void Mixer::start_mode_scanning(unsigned card_index)
 {
 	assert(card_index < MAX_VIDEO_CARDS);
-	if (cards[card_index].capture != nullptr) {
+	if (cards[card_index].capture == nullptr) {
 		// Inactive card. Should never happen.
 		return;
 	}
@@ -2189,7 +2196,7 @@ void Mixer::OutputChannel::set_color_updated_callback(Mixer::color_updated_callb
 #ifdef HAVE_SRT
 void Mixer::start_srt()
 {
-	SRTSOCKET sock = srt_socket(AF_INET6, 0, 0);
+	SRTSOCKET sock = srt_create_socket();
 	sockaddr_in6 addr;
 	memset(&addr, 0, sizeof(addr));
 	addr.sin6_family = AF_INET6;