| 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; | |
| 114 config.clock = clock; | 113 config.clock = clock; |
| 115 config.decoder_factory = std::move(decoder_factory); | 114 config.decoder_factory = std::move(decoder_factory); |
| 116 return config; | 115 return config; |
| 117 } | 116 } |
| 118 | 117 |
| 119 } // namespace | 118 } // namespace |
| 120 | 119 |
| 121 AcmReceiveTestOldApi::AcmReceiveTestOldApi( | 120 AcmReceiveTestOldApi::AcmReceiveTestOldApi( |
| 122 PacketSource* packet_source, | 121 PacketSource* packet_source, |
| 123 AudioSink* audio_sink, | 122 AudioSink* audio_sink, |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 if (clock_.TimeInMilliseconds() >= last_toggle_time_ms_ + toggle_period_ms_) { | 233 if (clock_.TimeInMilliseconds() >= last_toggle_time_ms_ + toggle_period_ms_) { |
| 235 output_freq_hz_ = (output_freq_hz_ == output_freq_hz_1_) | 234 output_freq_hz_ = (output_freq_hz_ == output_freq_hz_1_) |
| 236 ? output_freq_hz_2_ | 235 ? output_freq_hz_2_ |
| 237 : output_freq_hz_1_; | 236 : output_freq_hz_1_; |
| 238 last_toggle_time_ms_ = clock_.TimeInMilliseconds(); | 237 last_toggle_time_ms_ = clock_.TimeInMilliseconds(); |
| 239 } | 238 } |
| 240 } | 239 } |
| 241 | 240 |
| 242 } // namespace test | 241 } // namespace test |
| 243 } // namespace webrtc | 242 } // namespace webrtc |
| OLD | NEW |