stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 | * |
| 4 | * Use of this source code is governed by a BSD-style license |
| 5 | * that can be found in the LICENSE file in the root of the source |
| 6 | * tree. An additional intellectual property rights grant can be found |
| 7 | * in the file PATENTS. All contributing project authors may |
| 8 | * be found in the AUTHORS file in the root of the source tree. |
| 9 | */ |
| 10 | |
Jonas Olsson | a4d8737 | 2019-07-05 19:08:33 +0200 | [diff] [blame] | 11 | #include "video/stream_synchronization.h" |
| 12 | |
kjellander@webrtc.org | 0fcaf99 | 2015-11-26 15:24:52 +0100 | [diff] [blame] | 13 | #include <algorithm> |
| 14 | |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 15 | #include "system_wrappers/include/clock.h" |
Yves Gerey | 3e70781 | 2018-11-28 16:47:49 +0100 | [diff] [blame] | 16 | #include "system_wrappers/include/ntp_time.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 17 | #include "test/gtest.h" |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 18 | |
| 19 | namespace webrtc { |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 20 | namespace { |
| 21 | constexpr int kMaxAudioDiffMs = 80; // From stream_synchronization.cc |
| 22 | constexpr int kDefaultAudioFrequency = 8000; |
| 23 | constexpr int kDefaultVideoFrequency = 90000; |
| 24 | constexpr int kSmoothingFilter = 4 * 2; |
| 25 | } // namespace |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 26 | |
| 27 | class StreamSynchronizationTest : public ::testing::Test { |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 28 | public: |
| 29 | StreamSynchronizationTest() |
| 30 | : sync_(0, 0), clock_sender_(98765000), clock_receiver_(43210000) {} |
| 31 | |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 32 | protected: |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 33 | // Generates the necessary RTCP measurements and RTP timestamps and computes |
| 34 | // the audio and video delays needed to get the two streams in sync. |
| 35 | // |audio_delay_ms| and |video_delay_ms| are the number of milliseconds after |
| 36 | // capture which the frames are rendered. |
| 37 | // |current_audio_delay_ms| is the number of milliseconds which audio is |
| 38 | // currently being delayed by the receiver. |
| 39 | bool DelayedStreams(int audio_delay_ms, |
| 40 | int video_delay_ms, |
| 41 | int current_audio_delay_ms, |
| 42 | int* extra_audio_delay_ms, |
| 43 | int* total_video_delay_ms) { |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 44 | int audio_frequency = |
| 45 | static_cast<int>(kDefaultAudioFrequency * audio_clock_drift_ + 0.5); |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 46 | int video_frequency = |
| 47 | static_cast<int>(kDefaultVideoFrequency * video_clock_drift_ + 0.5); |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 48 | |
| 49 | // Generate NTP/RTP timestamp pair for both streams corresponding to RTCP. |
asapersson | de9e5ff | 2016-11-02 07:14:03 -0700 | [diff] [blame] | 50 | bool new_sr; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 51 | StreamSynchronization::Measurements audio; |
| 52 | StreamSynchronization::Measurements video; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 53 | NtpTime ntp_time = clock_sender_.CurrentNtpTime(); |
asapersson | fe50b4d | 2016-12-22 07:53:51 -0800 | [diff] [blame] | 54 | uint32_t rtp_timestamp = |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 55 | clock_sender_.CurrentTime().ms() * audio_frequency / 1000; |
asapersson | fe50b4d | 2016-12-22 07:53:51 -0800 | [diff] [blame] | 56 | EXPECT_TRUE(audio.rtp_to_ntp.UpdateMeasurements( |
| 57 | ntp_time.seconds(), ntp_time.fractions(), rtp_timestamp, &new_sr)); |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 58 | clock_sender_.AdvanceTimeMilliseconds(100); |
| 59 | clock_receiver_.AdvanceTimeMilliseconds(100); |
| 60 | ntp_time = clock_sender_.CurrentNtpTime(); |
| 61 | rtp_timestamp = clock_sender_.CurrentTime().ms() * video_frequency / 1000; |
asapersson | fe50b4d | 2016-12-22 07:53:51 -0800 | [diff] [blame] | 62 | EXPECT_TRUE(video.rtp_to_ntp.UpdateMeasurements( |
| 63 | ntp_time.seconds(), ntp_time.fractions(), rtp_timestamp, &new_sr)); |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 64 | clock_sender_.AdvanceTimeMilliseconds(900); |
| 65 | clock_receiver_.AdvanceTimeMilliseconds(900); |
| 66 | ntp_time = clock_sender_.CurrentNtpTime(); |
| 67 | rtp_timestamp = clock_sender_.CurrentTime().ms() * audio_frequency / 1000; |
asapersson | fe50b4d | 2016-12-22 07:53:51 -0800 | [diff] [blame] | 68 | EXPECT_TRUE(audio.rtp_to_ntp.UpdateMeasurements( |
| 69 | ntp_time.seconds(), ntp_time.fractions(), rtp_timestamp, &new_sr)); |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 70 | clock_sender_.AdvanceTimeMilliseconds(100); |
| 71 | clock_receiver_.AdvanceTimeMilliseconds(100); |
| 72 | ntp_time = clock_sender_.CurrentNtpTime(); |
| 73 | rtp_timestamp = clock_sender_.CurrentTime().ms() * video_frequency / 1000; |
asapersson | fe50b4d | 2016-12-22 07:53:51 -0800 | [diff] [blame] | 74 | EXPECT_TRUE(video.rtp_to_ntp.UpdateMeasurements( |
| 75 | ntp_time.seconds(), ntp_time.fractions(), rtp_timestamp, &new_sr)); |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 76 | clock_sender_.AdvanceTimeMilliseconds(900); |
| 77 | clock_receiver_.AdvanceTimeMilliseconds(900); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 78 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 79 | // Capture an audio and a video frame at the same time. |
asapersson | b7e7b49 | 2016-11-17 02:27:14 -0800 | [diff] [blame] | 80 | audio.latest_timestamp = |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 81 | clock_sender_.CurrentTime().ms() * audio_frequency / 1000; |
asapersson | b7e7b49 | 2016-11-17 02:27:14 -0800 | [diff] [blame] | 82 | video.latest_timestamp = |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 83 | clock_sender_.CurrentTime().ms() * video_frequency / 1000; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 84 | |
| 85 | if (audio_delay_ms > video_delay_ms) { |
| 86 | // Audio later than video. |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 87 | clock_receiver_.AdvanceTimeMilliseconds(video_delay_ms); |
| 88 | video.latest_receive_time_ms = clock_receiver_.CurrentTime().ms(); |
| 89 | clock_receiver_.AdvanceTimeMilliseconds(audio_delay_ms - video_delay_ms); |
| 90 | audio.latest_receive_time_ms = clock_receiver_.CurrentTime().ms(); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 91 | } else { |
| 92 | // Video later than audio. |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 93 | clock_receiver_.AdvanceTimeMilliseconds(audio_delay_ms); |
| 94 | audio.latest_receive_time_ms = clock_receiver_.CurrentTime().ms(); |
| 95 | clock_receiver_.AdvanceTimeMilliseconds(video_delay_ms - audio_delay_ms); |
| 96 | video.latest_receive_time_ms = clock_receiver_.CurrentTime().ms(); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 97 | } |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 98 | int relative_delay_ms; |
| 99 | StreamSynchronization::ComputeRelativeDelay(audio, video, |
| 100 | &relative_delay_ms); |
| 101 | EXPECT_EQ(video_delay_ms - audio_delay_ms, relative_delay_ms); |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 102 | return sync_.ComputeDelays(relative_delay_ms, current_audio_delay_ms, |
| 103 | extra_audio_delay_ms, total_video_delay_ms); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 104 | } |
| 105 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 106 | // Simulate audio playback 300 ms after capture and video rendering 100 ms |
| 107 | // after capture. Verify that the correct extra delays are calculated for |
| 108 | // audio and video, and that they change correctly when we simulate that |
| 109 | // NetEQ or the VCM adds more delay to the streams. |
| 110 | // TODO(holmer): This is currently wrong! We should simply change |
| 111 | // audio_delay_ms or video_delay_ms since those now include VCM and NetEQ |
| 112 | // delays. |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 113 | void BothDelayedAudioLaterTest(int base_target_delay) { |
| 114 | int current_audio_delay_ms = base_target_delay; |
| 115 | int audio_delay_ms = base_target_delay + 300; |
| 116 | int video_delay_ms = base_target_delay + 100; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 117 | int extra_audio_delay_ms = 0; |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 118 | int total_video_delay_ms = base_target_delay; |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 119 | int filtered_move = (audio_delay_ms - video_delay_ms) / kSmoothingFilter; |
pwestin@webrtc.org | 4e545b3 | 2013-04-26 15:23:34 +0000 | [diff] [blame] | 120 | const int kNeteqDelayIncrease = 50; |
| 121 | const int kNeteqDelayDecrease = 10; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 122 | |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 123 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, video_delay_ms, |
| 124 | current_audio_delay_ms, &extra_audio_delay_ms, |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 125 | &total_video_delay_ms)); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 126 | EXPECT_EQ(base_target_delay + filtered_move, total_video_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 127 | EXPECT_EQ(base_target_delay, extra_audio_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 128 | current_audio_delay_ms = extra_audio_delay_ms; |
| 129 | |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 130 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 131 | clock_receiver_.AdvanceTimeMilliseconds( |
| 132 | 1000 - std::max(audio_delay_ms, video_delay_ms)); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 133 | // Simulate base_target_delay minimum delay in the VCM. |
| 134 | total_video_delay_ms = base_target_delay; |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 135 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, video_delay_ms, |
| 136 | current_audio_delay_ms, &extra_audio_delay_ms, |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 137 | &total_video_delay_ms)); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 138 | EXPECT_EQ(base_target_delay + 2 * filtered_move, total_video_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 139 | EXPECT_EQ(base_target_delay, extra_audio_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 140 | current_audio_delay_ms = extra_audio_delay_ms; |
| 141 | |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 142 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 143 | clock_receiver_.AdvanceTimeMilliseconds( |
| 144 | 1000 - std::max(audio_delay_ms, video_delay_ms)); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 145 | // Simulate base_target_delay minimum delay in the VCM. |
| 146 | total_video_delay_ms = base_target_delay; |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 147 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, video_delay_ms, |
| 148 | current_audio_delay_ms, &extra_audio_delay_ms, |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 149 | &total_video_delay_ms)); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 150 | EXPECT_EQ(base_target_delay + 3 * filtered_move, total_video_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 151 | EXPECT_EQ(base_target_delay, extra_audio_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 152 | |
| 153 | // Simulate that NetEQ introduces some audio delay. |
pwestin@webrtc.org | 4e545b3 | 2013-04-26 15:23:34 +0000 | [diff] [blame] | 154 | current_audio_delay_ms = base_target_delay + kNeteqDelayIncrease; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 155 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 156 | clock_receiver_.AdvanceTimeMilliseconds( |
| 157 | 1000 - std::max(audio_delay_ms, video_delay_ms)); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 158 | // Simulate base_target_delay minimum delay in the VCM. |
| 159 | total_video_delay_ms = base_target_delay; |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 160 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, video_delay_ms, |
| 161 | current_audio_delay_ms, &extra_audio_delay_ms, |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 162 | &total_video_delay_ms)); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 163 | filtered_move = 3 * filtered_move + |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 164 | (kNeteqDelayIncrease + audio_delay_ms - video_delay_ms) / |
| 165 | kSmoothingFilter; |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 166 | EXPECT_EQ(base_target_delay + filtered_move, total_video_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 167 | EXPECT_EQ(base_target_delay, extra_audio_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 168 | |
| 169 | // Simulate that NetEQ reduces its delay. |
pwestin@webrtc.org | 4e545b3 | 2013-04-26 15:23:34 +0000 | [diff] [blame] | 170 | current_audio_delay_ms = base_target_delay + kNeteqDelayDecrease; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 171 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 172 | clock_receiver_.AdvanceTimeMilliseconds( |
| 173 | 1000 - std::max(audio_delay_ms, video_delay_ms)); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 174 | // Simulate base_target_delay minimum delay in the VCM. |
| 175 | total_video_delay_ms = base_target_delay; |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 176 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, video_delay_ms, |
| 177 | current_audio_delay_ms, &extra_audio_delay_ms, |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 178 | &total_video_delay_ms)); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 179 | |
| 180 | filtered_move = filtered_move + |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 181 | (kNeteqDelayDecrease + audio_delay_ms - video_delay_ms) / |
| 182 | kSmoothingFilter; |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 183 | |
| 184 | EXPECT_EQ(base_target_delay + filtered_move, total_video_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 185 | EXPECT_EQ(base_target_delay, extra_audio_delay_ms); |
| 186 | } |
| 187 | |
| 188 | void BothDelayedVideoLaterTest(int base_target_delay) { |
| 189 | int current_audio_delay_ms = base_target_delay; |
| 190 | int audio_delay_ms = base_target_delay + 100; |
| 191 | int video_delay_ms = base_target_delay + 300; |
| 192 | int extra_audio_delay_ms = 0; |
| 193 | int total_video_delay_ms = base_target_delay; |
| 194 | |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 195 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, video_delay_ms, |
| 196 | current_audio_delay_ms, &extra_audio_delay_ms, |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 197 | &total_video_delay_ms)); |
| 198 | EXPECT_EQ(base_target_delay, total_video_delay_ms); |
| 199 | // The audio delay is not allowed to change more than this in 1 second. |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 200 | EXPECT_GE(base_target_delay + kMaxAudioDiffMs, extra_audio_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 201 | current_audio_delay_ms = extra_audio_delay_ms; |
| 202 | int current_extra_delay_ms = extra_audio_delay_ms; |
| 203 | |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 204 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 205 | clock_receiver_.AdvanceTimeMilliseconds(800); |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 206 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, video_delay_ms, |
| 207 | current_audio_delay_ms, &extra_audio_delay_ms, |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 208 | &total_video_delay_ms)); |
| 209 | EXPECT_EQ(base_target_delay, total_video_delay_ms); |
| 210 | // The audio delay is not allowed to change more than the half of the |
| 211 | // required change in delay. |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 212 | EXPECT_EQ(current_extra_delay_ms + |
| 213 | MaxAudioDelayIncrease( |
| 214 | current_audio_delay_ms, |
| 215 | base_target_delay + video_delay_ms - audio_delay_ms), |
| 216 | extra_audio_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 217 | current_audio_delay_ms = extra_audio_delay_ms; |
| 218 | current_extra_delay_ms = extra_audio_delay_ms; |
| 219 | |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 220 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 221 | clock_receiver_.AdvanceTimeMilliseconds(800); |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 222 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, video_delay_ms, |
| 223 | current_audio_delay_ms, &extra_audio_delay_ms, |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 224 | &total_video_delay_ms)); |
| 225 | EXPECT_EQ(base_target_delay, total_video_delay_ms); |
| 226 | // The audio delay is not allowed to change more than the half of the |
| 227 | // required change in delay. |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 228 | EXPECT_EQ(current_extra_delay_ms + |
| 229 | MaxAudioDelayIncrease( |
| 230 | current_audio_delay_ms, |
| 231 | base_target_delay + video_delay_ms - audio_delay_ms), |
| 232 | extra_audio_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 233 | current_extra_delay_ms = extra_audio_delay_ms; |
| 234 | |
| 235 | // Simulate that NetEQ for some reason reduced the delay. |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 236 | current_audio_delay_ms = base_target_delay + 10; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 237 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 238 | clock_receiver_.AdvanceTimeMilliseconds(800); |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 239 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, video_delay_ms, |
| 240 | current_audio_delay_ms, &extra_audio_delay_ms, |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 241 | &total_video_delay_ms)); |
| 242 | EXPECT_EQ(base_target_delay, total_video_delay_ms); |
| 243 | // Since we only can ask NetEQ for a certain amount of extra delay, and |
| 244 | // we only measure the total NetEQ delay, we will ask for additional delay |
| 245 | // here to try to stay in sync. |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 246 | EXPECT_EQ(current_extra_delay_ms + |
| 247 | MaxAudioDelayIncrease( |
| 248 | current_audio_delay_ms, |
| 249 | base_target_delay + video_delay_ms - audio_delay_ms), |
| 250 | extra_audio_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 251 | current_extra_delay_ms = extra_audio_delay_ms; |
| 252 | |
| 253 | // Simulate that NetEQ for some reason significantly increased the delay. |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 254 | current_audio_delay_ms = base_target_delay + 350; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 255 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 256 | clock_receiver_.AdvanceTimeMilliseconds(800); |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 257 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, video_delay_ms, |
| 258 | current_audio_delay_ms, &extra_audio_delay_ms, |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 259 | &total_video_delay_ms)); |
| 260 | EXPECT_EQ(base_target_delay, total_video_delay_ms); |
| 261 | // The audio delay is not allowed to change more than the half of the |
| 262 | // required change in delay. |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 263 | EXPECT_EQ(current_extra_delay_ms + |
| 264 | MaxAudioDelayIncrease( |
| 265 | current_audio_delay_ms, |
| 266 | base_target_delay + video_delay_ms - audio_delay_ms), |
| 267 | extra_audio_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 268 | } |
| 269 | |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 270 | int MaxAudioDelayIncrease(int current_audio_delay_ms, int delay_ms) { |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 271 | return std::min((delay_ms - current_audio_delay_ms) / kSmoothingFilter, |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 272 | kMaxAudioDiffMs); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 273 | } |
| 274 | |
| 275 | int MaxAudioDelayDecrease(int current_audio_delay_ms, int delay_ms) { |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 276 | return std::max((delay_ms - current_audio_delay_ms) / kSmoothingFilter, |
| 277 | -kMaxAudioDiffMs); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 278 | } |
| 279 | |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 280 | StreamSynchronization sync_; |
| 281 | SimulatedClock clock_sender_; |
| 282 | SimulatedClock clock_receiver_; |
| 283 | double audio_clock_drift_ = 1.0; |
| 284 | double video_clock_drift_ = 1.0; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 285 | }; |
| 286 | |
| 287 | TEST_F(StreamSynchronizationTest, NoDelay) { |
| 288 | uint32_t current_audio_delay_ms = 0; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 289 | int extra_audio_delay_ms = 0; |
| 290 | int total_video_delay_ms = 0; |
| 291 | |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 292 | EXPECT_FALSE(DelayedStreams(0, 0, current_audio_delay_ms, |
| 293 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 294 | EXPECT_EQ(0, extra_audio_delay_ms); |
| 295 | EXPECT_EQ(0, total_video_delay_ms); |
| 296 | } |
| 297 | |
| 298 | TEST_F(StreamSynchronizationTest, VideoDelay) { |
| 299 | uint32_t current_audio_delay_ms = 0; |
| 300 | int delay_ms = 200; |
| 301 | int extra_audio_delay_ms = 0; |
| 302 | int total_video_delay_ms = 0; |
| 303 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 304 | EXPECT_TRUE(DelayedStreams(delay_ms, 0, current_audio_delay_ms, |
| 305 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 306 | EXPECT_EQ(0, extra_audio_delay_ms); |
| 307 | // The video delay is not allowed to change more than this in 1 second. |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 308 | EXPECT_EQ(delay_ms / kSmoothingFilter, total_video_delay_ms); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 309 | |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 310 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 311 | clock_receiver_.AdvanceTimeMilliseconds(800); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 312 | // Simulate 0 minimum delay in the VCM. |
| 313 | total_video_delay_ms = 0; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 314 | EXPECT_TRUE(DelayedStreams(delay_ms, 0, current_audio_delay_ms, |
| 315 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 316 | EXPECT_EQ(0, extra_audio_delay_ms); |
| 317 | // The video delay is not allowed to change more than this in 1 second. |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 318 | EXPECT_EQ(2 * delay_ms / kSmoothingFilter, total_video_delay_ms); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 319 | |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 320 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 321 | clock_receiver_.AdvanceTimeMilliseconds(800); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 322 | // Simulate 0 minimum delay in the VCM. |
| 323 | total_video_delay_ms = 0; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 324 | EXPECT_TRUE(DelayedStreams(delay_ms, 0, current_audio_delay_ms, |
| 325 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 326 | EXPECT_EQ(0, extra_audio_delay_ms); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 327 | EXPECT_EQ(3 * delay_ms / kSmoothingFilter, total_video_delay_ms); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 328 | } |
| 329 | |
| 330 | TEST_F(StreamSynchronizationTest, AudioDelay) { |
| 331 | int current_audio_delay_ms = 0; |
| 332 | int delay_ms = 200; |
| 333 | int extra_audio_delay_ms = 0; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 334 | int total_video_delay_ms = 0; |
| 335 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 336 | EXPECT_TRUE(DelayedStreams(0, delay_ms, current_audio_delay_ms, |
| 337 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 338 | EXPECT_EQ(0, total_video_delay_ms); |
| 339 | // The audio delay is not allowed to change more than this in 1 second. |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 340 | EXPECT_EQ(delay_ms / kSmoothingFilter, extra_audio_delay_ms); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 341 | current_audio_delay_ms = extra_audio_delay_ms; |
andrew@webrtc.org | d7a71d0 | 2012-08-01 01:40:02 +0000 | [diff] [blame] | 342 | int current_extra_delay_ms = extra_audio_delay_ms; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 343 | |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 344 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 345 | clock_receiver_.AdvanceTimeMilliseconds(800); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 346 | EXPECT_TRUE(DelayedStreams(0, delay_ms, current_audio_delay_ms, |
| 347 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 348 | EXPECT_EQ(0, total_video_delay_ms); |
| 349 | // The audio delay is not allowed to change more than the half of the required |
| 350 | // change in delay. |
| 351 | EXPECT_EQ(current_extra_delay_ms + |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 352 | MaxAudioDelayIncrease(current_audio_delay_ms, delay_ms), |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 353 | extra_audio_delay_ms); |
| 354 | current_audio_delay_ms = extra_audio_delay_ms; |
| 355 | current_extra_delay_ms = extra_audio_delay_ms; |
| 356 | |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 357 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 358 | clock_receiver_.AdvanceTimeMilliseconds(800); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 359 | EXPECT_TRUE(DelayedStreams(0, delay_ms, current_audio_delay_ms, |
| 360 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 361 | EXPECT_EQ(0, total_video_delay_ms); |
| 362 | // The audio delay is not allowed to change more than the half of the required |
| 363 | // change in delay. |
| 364 | EXPECT_EQ(current_extra_delay_ms + |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 365 | MaxAudioDelayIncrease(current_audio_delay_ms, delay_ms), |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 366 | extra_audio_delay_ms); |
| 367 | current_extra_delay_ms = extra_audio_delay_ms; |
| 368 | |
| 369 | // Simulate that NetEQ for some reason reduced the delay. |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 370 | current_audio_delay_ms = 10; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 371 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 372 | clock_receiver_.AdvanceTimeMilliseconds(800); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 373 | EXPECT_TRUE(DelayedStreams(0, delay_ms, current_audio_delay_ms, |
| 374 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 375 | EXPECT_EQ(0, total_video_delay_ms); |
| 376 | // Since we only can ask NetEQ for a certain amount of extra delay, and |
| 377 | // we only measure the total NetEQ delay, we will ask for additional delay |
| 378 | // here to try to |
| 379 | EXPECT_EQ(current_extra_delay_ms + |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 380 | MaxAudioDelayIncrease(current_audio_delay_ms, delay_ms), |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 381 | extra_audio_delay_ms); |
| 382 | current_extra_delay_ms = extra_audio_delay_ms; |
| 383 | |
| 384 | // Simulate that NetEQ for some reason significantly increased the delay. |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 385 | current_audio_delay_ms = 350; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 386 | clock_sender_.AdvanceTimeMilliseconds(1000); |
| 387 | clock_receiver_.AdvanceTimeMilliseconds(800); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 388 | EXPECT_TRUE(DelayedStreams(0, delay_ms, current_audio_delay_ms, |
| 389 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 390 | EXPECT_EQ(0, total_video_delay_ms); |
| 391 | // The audio delay is not allowed to change more than the half of the required |
| 392 | // change in delay. |
| 393 | EXPECT_EQ(current_extra_delay_ms + |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 394 | MaxAudioDelayDecrease(current_audio_delay_ms, delay_ms), |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 395 | extra_audio_delay_ms); |
| 396 | } |
| 397 | |
| 398 | TEST_F(StreamSynchronizationTest, BothDelayedVideoLater) { |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 399 | BothDelayedVideoLaterTest(0); |
| 400 | } |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 401 | |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 402 | TEST_F(StreamSynchronizationTest, BothDelayedVideoLaterAudioClockDrift) { |
| 403 | audio_clock_drift_ = 1.05; |
| 404 | BothDelayedVideoLaterTest(0); |
| 405 | } |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 406 | |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 407 | TEST_F(StreamSynchronizationTest, BothDelayedVideoLaterVideoClockDrift) { |
| 408 | video_clock_drift_ = 1.05; |
| 409 | BothDelayedVideoLaterTest(0); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 410 | } |
| 411 | |
| 412 | TEST_F(StreamSynchronizationTest, BothDelayedAudioLater) { |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 413 | BothDelayedAudioLaterTest(0); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 414 | } |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 415 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 416 | TEST_F(StreamSynchronizationTest, BothDelayedAudioClockDrift) { |
| 417 | audio_clock_drift_ = 1.05; |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 418 | BothDelayedAudioLaterTest(0); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 419 | } |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 420 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 421 | TEST_F(StreamSynchronizationTest, BothDelayedVideoClockDrift) { |
| 422 | video_clock_drift_ = 1.05; |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 423 | BothDelayedAudioLaterTest(0); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 424 | } |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 425 | |
| 426 | TEST_F(StreamSynchronizationTest, BaseDelay) { |
| 427 | int base_target_delay_ms = 2000; |
| 428 | int current_audio_delay_ms = 2000; |
| 429 | int extra_audio_delay_ms = 0; |
| 430 | int total_video_delay_ms = base_target_delay_ms; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 431 | sync_.SetTargetBufferingDelay(base_target_delay_ms); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 432 | // We are in sync don't change. |
| 433 | EXPECT_FALSE(DelayedStreams(base_target_delay_ms, base_target_delay_ms, |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 434 | current_audio_delay_ms, &extra_audio_delay_ms, |
| 435 | &total_video_delay_ms)); |
mikhal@webrtc.org | 0d8d010 | 2013-02-22 19:30:44 +0000 | [diff] [blame] | 436 | // Triggering another call with the same values. Delay should not be modified. |
| 437 | base_target_delay_ms = 2000; |
| 438 | current_audio_delay_ms = base_target_delay_ms; |
| 439 | total_video_delay_ms = base_target_delay_ms; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 440 | sync_.SetTargetBufferingDelay(base_target_delay_ms); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 441 | // We are in sync don't change. |
| 442 | EXPECT_FALSE(DelayedStreams(base_target_delay_ms, base_target_delay_ms, |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 443 | current_audio_delay_ms, &extra_audio_delay_ms, |
| 444 | &total_video_delay_ms)); |
mikhal@webrtc.org | 0d8d010 | 2013-02-22 19:30:44 +0000 | [diff] [blame] | 445 | // Changing delay value - intended to test this module only. In practice it |
| 446 | // would take VoE time to adapt. |
| 447 | base_target_delay_ms = 5000; |
| 448 | current_audio_delay_ms = base_target_delay_ms; |
| 449 | total_video_delay_ms = base_target_delay_ms; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 450 | sync_.SetTargetBufferingDelay(base_target_delay_ms); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 451 | // We are in sync don't change. |
| 452 | EXPECT_FALSE(DelayedStreams(base_target_delay_ms, base_target_delay_ms, |
Yves Gerey | 665174f | 2018-06-19 15:03:05 +0200 | [diff] [blame] | 453 | current_audio_delay_ms, &extra_audio_delay_ms, |
| 454 | &total_video_delay_ms)); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 455 | } |
| 456 | |
| 457 | TEST_F(StreamSynchronizationTest, BothDelayedAudioLaterWithBaseDelay) { |
| 458 | int base_target_delay_ms = 3000; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 459 | sync_.SetTargetBufferingDelay(base_target_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 460 | BothDelayedAudioLaterTest(base_target_delay_ms); |
| 461 | } |
| 462 | |
| 463 | TEST_F(StreamSynchronizationTest, BothDelayedAudioClockDriftWithBaseDelay) { |
| 464 | int base_target_delay_ms = 3000; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 465 | sync_.SetTargetBufferingDelay(base_target_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 466 | audio_clock_drift_ = 1.05; |
| 467 | BothDelayedAudioLaterTest(base_target_delay_ms); |
| 468 | } |
| 469 | |
| 470 | TEST_F(StreamSynchronizationTest, BothDelayedVideoClockDriftWithBaseDelay) { |
| 471 | int base_target_delay_ms = 3000; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 472 | sync_.SetTargetBufferingDelay(base_target_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 473 | video_clock_drift_ = 1.05; |
| 474 | BothDelayedAudioLaterTest(base_target_delay_ms); |
| 475 | } |
| 476 | |
| 477 | TEST_F(StreamSynchronizationTest, BothDelayedVideoLaterWithBaseDelay) { |
| 478 | int base_target_delay_ms = 2000; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 479 | sync_.SetTargetBufferingDelay(base_target_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 480 | BothDelayedVideoLaterTest(base_target_delay_ms); |
| 481 | } |
| 482 | |
| 483 | TEST_F(StreamSynchronizationTest, |
| 484 | BothDelayedVideoLaterAudioClockDriftWithBaseDelay) { |
| 485 | int base_target_delay_ms = 2000; |
| 486 | audio_clock_drift_ = 1.05; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 487 | sync_.SetTargetBufferingDelay(base_target_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 488 | BothDelayedVideoLaterTest(base_target_delay_ms); |
| 489 | } |
| 490 | |
| 491 | TEST_F(StreamSynchronizationTest, |
| 492 | BothDelayedVideoLaterVideoClockDriftWithBaseDelay) { |
| 493 | int base_target_delay_ms = 2000; |
| 494 | video_clock_drift_ = 1.05; |
Åsa Persson | 8fe22fa | 2019-11-18 14:10:56 +0100 | [diff] [blame] | 495 | sync_.SetTargetBufferingDelay(base_target_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 496 | BothDelayedVideoLaterTest(base_target_delay_ms); |
| 497 | } |
| 498 | |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 499 | } // namespace webrtc |