| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 // Maximum playout delay. | 147 // Maximum playout delay. |
| 148 int SetMaximumPlayoutDelay(int time_ms) override; | 148 int SetMaximumPlayoutDelay(int time_ms) override; |
| 149 | 149 |
| 150 // Smallest latency NetEq will maintain. | 150 // Smallest latency NetEq will maintain. |
| 151 int LeastRequiredDelayMs() const override; | 151 int LeastRequiredDelayMs() const override; |
| 152 | 152 |
| 153 // Impose an initial delay on playout. ACM plays silence until |delay_ms| | 153 // Impose an initial delay on playout. ACM plays silence until |delay_ms| |
| 154 // audio is accumulated in NetEq buffer, then starts decoding payloads. | 154 // audio is accumulated in NetEq buffer, then starts decoding payloads. |
| 155 int SetInitialPlayoutDelay(int delay_ms) override; | 155 int SetInitialPlayoutDelay(int delay_ms) override; |
| 156 | 156 |
| 157 // Set playout mode voice, fax. | |
| 158 int SetPlayoutMode(AudioPlayoutMode mode) override; | |
| 159 | |
| 160 // Get playout mode voice, fax. | |
| 161 AudioPlayoutMode PlayoutMode() const override; | |
| 162 | |
| 163 // Get playout timestamp. | 157 // Get playout timestamp. |
| 164 int PlayoutTimestamp(uint32_t* timestamp) override; | 158 int PlayoutTimestamp(uint32_t* timestamp) override; |
| 165 | 159 |
| 166 // Get 10 milliseconds of raw audio data to play out, and | 160 // Get 10 milliseconds of raw audio data to play out, and |
| 167 // automatic resample to the requested frequency if > 0. | 161 // automatic resample to the requested frequency if > 0. |
| 168 int PlayoutData10Ms(int desired_freq_hz, AudioFrame* audio_frame) override; | 162 int PlayoutData10Ms(int desired_freq_hz, AudioFrame* audio_frame) override; |
| 169 | 163 |
| 170 ///////////////////////////////////////// | 164 ///////////////////////////////////////// |
| 171 // Statistics | 165 // Statistics |
| 172 // | 166 // |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 int playout_frequency_hz_; | 349 int playout_frequency_hz_; |
| 356 // TODO(henrik.lundin): All members below this line are temporary and should | 350 // TODO(henrik.lundin): All members below this line are temporary and should |
| 357 // be removed after refactoring is completed. | 351 // be removed after refactoring is completed. |
| 358 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_; | 352 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_; |
| 359 CodecInst current_send_codec_; | 353 CodecInst current_send_codec_; |
| 360 }; | 354 }; |
| 361 | 355 |
| 362 } // namespace webrtc | 356 } // namespace webrtc |
| 363 | 357 |
| 364 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ | 358 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ |
| OLD | NEW |