From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 15 Jun 2017 17:33:01 +0000 (+0200)
Subject: Update the queue length metric after trimming, not before.
X-Git-Tag: 1.6.1~42
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=96cb6414f85e0ef4d660b7bd56267303e80fcd05

Update the queue length metric after trimming, not before.
---

diff --git a/mixer.cpp b/mixer.cpp
index 4560bbb..6846d83 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -207,8 +207,6 @@ void QueueLengthPolicy::register_metrics(const vector<pair<string, string>> &lab
 
 void QueueLengthPolicy::update_policy(unsigned queue_length)
 {
-	metric_input_queue_length_frames = queue_length;
-
 	if (queue_length == 0) {  // Starvation.
 		if (been_at_safe_point_since_last_starvation && safe_queue_length < unsigned(global_flags.max_input_queue_frames)) {
 			++safe_queue_length;
@@ -1047,6 +1045,7 @@ 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