admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove AMR format parameter from AudioCoder in utility

Browse Source 
The parameter was never used.

BUG=webrtc:3520

Review URL: https://codereview.webrtc.org/1365283002

Cr-Commit-Position: refs/heads/master@{#10095}
This commit is contained in:
henrik.lundin 2015-09-28 09:24:51 -07:00 committed by Commit bot
parent 1968d3f357
commit 8387c5f449
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/utility/source/coder.cc
View File

@ -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)
{

8
webrtc/modules/utility/source/coder.h
View File

@ -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);

2
webrtc/modules/utility/source/file_player_impl.cc
View File

@ -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.";

2
webrtc/modules/utility/source/file_recorder_impl.cc
View File

@ -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.";