| Index: webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
|
| diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
|
| index 5aa320b8b6a558b623dd55392a25a8e18f6df4d5..3013925c02efe305954d43700004feb3bca39cd4 100644
|
| --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
|
| +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
|
| @@ -199,7 +199,7 @@ int32_t AudioCodingModuleImpl::Encode(const InputData& input_data) {
|
| frame_type = kFrameEmpty;
|
| encoded_info.payload_type = previous_pltype;
|
| } else {
|
| - DCHECK_GT(encode_buffer_.size(), 0u);
|
| + RTC_DCHECK_GT(encode_buffer_.size(), 0u);
|
| frame_type = encoded_info.speech ? kAudioFrameSpeech : kAudioFrameCN;
|
| }
|
|
|
| @@ -500,7 +500,7 @@ int AudioCodingModuleImpl::SetVAD(bool enable_dtx,
|
| bool enable_vad,
|
| ACMVADMode mode) {
|
| // Note: |enable_vad| is not used; VAD is enabled based on the DTX setting.
|
| - DCHECK_EQ(enable_dtx, enable_vad);
|
| + RTC_DCHECK_EQ(enable_dtx, enable_vad);
|
| CriticalSectionScoped lock(acm_crit_sect_.get());
|
| return codec_manager_.SetVAD(enable_dtx, mode);
|
| }
|
| @@ -580,7 +580,7 @@ int AudioCodingModuleImpl::PlayoutFrequency() const {
|
| // for codecs, CNG (NB, WB and SWB), DTMF, RED.
|
| int AudioCodingModuleImpl::RegisterReceiveCodec(const CodecInst& codec) {
|
| CriticalSectionScoped lock(acm_crit_sect_.get());
|
| - DCHECK(receiver_initialized_);
|
| + RTC_DCHECK(receiver_initialized_);
|
| if (codec.channels > 2 || codec.channels < 0) {
|
| LOG_F(LS_ERROR) << "Unsupported number of channels: " << codec.channels;
|
| return -1;
|
| @@ -612,7 +612,7 @@ int AudioCodingModuleImpl::RegisterExternalReceiveCodec(
|
| int sample_rate_hz,
|
| int num_channels) {
|
| CriticalSectionScoped lock(acm_crit_sect_.get());
|
| - DCHECK(receiver_initialized_);
|
| + RTC_DCHECK(receiver_initialized_);
|
| if (num_channels > 2 || num_channels < 0) {
|
| LOG_F(LS_ERROR) << "Unsupported number of channels: " << num_channels;
|
| return -1;
|
|
|