commit 70f866c647fde769e9685e20596b568cc7e27c15
author aleloi <aleloi@webrtc.org> Tue Aug 16 02:15:49 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Aug 16 09:15:55 2016 +0000
tree fe99e7a8ac2e33b546e849da4e0abda4fa0d7e3d
parent 7522a2805118b561322a9ac7d37cec8e8eea06e3

Added new mixer to |check_targets| in .gn and fixed include/depend errors.

Also fixed one small chromium-style error in the new mixer.

NOTRY=True

Committed: https://crrev.com/d700bef583d29ba2834ae57b3af7e8d3b8306cb9
Review-Url: https://codereview.webrtc.org/2234293002
Cr-Original-Commit-Position: refs/heads/master@{#13752}
Cr-Commit-Position: refs/heads/master@{#13772}

.gn

diff --git a/.gn b/.gn
index 841989c..4cd7b01 100644
--- a/.gn
+++ b/.gn
@@ -22,6 +22,7 @@
 check_targets = [
   "//webrtc/voice_engine:level_indicator",
   "//webrtc/modules/audio_coding:isac_fix_test",
+  "//webrtc/modules/audio_mixer:audio_conference_mixer",
 ]
 
 # These are the list of GN files that run exec_script. This whitelist exists

webrtc/modules/audio_mixer/BUILD.gn

diff --git a/webrtc/modules/audio_mixer/BUILD.gn b/webrtc/modules/audio_mixer/BUILD.gn
index 7ef2790..afd29c4 100644
--- a/webrtc/modules/audio_mixer/BUILD.gn
+++ b/webrtc/modules/audio_mixer/BUILD.gn
@@ -72,6 +72,7 @@
   }
 
   deps = [
+    "../..:webrtc_common",
     "../../base:rtc_base_approved",
     "../../modules/audio_processing",
     "../../modules/utility",

webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc

diff --git a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc b/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc
index 5be76ec..48380fc 100644
--- a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc
+++ b/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc
@@ -19,7 +19,6 @@
 #include "webrtc/modules/utility/include/audio_frame_operations.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
-#include "webrtc/voice_engine/utility.h"
 
 namespace webrtc {
 namespace {
@@ -142,6 +141,8 @@
   thread_checker_.DetachFromThread();
 }
 
+NewAudioConferenceMixerImpl::~NewAudioConferenceMixerImpl() {}
+
 bool NewAudioConferenceMixerImpl::Init() {
   crit_.reset(CriticalSectionWrapper::CreateCriticalSection());
   if (crit_.get() == NULL)

webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h

diff --git a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h b/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
index ef93e6f..3933350 100644
--- a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
+++ b/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
@@ -19,7 +19,6 @@
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/engine_configurations.h"
 #include "webrtc/modules/audio_mixer/new_audio_conference_mixer.h"
-#include "webrtc/modules/audio_conference_mixer/source/memory_pool.h"
 #include "webrtc/modules/include/module_common_types.h"
 
 namespace webrtc {
@@ -64,6 +63,8 @@
 
   explicit NewAudioConferenceMixerImpl(int id);
 
+  ~NewAudioConferenceMixerImpl() override;
+
   // Must be called after ctor.
   bool Init();