Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: webrtc/modules/audio_processing/echo_cancellation_impl.cc

Issue 1212653012: Follow-up: Remove old ReportedDelay AEC config (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 int err = ProcessingComponent::Initialize(); 322 int err = ProcessingComponent::Initialize();
323 if (err != apm_->kNoError || !is_component_enabled()) { 323 if (err != apm_->kNoError || !is_component_enabled()) {
324 return err; 324 return err;
325 } 325 }
326 326
327 return apm_->kNoError; 327 return apm_->kNoError;
328 } 328 }
329 329
330 void EchoCancellationImpl::SetExtraOptions(const Config& config) { 330 void EchoCancellationImpl::SetExtraOptions(const Config& config) {
331 extended_filter_enabled_ = config.Get<ExtendedFilter>().enabled; 331 extended_filter_enabled_ = config.Get<ExtendedFilter>().enabled;
332 delay_agnostic_enabled_ = config.Get<DelayAgnostic>().enabled || 332 delay_agnostic_enabled_ = config.Get<DelayAgnostic>().enabled;
333 !config.Get<ReportedDelay>().enabled;
334 Configure(); 333 Configure();
335 } 334 }
336 335
337 void* EchoCancellationImpl::CreateHandle() const { 336 void* EchoCancellationImpl::CreateHandle() const {
338 return WebRtcAec_Create(); 337 return WebRtcAec_Create();
339 } 338 }
340 339
341 void EchoCancellationImpl::DestroyHandle(void* handle) const { 340 void EchoCancellationImpl::DestroyHandle(void* handle) const {
342 assert(handle != NULL); 341 assert(handle != NULL);
343 WebRtcAec_Free(static_cast<Handle*>(handle)); 342 WebRtcAec_Free(static_cast<Handle*>(handle));
(...skipping 29 matching lines...) Expand all
373 int EchoCancellationImpl::num_handles_required() const { 372 int EchoCancellationImpl::num_handles_required() const {
374 return apm_->num_output_channels() * 373 return apm_->num_output_channels() *
375 apm_->num_reverse_channels(); 374 apm_->num_reverse_channels();
376 } 375 }
377 376
378 int EchoCancellationImpl::GetHandleError(void* handle) const { 377 int EchoCancellationImpl::GetHandleError(void* handle) const {
379 assert(handle != NULL); 378 assert(handle != NULL);
380 return MapError(WebRtcAec_get_error_code(static_cast<Handle*>(handle))); 379 return MapError(WebRtcAec_get_error_code(static_cast<Handle*>(handle)));
381 } 380 }
382 } // namespace webrtc 381 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698