admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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}
This commit is contained in:
aleloi 2016-08-16 02:15:49 -07:00 committed by Commit bot
parent 7522a28051
commit 70f866c647
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gn
View File

@ -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

1
webrtc/modules/audio_mixer/BUILD.gn
View File

@ -72,6 +72,7 @@ source_set("audio_conference_mixer") {
}
deps = [
"../..:webrtc_common",
"../../base:rtc_base_approved",
"../../modules/audio_processing",
"../../modules/utility",

3
webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc
View File

@ -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)

3
webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
View File

@ -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();