Chromium Code Reviews| Index: webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc |
| diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc b/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc |
| index 1a1ae37a8a38da869caa30fc78539ccb49c11028..4aae5880b49e8e753e3399cfc3749135693cfefe 100644 |
| --- a/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc |
| +++ b/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc |
| @@ -791,9 +791,10 @@ int AudioCodingModuleImpl::SetMaximumPlayoutDelay(int time_ms) { |
| // Get 10 milliseconds of raw audio data to play out. |
| // Automatic resample to the requested frequency. |
| int AudioCodingModuleImpl::PlayoutData10Ms(int desired_freq_hz, |
| - AudioFrame* audio_frame) { |
| + AudioFrame* audio_frame, |
| + bool* muted) { |
| // GetAudio always returns 10 ms, at the requested sample rate. |
| - if (receiver_.GetAudio(desired_freq_hz, audio_frame) != 0) { |
| + if (receiver_.GetAudio(desired_freq_hz, audio_frame, muted) != 0) { |
| WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, id_, |
| "PlayoutData failed, RecOut Failed"); |
| return -1; |
| @@ -802,6 +803,14 @@ int AudioCodingModuleImpl::PlayoutData10Ms(int desired_freq_hz, |
| return 0; |
| } |
| +int AudioCodingModuleImpl::PlayoutData10Ms(int desired_freq_hz, |
| + AudioFrame* audio_frame) { |
| + bool muted; |
| + int ret = PlayoutData10Ms(desired_freq_hz, audio_frame, &muted); |
| + RTC_DCHECK(!muted); |
|
minyue-webrtc
2016/05/13 09:43:12
Is it possible to check enable_fast_accelerate of
hlundin-webrtc
2016/05/13 09:45:52
The config is not stored anywhere, so it is not st
|
| + return ret; |
| +} |
| + |
| ///////////////////////////////////////// |
| // Statistics |
| // |