diff --git a/.gn b/.gn index 841989caa1..4cd7b013e1 100644 --- a/.gn +++ b/.gn @@ -22,6 +22,7 @@ secondary_source = "//build/secondary/" 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 diff --git a/webrtc/modules/audio_mixer/BUILD.gn b/webrtc/modules/audio_mixer/BUILD.gn index 7ef27908be..afd29c4f82 100644 --- a/webrtc/modules/audio_mixer/BUILD.gn +++ b/webrtc/modules/audio_mixer/BUILD.gn @@ -72,6 +72,7 @@ source_set("audio_conference_mixer") { } deps = [ + "../..:webrtc_common", "../../base:rtc_base_approved", "../../modules/audio_processing", "../../modules/utility", 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 5be76ec4d0..48380fc550 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 @@ NewAudioConferenceMixerImpl::NewAudioConferenceMixerImpl(int id) thread_checker_.DetachFromThread(); } +NewAudioConferenceMixerImpl::~NewAudioConferenceMixerImpl() {} + bool NewAudioConferenceMixerImpl::Init() { crit_.reset(CriticalSectionWrapper::CreateCriticalSection()); if (crit_.get() == NULL) 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 ef93e6ff91..3933350fed 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 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer { explicit NewAudioConferenceMixerImpl(int id); + ~NewAudioConferenceMixerImpl() override; + // Must be called after ctor. bool Init();