Remove VoEExternalMedia interface.

webrtc/voice_engine/channel.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 17 matching lines @@
 #include "webrtc/modules/audio_device/include/audio_device.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/pacing/packet_router.h"
 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
 #include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/system_wrappers/include/trace.h"
-#include "webrtc/voice_engine/include/voe_external_media.h"
 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
 #include "webrtc/voice_engine/output_mixer.h"
 #include "webrtc/voice_engine/statistics.h"
 #include "webrtc/voice_engine/transmit_mixer.h"
 #include "webrtc/voice_engine/utility.h"
 
 namespace webrtc {
 namespace voe {
 
 namespace {
@@ skipping 646 matching lines @@
     // stage)
     AudioFrameOperations::Scale(left_pan, right_pan, *audioFrame);
   }
 
   // Mix decoded PCM output with file if file mixing is enabled
   if (state.output_file_playing) {
     MixAudioWithFile(*audioFrame, audioFrame->sample_rate_hz_);
     muted = false;  // We may have added non-zero samples.
   }
 
-  // External media
-  if (_outputExternalMedia) {
-    rtc::CritScope cs(&_callbackCritSect);
-    const bool isStereo = (audioFrame->num_channels_ == 2);
-    if (_outputExternalMediaCallbackPtr) {
-      _outputExternalMediaCallbackPtr->Process(
-          _channelId, kPlaybackPerChannel, (int16_t*)audioFrame->data_,
-          audioFrame->samples_per_channel_, audioFrame->sample_rate_hz_,
-          isStereo);
-    }
-  }
-
   // Record playout if enabled
   {
     rtc::CritScope cs(&_fileCritSect);
 
     if (_outputFileRecording && output_file_recorder_) {
       output_file_recorder_->RecordAudioToFile(*audioFrame);
     }
   }
 
   // Measure audio level (0-9)
@@ skipping 173 matching lines @@
                                            rtp_payload_registry_.get())),
       telephone_event_handler_(rtp_receiver_->GetTelephoneEventHandler()),
       _outputAudioLevel(),
       _externalTransport(false),
       // Avoid conflict with other channels by adding 1024 - 1026,
       // won't use as much as 1024 channels.
       _inputFilePlayerId(VoEModuleId(instanceId, channelId) + 1024),
       _outputFilePlayerId(VoEModuleId(instanceId, channelId) + 1025),
       _outputFileRecorderId(VoEModuleId(instanceId, channelId) + 1026),
       _outputFileRecording(false),
-      _outputExternalMedia(false),
-      _inputExternalMediaCallbackPtr(NULL),
-      _outputExternalMediaCallbackPtr(NULL),
       _timeStamp(0),  // This is just an offset, RTP module will add it's own
                       // random offset
       ntp_estimator_(Clock::GetRealTimeClock()),
       playout_timestamp_rtp_(0),
       playout_timestamp_rtcp_(0),
       playout_delay_ms_(0),
       _numberOfDiscardedPackets(0),
       send_sequence_number_(0),
       rtp_ts_wraparound_handler_(new rtc::TimestampWrapAroundHandler()),
       capture_start_rtp_time_stamp_(-1),
       capture_start_ntp_time_ms_(-1),
       _engineStatisticsPtr(NULL),
       _outputMixerPtr(NULL),
       _transmitMixerPtr(NULL),
       _moduleProcessThreadPtr(NULL),
       _audioDeviceModulePtr(NULL),
       _voiceEngineObserverPtr(NULL),
       _callbackCritSectPtr(NULL),
       _transportPtr(NULL),
       _sendFrameType(0),
-      _externalMixing(false),
       _mixFileWithMicrophone(false),
       input_mute_(false),
       previous_frame_muted_(false),
       _panLeft(1.0f),
       _panRight(1.0f),
       _outputGain(1.0f),
       _lastLocalTimeStamp(0),
       _lastPayloadType(0),
       _includeAudioLevelIndication(false),
       transport_overhead_per_packet_(0),
@@ skipping 41 matching lines @@
   statistics_proxy_.reset(new StatisticsProxy(_rtpRtcpModule->SSRC()));
   rtp_receive_statistics_->RegisterRtcpStatisticsCallback(
       statistics_proxy_.get());
 }
 
 Channel::~Channel() {
   rtp_receive_statistics_->RegisterRtcpStatisticsCallback(NULL);
   WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, _channelId),
                "Channel::~Channel() - dtor");
 
