X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=9f549e968b7eb173f872d55fc316f7c1982ccc3e;hb=525665b0f6639686dad77785e81f31a5a9d87bc8;hp=6846d83ffdbaef73420d638cc1b282ce11cb02a3;hpb=96cb6414f85e0ef4d660b7bd56267303e80fcd05;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index 6846d83..9f549e9 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -217,6 +217,7 @@ void QueueLengthPolicy::update_policy(unsigned queue_length)
 		been_at_safe_point_since_last_starvation = false;
 		++metric_input_duped_frames;
 		metric_input_queue_safe_length_frames = safe_queue_length;
+		metric_input_queue_length_frames = 0;
 		return;
 	}
 	if (queue_length >= safe_queue_length) {
@@ -229,6 +230,7 @@ void QueueLengthPolicy::update_policy(unsigned queue_length)
 			card_index, safe_queue_length);
 		frames_with_at_least_one = 0;
 	}
+	metric_input_queue_length_frames = min(queue_length, safe_queue_length);  // The caller will drop frames for us if needed.
 }
 
 Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
@@ -237,9 +239,9 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 	  mixer_surface(create_surface(format)),
 	  h264_encoder_surface(create_surface(format)),
 	  decklink_output_surface(create_surface(format)),
-	  ycbcr_interpretation(global_flags.ycbcr_interpretation),
 	  audio_mixer(num_cards)
 {
+	memcpy(ycbcr_interpretation, global_flags.ycbcr_interpretation, sizeof(ycbcr_interpretation));
 	CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF));
 	check_error();
 
@@ -406,7 +408,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 	global_metrics.add("frames_output_dropped", &metric_frames_output_dropped);
 	global_metrics.add("start_time_seconds", &metric_start_time_seconds, Metrics::TYPE_GAUGE);
 	global_metrics.add("memory_used_bytes", &metrics_memory_used_bytes);
-	global_metrics.add("metrics_memory_locked_limit_bytes", &metrics_memory_locked_limit_bytes);
+	global_metrics.add("memory_locked_limit_bytes", &metrics_memory_locked_limit_bytes);
 }
 
 Mixer::~Mixer()
@@ -473,6 +475,24 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
 	audio_mixer.set_display_name(device, card->capture->get_description());
 	audio_mixer.trigger_state_changed_callback();
 
+	// Unregister old metrics, if any.
+	if (!card->labels.empty()) {
+		const vector<pair<string, string>> &labels = card->labels;
+		global_metrics.remove("input_received_frames", labels);
+		global_metrics.remove("input_dropped_frames_jitter", labels);
+		global_metrics.remove("input_dropped_frames_error", labels);
+		global_metrics.remove("input_dropped_frames_resets", labels);
+
+		global_metrics.remove("input_has_signal_bool", labels);
+		global_metrics.remove("input_is_connected_bool", labels);
+		global_metrics.remove("input_interlaced_bool", labels);
+		global_metrics.remove("input_width_pixels", labels);
+		global_metrics.remove("input_height_pixels", labels);
+		global_metrics.remove("input_frame_rate_nom", labels);
+		global_metrics.remove("input_frame_rate_den", labels);
+		global_metrics.remove("input_sample_rate_hz", labels);
+	}
+
 	// Register metrics.
 	vector<pair<string, string>> labels;
 	char card_name[64];
@@ -493,6 +513,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
 		assert(false);
 	}
 	card->queue_length_policy.register_metrics(labels);
+	global_metrics.add("input_received_frames", labels, &card->metric_input_received_frames);
 	global_metrics.add("input_dropped_frames_jitter", labels, &card->metric_input_dropped_frames_jitter);
 	global_metrics.add("input_dropped_frames_error", labels, &card->metric_input_dropped_frames_error);
 	global_metrics.add("input_dropped_frames_resets", labels, &card->metric_input_resets);
@@ -505,6 +526,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
 	global_metrics.add("input_frame_rate_nom", labels, &card->metric_input_frame_rate_nom, Metrics::TYPE_GAUGE);
 	global_metrics.add("input_frame_rate_den", labels, &card->metric_input_frame_rate_den, Metrics::TYPE_GAUGE);
 	global_metrics.add("input_sample_rate_hz", labels, &card->metric_input_sample_rate_hz, Metrics::TYPE_GAUGE);
+	card->labels = labels;
 }
 
 void Mixer::set_output_card_internal(int card_index)
@@ -570,6 +592,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 	DeviceSpec device{InputSourceType::CAPTURE_CARD, card_index};
 	CaptureCard *card = &cards[card_index];
 
+	++card->metric_input_received_frames;
 	card->metric_input_has_signal_bool = video_format.has_signal;
 	card->metric_input_is_connected_bool = video_format.is_connected;
 	card->metric_input_interlaced_bool = video_format.interlaced;
@@ -977,7 +1000,7 @@ void Mixer::thread_func()
 
 			printf("\n");
 
-			metrics_memory_used_bytes = used.ru_maxrss;
+			metrics_memory_used_bytes = used.ru_maxrss * 1024;
 		}
 
 
@@ -1045,7 +1068,6 @@ void Mixer::trim_queue(CaptureCard *card, unsigned card_index)
 		++dropped_frames;
 	}
 
-	metric_input_queue_length_frames = queue_length;
 	card->metric_input_dropped_frames_jitter += dropped_frames;
 
 #if 0
@@ -1081,6 +1103,7 @@ start:
 		// and then restart.
 		assert(cards[master_card_index].capture->get_disconnected());
 		handle_hotplugged_cards();
+		lock.unlock();
 		goto start;
 	}