commit 796b8f9d71ffa733097d95f31efe5d9a8e4d6b8e
author solenberg <solenberg@webrtc.org> Wed Mar 01 17:02:23 2017 -0800
committer Commit bot <commit-bot@chromium.org> Thu Mar 02 01:02:23 2017 +0000
tree bee39d429073e36a1158dd8fbaa9ae38e4d1a2f5
parent d48f488bed37e8a5af47bd4be85d9b819fa284b4

Remove usage of VoEVolumeControl from WVoE and Audio[Send|Receive]Stream.

BUG=webrtc:4690

Review-Url: https://codereview.webrtc.org/2721003002
Cr-Commit-Position: refs/heads/master@{#16956}

webrtc/audio/audio_send_stream.cc

diff --git a/webrtc/audio/audio_send_stream.cc b/webrtc/audio/audio_send_stream.cc
index ec18125..2d0c99b 100644
--- a/webrtc/audio/audio_send_stream.cc
+++ b/webrtc/audio/audio_send_stream.cc
@@ -25,7 +25,7 @@
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/voice_engine/channel_proxy.h"
 #include "webrtc/voice_engine/include/voe_base.h"
-#include "webrtc/voice_engine/include/voe_volume_control.h"
+#include "webrtc/voice_engine/transmit_mixer.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"
 
 namespace webrtc {
@@ -193,16 +193,11 @@
     }
   }
 
-  // Local speech level.
-  {
-    ScopedVoEInterface<VoEVolumeControl> volume(voice_engine());
-    unsigned int level = 0;
-    int error = volume->GetSpeechInputLevelFullRange(level);
-    RTC_DCHECK_EQ(0, error);
-    stats.audio_level = static_cast<int32_t>(level);
-  }
-
   ScopedVoEInterface<VoEBase> base(voice_engine());
+  RTC_DCHECK(base->transmit_mixer());
+  stats.audio_level = base->transmit_mixer()->AudioLevelFullRange();
+  RTC_DCHECK_LE(0, stats.audio_level);
+
   RTC_DCHECK(base->audio_processing());
   auto audio_processing_stats = base->audio_processing()->GetStatistics();
   stats.echo_delay_median_ms = audio_processing_stats.delay_median;