OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 // Don't use any other codecs. | 103 // Don't use any other codecs. |
104 return false; | 104 return false; |
105 } | 105 } |
106 return true; | 106 return true; |
107 } | 107 } |
108 | 108 |
109 AudioCodingModule::Config MakeAcmConfig( | 109 AudioCodingModule::Config MakeAcmConfig( |
110 Clock* clock, | 110 Clock* clock, |
111 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory) { | 111 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory) { |
112 AudioCodingModule::Config config; | 112 AudioCodingModule::Config config; |
| 113 config.id = 0; |
113 config.clock = clock; | 114 config.clock = clock; |
114 config.decoder_factory = std::move(decoder_factory); | 115 config.decoder_factory = std::move(decoder_factory); |
115 return config; | 116 return config; |
116 } | 117 } |
117 | 118 |
118 } // namespace | 119 } // namespace |
119 | 120 |
120 AcmReceiveTestOldApi::AcmReceiveTestOldApi( | 121 AcmReceiveTestOldApi::AcmReceiveTestOldApi( |
121 PacketSource* packet_source, | 122 PacketSource* packet_source, |
122 AudioSink* audio_sink, | 123 AudioSink* audio_sink, |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 if (clock_.TimeInMilliseconds() >= last_toggle_time_ms_ + toggle_period_ms_) { | 234 if (clock_.TimeInMilliseconds() >= last_toggle_time_ms_ + toggle_period_ms_) { |
234 output_freq_hz_ = (output_freq_hz_ == output_freq_hz_1_) | 235 output_freq_hz_ = (output_freq_hz_ == output_freq_hz_1_) |
235 ? output_freq_hz_2_ | 236 ? output_freq_hz_2_ |
236 : output_freq_hz_1_; | 237 : output_freq_hz_1_; |
237 last_toggle_time_ms_ = clock_.TimeInMilliseconds(); | 238 last_toggle_time_ms_ = clock_.TimeInMilliseconds(); |
238 } | 239 } |
239 } | 240 } |
240 | 241 |
241 } // namespace test | 242 } // namespace test |
242 } // namespace webrtc | 243 } // namespace webrtc |
OLD | NEW |