Make struct SynchronizationDelays more general.
Bug: none
Change-Id: Iab263789cc8b51917acb3db2803fa71a927bc62a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161640
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30060}
diff --git a/video/stream_synchronization.h b/video/stream_synchronization.h
index 9050d22..5f7ca6a 100644
--- a/video/stream_synchronization.h
+++ b/video/stream_synchronization.h
@@ -30,28 +30,28 @@
bool ComputeDelays(int relative_delay_ms,
int current_audio_delay_ms,
- int* extra_audio_delay_ms,
+ int* total_audio_delay_target_ms,
int* total_video_delay_target_ms);
- // On success |relative_delay| contains the number of milliseconds later video
- // is rendered relative audio. If audio is played back later than video a
- // |relative_delay| will be negative.
+ // On success |relative_delay_ms| contains the number of milliseconds later
+ // video is rendered relative audio. If audio is played back later than video
+ // |relative_delay_ms| will be negative.
static bool ComputeRelativeDelay(const Measurements& audio_measurement,
const Measurements& video_measurement,
int* relative_delay_ms);
- // Set target buffering delay - All audio and video will be delayed by at
- // least target_delay_ms.
+
+ // Set target buffering delay. Audio and video will be delayed by at least
+ // |target_delay_ms|.
void SetTargetBufferingDelay(int target_delay_ms);
private:
struct SynchronizationDelays {
- int extra_video_delay_ms = 0;
- int last_video_delay_ms = 0;
- int extra_audio_delay_ms = 0;
- int last_audio_delay_ms = 0;
+ int extra_ms = 0;
+ int last_ms = 0;
};
- SynchronizationDelays channel_delay_;
+ SynchronizationDelays audio_delay_;
+ SynchronizationDelays video_delay_;
const int video_stream_id_;
const int audio_stream_id_;
int base_target_delay_ms_;
