Chromium Code Reviews| Index: webrtc/voice_engine/channel.cc |
| diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc |
| index 37b02702dc1539bb8a5f479b4ab14ba8a45ba9d8..7065d89fb92d7acac312364cdbd118e2c988be09 100644 |
| --- a/webrtc/voice_engine/channel.cc |
| +++ b/webrtc/voice_engine/channel.cc |
| @@ -483,8 +483,9 @@ int32_t Channel::GetAudioFrame(int32_t id, AudioFrame* audioFrame) { |
| event_log_->LogAudioPlayout(ssrc); |
| } |
| // Get 10ms raw PCM data from the ACM (mixer limits output frequency) |
| - if (audio_coding_->PlayoutData10Ms(audioFrame->sample_rate_hz_, audioFrame) == |
| - -1) { |
| + bool muted; |
| + if (audio_coding_->PlayoutData10Ms(audioFrame->sample_rate_hz_, audioFrame, |
| + &muted) == -1) { |
| WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId, _channelId), |
| "Channel::GetAudioFrame() PlayoutData10Ms() failed!"); |
| // In all likelihood, the audio in this frame is garbage. We return an |
| @@ -493,6 +494,7 @@ int32_t Channel::GetAudioFrame(int32_t id, AudioFrame* audioFrame) { |
| // irrelevant. |
| return -1; |
| } |
| + RTC_DCHECK(!muted); |
| if (_RxVadDetection) { |
| UpdateRxVadDetection(*audioFrame); |
| @@ -811,6 +813,7 @@ Channel::Channel(int32_t channelId, |
| } |
| acm_config.neteq_config.enable_fast_accelerate = |
| config.Get<NetEqFastAccelerate>().enabled; |
| + RTC_DCHECK(!acm_config.neteq_config.enable_muted_state); |
|
minyue-webrtc
2016/05/17 02:20:57
why not setting it to false then?
hlundin-webrtc
2016/05/17 07:18:44
Done.
|
| audio_coding_.reset(AudioCodingModule::Create(acm_config)); |
| _outputAudioLevel.Clear(); |