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

Side by Side Diff: webrtc/modules/audio_device/android/audio_manager.h

Issue 1417683006: modules: more interface -> include renames (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix last incorrectly wrapped pragma message Created 5 years, 1 month 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 #ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_
12 #define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_ 12 #define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_
13 13
14 #include <jni.h> 14 #include <jni.h>
15 15
16 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/base/thread_checker.h" 17 #include "webrtc/base/thread_checker.h"
18 #include "webrtc/modules/audio_device/android/audio_common.h" 18 #include "webrtc/modules/audio_device/android/audio_common.h"
19 #include "webrtc/modules/audio_device/audio_device_config.h" 19 #include "webrtc/modules/audio_device/audio_device_config.h"
20 #include "webrtc/modules/audio_device/include/audio_device_defines.h" 20 #include "webrtc/modules/audio_device/include/audio_device_defines.h"
21 #include "webrtc/modules/audio_device/audio_device_generic.h" 21 #include "webrtc/modules/audio_device/audio_device_generic.h"
22 #include "webrtc/modules/utility/interface/helpers_android.h" 22 #include "webrtc/modules/utility/include/helpers_android.h"
23 #include "webrtc/modules/utility/interface/jvm_android.h" 23 #include "webrtc/modules/utility/include/jvm_android.h"
24 24
25 namespace webrtc { 25 namespace webrtc {
26 26
27 // Implements support for functions in the WebRTC audio stack for Android that 27 // Implements support for functions in the WebRTC audio stack for Android that
28 // relies on the AudioManager in android.media. It also populates an 28 // relies on the AudioManager in android.media. It also populates an
29 // AudioParameter structure with native audio parameters detected at 29 // AudioParameter structure with native audio parameters detected at
30 // construction. This class does not make any audio-related modifications 30 // construction. This class does not make any audio-related modifications
31 // unless Init() is called. Caching audio parameters makes no changes but only 31 // unless Init() is called. Caching audio parameters makes no changes but only
32 // reads data from the Java side. 32 // reads data from the Java side.
33 class AudioManager { 33 class AudioManager {
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 // Contains native parameters (e.g. sample rate, channel configuration). 158 // Contains native parameters (e.g. sample rate, channel configuration).
159 // Set at construction in OnCacheAudioParameters() which is called from 159 // Set at construction in OnCacheAudioParameters() which is called from
160 // Java on the same thread as this object is created on. 160 // Java on the same thread as this object is created on.
161 AudioParameters playout_parameters_; 161 AudioParameters playout_parameters_;
162 AudioParameters record_parameters_; 162 AudioParameters record_parameters_;
163 }; 163 };
164 164
165 } // namespace webrtc 165 } // namespace webrtc
166 166
167 #endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_ 167 #endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/BUILD.gn ('k') | webrtc/modules/audio_device/android/audio_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698