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

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

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 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) 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_OPENSLES_PLAYER_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_PLAYER_H_
12 #define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_PLAYER_H_ 12 #define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_PLAYER_H_
13 13
14 #include <SLES/OpenSLES.h> 14 #include <SLES/OpenSLES.h>
15 #include <SLES/OpenSLES_Android.h> 15 #include <SLES/OpenSLES_Android.h>
16 #include <SLES/OpenSLES_AndroidConfiguration.h> 16 #include <SLES/OpenSLES_AndroidConfiguration.h>
17 17
18 #include "webrtc/base/thread_checker.h"
18 #include "webrtc/modules/audio_device/android/audio_common.h" 19 #include "webrtc/modules/audio_device/android/audio_common.h"
19 #include "webrtc/modules/audio_device/android/audio_manager.h" 20 #include "webrtc/modules/audio_device/android/audio_manager.h"
20 #include "webrtc/modules/audio_device/android/opensles_common.h" 21 #include "webrtc/modules/audio_device/android/opensles_common.h"
22 #include "webrtc/modules/audio_device/include/audio_device_defines.h"
21 #include "webrtc/modules/audio_device/audio_device_generic.h" 23 #include "webrtc/modules/audio_device/audio_device_generic.h"
22 #include "webrtc/modules/audio_device/include/audio_device_defines.h"
23 #include "webrtc/modules/utility/include/helpers_android.h" 24 #include "webrtc/modules/utility/include/helpers_android.h"
24 #include "webrtc/rtc_base/thread_checker.h"
25 25
26 namespace webrtc { 26 namespace webrtc {
27 27
28 class FineAudioBuffer; 28 class FineAudioBuffer;
29 29
30 // Implements 16-bit mono PCM audio output support for Android using the 30 // Implements 16-bit mono PCM audio output support for Android using the
31 // C based OpenSL ES API. No calls from C/C++ to Java using JNI is done. 31 // C based OpenSL ES API. No calls from C/C++ to Java using JNI is done.
32 // 32 //
33 // An instance must be created and destroyed on one and the same thread. 33 // An instance must be created and destroyed on one and the same thread.
34 // All public methods must also be called on the same thread. A thread checker 34 // All public methods must also be called on the same thread. A thread checker
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 // properties. This interface is supported on the Audio Player object. 187 // properties. This interface is supported on the Audio Player object.
188 SLVolumeItf volume_; 188 SLVolumeItf volume_;
189 189
190 // Last time the OpenSL ES layer asked for audio data to play out. 190 // Last time the OpenSL ES layer asked for audio data to play out.
191 uint32_t last_play_time_; 191 uint32_t last_play_time_;
192 }; 192 };
193 193
194 } // namespace webrtc 194 } // namespace webrtc
195 195
196 #endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_PLAYER_H_ 196 #endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_PLAYER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/android/opensles_common.cc ('k') | webrtc/modules/audio_device/android/opensles_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698