OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 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 | 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 | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 void Push() { | 143 void Push() { |
144 rtp_info_.header.timestamp += kFrameSizeSamples; | 144 rtp_info_.header.timestamp += kFrameSizeSamples; |
145 rtp_info_.header.sequenceNumber++; | 145 rtp_info_.header.sequenceNumber++; |
146 ASSERT_EQ(0, acm_->IncomingPacket(payload_, kFrameSizeSamples * 2, | 146 ASSERT_EQ(0, acm_->IncomingPacket(payload_, kFrameSizeSamples * 2, |
147 rtp_info_)); | 147 rtp_info_)); |
148 } | 148 } |
149 | 149 |
150 // Pull audio equivalent to the amount of audio in one RTP packet. | 150 // Pull audio equivalent to the amount of audio in one RTP packet. |
151 void Pull() { | 151 void Pull() { |
152 AudioFrame frame; | 152 AudioFrame frame; |
| 153 bool muted; |
153 for (int k = 0; k < kNum10msPerFrame; ++k) { // Pull one frame. | 154 for (int k = 0; k < kNum10msPerFrame; ++k) { // Pull one frame. |
154 ASSERT_EQ(0, acm_->PlayoutData10Ms(-1, &frame)); | 155 ASSERT_EQ(0, acm_->PlayoutData10Ms(-1, &frame, &muted)); |
| 156 ASSERT_FALSE(muted); |
155 // Had to use ASSERT_TRUE, ASSERT_EQ generated error. | 157 // Had to use ASSERT_TRUE, ASSERT_EQ generated error. |
156 ASSERT_TRUE(kSampleRateHz == frame.sample_rate_hz_); | 158 ASSERT_TRUE(kSampleRateHz == frame.sample_rate_hz_); |
157 ASSERT_EQ(1u, frame.num_channels_); | 159 ASSERT_EQ(1u, frame.num_channels_); |
158 ASSERT_TRUE(kSampleRateHz / 100 == frame.samples_per_channel_); | 160 ASSERT_TRUE(kSampleRateHz / 100 == frame.samples_per_channel_); |
159 } | 161 } |
160 } | 162 } |
161 | 163 |
162 void Run(bool clean) { | 164 void Run(bool clean) { |
163 for (int n = 0; n < 10; ++n) { | 165 for (int n = 0; n < 10; ++n) { |
164 for (int m = 0; m < 5; ++m) { | 166 for (int m = 0; m < 5; ++m) { |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 #define MAYBE_TargetDelayBufferMinMax DISABLED_TargetDelayBufferMinMax | 243 #define MAYBE_TargetDelayBufferMinMax DISABLED_TargetDelayBufferMinMax |
242 #else | 244 #else |
243 #define MAYBE_TargetDelayBufferMinMax TargetDelayBufferMinMax | 245 #define MAYBE_TargetDelayBufferMinMax TargetDelayBufferMinMax |
244 #endif | 246 #endif |
245 TEST_F(TargetDelayTest, MAYBE_TargetDelayBufferMinMax) { | 247 TEST_F(TargetDelayTest, MAYBE_TargetDelayBufferMinMax) { |
246 TargetDelayBufferMinMax(); | 248 TargetDelayBufferMinMax(); |
247 } | 249 } |
248 | 250 |
249 } // namespace webrtc | 251 } // namespace webrtc |
250 | 252 |
OLD | NEW |