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

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

Issue 3011943002: Move optional.h to webrtc/api/ (Closed)
Patch Set: Created 3 years, 3 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
11 #include "webrtc/modules/audio_processing/gain_control_impl.h" 11 #include "webrtc/modules/audio_processing/gain_control_impl.h"
12 12
13 #include "webrtc/api/optional.h"
13 #include "webrtc/modules/audio_processing/agc/legacy/gain_control.h" 14 #include "webrtc/modules/audio_processing/agc/legacy/gain_control.h"
14 #include "webrtc/modules/audio_processing/audio_buffer.h" 15 #include "webrtc/modules/audio_processing/audio_buffer.h"
15 #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h" 16 #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h"
16 #include "webrtc/rtc_base/constructormagic.h" 17 #include "webrtc/rtc_base/constructormagic.h"
17 #include "webrtc/rtc_base/optional.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 typedef void Handle; 21 typedef void Handle;
22 22
23 namespace { 23 namespace {
24 int16_t MapSetting(GainControl::Mode mode) { 24 int16_t MapSetting(GainControl::Mode mode) {
25 switch (mode) { 25 switch (mode) {
26 case GainControl::kAdaptiveAnalog: 26 case GainControl::kAdaptiveAnalog:
27 return kAgcModeAdaptiveAnalog; 27 return kAgcModeAdaptiveAnalog;
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 for (auto& gain_controller : gain_controllers_) { 430 for (auto& gain_controller : gain_controllers_) {
431 const int handle_error = 431 const int handle_error =
432 WebRtcAgc_set_config(gain_controller->state(), config); 432 WebRtcAgc_set_config(gain_controller->state(), config);
433 if (handle_error != AudioProcessing::kNoError) { 433 if (handle_error != AudioProcessing::kNoError) {
434 error = handle_error; 434 error = handle_error;
435 } 435 }
436 } 436 }
437 return error; 437 return error;
438 } 438 }
439 } // namespace webrtc 439 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698