-  if (_outputExternalMedia) {
-    DeRegisterExternalMediaProcessing(kPlaybackPerChannel);
-  }
-  if (channel_state_.Get().input_external_media) {
-    DeRegisterExternalMediaProcessing(kRecordingPerChannel);
-  }
   StopSend();
   StopPlayout();
 
   {
     rtc::CritScope cs(&_fileCritSect);
     if (input_file_player_) {
       input_file_player_->RegisterModuleFileCallback(NULL);
       input_file_player_->StopPlayingFile();
     }
     if (output_file_player_) {
@@ skipping 166 matching lines @@
   return decoder_factory_;
 }
 
 int32_t Channel::StartPlayout() {
   WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
                "Channel::StartPlayout()");
   if (channel_state_.Get().playing) {
     return 0;
   }
 
-  if (!_externalMixing) {
-    // Add participant as candidates for mixing.
-    if (_outputMixerPtr->SetMixabilityStatus(*this, true) != 0) {
-      _engineStatisticsPtr->SetLastError(
-          VE_AUDIO_CONF_MIX_MODULE_ERROR, kTraceError,
-          "StartPlayout() failed to add participant to mixer");
-      return -1;
-    }
+  // Add participant as candidates for mixing.
+  if (_outputMixerPtr->SetMixabilityStatus(*this, true) != 0) {
+    _engineStatisticsPtr->SetLastError(
+        VE_AUDIO_CONF_MIX_MODULE_ERROR, kTraceError,
+        "StartPlayout() failed to add participant to mixer");
+    return -1;
   }
 
   channel_state_.SetPlaying(true);
   if (RegisterFilePlayingToMixer() != 0)
     return -1;
 
   return 0;
 }
 
 int32_t Channel::StopPlayout() {
   WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
                "Channel::StopPlayout()");
   if (!channel_state_.Get().playing) {
     return 0;
   }
 
-  if (!_externalMixing) {
-    // Remove participant as candidates for mixing
-    if (_outputMixerPtr->SetMixabilityStatus(*this, false) != 0) {
-      _engineStatisticsPtr->SetLastError(
-          VE_AUDIO_CONF_MIX_MODULE_ERROR, kTraceError,
-          "StopPlayout() failed to remove participant from mixer");
-      return -1;
-    }
+  // Remove participant as candidates for mixing
+  if (_outputMixerPtr->SetMixabilityStatus(*this, false) != 0) {
+    _engineStatisticsPtr->SetLastError(
+        VE_AUDIO_CONF_MIX_MODULE_ERROR, kTraceError,
+        "StopPlayout() failed to remove participant from mixer");
+    return -1;
   }
 
   channel_state_.SetPlaying(false);
   _outputAudioLevel.Clear();
 
   return 0;
 }
 
 int32_t Channel::StartSend() {
   WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
@@ skipping 1588 matching lines @@
     return 0xFFFFFFFF;
   }
 
   if (channel_state_.Get().input_file_playing) {
     MixOrReplaceAudioWithFile(mixingFrequency);
   }
 
   bool is_muted = InputMute();  // Cache locally as InputMute() takes a lock.
   AudioFrameOperations::Mute(&_audioFrame, previous_frame_muted_, is_muted);
 
-  if (channel_state_.Get().input_external_media) {
-    rtc::CritScope cs(&_callbackCritSect);
-    const bool isStereo = (_audioFrame.num_channels_ == 2);
-    if (_inputExternalMediaCallbackPtr) {
-      _inputExternalMediaCallbackPtr->Process(
-          _channelId, kRecordingPerChannel, (int16_t*)_audioFrame.data_,
-          _audioFrame.samples_per_channel_, _audioFrame.sample_rate_hz_,
-          isStereo);
-    }
-  }
-
   if (_includeAudioLevelIndication) {
     size_t length =
         _audioFrame.samples_per_channel_ * _audioFrame.num_channels_;
     RTC_CHECK_LE(length, sizeof(_audioFrame.data_));
     if (is_muted && previous_frame_muted_) {
       rms_level_.AnalyzeMuted(length);
     } else {
       rms_level_.Analyze(
           rtc::ArrayView<const int16_t>(_audioFrame.data_, length));
     }
@@ skipping 71 matching lines @@
 void Channel::SetTransportOverhead(size_t transport_overhead_per_packet) {
   transport_overhead_per_packet_ = transport_overhead_per_packet;
   UpdateOverheadForEncoder();
 }
 
 void Channel::OnOverheadChanged(size_t overhead_bytes_per_packet) {
   rtp_overhead_per_packet_ = overhead_bytes_per_packet;
   UpdateOverheadForEncoder();
 }
 
-int Channel::RegisterExternalMediaProcessing(ProcessingTypes type,
-                                             VoEMediaProcess& processObject) {
-  WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
-               "Channel::RegisterExternalMediaProcessing()");
-
-  rtc::CritScope cs(&_callbackCritSect);
-
-  if (kPlaybackPerChannel == type) {
-    if (_outputExternalMediaCallbackPtr) {
-      _engineStatisticsPtr->SetLastError(
-          VE_INVALID_OPERATION, kTraceError,
-          "Channel::RegisterExternalMediaProcessing() "
-          "output external media already enabled");
-      return -1;
-    }
-    _outputExternalMediaCallbackPtr = &processObject;
-    _outputExternalMedia = true;
-  } else if (kRecordingPerChannel == type) {
-    if (_inputExternalMediaCallbackPtr) {
-      _engineStatisticsPtr->SetLastError(
-          VE_INVALID_OPERATION, kTraceError,
-          "Channel::RegisterExternalMediaProcessing() "
-          "output external media already enabled");
-      return -1;
-    }
-    _inputExternalMediaCallbackPtr = &processObject;
-    channel_state_.SetInputExternalMedia(true);
-  }
-  return 0;
-}
-
-int Channel::DeRegisterExternalMediaProcessing(ProcessingTypes type) {
-  WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
-               "Channel::DeRegisterExternalMediaProcessing()");
-
-  rtc::CritScope cs(&_callbackCritSect);
-
-  if (kPlaybackPerChannel == type) {
-    if (!_outputExternalMediaCallbackPtr) {
-      _engineStatisticsPtr->SetLastError(
-          VE_INVALID_OPERATION, kTraceWarning,
-          "Channel::DeRegisterExternalMediaProcessing() "
-          "output external media already disabled");
-      return 0;
-    }
-    _outputExternalMedia = false;
-    _outputExternalMediaCallbackPtr = NULL;
-  } else if (kRecordingPerChannel == type) {
-    if (!_inputExternalMediaCallbackPtr) {
-      _engineStatisticsPtr->SetLastError(
-          VE_INVALID_OPERATION, kTraceWarning,
-          "Channel::DeRegisterExternalMediaProcessing() "
-          "input external media already disabled");
-      return 0;
-    }
-    channel_state_.SetInputExternalMedia(false);
-    _inputExternalMediaCallbackPtr = NULL;
-  }
-
-  return 0;
-}
-
-int Channel::SetExternalMixing(bool enabled) {
-  WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
-               "Channel::SetExternalMixing(enabled=%d)", enabled);
-
-  if (channel_state_.Get().playing) {
-    _engineStatisticsPtr->SetLastError(
-        VE_INVALID_OPERATION, kTraceError,
-        "Channel::SetExternalMixing() "
-        "external mixing cannot be changed while playing.");
-    return -1;
-  }
-
-  _externalMixing = enabled;
-
-  return 0;
-}
-
 int Channel::GetNetworkStatistics(NetworkStatistics& stats) {
   return audio_coding_->GetNetworkStatistics(&stats);
 }
 
 void Channel::GetDecodingCallStatistics(AudioDecodingCallStats* stats) const {
   audio_coding_->GetDecodingCallStatistics(stats);
 }
 
 bool Channel::GetDelayEstimate(int* jitter_buffer_delay_ms,
                                int* playout_buffer_delay_ms) const {
@@ skipping 306 matching lines @@
   int64_t min_rtt = 0;
   if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
       0) {
     return 0;
   }
   return rtt;
 }
 
 }  // namespace voe
 }  // namespace webrtc