zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Added new mixer to |check_targets| in .gn and fixed include/depend errors. (patchset #1 id:1 of https://codereview.webrtc.org/2234293002/ )

Browse Source 
Reason for revert:
Breaks Chromium FYI builds, for example https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/9219/steps/compile/logs/stdio

Original issue's description:
> 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
> Cr-Commit-Position: refs/heads/master@{#13752}

TBR=kjellander@webrtc.org,aleloi@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.webrtc.org/2241243002
Cr-Commit-Position: refs/heads/master@{#13753}
This commit is contained in:
olka
2016-08-15 07:36:17 -07:00
committed by Commit bot
parent d700bef583
commit 2ab1da7c37
4 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gn
View File

@ -19,10 +19,7 @@ secondary_source = "//build/secondary/"
# their includes checked for proper dependencies when you run either
# "gn check" or "gn gen --check".
# TODO(kjellander): Keep adding paths to this list as work in webrtc:5589 is done.
check_targets = [
"//webrtc/voice_engine:level_indicator",
"//webrtc/modules/audio_mixer:audio_conference_mixer",
]
check_targets = [ "//webrtc/voice_engine:level_indicator" ]
# These are the list of GN files that run exec_script. This whitelist exists
# to force additional review for new uses of exec_script, which is strongly

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

@ -72,11 +72,9 @@ source_set("audio_conference_mixer") {
}
deps = [
"../..:webrtc_common",
"../../base:rtc_base_approved",
"../../modules/audio_processing",
"../../modules/utility",
"../../system_wrappers",
"../../system_wrappers:system_wrappers_default",
]
}

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

@ -19,6 +19,7 @@
#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 {
@ -141,8 +142,6 @@ 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,6 +19,7 @@
#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 {
@ -63,8 +64,6 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
explicit NewAudioConferenceMixerImpl(int id);
~NewAudioConferenceMixerImpl() override;
// Must be called after ctor.
bool Init();