1 files changed, 21 insertions, 27 deletions

diff --git a/chromium/third_party/webrtc/voice_engine/include/voe_codec.h b/chromium/third_party/webrtc/voice_engine/include/voe_codec.h
index e69737d689b..34a223211ac 100644
--- a/chromium/third_party/webrtc/voice_engine/include/voe_codec.h
+++ b/chromium/third_party/webrtc/voice_engine/include/voe_codec.h
@@ -84,22 +84,6 @@ public:
     // Gets the currently received |codec| for a specific |channel|.
     virtual int GetRecCodec(int channel, CodecInst& codec) = 0;
 
-    // Sets the initial values of target rate and frame size for iSAC
-    // for a specified |channel|. This API is only valid if iSAC is setup
-    // to run in channel-adaptive mode
-    virtual int SetISACInitTargetRate(int channel, int rateBps,
-                                      bool useFixedFrameSize = false) = 0;
-
-    // Sets the maximum allowed iSAC rate which the codec may not exceed
-    // for a single packet for the specified |channel|. The maximum rate is
-    // defined as payload size per frame size in bits per second.
-    virtual int SetISACMaxRate(int channel, int rateBps) = 0;
-
-    // Sets the maximum allowed iSAC payload size for a specified |channel|.
-    // The maximum value is set independently of the frame size, i.e.
-    // 30 ms and 60 ms packets have the same limit.
-    virtual int SetISACMaxPayloadSize(int channel, int sizeBytes) = 0;
-
     // Sets the dynamic payload type number for a particular |codec| or
     // disables (ignores) a codec for receiving. For instance, when receiving
     // an invite from a SIP-based client, this function can be used to change
@@ -118,6 +102,18 @@ public:
     virtual int SetSendCNPayloadType(
         int channel, int type, PayloadFrequencies frequency = kFreq16000Hz) = 0;
 
+    // Sets the codec internal FEC (forward error correction) status for a
+    // specified |channel|. Returns 0 if success, and -1 if failed.
+    // TODO(minyue): Make SetFECStatus() pure virtual when fakewebrtcvoiceengine
+    // in talk is ready.
+    virtual int SetFECStatus(int channel, bool enable) { return -1; }
+
+    // Gets the codec internal FEC status for a specified |channel|. Returns 0
+    // with the status stored in |enabled| if success, and -1 if encountered
+    // error.
+    // TODO(minyue): Make GetFECStatus() pure virtual when fakewebrtcvoiceengine
+    // in talk is ready.
+    virtual int GetFECStatus(int channel, bool& enabled) { return -1; }
 
     // Sets the VAD/DTX (silence suppression) status and |mode| for a
     // specified |channel|. Disabling VAD (through |enable|) will also disable
@@ -130,17 +126,15 @@ public:
     virtual int GetVADStatus(int channel, bool& enabled, VadModes& mode,
                              bool& disabledDTX) = 0;
 
-    // Not supported
-    virtual int SetAMREncFormat(int channel, AmrMode mode) = 0;
-
-    // Not supported
-    virtual int SetAMRDecFormat(int channel, AmrMode mode) = 0;
-
-    // Not supported
-    virtual int SetAMRWbEncFormat(int channel, AmrMode mode) = 0;
-
-    // Not supported
-    virtual int SetAMRWbDecFormat(int channel, AmrMode mode) = 0;
+    // Don't use. To be removed.
+    virtual int SetAMREncFormat(int channel, AmrMode mode) { return -1; }
+    virtual int SetAMRDecFormat(int channel, AmrMode mode) { return -1; }
+    virtual int SetAMRWbEncFormat(int channel, AmrMode mode) { return -1; }
+    virtual int SetAMRWbDecFormat(int channel, AmrMode mode) { return -1; }
+    virtual int SetISACInitTargetRate(int channel, int rateBps,
+            bool useFixedFrameSize = false) { return -1; }
+    virtual int SetISACMaxRate(int channel, int rateBps) { return -1; }
+    virtual int SetISACMaxPayloadSize(int channel, int sizeBytes) { return -1; }
 
 protected:
     VoECodec() {}