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 | |
pbos@webrtc.org | f5d4cb1 | 2013-05-17 13:44:48 +0000 | [diff] [blame] | 11 | #include <math.h> |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 12 | |
kjellander@webrtc.org | 0fcaf99 | 2015-11-26 15:24:52 +0100 | [diff] [blame] | 13 | #include <algorithm> |
| 14 | |
kwiberg | 77eab70 | 2016-09-28 17:42:01 -0700 | [diff] [blame] | 15 | #include "webrtc/test/gtest.h" |
Peter Boström | 7623ce4 | 2015-12-09 12:13:30 +0100 | [diff] [blame] | 16 | #include "webrtc/video/stream_synchronization.h" |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 17 | |
| 18 | namespace webrtc { |
| 19 | |
| 20 | // These correspond to the same constants defined in vie_sync_module.cc. |
| 21 | enum { kMaxVideoDiffMs = 80 }; |
| 22 | enum { kMaxAudioDiffMs = 80 }; |
| 23 | enum { kMaxDelay = 1500 }; |
| 24 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 25 | // Test constants. |
| 26 | enum { kDefaultAudioFrequency = 8000 }; |
| 27 | enum { kDefaultVideoFrequency = 90000 }; |
| 28 | const double kNtpFracPerMs = 4.294967296E6; |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 29 | static const int kSmoothingFilter = 4 * 2; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 30 | |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 31 | class Time { |
| 32 | public: |
| 33 | explicit Time(int64_t offset) |
| 34 | : kNtpJan1970(2208988800UL), |
| 35 | time_now_ms_(offset) {} |
| 36 | |
wu@webrtc.org | 66773a0 | 2014-05-07 17:09:44 +0000 | [diff] [blame] | 37 | RtcpMeasurement GenerateRtcp(int frequency, uint32_t offset) const { |
| 38 | RtcpMeasurement rtcp; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 39 | NowNtp(&rtcp.ntp_secs, &rtcp.ntp_frac); |
| 40 | rtcp.rtp_timestamp = NowRtp(frequency, offset); |
| 41 | return rtcp; |
| 42 | } |
| 43 | |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 44 | void NowNtp(uint32_t* ntp_secs, uint32_t* ntp_frac) const { |
| 45 | *ntp_secs = time_now_ms_ / 1000 + kNtpJan1970; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 46 | int64_t remainder_ms = time_now_ms_ % 1000; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 47 | *ntp_frac = static_cast<uint32_t>( |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 48 | static_cast<double>(remainder_ms) * kNtpFracPerMs + 0.5); |
| 49 | } |
| 50 | |
| 51 | uint32_t NowRtp(int frequency, uint32_t offset) const { |
| 52 | return frequency * time_now_ms_ / 1000 + offset; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 53 | } |
| 54 | |
| 55 | void IncreaseTimeMs(int64_t inc) { |
| 56 | time_now_ms_ += inc; |
| 57 | } |
| 58 | |
| 59 | int64_t time_now_ms() const { |
| 60 | return time_now_ms_; |
| 61 | } |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 62 | |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 63 | private: |
| 64 | // January 1970, in NTP seconds. |
| 65 | const uint32_t kNtpJan1970; |
| 66 | int64_t time_now_ms_; |
| 67 | }; |
| 68 | |
| 69 | class StreamSynchronizationTest : public ::testing::Test { |
| 70 | protected: |
| 71 | virtual void SetUp() { |
| 72 | sync_ = new StreamSynchronization(0, 0); |
| 73 | send_time_ = new Time(kSendTimeOffsetMs); |
| 74 | receive_time_ = new Time(kReceiveTimeOffsetMs); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 75 | audio_clock_drift_ = 1.0; |
| 76 | video_clock_drift_ = 1.0; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 77 | } |
| 78 | |
| 79 | virtual void TearDown() { |
| 80 | delete sync_; |
| 81 | delete send_time_; |
| 82 | delete receive_time_; |
| 83 | } |
| 84 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 85 | // Generates the necessary RTCP measurements and RTP timestamps and computes |
| 86 | // the audio and video delays needed to get the two streams in sync. |
| 87 | // |audio_delay_ms| and |video_delay_ms| are the number of milliseconds after |
| 88 | // capture which the frames are rendered. |
| 89 | // |current_audio_delay_ms| is the number of milliseconds which audio is |
| 90 | // currently being delayed by the receiver. |
| 91 | bool DelayedStreams(int audio_delay_ms, |
| 92 | int video_delay_ms, |
| 93 | int current_audio_delay_ms, |
| 94 | int* extra_audio_delay_ms, |
| 95 | int* total_video_delay_ms) { |
| 96 | int audio_frequency = static_cast<int>(kDefaultAudioFrequency * |
| 97 | audio_clock_drift_ + 0.5); |
| 98 | int audio_offset = 0; |
| 99 | int video_frequency = static_cast<int>(kDefaultVideoFrequency * |
| 100 | video_clock_drift_ + 0.5); |
asapersson | de9e5ff | 2016-11-02 07:14:03 -0700 | [diff] [blame^] | 101 | bool new_sr; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 102 | int video_offset = 0; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 103 | StreamSynchronization::Measurements audio; |
| 104 | StreamSynchronization::Measurements video; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 105 | // Generate NTP/RTP timestamp pair for both streams corresponding to RTCP. |
asapersson | de9e5ff | 2016-11-02 07:14:03 -0700 | [diff] [blame^] | 106 | RtcpMeasurement rtcp = |
| 107 | send_time_->GenerateRtcp(audio_frequency, audio_offset); |
| 108 | EXPECT_TRUE(UpdateRtcpList(rtcp.ntp_secs, rtcp.ntp_frac, rtcp.rtp_timestamp, |
| 109 | &audio.rtcp, &new_sr)); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 110 | send_time_->IncreaseTimeMs(100); |
| 111 | receive_time_->IncreaseTimeMs(100); |
asapersson | de9e5ff | 2016-11-02 07:14:03 -0700 | [diff] [blame^] | 112 | rtcp = send_time_->GenerateRtcp(video_frequency, video_offset); |
| 113 | EXPECT_TRUE(UpdateRtcpList(rtcp.ntp_secs, rtcp.ntp_frac, rtcp.rtp_timestamp, |
| 114 | &video.rtcp, &new_sr)); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 115 | send_time_->IncreaseTimeMs(900); |
| 116 | receive_time_->IncreaseTimeMs(900); |
asapersson | de9e5ff | 2016-11-02 07:14:03 -0700 | [diff] [blame^] | 117 | rtcp = send_time_->GenerateRtcp(audio_frequency, audio_offset); |
| 118 | EXPECT_TRUE(UpdateRtcpList(rtcp.ntp_secs, rtcp.ntp_frac, rtcp.rtp_timestamp, |
| 119 | &audio.rtcp, &new_sr)); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 120 | send_time_->IncreaseTimeMs(100); |
| 121 | receive_time_->IncreaseTimeMs(100); |
asapersson | de9e5ff | 2016-11-02 07:14:03 -0700 | [diff] [blame^] | 122 | rtcp = send_time_->GenerateRtcp(video_frequency, video_offset); |
| 123 | EXPECT_TRUE(UpdateRtcpList(rtcp.ntp_secs, rtcp.ntp_frac, rtcp.rtp_timestamp, |
| 124 | &video.rtcp, &new_sr)); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 125 | send_time_->IncreaseTimeMs(900); |
| 126 | receive_time_->IncreaseTimeMs(900); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 127 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 128 | // Capture an audio and a video frame at the same time. |
| 129 | audio.latest_timestamp = send_time_->NowRtp(audio_frequency, |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 130 | audio_offset); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 131 | video.latest_timestamp = send_time_->NowRtp(video_frequency, |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 132 | video_offset); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 133 | |
| 134 | if (audio_delay_ms > video_delay_ms) { |
| 135 | // Audio later than video. |
| 136 | receive_time_->IncreaseTimeMs(video_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 137 | video.latest_receive_time_ms = receive_time_->time_now_ms(); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 138 | receive_time_->IncreaseTimeMs(audio_delay_ms - video_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 139 | audio.latest_receive_time_ms = receive_time_->time_now_ms(); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 140 | } else { |
| 141 | // Video later than audio. |
| 142 | receive_time_->IncreaseTimeMs(audio_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 143 | audio.latest_receive_time_ms = receive_time_->time_now_ms(); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 144 | receive_time_->IncreaseTimeMs(video_delay_ms - audio_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 145 | video.latest_receive_time_ms = receive_time_->time_now_ms(); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 146 | } |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 147 | int relative_delay_ms; |
| 148 | StreamSynchronization::ComputeRelativeDelay(audio, video, |
| 149 | &relative_delay_ms); |
| 150 | EXPECT_EQ(video_delay_ms - audio_delay_ms, relative_delay_ms); |
| 151 | return sync_->ComputeDelays(relative_delay_ms, |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 152 | current_audio_delay_ms, |
| 153 | extra_audio_delay_ms, |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 154 | total_video_delay_ms); |
| 155 | } |
| 156 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 157 | // Simulate audio playback 300 ms after capture and video rendering 100 ms |
| 158 | // after capture. Verify that the correct extra delays are calculated for |
| 159 | // audio and video, and that they change correctly when we simulate that |
| 160 | // NetEQ or the VCM adds more delay to the streams. |
| 161 | // TODO(holmer): This is currently wrong! We should simply change |
| 162 | // audio_delay_ms or video_delay_ms since those now include VCM and NetEQ |
| 163 | // delays. |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 164 | void BothDelayedAudioLaterTest(int base_target_delay) { |
| 165 | int current_audio_delay_ms = base_target_delay; |
| 166 | int audio_delay_ms = base_target_delay + 300; |
| 167 | int video_delay_ms = base_target_delay + 100; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 168 | int extra_audio_delay_ms = 0; |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 169 | int total_video_delay_ms = base_target_delay; |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 170 | int filtered_move = (audio_delay_ms - video_delay_ms) / kSmoothingFilter; |
pwestin@webrtc.org | 4e545b3 | 2013-04-26 15:23:34 +0000 | [diff] [blame] | 171 | const int kNeteqDelayIncrease = 50; |
| 172 | const int kNeteqDelayDecrease = 10; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 173 | |
| 174 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, |
| 175 | video_delay_ms, |
| 176 | current_audio_delay_ms, |
| 177 | &extra_audio_delay_ms, |
| 178 | &total_video_delay_ms)); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 179 | EXPECT_EQ(base_target_delay + filtered_move, total_video_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 180 | EXPECT_EQ(base_target_delay, extra_audio_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 181 | current_audio_delay_ms = extra_audio_delay_ms; |
| 182 | |
| 183 | send_time_->IncreaseTimeMs(1000); |
| 184 | receive_time_->IncreaseTimeMs(1000 - std::max(audio_delay_ms, |
| 185 | video_delay_ms)); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 186 | // Simulate base_target_delay minimum delay in the VCM. |
| 187 | total_video_delay_ms = base_target_delay; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 188 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, |
| 189 | video_delay_ms, |
| 190 | current_audio_delay_ms, |
| 191 | &extra_audio_delay_ms, |
| 192 | &total_video_delay_ms)); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 193 | 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] | 194 | EXPECT_EQ(base_target_delay, extra_audio_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 195 | current_audio_delay_ms = extra_audio_delay_ms; |
| 196 | |
| 197 | send_time_->IncreaseTimeMs(1000); |
| 198 | receive_time_->IncreaseTimeMs(1000 - std::max(audio_delay_ms, |
| 199 | video_delay_ms)); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 200 | // Simulate base_target_delay minimum delay in the VCM. |
| 201 | total_video_delay_ms = base_target_delay; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 202 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, |
| 203 | video_delay_ms, |
| 204 | current_audio_delay_ms, |
| 205 | &extra_audio_delay_ms, |
| 206 | &total_video_delay_ms)); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 207 | 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] | 208 | EXPECT_EQ(base_target_delay, extra_audio_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 209 | |
| 210 | // Simulate that NetEQ introduces some audio delay. |
pwestin@webrtc.org | 4e545b3 | 2013-04-26 15:23:34 +0000 | [diff] [blame] | 211 | current_audio_delay_ms = base_target_delay + kNeteqDelayIncrease; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 212 | send_time_->IncreaseTimeMs(1000); |
| 213 | receive_time_->IncreaseTimeMs(1000 - std::max(audio_delay_ms, |
| 214 | video_delay_ms)); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 215 | // Simulate base_target_delay minimum delay in the VCM. |
| 216 | total_video_delay_ms = base_target_delay; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 217 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, |
| 218 | video_delay_ms, |
| 219 | current_audio_delay_ms, |
| 220 | &extra_audio_delay_ms, |
| 221 | &total_video_delay_ms)); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 222 | filtered_move = 3 * filtered_move + |
pwestin@webrtc.org | 4e545b3 | 2013-04-26 15:23:34 +0000 | [diff] [blame] | 223 | (kNeteqDelayIncrease + audio_delay_ms - video_delay_ms) / |
| 224 | kSmoothingFilter; |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 225 | EXPECT_EQ(base_target_delay + filtered_move, total_video_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 226 | EXPECT_EQ(base_target_delay, extra_audio_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 227 | |
| 228 | // Simulate that NetEQ reduces its delay. |
pwestin@webrtc.org | 4e545b3 | 2013-04-26 15:23:34 +0000 | [diff] [blame] | 229 | current_audio_delay_ms = base_target_delay + kNeteqDelayDecrease; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 230 | send_time_->IncreaseTimeMs(1000); |
| 231 | receive_time_->IncreaseTimeMs(1000 - std::max(audio_delay_ms, |
| 232 | video_delay_ms)); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 233 | // Simulate base_target_delay minimum delay in the VCM. |
| 234 | total_video_delay_ms = base_target_delay; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 235 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, |
| 236 | video_delay_ms, |
| 237 | current_audio_delay_ms, |
| 238 | &extra_audio_delay_ms, |
| 239 | &total_video_delay_ms)); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 240 | |
| 241 | filtered_move = filtered_move + |
pwestin@webrtc.org | 4e545b3 | 2013-04-26 15:23:34 +0000 | [diff] [blame] | 242 | (kNeteqDelayDecrease + audio_delay_ms - video_delay_ms) / |
| 243 | kSmoothingFilter; |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 244 | |
| 245 | EXPECT_EQ(base_target_delay + filtered_move, total_video_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 246 | EXPECT_EQ(base_target_delay, extra_audio_delay_ms); |
| 247 | } |
| 248 | |
| 249 | void BothDelayedVideoLaterTest(int base_target_delay) { |
| 250 | int current_audio_delay_ms = base_target_delay; |
| 251 | int audio_delay_ms = base_target_delay + 100; |
| 252 | int video_delay_ms = base_target_delay + 300; |
| 253 | int extra_audio_delay_ms = 0; |
| 254 | int total_video_delay_ms = base_target_delay; |
| 255 | |
| 256 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, |
| 257 | video_delay_ms, |
| 258 | current_audio_delay_ms, |
| 259 | &extra_audio_delay_ms, |
| 260 | &total_video_delay_ms)); |
| 261 | EXPECT_EQ(base_target_delay, total_video_delay_ms); |
| 262 | // 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] | 263 | EXPECT_GE(base_target_delay + kMaxAudioDiffMs, extra_audio_delay_ms); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 264 | current_audio_delay_ms = extra_audio_delay_ms; |
| 265 | int current_extra_delay_ms = extra_audio_delay_ms; |
| 266 | |
| 267 | send_time_->IncreaseTimeMs(1000); |
| 268 | receive_time_->IncreaseTimeMs(800); |
| 269 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, |
| 270 | video_delay_ms, |
| 271 | current_audio_delay_ms, |
| 272 | &extra_audio_delay_ms, |
| 273 | &total_video_delay_ms)); |
| 274 | EXPECT_EQ(base_target_delay, total_video_delay_ms); |
| 275 | // The audio delay is not allowed to change more than the half of the |
| 276 | // required change in delay. |
| 277 | EXPECT_EQ(current_extra_delay_ms + MaxAudioDelayIncrease( |
| 278 | current_audio_delay_ms, |
| 279 | base_target_delay + video_delay_ms - audio_delay_ms), |
| 280 | extra_audio_delay_ms); |
| 281 | current_audio_delay_ms = extra_audio_delay_ms; |
| 282 | current_extra_delay_ms = extra_audio_delay_ms; |
| 283 | |
| 284 | send_time_->IncreaseTimeMs(1000); |
| 285 | receive_time_->IncreaseTimeMs(800); |
| 286 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, |
| 287 | video_delay_ms, |
| 288 | current_audio_delay_ms, |
| 289 | &extra_audio_delay_ms, |
| 290 | &total_video_delay_ms)); |
| 291 | EXPECT_EQ(base_target_delay, total_video_delay_ms); |
| 292 | // The audio delay is not allowed to change more than the half of the |
| 293 | // required change in delay. |
| 294 | EXPECT_EQ(current_extra_delay_ms + MaxAudioDelayIncrease( |
| 295 | current_audio_delay_ms, |
| 296 | base_target_delay + video_delay_ms - audio_delay_ms), |
| 297 | extra_audio_delay_ms); |
| 298 | current_extra_delay_ms = extra_audio_delay_ms; |
| 299 | |
| 300 | // Simulate that NetEQ for some reason reduced the delay. |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 301 | current_audio_delay_ms = base_target_delay + 10; |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 302 | send_time_->IncreaseTimeMs(1000); |
| 303 | receive_time_->IncreaseTimeMs(800); |
| 304 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, |
| 305 | video_delay_ms, |
| 306 | current_audio_delay_ms, |
| 307 | &extra_audio_delay_ms, |
| 308 | &total_video_delay_ms)); |
| 309 | EXPECT_EQ(base_target_delay, total_video_delay_ms); |
| 310 | // Since we only can ask NetEQ for a certain amount of extra delay, and |
| 311 | // we only measure the total NetEQ delay, we will ask for additional delay |
| 312 | // here to try to stay in sync. |
| 313 | EXPECT_EQ(current_extra_delay_ms + MaxAudioDelayIncrease( |
| 314 | current_audio_delay_ms, |
| 315 | base_target_delay + video_delay_ms - audio_delay_ms), |
| 316 | extra_audio_delay_ms); |
| 317 | current_extra_delay_ms = extra_audio_delay_ms; |
| 318 | |
| 319 | // Simulate that NetEQ for some reason significantly increased the delay. |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 320 | current_audio_delay_ms = base_target_delay + 350; |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 321 | send_time_->IncreaseTimeMs(1000); |
| 322 | receive_time_->IncreaseTimeMs(800); |
| 323 | EXPECT_TRUE(DelayedStreams(audio_delay_ms, |
| 324 | video_delay_ms, |
| 325 | current_audio_delay_ms, |
| 326 | &extra_audio_delay_ms, |
| 327 | &total_video_delay_ms)); |
| 328 | EXPECT_EQ(base_target_delay, total_video_delay_ms); |
| 329 | // The audio delay is not allowed to change more than the half of the |
| 330 | // required change in delay. |
| 331 | EXPECT_EQ(current_extra_delay_ms + MaxAudioDelayIncrease( |
| 332 | current_audio_delay_ms, |
| 333 | base_target_delay + video_delay_ms - audio_delay_ms), |
| 334 | extra_audio_delay_ms); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 335 | } |
| 336 | |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 337 | int MaxAudioDelayIncrease(int current_audio_delay_ms, int delay_ms) { |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 338 | return std::min((delay_ms - current_audio_delay_ms) / kSmoothingFilter, |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 339 | static_cast<int>(kMaxAudioDiffMs)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 340 | } |
| 341 | |
| 342 | int MaxAudioDelayDecrease(int current_audio_delay_ms, int delay_ms) { |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 343 | return std::max((delay_ms - current_audio_delay_ms) / kSmoothingFilter, |
| 344 | -kMaxAudioDiffMs); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 345 | } |
| 346 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 347 | enum { kSendTimeOffsetMs = 98765 }; |
| 348 | enum { kReceiveTimeOffsetMs = 43210 }; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 349 | |
| 350 | StreamSynchronization* sync_; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 351 | Time* send_time_; // The simulated clock at the sender. |
| 352 | Time* receive_time_; // The simulated clock at the receiver. |
| 353 | double audio_clock_drift_; |
| 354 | double video_clock_drift_; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 355 | }; |
| 356 | |
| 357 | TEST_F(StreamSynchronizationTest, NoDelay) { |
| 358 | uint32_t current_audio_delay_ms = 0; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 359 | int extra_audio_delay_ms = 0; |
| 360 | int total_video_delay_ms = 0; |
| 361 | |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 362 | EXPECT_FALSE(DelayedStreams(0, 0, current_audio_delay_ms, |
| 363 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 364 | EXPECT_EQ(0, extra_audio_delay_ms); |
| 365 | EXPECT_EQ(0, total_video_delay_ms); |
| 366 | } |
| 367 | |
| 368 | TEST_F(StreamSynchronizationTest, VideoDelay) { |
| 369 | uint32_t current_audio_delay_ms = 0; |
| 370 | int delay_ms = 200; |
| 371 | int extra_audio_delay_ms = 0; |
| 372 | int total_video_delay_ms = 0; |
| 373 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 374 | EXPECT_TRUE(DelayedStreams(delay_ms, 0, current_audio_delay_ms, |
| 375 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 376 | EXPECT_EQ(0, extra_audio_delay_ms); |
| 377 | // 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] | 378 | EXPECT_EQ(delay_ms / kSmoothingFilter, total_video_delay_ms); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 379 | |
| 380 | send_time_->IncreaseTimeMs(1000); |
| 381 | receive_time_->IncreaseTimeMs(800); |
| 382 | // Simulate 0 minimum delay in the VCM. |
| 383 | total_video_delay_ms = 0; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 384 | EXPECT_TRUE(DelayedStreams(delay_ms, 0, current_audio_delay_ms, |
| 385 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 386 | EXPECT_EQ(0, extra_audio_delay_ms); |
| 387 | // 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] | 388 | EXPECT_EQ(2 * delay_ms / kSmoothingFilter, total_video_delay_ms); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 389 | |
| 390 | send_time_->IncreaseTimeMs(1000); |
| 391 | receive_time_->IncreaseTimeMs(800); |
| 392 | // Simulate 0 minimum delay in the VCM. |
| 393 | total_video_delay_ms = 0; |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 394 | EXPECT_TRUE(DelayedStreams(delay_ms, 0, current_audio_delay_ms, |
| 395 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 396 | EXPECT_EQ(0, extra_audio_delay_ms); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 397 | EXPECT_EQ(3 * delay_ms / kSmoothingFilter, total_video_delay_ms); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 398 | } |
| 399 | |
| 400 | TEST_F(StreamSynchronizationTest, AudioDelay) { |
| 401 | int current_audio_delay_ms = 0; |
| 402 | int delay_ms = 200; |
| 403 | int extra_audio_delay_ms = 0; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 404 | int total_video_delay_ms = 0; |
| 405 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 406 | EXPECT_TRUE(DelayedStreams(0, delay_ms, current_audio_delay_ms, |
| 407 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 408 | EXPECT_EQ(0, total_video_delay_ms); |
| 409 | // 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] | 410 | EXPECT_EQ(delay_ms / kSmoothingFilter, extra_audio_delay_ms); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 411 | current_audio_delay_ms = extra_audio_delay_ms; |
andrew@webrtc.org | d7a71d0 | 2012-08-01 01:40:02 +0000 | [diff] [blame] | 412 | int current_extra_delay_ms = extra_audio_delay_ms; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 413 | |
| 414 | send_time_->IncreaseTimeMs(1000); |
| 415 | receive_time_->IncreaseTimeMs(800); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 416 | EXPECT_TRUE(DelayedStreams(0, delay_ms, current_audio_delay_ms, |
| 417 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 418 | EXPECT_EQ(0, total_video_delay_ms); |
| 419 | // The audio delay is not allowed to change more than the half of the required |
| 420 | // change in delay. |
| 421 | EXPECT_EQ(current_extra_delay_ms + |
| 422 | MaxAudioDelayIncrease(current_audio_delay_ms, delay_ms), |
| 423 | extra_audio_delay_ms); |
| 424 | current_audio_delay_ms = extra_audio_delay_ms; |
| 425 | current_extra_delay_ms = extra_audio_delay_ms; |
| 426 | |
| 427 | send_time_->IncreaseTimeMs(1000); |
| 428 | receive_time_->IncreaseTimeMs(800); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 429 | EXPECT_TRUE(DelayedStreams(0, delay_ms, current_audio_delay_ms, |
| 430 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 431 | EXPECT_EQ(0, total_video_delay_ms); |
| 432 | // The audio delay is not allowed to change more than the half of the required |
| 433 | // change in delay. |
| 434 | EXPECT_EQ(current_extra_delay_ms + |
| 435 | MaxAudioDelayIncrease(current_audio_delay_ms, delay_ms), |
| 436 | extra_audio_delay_ms); |
| 437 | current_extra_delay_ms = extra_audio_delay_ms; |
| 438 | |
| 439 | // Simulate that NetEQ for some reason reduced the delay. |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 440 | current_audio_delay_ms = 10; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 441 | send_time_->IncreaseTimeMs(1000); |
| 442 | receive_time_->IncreaseTimeMs(800); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 443 | EXPECT_TRUE(DelayedStreams(0, delay_ms, current_audio_delay_ms, |
| 444 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 445 | EXPECT_EQ(0, total_video_delay_ms); |
| 446 | // Since we only can ask NetEQ for a certain amount of extra delay, and |
| 447 | // we only measure the total NetEQ delay, we will ask for additional delay |
| 448 | // here to try to |
| 449 | EXPECT_EQ(current_extra_delay_ms + |
| 450 | MaxAudioDelayIncrease(current_audio_delay_ms, delay_ms), |
| 451 | extra_audio_delay_ms); |
| 452 | current_extra_delay_ms = extra_audio_delay_ms; |
| 453 | |
| 454 | // Simulate that NetEQ for some reason significantly increased the delay. |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 455 | current_audio_delay_ms = 350; |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 456 | send_time_->IncreaseTimeMs(1000); |
| 457 | receive_time_->IncreaseTimeMs(800); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 458 | EXPECT_TRUE(DelayedStreams(0, delay_ms, current_audio_delay_ms, |
| 459 | &extra_audio_delay_ms, &total_video_delay_ms)); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 460 | EXPECT_EQ(0, total_video_delay_ms); |
| 461 | // The audio delay is not allowed to change more than the half of the required |
| 462 | // change in delay. |
| 463 | EXPECT_EQ(current_extra_delay_ms + |
| 464 | MaxAudioDelayDecrease(current_audio_delay_ms, delay_ms), |
| 465 | extra_audio_delay_ms); |
| 466 | } |
| 467 | |
| 468 | TEST_F(StreamSynchronizationTest, BothDelayedVideoLater) { |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 469 | BothDelayedVideoLaterTest(0); |
| 470 | } |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 471 | |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 472 | TEST_F(StreamSynchronizationTest, BothDelayedVideoLaterAudioClockDrift) { |
| 473 | audio_clock_drift_ = 1.05; |
| 474 | BothDelayedVideoLaterTest(0); |
| 475 | } |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 476 | |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 477 | TEST_F(StreamSynchronizationTest, BothDelayedVideoLaterVideoClockDrift) { |
| 478 | video_clock_drift_ = 1.05; |
| 479 | BothDelayedVideoLaterTest(0); |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 480 | } |
| 481 | |
| 482 | TEST_F(StreamSynchronizationTest, BothDelayedAudioLater) { |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 483 | BothDelayedAudioLaterTest(0); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 484 | } |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 485 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 486 | TEST_F(StreamSynchronizationTest, BothDelayedAudioClockDrift) { |
| 487 | audio_clock_drift_ = 1.05; |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 488 | BothDelayedAudioLaterTest(0); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 489 | } |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 490 | |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 491 | TEST_F(StreamSynchronizationTest, BothDelayedVideoClockDrift) { |
| 492 | video_clock_drift_ = 1.05; |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 493 | BothDelayedAudioLaterTest(0); |
stefan@webrtc.org | 7c3523c | 2012-09-11 07:00:42 +0000 | [diff] [blame] | 494 | } |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 495 | |
| 496 | TEST_F(StreamSynchronizationTest, BaseDelay) { |
| 497 | int base_target_delay_ms = 2000; |
| 498 | int current_audio_delay_ms = 2000; |
| 499 | int extra_audio_delay_ms = 0; |
| 500 | int total_video_delay_ms = base_target_delay_ms; |
| 501 | sync_->SetTargetBufferingDelay(base_target_delay_ms); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 502 | // We are in sync don't change. |
| 503 | EXPECT_FALSE(DelayedStreams(base_target_delay_ms, base_target_delay_ms, |
| 504 | current_audio_delay_ms, |
| 505 | &extra_audio_delay_ms, &total_video_delay_ms)); |
mikhal@webrtc.org | 0d8d010 | 2013-02-22 19:30:44 +0000 | [diff] [blame] | 506 | // Triggering another call with the same values. Delay should not be modified. |
| 507 | base_target_delay_ms = 2000; |
| 508 | current_audio_delay_ms = base_target_delay_ms; |
| 509 | total_video_delay_ms = base_target_delay_ms; |
| 510 | sync_->SetTargetBufferingDelay(base_target_delay_ms); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 511 | // We are in sync don't change. |
| 512 | EXPECT_FALSE(DelayedStreams(base_target_delay_ms, base_target_delay_ms, |
| 513 | current_audio_delay_ms, |
| 514 | &extra_audio_delay_ms, &total_video_delay_ms)); |
mikhal@webrtc.org | 0d8d010 | 2013-02-22 19:30:44 +0000 | [diff] [blame] | 515 | // Changing delay value - intended to test this module only. In practice it |
| 516 | // would take VoE time to adapt. |
| 517 | base_target_delay_ms = 5000; |
| 518 | current_audio_delay_ms = base_target_delay_ms; |
| 519 | total_video_delay_ms = base_target_delay_ms; |
| 520 | sync_->SetTargetBufferingDelay(base_target_delay_ms); |
pwestin@webrtc.org | 6311733 | 2013-04-22 18:57:14 +0000 | [diff] [blame] | 521 | // We are in sync don't change. |
| 522 | EXPECT_FALSE(DelayedStreams(base_target_delay_ms, base_target_delay_ms, |
| 523 | current_audio_delay_ms, |
| 524 | &extra_audio_delay_ms, &total_video_delay_ms)); |
mikhal@webrtc.org | ef9f76a | 2013-02-15 23:22:18 +0000 | [diff] [blame] | 525 | } |
| 526 | |
| 527 | TEST_F(StreamSynchronizationTest, BothDelayedAudioLaterWithBaseDelay) { |
| 528 | int base_target_delay_ms = 3000; |
| 529 | sync_->SetTargetBufferingDelay(base_target_delay_ms); |
| 530 | BothDelayedAudioLaterTest(base_target_delay_ms); |
| 531 | } |
| 532 | |
| 533 | TEST_F(StreamSynchronizationTest, BothDelayedAudioClockDriftWithBaseDelay) { |
| 534 | int base_target_delay_ms = 3000; |
| 535 | sync_->SetTargetBufferingDelay(base_target_delay_ms); |
| 536 | audio_clock_drift_ = 1.05; |
| 537 | BothDelayedAudioLaterTest(base_target_delay_ms); |
| 538 | } |
| 539 | |
| 540 | TEST_F(StreamSynchronizationTest, BothDelayedVideoClockDriftWithBaseDelay) { |
| 541 | int base_target_delay_ms = 3000; |
| 542 | sync_->SetTargetBufferingDelay(base_target_delay_ms); |
| 543 | video_clock_drift_ = 1.05; |
| 544 | BothDelayedAudioLaterTest(base_target_delay_ms); |
| 545 | } |
| 546 | |
| 547 | TEST_F(StreamSynchronizationTest, BothDelayedVideoLaterWithBaseDelay) { |
| 548 | int base_target_delay_ms = 2000; |
| 549 | sync_->SetTargetBufferingDelay(base_target_delay_ms); |
| 550 | BothDelayedVideoLaterTest(base_target_delay_ms); |
| 551 | } |
| 552 | |
| 553 | TEST_F(StreamSynchronizationTest, |
| 554 | BothDelayedVideoLaterAudioClockDriftWithBaseDelay) { |
| 555 | int base_target_delay_ms = 2000; |
| 556 | audio_clock_drift_ = 1.05; |
| 557 | sync_->SetTargetBufferingDelay(base_target_delay_ms); |
| 558 | BothDelayedVideoLaterTest(base_target_delay_ms); |
| 559 | } |
| 560 | |
| 561 | TEST_F(StreamSynchronizationTest, |
| 562 | BothDelayedVideoLaterVideoClockDriftWithBaseDelay) { |
| 563 | int base_target_delay_ms = 2000; |
| 564 | video_clock_drift_ = 1.05; |
| 565 | sync_->SetTargetBufferingDelay(base_target_delay_ms); |
| 566 | BothDelayedVideoLaterTest(base_target_delay_ms); |
| 567 | } |
| 568 | |
stefan@webrtc.org | 5f28498 | 2012-06-28 07:51:16 +0000 | [diff] [blame] | 569 | } // namespace webrtc |