X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=7bfa009ca5ee49befa636859fcbbe3237767f886;hb=4db1223f01b0d1731ff571f20c677a7675b645ec;hp=31277f1cd87af1bf2e03a67a1f169dcdf8f8c03a;hpb=fa0b850bb90894ae9686e0ad7a17ed1b2aafb5d1;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index 31277f1..7bfa009 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -256,10 +256,12 @@ 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,
+                                      int64_t input_frame_duration,
                                       int64_t master_frame_duration,
                                       double max_input_card_jitter_seconds,
                                       double max_master_card_jitter_seconds)
 {
+	double input_frame_duration_seconds = input_frame_duration / double(TIMEBASE);
 	double master_frame_duration_seconds = master_frame_duration / double(TIMEBASE);
 
 	// Figure out when we can expect the next frame for this card, assuming
@@ -279,8 +281,8 @@ void QueueLengthPolicy::update_policy(steady_clock::time_point now,
 	// We account for this by looking at the situation five frames ahead,
 	// assuming everything else is the same.
 	double frames_allowed;
-	if (max_master_card_jitter_seconds < max_input_card_jitter_seconds) {
-		frames_allowed = frames_needed + 5 * (max_input_card_jitter_seconds - max_master_card_jitter_seconds) / master_frame_duration_seconds;
+	if (master_frame_duration < input_frame_duration) {
+		frames_allowed = frames_needed + 5 * (input_frame_duration_seconds - master_frame_duration_seconds) / master_frame_duration_seconds;
 	} else {
 		frames_allowed = frames_needed;
 	}
@@ -729,7 +731,9 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 		} while (!success);
 	}
 
-	audio_mixer.add_audio(device, audio_frame.data + audio_offset, num_samples, audio_format, frame_length, audio_frame.received_timestamp);
+	if (num_samples > 0) {
+		audio_mixer.add_audio(device, audio_frame.data + audio_offset, num_samples, audio_format, frame_length, audio_frame.received_timestamp);
+	}
 
 	// Done with the audio, so release it.
 	if (audio_frame.owner) {
@@ -738,11 +742,6 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 
 	card->last_timecode = timecode;
 
-	// Calculate jitter for this card here. We do it on arrival so that we
-	// make sure every frame counts, even the dropped ones -- and it will also
-	// make sure the jitter number is as recent as possible, should it change.
-	card->jitter_history.frame_arrived(video_frame.received_timestamp, frame_length, dropped_frames);
-
 	PBOFrameAllocator::Userdata *userdata = (PBOFrameAllocator::Userdata *)video_frame.userdata;
 
 	size_t cbcr_width, cbcr_height, cbcr_offset, y_offset;
@@ -786,8 +785,9 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 			new_frame.dropped_frames = dropped_frames;
 			new_frame.received_timestamp = video_frame.received_timestamp;
 			card->new_frames.push_back(move(new_frame));
-			card->new_frames_changed.notify_all();
+			card->jitter_history.frame_arrived(video_frame.received_timestamp, frame_length, dropped_frames);
 		}
+		card->new_frames_changed.notify_all();
 		return;
 	}
 
@@ -911,8 +911,9 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 			new_frame.dropped_frames = dropped_frames;
 			new_frame.received_timestamp = video_frame.received_timestamp;  // Ignore the audio timestamp.
 			card->new_frames.push_back(move(new_frame));
-			card->new_frames_changed.notify_all();
+			card->jitter_history.frame_arrived(video_frame.received_timestamp, frame_length, dropped_frames);
 		}
+		card->new_frames_changed.notify_all();
 	}
 }
 
@@ -1207,6 +1208,7 @@ start:
 			card->queue_length_policy.update_policy(
 				output_frame_info.frame_timestamp,
 				card->jitter_history.get_expected_next_frame(),
+				new_frames[master_card_index].length,
 				output_frame_info.frame_duration,
 				card->jitter_history.estimate_max_jitter(),
 				output_jitter_history.estimate_max_jitter());