Remove VoEExternalMedia interface.

webrtc/voice_engine/channel.h

Index: webrtc/voice_engine/channel.h
diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
index c512c0838458751b16a072745943715e2051e784..81253466a7999cb00e959aff473e4b2221582e61 100644
--- a/webrtc/voice_engine/channel.h
+++ b/webrtc/voice_engine/channel.h
@@ -55,7 +55,6 @@ class RtpReceiver;
 class RTPReceiverAudio;
 class RtpRtcp;
 class TelephoneEventHandler;
-class VoEMediaProcess;
 class VoERTPObserver;
 class VoiceEngineObserver;
 
@@ -84,7 +83,6 @@ class VoERtcpObserver;
 class ChannelState {
  public:
   struct State {
-    bool input_external_media = false;
     bool output_file_playing = false;
     bool input_file_playing = false;
     bool playing = false;
@@ -104,11 +102,6 @@ class ChannelState {
     return state_;
   }
 
-  void SetInputExternalMedia(bool enable) {
-    rtc::CritScope lock(&lock_);
-    state_.input_external_media = enable;
-  }
-
   void SetOutputFilePlaying(bool enable) {
     rtc::CritScope lock(&lock_);
     state_.output_file_playing = enable;
@@ -253,12 +246,6 @@ class Channel
 
   void SetMixWithMicStatus(bool mix);
 
-  // VoEExternalMediaProcessing
-  int RegisterExternalMediaProcessing(ProcessingTypes type,
-                                      VoEMediaProcess& processObject);
-  int DeRegisterExternalMediaProcessing(ProcessingTypes type);
-  int SetExternalMixing(bool enabled);
-
   // VoEVolumeControl
   int GetSpeechOutputLevel(uint32_t& level) const;
   int GetSpeechOutputLevelFullRange(uint32_t& level) const;
@@ -392,7 +379,6 @@ class Channel
     rtc::CritScope cs(&_callbackCritSect);
     return _externalTransport;
   }
-  bool ExternalMixing() const { return _externalMixing; }
   RtpRtcp* RtpRtcpModulePtr() const { return _rtpRtcpModule.get(); }
   int8_t OutputEnergyLevel() const { return _outputAudioLevel.Level(); }
   uint32_t Demultiplex(const AudioFrame& audioFrame);
@@ -483,9 +469,6 @@ class Channel
   int _outputFilePlayerId;
   int _outputFileRecorderId;
   bool _outputFileRecording;
-  bool _outputExternalMedia;
-  VoEMediaProcess* _inputExternalMediaCallbackPtr;
-  VoEMediaProcess* _outputExternalMediaCallbackPtr;
   uint32_t _timeStamp;
 
   RemoteNtpTimeEstimator ntp_estimator_ GUARDED_BY(ts_stats_lock_);
@@ -520,7 +503,6 @@ class Channel
   RmsLevel rms_level_;
   int32_t _sendFrameType;  // Send data is voice, 1-voice, 0-otherwise
   // VoEBase
-  bool _externalMixing;
   bool _mixFileWithMicrophone;
   // VoEVolumeControl
   bool input_mute_ GUARDED_BY(volume_settings_critsect_);