commit 8387c5f449c6cfcf6fe604489439efdb889e0c05
author henrik.lundin <henrik.lundin@webrtc.org> Mon Sep 28 09:24:51 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon Sep 28 16:24:56 2015 +0000
tree 5755465a6d580d69b193d89d84edba568f66274b
parent 1968d3f357f3cb01c4fdd3d9e89e22a1f0d6660a

Remove AMR format parameter from AudioCoder in utility

The parameter was never used.

BUG=webrtc:3520

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

Cr-Commit-Position: refs/heads/master@{#10095}

webrtc/modules/utility/source/coder.cc

diff --git a/webrtc/modules/utility/source/coder.cc b/webrtc/modules/utility/source/coder.cc
index 1baeaef..4ec5f9b 100644
--- a/webrtc/modules/utility/source/coder.cc
+++ b/webrtc/modules/utility/source/coder.cc
@@ -29,8 +29,7 @@
 {
 }
 
-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 @@
     return 0;
 }
 
-int32_t AudioCoder::SetDecodeCodec(const CodecInst& codecInst,
-                                   ACMAMRPackingFormat amrFormat)
+int32_t AudioCoder::SetDecodeCodec(const CodecInst& codecInst)
 {
     if(_acm->RegisterReceiveCodec((CodecInst&)codecInst) == -1)
     {

webrtc/modules/utility/source/coder.h

diff --git a/webrtc/modules/utility/source/coder.h b/webrtc/modules/utility/source/coder.h
index 57eada1..a57ba86 100644
--- a/webrtc/modules/utility/source/coder.h
+++ b/webrtc/modules/utility/source/coder.h
@@ -25,13 +25,9 @@
     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);

webrtc/modules/utility/source/file_player_impl.cc

diff --git a/webrtc/modules/utility/source/file_player_impl.cc b/webrtc/modules/utility/source/file_player_impl.cc
index 8c94caa..29ad9e3 100644
--- a/webrtc/modules/utility/source/file_player_impl.cc
+++ b/webrtc/modules/utility/source/file_player_impl.cc
@@ -389,7 +389,7 @@
         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.";

webrtc/modules/utility/source/file_recorder_impl.cc

diff --git a/webrtc/modules/utility/source/file_recorder_impl.cc b/webrtc/modules/utility/source/file_recorder_impl.cc
index 6a5f2c2..1ea62e6 100644
--- a/webrtc/modules/utility/source/file_recorder_impl.cc
+++ b/webrtc/modules/utility/source/file_recorder_impl.cc
@@ -240,7 +240,7 @@
     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.";