diff --git a/webrtc/modules/utility/source/coder.cc b/webrtc/modules/utility/source/coder.cc index 1baeaef721..4ec5f9b4e2 100644 --- a/webrtc/modules/utility/source/coder.cc +++ b/webrtc/modules/utility/source/coder.cc @@ -29,8 +29,7 @@ AudioCoder::~AudioCoder() { } -int32_t AudioCoder::SetEncodeCodec(const CodecInst& codecInst, - ACMAMRPackingFormat amrFormat) +int32_t AudioCoder::SetEncodeCodec(const CodecInst& codecInst) { if(_acm->RegisterSendCodec((CodecInst&)codecInst) == -1) { @@ -39,8 +38,7 @@ int32_t AudioCoder::SetEncodeCodec(const CodecInst& codecInst, return 0; } -int32_t AudioCoder::SetDecodeCodec(const CodecInst& codecInst, - ACMAMRPackingFormat amrFormat) +int32_t AudioCoder::SetDecodeCodec(const CodecInst& codecInst) { if(_acm->RegisterReceiveCodec((CodecInst&)codecInst) == -1) { diff --git a/webrtc/modules/utility/source/coder.h b/webrtc/modules/utility/source/coder.h index 57eada18cc..a57ba86d83 100644 --- a/webrtc/modules/utility/source/coder.h +++ b/webrtc/modules/utility/source/coder.h @@ -25,13 +25,9 @@ public: AudioCoder(uint32_t instanceID); ~AudioCoder(); - int32_t SetEncodeCodec( - const CodecInst& codecInst, - ACMAMRPackingFormat amrFormat = AMRBandwidthEfficient); + int32_t SetEncodeCodec(const CodecInst& codecInst); - int32_t SetDecodeCodec( - const CodecInst& codecInst, - ACMAMRPackingFormat amrFormat = AMRBandwidthEfficient); + int32_t SetDecodeCodec(const CodecInst& codecInst); int32_t Decode(AudioFrame& decodedAudio, uint32_t sampFreqHz, const int8_t* incomingPayload, size_t payloadLength); diff --git a/webrtc/modules/utility/source/file_player_impl.cc b/webrtc/modules/utility/source/file_player_impl.cc index 8c94caafb5..29ad9e3fe1 100644 --- a/webrtc/modules/utility/source/file_player_impl.cc +++ b/webrtc/modules/utility/source/file_player_impl.cc @@ -389,7 +389,7 @@ int32_t FilePlayerImpl::SetUpAudioDecoder() return -1; } if( STR_CASE_CMP(_codec.plname, "L16") != 0 && - _audioDecoder.SetDecodeCodec(_codec,AMRFileStorage) == -1) + _audioDecoder.SetDecodeCodec(_codec) == -1) { LOG(LS_WARNING) << "SetUpAudioDecoder() codec " << _codec.plname << " not supported."; diff --git a/webrtc/modules/utility/source/file_recorder_impl.cc b/webrtc/modules/utility/source/file_recorder_impl.cc index 6a5f2c27c2..1ea62e6e03 100644 --- a/webrtc/modules/utility/source/file_recorder_impl.cc +++ b/webrtc/modules/utility/source/file_recorder_impl.cc @@ -240,7 +240,7 @@ int32_t FileRecorderImpl::SetUpAudioEncoder() if (_fileFormat == kFileFormatPreencodedFile || STR_CASE_CMP(codec_info_.plname, "L16") != 0) { - if(_audioEncoder.SetEncodeCodec(codec_info_,_amrFormat) == -1) + if(_audioEncoder.SetEncodeCodec(codec_info_) == -1) { LOG(LS_ERROR) << "SetUpAudioEncoder() codec " << codec_info_.plname << " not supported.";