From 97cb448d253b1af1157985a87b2ed52426abd15b Mon Sep 17 00:00:00 2001 From: Alex Loiko Date: Wed, 27 Dec 2017 09:36:31 +0100 Subject: [PATCH] Update Webrtc to new AudioProcessing API. webrtc::PostProcessor changed to webrtc::CustomProcessor and one APM factory method has been deprecated. The APM API changed in this cl: https://webrtc-review.googlesource.com/c/src/+/29201 TBR=henrik.lundin@webrtc.org, sakal@webrtc.org Bug: webrtc:8665 Change-Id: I76dfc7831575d4dfce7e60cbe22007bd2a50e946 Reviewed-on: https://webrtc-review.googlesource.com/34381 Reviewed-by: Alex Loiko Reviewed-by: Henrik Lundin Commit-Queue: Alex Loiko Cr-Commit-Position: refs/heads/master@{#21451} --- sdk/android/src/jni/pc/defaultaudioprocessingfactory.cc | 5 +++-- test/fuzzers/audio_processing_fuzzer_configs.cc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk/android/src/jni/pc/defaultaudioprocessingfactory.cc b/sdk/android/src/jni/pc/defaultaudioprocessingfactory.cc index bc6d6a43ae..071e218ef0 100644 --- a/sdk/android/src/jni/pc/defaultaudioprocessingfactory.cc +++ b/sdk/android/src/jni/pc/defaultaudioprocessingfactory.cc @@ -22,10 +22,11 @@ static jlong JNI_DefaultAudioProcessingFactory_CreateAudioProcessing( JNIEnv*, const JavaParamRef&, jlong native_post_processor) { - std::unique_ptr post_processor( - reinterpret_cast(native_post_processor)); + std::unique_ptr post_processor( + reinterpret_cast(native_post_processor)); rtc::scoped_refptr audio_processing = AudioProcessing::Create(webrtc::Config(), std::move(post_processor), + nullptr /* render_pre_processing */, nullptr /* echo_control_factory */, nullptr /* beamformer */); return jlongFromPointer(audio_processing.release()); diff --git a/test/fuzzers/audio_processing_fuzzer_configs.cc b/test/fuzzers/audio_processing_fuzzer_configs.cc index 15e0beeba9..369aa5a467 100644 --- a/test/fuzzers/audio_processing_fuzzer_configs.cc +++ b/test/fuzzers/audio_processing_fuzzer_configs.cc @@ -70,7 +70,7 @@ std::unique_ptr CreateAPM(const uint8_t** data, config.Set(new Intelligibility(*ie)); std::unique_ptr apm(AudioProcessing::Create( - config, nullptr, std::move(echo_control_factory), nullptr)); + config, nullptr, nullptr, std::move(echo_control_factory), nullptr)); webrtc::AudioProcessing::Config apm_config; apm_config.residual_echo_detector.enabled = *red;