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

diff --git a/mixer.cpp b/mixer.cpp
index 6846d83..d55fa61 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();
 
@@ -1045,7 +1047,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