| OLD | NEW | 
|---|
| 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/scoped_ptr.h" | 18 #include "webrtc/base/scoped_ptr.h" | 
| 19 #include "webrtc/base/thread_checker.h" | 19 #include "webrtc/base/thread_checker.h" | 
| 20 #include "webrtc/modules/audio_device/android/audio_common.h" | 20 #include "webrtc/modules/audio_device/android/audio_common.h" | 
| 21 #include "webrtc/modules/audio_device/android/audio_manager.h" | 21 #include "webrtc/modules/audio_device/android/audio_manager.h" | 
| 22 #include "webrtc/modules/audio_device/android/opensles_common.h" | 22 #include "webrtc/modules/audio_device/android/opensles_common.h" | 
| 23 #include "webrtc/modules/audio_device/include/audio_device_defines.h" | 23 #include "webrtc/modules/audio_device/include/audio_device_defines.h" | 
| 24 #include "webrtc/modules/audio_device/audio_device_generic.h" | 24 #include "webrtc/modules/audio_device/audio_device_generic.h" | 
| 25 #include "webrtc/modules/utility/interface/helpers_android.h" | 25 #include "webrtc/modules/utility/include/helpers_android.h" | 
| 26 | 26 | 
| 27 namespace webrtc { | 27 namespace webrtc { | 
| 28 | 28 | 
| 29 class FineAudioBuffer; | 29 class FineAudioBuffer; | 
| 30 | 30 | 
| 31 // Implements 16-bit mono PCM audio output support for Android using the | 31 // Implements 16-bit mono PCM audio output support for Android using the | 
| 32 // C based OpenSL ES API. No calls from C/C++ to Java using JNI is done. | 32 // C based OpenSL ES API. No calls from C/C++ to Java using JNI is done. | 
| 33 // | 33 // | 
| 34 // An instance must be created and destroyed on one and the same thread. | 34 // An instance must be created and destroyed on one and the same thread. | 
| 35 // All public methods must also be called on the same thread. A thread checker | 35 // All public methods must also be called on the same thread. A thread checker | 
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 193   SLAndroidSimpleBufferQueueItf simple_buffer_queue_; | 193   SLAndroidSimpleBufferQueueItf simple_buffer_queue_; | 
| 194 | 194 | 
| 195   // This interface exposes controls for manipulating the object’s audio volume | 195   // This interface exposes controls for manipulating the object’s audio volume | 
| 196   // properties. This interface is supported on the Audio Player object. | 196   // properties. This interface is supported on the Audio Player object. | 
| 197   SLVolumeItf volume_; | 197   SLVolumeItf volume_; | 
| 198 }; | 198 }; | 
| 199 | 199 | 
| 200 }  // namespace webrtc | 200 }  // namespace webrtc | 
| 201 | 201 | 
| 202 #endif  // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_PLAYER_H_ | 202 #endif  // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_PLAYER_H_ | 
| OLD | NEW | 
|---|