commit ae9f2bdcef7f3a338ece6f57744c8c8f74d15483
author solenberg <solenberg@webrtc.org> Thu Sep 08 13:44:23 2016
committer Commit bot <commit-bot@chromium.org> Thu Sep 08 13:44:31 2016
tree 743c40f848115917b7e1fb7c68f8d57d14b169f9
parent 49fbbe089e1ab892e365a50c5e9373da4650e13f

Don't use VoE legacy APIs in force_mic_volume_max tool.

BUG=webrtc:4690

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

webrtc/tools/DEPS

diff --git a/webrtc/tools/DEPS b/webrtc/tools/DEPS
index e4b85c8..b9adeaf 100644
--- a/webrtc/tools/DEPS
+++ b/webrtc/tools/DEPS
@@ -2,6 +2,7 @@
   "+webrtc/base",
   "+webrtc/call",
   "+webrtc/common_video",
+  "+webrtc/modules/audio_device",
   "+webrtc/modules/audio_processing",
   "+webrtc/modules/congestion_controller",
   "+webrtc/modules/rtp_rtcp",

webrtc/tools/force_mic_volume_max/force_mic_volume_max.cc

diff --git a/webrtc/tools/force_mic_volume_max/force_mic_volume_max.cc b/webrtc/tools/force_mic_volume_max/force_mic_volume_max.cc
index 2bab288..0a2347d 100644
--- a/webrtc/tools/force_mic_volume_max/force_mic_volume_max.cc
+++ b/webrtc/tools/force_mic_volume_max/force_mic_volume_max.cc
@@ -12,33 +12,45 @@
 
 #include <stdio.h>
 
-#include "webrtc/test/channel_transport/channel_transport.h"
-#include "webrtc/voice_engine/include/voe_audio_processing.h"
-#include "webrtc/voice_engine/include/voe_base.h"
-#include "webrtc/voice_engine/include/voe_volume_control.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
 
-int main(int argc, char** argv) {
-  webrtc::VoiceEngine* voe = webrtc::VoiceEngine::Create();
-  if (voe == NULL) {
-    fprintf(stderr, "Failed to initialize voice engine.\n");
+using webrtc::AudioDeviceModule;
+
+#if defined(_WIN32)
+#define DEFAULT_INPUT_DEVICE (AudioDeviceModule::kDefaultCommunicationDevice)
+#else
+#define DEFAULT_INPUT_DEVICE (0)
+#endif
+
+int main(int /*argc*/, char** /*argv*/) {
+  // Create and initialize the ADM.
+  rtc::scoped_refptr<AudioDeviceModule> adm(
+      AudioDeviceModule::Create(1, AudioDeviceModule::kPlatformDefaultAudio));
+  if (!adm.get()) {
+    fprintf(stderr, "Failed to create Audio Device Module.\n");
+    return 1;
+  }
+  if (adm->Init() != 0) {
+    fprintf(stderr, "Failed to initialize Audio Device Module.\n");
+    return 1;
+  }
+  if (adm->SetRecordingDevice(DEFAULT_INPUT_DEVICE) != 0) {
+    fprintf(stderr, "Failed to set the default input device.\n");
+    return 1;
+  }
+  if (adm->InitMicrophone() != 0) {
+    fprintf(stderr, "Failed to to initialize the microphone.\n");
     return 1;
   }
 
-  webrtc::VoEBase* base = webrtc::VoEBase::GetInterface(voe);
-  webrtc::VoEVolumeControl* volume_control =
-      webrtc::VoEVolumeControl::GetInterface(voe);
-
-  if (base->Init() != 0) {
-    fprintf(stderr, "Failed to initialize voice engine base.\n");
+  // Set mic volume to max.
+  uint32_t max_vol = 0;
+  if (adm->MaxMicrophoneVolume(&max_vol) != 0) {
+    fprintf(stderr, "Failed to get max volume.\n");
     return 1;
   }
-  // Set to 0 first in case the mic is above 100%.
-  if (volume_control->SetMicVolume(0) != 0) {
-    fprintf(stderr, "Failed set volume to 0.\n");
-    return 1;
-  }
-  if (volume_control->SetMicVolume(255) != 0) {
-    fprintf(stderr, "Failed set volume to 255.\n");
+  if (adm->SetMicrophoneVolume(max_vol) != 0) {
+    fprintf(stderr, "Failed to set mic volume.\n");
     return 1;
   }