Remove VoEVolumeControl 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/statistics.h"
 #include "webrtc/voice_engine/utility.h"
 
 namespace webrtc {
 namespace voe {
 
@@ skipping 60 matching lines @@
         WEBRTC_TRACE(kTraceMemory, kTraceVoice, instanceId,
                      "OutputMixer::Create() unable to allocate memory for"
                      "mixer");
         return -1;
     }
     return 0;
 }
 
 OutputMixer::OutputMixer(uint32_t instanceId) :
     _mixerModule(*AudioConferenceMixer::Create(instanceId)),
-    _audioLevel(),
     _instanceId(instanceId),
-    _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)
     {
         WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId,-1),
                      "OutputMixer::OutputMixer() failed to register mixer"
@@ skipping 59 matching lines @@
     return _mixerModule.SetAnonymousMixabilityStatus(&participant, mixable);
 }
 
 int32_t
 OutputMixer::MixActiveChannels()
 {
     _mixerModule.Process();
     return 0;
 }
 
-int
-OutputMixer::GetSpeechOutputLevel(uint32_t& level)
-{
-    int8_t currentLevel = _audioLevel.Level();
-    level = static_cast<uint32_t> (currentLevel);
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_instanceId,-1),
-                 "GetSpeechOutputLevel() => level=%u", level);
-    return 0;
-}
-
-int
-OutputMixer::GetSpeechOutputLevelFullRange(uint32_t& level)
-{
-    int16_t currentLevel = _audioLevel.LevelFullRange();
-    level = static_cast<uint32_t> (currentLevel);
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_instanceId,-1),
-                 "GetSpeechOutputLevelFullRange() => level=%u", level);
-    return 0;
-}
-
-int
-OutputMixer::SetOutputVolumePan(float left, float right)
-{
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,-1),
-                 "OutputMixer::SetOutputVolumePan()");
-    _panLeft = left;
-    _panRight = right;
-    return 0;
-}
-
-int
-OutputMixer::GetOutputVolumePan(float& left, float& right)
-{
-    left = _panLeft;
-    right = _panRight;
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_instanceId,-1),
-                 "GetOutputVolumePan() => left=%2.1f, right=%2.1f",
-                 left, right);
-    return 0;
-}
-
 int OutputMixer::StartRecordingPlayout(const char* fileName,
                                        const CodecInst* codecInst)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,-1),
                  "OutputMixer::StartRecordingPlayout(fileName=%s)", fileName);
 
     if (_outputFileRecording)
     {
         WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId,-1),
                      "StartRecordingPlayout() is already recording");
@@ skipping 187 matching lines @@
 OutputMixer::DoOperationsOnCombinedSignal(bool feed_data_to_apm)
 {
     if (_audioFrame.sample_rate_hz_ != _mixingFrequencyHz)
     {
         WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,-1),
                      "OutputMixer::DoOperationsOnCombinedSignal() => "
                      "mixing frequency = %d", _audioFrame.sample_rate_hz_);
         _mixingFrequencyHz = _audioFrame.sample_rate_hz_;
     }
 
-    // Scale left and/or right channel(s) if balance is active
-    if (_panLeft != 1.0 || _panRight != 1.0)
-    {
-        if (_audioFrame.num_channels_ == 1)
-        {
-            AudioFrameOperations::MonoToStereo(&_audioFrame);
-        }
-        else
-        {
-            // Pure stereo mode (we are receiving a stereo signal).
-        }
-
-        assert(_audioFrame.num_channels_ == 2);
-        AudioFrameOperations::Scale(_panLeft, _panRight, _audioFrame);
-    }
-
     // --- 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();
       }
     }
 
-    // --- Measure audio level (0-9) for the combined signal
-    _audioLevel.ComputeLevel(_audioFrame);
-
     return 0;
 }
 }  // namespace voe
 }  // namespace webrtc