diff options
author | xians <xians@chromium.org> | 2014-11-17 15:26:25 +0100 |
---|---|---|
committer | xians <xians@chromium.org> | 2014-11-17 14:28:02 +0000 |
commit | 09340dc908cbe23a62907f98e51a669fd19c8930 (patch) | |
tree | 04b1cea59903802f78580915cde563bf4b332259 /third_party/libjingle/overrides/initialize_module.cc | |
parent | c64be1dc5a858b7318f5a746fad3f7f9cf754c87 (diff) | |
download | chromium_src-09340dc908cbe23a62907f98e51a669fd19c8930.zip chromium_src-09340dc908cbe23a62907f98e51a669fd19c8930.tar.gz chromium_src-09340dc908cbe23a62907f98e51a669fd19c8930.tar.bz2 |
Merge the revert to M40.
Revert of Reland 597923002: Fix the way how we create webrtc::AudioProcessing in Chrome (patchset #4 id:60001 of https://codereview.chromium.org/663413002/)
Reason for revert:
This CL broke the configuration of AudioProcessing, we have to revert it to fix the echo issues it introduces.
Original issue's description:
> Reland 597923002: Fix the way how we create webrtc::AudioProcessing in Chrome.
>
> The original review thread is in https://codereview.chromium.org/588523002/
>
> Fix the way how we create webrtc::AudioProcessing in Chrome.
>
> TBR=tommi@chromium.org,maruel@chromium.org
>
> BUG=415935
> TEST=all webrtc tests in all bots + manual test to verify the agc loggings exist.
>
> Committed: https://crrev.com/79ef9085fbdbc8e09ac989ea4d5f4c28e516bba9
> Cr-Commit-Position: refs/heads/master@{#300509}
TBR=maruel@chromium.org,tommi@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=415935
Review URL: https://codereview.chromium.org/717203002
Cr-Commit-Position: refs/heads/master@{#303834}
(cherry picked from commit 515c2beb237eae38347a86f7011b897674496ea2)
Review URL: https://codereview.chromium.org/727383002
Cr-Commit-Position: refs/branch-heads/2214@{#60}
Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
Diffstat (limited to 'third_party/libjingle/overrides/initialize_module.cc')
-rw-r--r-- | third_party/libjingle/overrides/initialize_module.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/third_party/libjingle/overrides/initialize_module.cc b/third_party/libjingle/overrides/initialize_module.cc index 1250cfb..09afbc2 100644 --- a/third_party/libjingle/overrides/initialize_module.cc +++ b/third_party/libjingle/overrides/initialize_module.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "init_webrtc.h" #include "talk/media/webrtc/webrtcmediaengine.h" -#include "third_party/webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/logging.h" @@ -99,9 +98,7 @@ bool InitializeModule(const CommandLine& command_line, CreateWebRtcMediaEngineFunction* create_media_engine, DestroyWebRtcMediaEngineFunction* destroy_media_engine, InitDiagnosticLoggingDelegateFunctionFunction* - init_diagnostic_logging, - CreateWebRtcAudioProcessingFunction* - create_audio_processing) { + init_diagnostic_logging) { #if !defined(OS_MACOSX) && !defined(OS_ANDROID) g_alloc = alloc; g_dealloc = dealloc; @@ -115,7 +112,6 @@ bool InitializeModule(const CommandLine& command_line, *create_media_engine = &CreateWebRtcMediaEngine; *destroy_media_engine = &DestroyWebRtcMediaEngine; *init_diagnostic_logging = &rtc::InitDiagnosticLoggingDelegateFunction; - *create_audio_processing = &webrtc::AudioProcessing::Create; if (CommandLine::Init(0, NULL)) { #if !defined(OS_WIN) |