3 files changed, 2 insertions, 21 deletions
diff --git a/webrtc/voice_engine/include/voe_base.h b/webrtc/voice_engine/include/voe_base.h
index c82ad3dc3a..3d07fa78ff 100644
--- a/webrtc/voice_engine/include/voe_base.h
+++ b/webrtc/voice_engine/include/voe_base.h
@@ -87,6 +87,8 @@ class WEBRTC_DLLEXPORT VoiceEngine {
   static int SetAndroidObjects(void* javaVM, void* context);
 #endif
 
+  static std::string GetVersionString();
+
  protected:
   VoiceEngine() {}
   ~VoiceEngine() {}
diff --git a/webrtc/voice_engine/include/voe_rtp_rtcp.h b/webrtc/voice_engine/include/voe_rtp_rtcp.h
index 6d17501772..dd3609aa00 100644
--- a/webrtc/voice_engine/include/voe_rtp_rtcp.h
+++ b/webrtc/voice_engine/include/voe_rtp_rtcp.h
@@ -201,20 +201,6 @@ class WEBRTC_DLLEXPORT VoERTP_RTCP {
     return -1;
   }
 
-  // Sets the Forward Error Correction (FEC) status on a specific |channel|.
-  // TODO(minyue): Remove SetFECStatus() when SetFECStatus() is replaced by
-  // SetREDStatus() in fakewebrtcvoiceengine.
-  virtual int SetFECStatus(int channel, bool enable, int redPayloadtype = -1) {
-    return SetREDStatus(channel, enable, redPayloadtype);
-  };
-
-  // Gets the FEC status on a specific |channel|.
-  // TODO(minyue): Remove GetFECStatus() when GetFECStatus() is replaced by
-  // GetREDStatus() in fakewebrtcvoiceengine.
-  virtual int GetFECStatus(int channel, bool& enabled, int& redPayloadtype) {
-    return SetREDStatus(channel, enabled, redPayloadtype);
-  }
-
   // This function enables Negative Acknowledgment (NACK) using RTCP,
   // implemented based on RFC 4585. NACK retransmits RTP packets if lost on
   // the network. This creates a lossless transport at the expense of delay.
diff --git a/webrtc/voice_engine/include/voe_video_sync.h b/webrtc/voice_engine/include/voe_video_sync.h
index 1143cefb0e..655ba63543 100644
--- a/webrtc/voice_engine/include/voe_video_sync.h
+++ b/webrtc/voice_engine/include/voe_video_sync.h
@@ -64,13 +64,6 @@ class WEBRTC_DLLEXPORT VoEVideoSync {
   // computes based on inter-arrival times and its playout mode.
   virtual int SetMinimumPlayoutDelay(int channel, int delay_ms) = 0;
 
-  // Sets an initial delay for the playout jitter buffer. The playout of the
-  // audio is delayed by |delay_ms| in milliseconds. Thereafter, the delay is
-  // maintained, unless NetEq's internal mechanism requires a higher latency.
-  // Such a latency is computed based on inter-arrival times and NetEq's
-  // playout mode.
-  virtual int SetInitialPlayoutDelay(int channel, int delay_ms) = 0;
-
   // Gets the |jitter_buffer_delay_ms| (including the algorithmic delay), and
   // the |playout_buffer_delay_ms| for a specified |channel|.
   virtual int GetDelayEstimate(int channel,