Remove VoEExternalMedia interface.

webrtc/voice_engine/output_mixer.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.
  */
 
 #include "webrtc/voice_engine/output_mixer.h"
 
 #include "webrtc/audio/utility/audio_frame_operations.h"
 #include "webrtc/base/format_macros.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
-#include "webrtc/voice_engine/include/voe_external_media.h"
 #include "webrtc/voice_engine/statistics.h"
 #include "webrtc/voice_engine/utility.h"
 
 namespace webrtc {
 namespace voe {
 
 void
 OutputMixer::NewMixedAudio(int32_t id,
                            const AudioFrame& generalAudioFrame,
                            const AudioFrame** uniqueAudioFrames,
@@ skipping 58 matching lines @@
                      "mixer");
         return -1;
     }
     return 0;
 }
 
 OutputMixer::OutputMixer(uint32_t instanceId) :
     _mixerModule(*AudioConferenceMixer::Create(instanceId)),
     _audioLevel(),
     _instanceId(instanceId),
-    _externalMediaCallbackPtr(NULL),
-    _externalMedia(false),
     _panLeft(1.0f),
     _panRight(1.0f),
     _mixingFrequencyHz(8000),
     _outputFileRecording(false)
 {
     WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId,-1),
                  "OutputMixer::OutputMixer() - ctor");
 
     if (_mixerModule.RegisterMixedStreamCallback(this) == -1)
     {
@@ skipping 10 matching lines @@
     {
         delete mixer;
         mixer = NULL;
     }
 }
 
 OutputMixer::~OutputMixer()
 {
     WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId,-1),
                  "OutputMixer::~OutputMixer() - dtor");
-    if (_externalMedia)
-    {
-        DeRegisterExternalMediaProcessing();
-    }
     {
         rtc::CritScope cs(&_fileCritSect);
         if (output_file_recorder_) {
           output_file_recorder_->RegisterModuleFileCallback(NULL);
           output_file_recorder_->StopRecording();
         }
     }
     _mixerModule.UnRegisterMixedStreamCallback();
     delete &_mixerModule;
 }
@@ skipping 10 matching lines @@
 int32_t
 OutputMixer::SetAudioProcessingModule(AudioProcessing* audioProcessingModule)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,-1),
                  "OutputMixer::SetAudioProcessingModule("
                  "audioProcessingModule=0x%x)", audioProcessingModule);
     _audioProcessingModulePtr = audioProcessingModule;
     return 0;
 }
 
-int OutputMixer::RegisterExternalMediaProcessing(
-    VoEMediaProcess& proccess_object)
-{
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,-1),
-               "OutputMixer::RegisterExternalMediaProcessing()");
-
-    rtc::CritScope cs(&_callbackCritSect);
-    _externalMediaCallbackPtr = &proccess_object;
-    _externalMedia = true;
-
-    return 0;
-}
-
-int OutputMixer::DeRegisterExternalMediaProcessing()
-{
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,-1),
-                 "OutputMixer::DeRegisterExternalMediaProcessing()");
-
-    rtc::CritScope cs(&_callbackCritSect);
-    _externalMedia = false;
-    _externalMediaCallbackPtr = NULL;
-
-    return 0;
-}
-
 int32_t
 OutputMixer::SetMixabilityStatus(MixerParticipant& participant,
                                  bool mixable)
 {
     return _mixerModule.SetMixabilityStatus(&participant, mixable);
 }
 
 int32_t
 OutputMixer::SetAnonymousMixabilityStatus(MixerParticipant& participant,
                                           bool mixable)
@@ skipping 274 matching lines @@
 
     // --- Far-end Voice Quality Enhancement (AudioProcessing Module)
     if (feed_data_to_apm) {
       if (_audioProcessingModulePtr->ProcessReverseStream(&_audioFrame) != 0) {
         WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, -1),
                      "AudioProcessingModule::ProcessReverseStream() => error");
         RTC_NOTREACHED();
       }
     }
 
-    // --- External media processing
-    {
-        rtc::CritScope cs(&_callbackCritSect);
-        if (_externalMedia)
-        {
-            const bool is_stereo = (_audioFrame.num_channels_ == 2);
-            if (_externalMediaCallbackPtr)
-            {
-                _externalMediaCallbackPtr->Process(
-                    -1,
-                    kPlaybackAllChannelsMixed,
-                    (int16_t*)_audioFrame.data_,
-                    _audioFrame.samples_per_channel_,
-                    _audioFrame.sample_rate_hz_,
-                    is_stereo);
-            }
-        }
-    }
-
     // --- Measure audio level (0-9) for the combined signal
     _audioLevel.ComputeLevel(_audioFrame);
 
     return 0;
 }
 }  // namespace voe
 }  // namespace webrtc