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

Side by Side Diff: webrtc/modules/audio_device/include/audio_device.h

Issue 2019223004: Moves ownership of OpenSL engine object to Android audio manager (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Feedback from magjed@ Created 4 years, 6 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
« no previous file with comments | « webrtc/modules/audio_device/android/opensles_player.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 13 matching lines...) Expand all
24 kAdmErrArgument = 1 24 kAdmErrArgument = 1
25 }; 25 };
26 26
27 enum AudioLayer { 27 enum AudioLayer {
28 kPlatformDefaultAudio = 0, 28 kPlatformDefaultAudio = 0,
29 kWindowsWaveAudio = 1, 29 kWindowsWaveAudio = 1,
30 kWindowsCoreAudio = 2, 30 kWindowsCoreAudio = 2,
31 kLinuxAlsaAudio = 3, 31 kLinuxAlsaAudio = 3,
32 kLinuxPulseAudio = 4, 32 kLinuxPulseAudio = 4,
33 kAndroidJavaAudio = 5, 33 kAndroidJavaAudio = 5,
34 kAndroidJavaInputAndOpenSLESOutputAudio = 6, 34 kAndroidOpenSLESAudio = 6,
35 kAndroidJavaInputAndOpenSLESOutputAudio = 7,
35 kDummyAudio = 8 36 kDummyAudio = 8
36 }; 37 };
37 38
38 enum WindowsDeviceType { 39 enum WindowsDeviceType {
39 kDefaultCommunicationDevice = -1, 40 kDefaultCommunicationDevice = -1,
40 kDefaultDevice = -2 41 kDefaultDevice = -2
41 }; 42 };
42 43
43 enum BufferType { 44 enum BufferType {
44 kFixedBufferSize = 0, 45 kFixedBufferSize = 0,
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 return -1; 214 return -1;
214 } 215 }
215 216
216 protected: 217 protected:
217 virtual ~AudioDeviceModule() {} 218 virtual ~AudioDeviceModule() {}
218 }; 219 };
219 220
220 } // namespace webrtc 221 } // namespace webrtc
221 222
222 #endif // MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_ 223 #endif // MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/android/opensles_player.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698