From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Tue, 21 Sep 2010 18:32:41 +0000 (-0700)
Subject: Fix bug 3022251
X-Git-Tag: android-x86-7.1-r1~1071^2~52
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a0786c52adce0defd7021d5718809e790493ebc0;p=android-x86%2Fsystem-media.git

Fix bug 3022251

Remove prefetch status error codes: not officially in OpenSL ES spec.

AndroidEffectCapabilities: no const for effect name

Android file descriptor data source: don't use a value that will
 likely be used by the specification in the future.

Change-Id: I9b4e0d7eb265dc98c76021cddfe5a1f50b5eb6ef
---

diff --git a/opensles/include/SLES/OpenSLES.h b/opensles/include/SLES/OpenSLES.h
index 29966c48..16496f9b 100644
--- a/opensles/include/SLES/OpenSLES.h
+++ b/opensles/include/SLES/OpenSLES.h
@@ -991,8 +991,6 @@ struct SLPlayItf_ {
 
 #define SL_PREFETCHEVENT_STATUSCHANGE		((SLuint32) 0x00000001)
 #define SL_PREFETCHEVENT_FILLLEVELCHANGE	((SLuint32) 0x00000002)
-#define SL_PREFETCHEVENT_ERROR			((SLuint32) 0x00000003)
-#define SL_PREFETCHEVENT_ERROR_UNRECOVERABLE	((SLuint32) 0x00000004)
 
 #define SL_PREFETCHSTATUS_UNDERFLOW		((SLuint32) 0x00000001)
 #define SL_PREFETCHSTATUS_SUFFICIENTDATA	((SLuint32) 0x00000002)
diff --git a/opensles/include/SLES/OpenSLES_Android.h b/opensles/include/SLES/OpenSLES_Android.h
index 56d16852..37ec2c1b 100644
--- a/opensles/include/SLES/OpenSLES_Android.h
+++ b/opensles/include/SLES/OpenSLES_Android.h
@@ -129,7 +129,7 @@ struct SLAndroidEffectCapabilitiesItf_ {
             SLuint32 index,
             SLInterfaceID *pEffectType,
             SLInterfaceID *pEffectImplementation,
-            const SLchar *pName,
+            SLchar *pName,
             SLuint16 *pNameSize);
 };
 
@@ -162,7 +162,7 @@ struct SLAndroidConfigurationItf_ {
 /* Android File Descriptor Data Locator                                      */
 /*---------------------------------------------------------------------------*/
 /** Addendum to Data locator macros  */
-#define SL_DATALOCATOR_ANDROIDFD        ((SLuint32) 0x00000009)
+#define SL_DATALOCATOR_ANDROIDFD        ((SLuint32) 0x800007BD)
 
 #define SL_DATALOCATOR_ANDROIDFD_USE_FILE_SIZE ((SLAint64) 0xFFFFFFFFFFFFFFFFll)
 
diff --git a/opensles/libopensles/IAndroidEffectCapabilities.c b/opensles/libopensles/IAndroidEffectCapabilities.c
index ff0a68ab..e9682910 100644
--- a/opensles/libopensles/IAndroidEffectCapabilities.c
+++ b/opensles/libopensles/IAndroidEffectCapabilities.c
@@ -44,7 +44,7 @@ static SLresult IAndroidEffectCapabilities_QueryNumEffects(SLAndroidEffectCapabi
 
 static SLresult IAndroidEffectCapabilities_QueryEffect(SLAndroidEffectCapabilitiesItf self,
         SLuint32 index, SLInterfaceID *pEffectType, SLInterfaceID *pEffectImplementation,
-        const SLchar * pName, SLuint16 *pNameSize) {
+        SLchar * pName, SLuint16 *pNameSize) {
 
     SL_ENTER_INTERFACE