am 2e9b39e4: Merge "ndk: Add missing OpenSLES headers and libraries." into gingerbread
Merge commit '2e9b39e457f1cf6794356144cad250c7fbe4e868' into gingerbread-plus-aosp * commit '2e9b39e457f1cf6794356144cad250c7fbe4e868': ndk: Add missing OpenSLES headers and libraries.
This commit is contained in:
David 'Digit' Turner
committed by
Android Git Automerger
Android Git Automerger
commit
e68362e1d6
BIN
ndk/platforms/android-9/arch-arm/lib/libOpenSLES.so
Executable file
BIN
ndk/platforms/android-9/arch-arm/lib/libOpenSLES.so
Executable file
Binary file not shown.
52
ndk/platforms/android-9/arch-arm/symbols/libOpenSLES.so.txt
Normal file
52
ndk/platforms/android-9/arch-arm/symbols/libOpenSLES.so.txt
Normal file
@@ -0,0 +1,52 @@
|
||||
SL_IID_3DCOMMIT
|
||||
SL_IID_3DDOPPLER
|
||||
SL_IID_3DGROUPING
|
||||
SL_IID_3DLOCATION
|
||||
SL_IID_3DMACROSCOPIC
|
||||
SL_IID_3DSOURCE
|
||||
SL_IID_ANDROIDCONFIGURATION
|
||||
SL_IID_ANDROIDEFFECT
|
||||
SL_IID_ANDROIDEFFECTCAPABILITIES
|
||||
SL_IID_ANDROIDEFFECTSEND
|
||||
SL_IID_ANDROIDSIMPLEBUFFERQUEUE
|
||||
SL_IID_AUDIODECODERCAPABILITIES
|
||||
SL_IID_AUDIOENCODER
|
||||
SL_IID_AUDIOENCODERCAPABILITIES
|
||||
SL_IID_AUDIOIODEVICECAPABILITIES
|
||||
SL_IID_BASSBOOST
|
||||
SL_IID_BUFFERQUEUE
|
||||
SL_IID_DEVICEVOLUME
|
||||
SL_IID_DYNAMICINTERFACEMANAGEMENT
|
||||
SL_IID_DYNAMICSOURCE
|
||||
SL_IID_EFFECTSEND
|
||||
SL_IID_ENGINE
|
||||
SL_IID_ENGINECAPABILITIES
|
||||
SL_IID_ENVIRONMENTALREVERB
|
||||
SL_IID_EQUALIZER
|
||||
SL_IID_LED
|
||||
SL_IID_METADATAEXTRACTION
|
||||
SL_IID_METADATATRAVERSAL
|
||||
SL_IID_MIDIMESSAGE
|
||||
SL_IID_MIDIMUTESOLO
|
||||
SL_IID_MIDITEMPO
|
||||
SL_IID_MIDITIME
|
||||
SL_IID_MUTESOLO
|
||||
SL_IID_NULL
|
||||
SL_IID_OBJECT
|
||||
SL_IID_OUTPUTMIX
|
||||
SL_IID_PITCH
|
||||
SL_IID_PLAY
|
||||
SL_IID_PLAYBACKRATE
|
||||
SL_IID_PREFETCHSTATUS
|
||||
SL_IID_PRESETREVERB
|
||||
SL_IID_RATEPITCH
|
||||
SL_IID_RECORD
|
||||
SL_IID_SEEK
|
||||
SL_IID_THREADSYNC
|
||||
SL_IID_VIBRA
|
||||
SL_IID_VIRTUALIZER
|
||||
SL_IID_VISUALIZATION
|
||||
SL_IID_VOLUME
|
||||
slCreateEngine
|
||||
slQueryNumSupportedEngineInterfaces
|
||||
slQuerySupportedEngineInterfaces
|
||||
2774
ndk/platforms/android-9/include/SLES/OpenSLES.h
Normal file
2774
ndk/platforms/android-9/include/SLES/OpenSLES.h
Normal file
File diff suppressed because it is too large
Load Diff
242
ndk/platforms/android-9/include/SLES/OpenSLES_Android.h
Normal file
242
ndk/platforms/android-9/include/SLES/OpenSLES_Android.h
Normal file
@@ -0,0 +1,242 @@
|
||||
/*
|
||||
* Copyright (C) 2010 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef OPENSL_ES_ANDROID_H_
|
||||
#define OPENSL_ES_ANDROID_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Android common types */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
typedef sl_int64_t SLAint64; /* 64 bit signed integer */
|
||||
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Android Effect interface */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
extern SLAPIENTRY const SLInterfaceID SL_IID_ANDROIDEFFECT;
|
||||
|
||||
/** Android Effect interface methods */
|
||||
|
||||
struct SLAndroidEffectItf_;
|
||||
typedef const struct SLAndroidEffectItf_ * const * SLAndroidEffectItf;
|
||||
|
||||
struct SLAndroidEffectItf_ {
|
||||
|
||||
SLresult (*CreateEffect) (SLAndroidEffectItf self,
|
||||
SLInterfaceID effectImplementationId);
|
||||
|
||||
SLresult (*ReleaseEffect) (SLAndroidEffectItf self,
|
||||
SLInterfaceID effectImplementationId);
|
||||
|
||||
SLresult (*SetEnabled) (SLAndroidEffectItf self,
|
||||
SLInterfaceID effectImplementationId,
|
||||
SLboolean enabled);
|
||||
|
||||
SLresult (*IsEnabled) (SLAndroidEffectItf self,
|
||||
SLInterfaceID effectImplementationId,
|
||||
SLboolean *pEnabled);
|
||||
|
||||
SLresult (*SendCommand) (SLAndroidEffectItf self,
|
||||
SLInterfaceID effectImplementationId,
|
||||
SLuint32 command,
|
||||
SLuint32 commandSize,
|
||||
void *pCommandData,
|
||||
SLuint32 *replySize,
|
||||
void *pReplyData);
|
||||
};
|
||||
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Android Effect Send interface */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
extern SLAPIENTRY const SLInterfaceID SL_IID_ANDROIDEFFECTSEND;
|
||||
|
||||
/** Android Effect Send interface methods */
|
||||
|
||||
struct SLAndroidEffectSendItf_;
|
||||
typedef const struct SLAndroidEffectSendItf_ * const * SLAndroidEffectSendItf;
|
||||
|
||||
struct SLAndroidEffectSendItf_ {
|
||||
SLresult (*EnableEffectSend) (
|
||||
SLAndroidEffectSendItf self,
|
||||
SLInterfaceID effectImplementationId,
|
||||
SLboolean enable,
|
||||
SLmillibel initialLevel
|
||||
);
|
||||
SLresult (*IsEnabled) (
|
||||
SLAndroidEffectSendItf self,
|
||||
SLInterfaceID effectImplementationId,
|
||||
SLboolean *pEnable
|
||||
);
|
||||
SLresult (*SetDirectLevel) (
|
||||
SLAndroidEffectSendItf self,
|
||||
SLmillibel directLevel
|
||||
);
|
||||
SLresult (*GetDirectLevel) (
|
||||
SLAndroidEffectSendItf self,
|
||||
SLmillibel *pDirectLevel
|
||||
);
|
||||
SLresult (*SetSendLevel) (
|
||||
SLAndroidEffectSendItf self,
|
||||
SLInterfaceID effectImplementationId,
|
||||
SLmillibel sendLevel
|
||||
);
|
||||
SLresult (*GetSendLevel)(
|
||||
SLAndroidEffectSendItf self,
|
||||
SLInterfaceID effectImplementationId,
|
||||
SLmillibel *pSendLevel
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Android Effect Capabilities interface */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
extern SLAPIENTRY const SLInterfaceID SL_IID_ANDROIDEFFECTCAPABILITIES;
|
||||
|
||||
/** Android Effect Capabilities interface methods */
|
||||
|
||||
struct SLAndroidEffectCapabilitiesItf_;
|
||||
typedef const struct SLAndroidEffectCapabilitiesItf_ * const * SLAndroidEffectCapabilitiesItf;
|
||||
|
||||
struct SLAndroidEffectCapabilitiesItf_ {
|
||||
|
||||
SLresult (*QueryNumEffects) (SLAndroidEffectCapabilitiesItf self,
|
||||
SLuint32 *pNumSupportedEffects);
|
||||
|
||||
|
||||
SLresult (*QueryEffect) (SLAndroidEffectCapabilitiesItf self,
|
||||
SLuint32 index,
|
||||
SLInterfaceID *pEffectType,
|
||||
SLInterfaceID *pEffectImplementation,
|
||||
SLchar *pName,
|
||||
SLuint16 *pNameSize);
|
||||
};
|
||||
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Android Configuration interface */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
extern SLAPIENTRY const SLInterfaceID SL_IID_ANDROIDCONFIGURATION;
|
||||
|
||||
/** Android Configuration interface methods */
|
||||
|
||||
struct SLAndroidConfigurationItf_;
|
||||
typedef const struct SLAndroidConfigurationItf_ * const * SLAndroidConfigurationItf;
|
||||
|
||||
struct SLAndroidConfigurationItf_ {
|
||||
|
||||
SLresult (*SetConfiguration) (SLAndroidConfigurationItf self,
|
||||
const SLchar *configKey,
|
||||
const void *pConfigValue,
|
||||
SLuint32 valueSize);
|
||||
|
||||
SLresult (*GetConfiguration) (SLAndroidConfigurationItf self,
|
||||
const SLchar *configKey,
|
||||
SLuint32 *pValueSize,
|
||||
void *pConfigValue
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Android Simple Buffer Queue Interface */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
extern SLAPIENTRY const SLInterfaceID SL_IID_ANDROIDSIMPLEBUFFERQUEUE;
|
||||
|
||||
struct SLAndroidSimpleBufferQueueItf_;
|
||||
typedef const struct SLAndroidSimpleBufferQueueItf_ * const * SLAndroidSimpleBufferQueueItf;
|
||||
|
||||
typedef void (/*SLAPIENTRY*/ *slAndroidSimpleBufferQueueCallback)(
|
||||
SLAndroidSimpleBufferQueueItf caller,
|
||||
void *pContext
|
||||
);
|
||||
|
||||
/** Android simple buffer queue state **/
|
||||
|
||||
typedef struct SLAndroidSimpleBufferQueueState_ {
|
||||
SLuint32 count;
|
||||
SLuint32 index;
|
||||
} SLAndroidSimpleBufferQueueState;
|
||||
|
||||
|
||||
struct SLAndroidSimpleBufferQueueItf_ {
|
||||
SLresult (*Enqueue) (
|
||||
SLAndroidSimpleBufferQueueItf self,
|
||||
const void *pBuffer,
|
||||
SLuint32 size
|
||||
);
|
||||
SLresult (*Clear) (
|
||||
SLAndroidSimpleBufferQueueItf self
|
||||
);
|
||||
SLresult (*GetState) (
|
||||
SLAndroidSimpleBufferQueueItf self,
|
||||
SLAndroidSimpleBufferQueueState *pState
|
||||
);
|
||||
SLresult (*RegisterCallback) (
|
||||
SLAndroidSimpleBufferQueueItf self,
|
||||
slAndroidSimpleBufferQueueCallback callback,
|
||||
void* pContext
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Android File Descriptor Data Locator */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
/** Addendum to Data locator macros */
|
||||
#define SL_DATALOCATOR_ANDROIDFD ((SLuint32) 0x800007BC)
|
||||
|
||||
#define SL_DATALOCATOR_ANDROIDFD_USE_FILE_SIZE ((SLAint64) 0xFFFFFFFFFFFFFFFFll)
|
||||
|
||||
/** File Descriptor-based data locator definition, locatorType must be SL_DATALOCATOR_ANDROIDFD */
|
||||
typedef struct SLDataLocator_AndroidFD_ {
|
||||
SLuint32 locatorType;
|
||||
SLint32 fd;
|
||||
SLAint64 offset;
|
||||
SLAint64 length;
|
||||
} SLDataLocator_AndroidFD;
|
||||
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Android Android Simple Buffer Queue Data Locator */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
/** Addendum to Data locator macros */
|
||||
#define SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE ((SLuint32) 0x800007BD)
|
||||
|
||||
/** BufferQueue-based data locator definition where locatorType must be SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE*/
|
||||
typedef struct SLDataLocator_AndroidSimpleBufferQueue {
|
||||
SLuint32 locatorType;
|
||||
SLuint32 numBuffers;
|
||||
} SLDataLocator_AndroidSimpleBufferQueue;
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OPENSL_ES_ANDROID_H_ */
|
||||
@@ -0,0 +1,69 @@
|
||||
/*
|
||||
* Copyright (C) 2010 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef OPENSL_ES_ANDROIDCONFIGURATION_H_
|
||||
#define OPENSL_ES_ANDROIDCONFIGURATION_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Android AudioRecorder configuration */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
/** Audio recording preset */
|
||||
/** Audio recording preset key */
|
||||
#define SL_ANDROID_KEY_RECORDING_PRESET ((const SLchar*) "androidRecordingPreset")
|
||||
/** Audio recording preset values */
|
||||
/** preset "none" cannot be set, it is used to indicate the current settings
|
||||
* do not match any of the presets. */
|
||||
#define SL_ANDROID_RECORDING_PRESET_NONE ((SLuint32) 0x00000000)
|
||||
/** generic recording configuration on the platform */
|
||||
#define SL_ANDROID_RECORDING_PRESET_GENERIC ((SLuint32) 0x00000001)
|
||||
/** uses the microphone audio source with the same orientation as the camera
|
||||
* if available, the main device microphone otherwise */
|
||||
#define SL_ANDROID_RECORDING_PRESET_CAMCORDER ((SLuint32) 0x00000002)
|
||||
/** uses the main microphone tuned for voice recognition */
|
||||
#define SL_ANDROID_RECORDING_PRESET_VOICE_RECOGNITION ((SLuint32) 0x00000003)
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Android AudioPlayer configuration */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
/** Audio playback stream type */
|
||||
/** Audio playback stream type key */
|
||||
#define SL_ANDROID_KEY_STREAM_TYPE ((const SLchar*) "androidPlaybackStreamType")
|
||||
|
||||
/** Audio playback stream type values */
|
||||
/* same as android.media.AudioManager.STREAM_VOICE_CALL */
|
||||
#define SL_ANDROID_STREAM_VOICE ((SLint32) 0x00000000)
|
||||
/* same as android.media.AudioManager.STREAM_SYSTEM */
|
||||
#define SL_ANDROID_STREAM_SYSTEM ((SLint32) 0x00000001)
|
||||
/* same as android.media.AudioManager.STREAM_RING */
|
||||
#define SL_ANDROID_STREAM_RING ((SLint32) 0x00000002)
|
||||
/* same as android.media.AudioManager.STREAM_MUSIC */
|
||||
#define SL_ANDROID_STREAM_MEDIA ((SLint32) 0x00000003)
|
||||
/* same as android.media.AudioManager.STREAM_ALARM */
|
||||
#define SL_ANDROID_STREAM_ALARM ((SLint32) 0x00000004)
|
||||
/* same as android.media.AudioManager.STREAM_NOTIFICATION */
|
||||
#define SL_ANDROID_STREAM_NOTIFICATION ((SLint32) 0x00000005)
|
||||
|
||||
|
||||
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OPENSL_ES_ANDROIDCONFIGURATION_H_ */
|
||||
52
ndk/platforms/android-9/include/SLES/OpenSLES_Platform.h
Normal file
52
ndk/platforms/android-9/include/SLES/OpenSLES_Platform.h
Normal file
@@ -0,0 +1,52 @@
|
||||
/*
|
||||
* Copyright (c) 2007-2009 The Khronos Group Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
* this software and /or associated documentation files (the "Materials "), to
|
||||
* deal in the Materials without restriction, including without limitation the
|
||||
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
* sell copies of the Materials, and to permit persons to whom the Materials are
|
||||
* furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Materials.
|
||||
*
|
||||
* THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN THE
|
||||
* MATERIALS.
|
||||
*
|
||||
* OpenSLES_Platform.h - OpenSL ES version 1.0
|
||||
*
|
||||
*/
|
||||
|
||||
/****************************************************************************/
|
||||
/* NOTE: This file contains definitions for the base types and the */
|
||||
/* SLAPIENTRY macro. This file **WILL NEED TO BE EDITED** to provide */
|
||||
/* the correct definitions specific to the platform being used. */
|
||||
/****************************************************************************/
|
||||
|
||||
#ifndef _OPENSLES_PLATFORM_H_
|
||||
#define _OPENSLES_PLATFORM_H_
|
||||
|
||||
typedef unsigned char sl_uint8_t;
|
||||
typedef signed char sl_int8_t;
|
||||
typedef unsigned short sl_uint16_t;
|
||||
typedef signed short sl_int16_t;
|
||||
typedef unsigned long sl_uint32_t;
|
||||
typedef signed long sl_int32_t;
|
||||
typedef long long sl_int64_t;
|
||||
|
||||
#ifndef SLAPIENTRY
|
||||
#ifdef __GNUC__
|
||||
#define SLAPIENTRY /* override per-platform */
|
||||
#else
|
||||
#define SLAPIENTRY __declspec(dllimport)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* _OPENSLES_PLATFORM_H_ */
|
||||
Reference in New Issue
Block a user