commit eae4df541ba1d46f65d37e959baf2127aa632c93
author Jean-Michel Trivi <jmtrivi@google.com> Fri Dec 10 11:03:19 2010 -0800
committer Jean-Michel Trivi <jmtrivi@google.com> Fri Dec 10 12:05:08 2010 -0800
tree 4ab1442fd4cc1c27545f5d9b8f2ac8f92da35535
parent 16ce39d96d41884c7b0d1676553ab8167baaab74

Start support for XAAndroidBufferQueueItf in OpenMAX AL

Added an Android OpenMAX AL header for the Android interfaces
Registered the AndroidBufferQueueItf as an explicit
 interface on MediaPlayer.
Updated the Java+Native example to register a callback from
 which OpenMAX AL can retrieve the data to play
Started unifying the player object used by OpenMAX AL and
 OpenSL ES so they use a common class.

Change-Id: I73cec8c802f74767545c91278e5e73c8c7995218

libopensles/IAndroidBufferQueue.c

diff --git a/libopensles/IAndroidBufferQueue.c b/libopensles/IAndroidBufferQueue.c
index f9f74ad..f01be23 100644
--- a/libopensles/IAndroidBufferQueue.c
+++ b/libopensles/IAndroidBufferQueue.c
@@ -28,14 +28,28 @@
     interface_lock_exclusive(this);
 
     // verify pre-condition that media object is in the SL_PLAYSTATE_STOPPED state
-    if (SL_PLAYSTATE_STOPPED == ((CAudioPlayer*) this->mThis)->mPlay.mState) {
+    // FIXME PRIORITY 1 check play state
+    //if (SL_PLAYSTATE_STOPPED == ((CAudioPlayer*) this->mThis)->mPlay.mState) {
         this->mCallback = callback;
         this->mContext = pContext;
-        result = SL_RESULT_SUCCESS;
-        android_audioPlayer_androidBufferQueue_registerCallback_l((CAudioPlayer*) this->mThis);
-    } else {
-        result = SL_RESULT_PRECONDITIONS_VIOLATED;
-    }
+
+        switch (InterfaceToObjectID(this)) {
+        case SL_OBJECTID_AUDIOPLAYER:
+            result = SL_RESULT_SUCCESS;
+            android_audioPlayer_androidBufferQueue_registerCallback_l((CAudioPlayer*) this->mThis);
+            break;
+        case XA_OBJECTID_MEDIAPLAYER:
+            SL_LOGI("IAndroidBufferQueue_RegisterCallback()");
+            result = SL_RESULT_SUCCESS;
+            android_Player_androidBufferQueue_registerCallback_l((CMediaPlayer*) this->mThis);
+        default:
+            result = SL_RESULT_PARAMETER_INVALID;
+            break;
+        }
+
+    //} else {
+    //    result = SL_RESULT_PRECONDITIONS_VIOLATED;
+    //}
 
     interface_unlock_exclusive(this);
 
@@ -75,9 +89,22 @@
 
     // FIXME return value? of particular interest: error is length is larger than size received
     //   in callback
-    result = SL_RESULT_SUCCESS;
-    android_audioPlayer_androidBufferQueue_enqueue_l((CAudioPlayer*) this->mThis,
-            bufferId, length, event, pData);
+    switch (InterfaceToObjectID(this)) {
+    case SL_OBJECTID_AUDIOPLAYER:
+        result = SL_RESULT_SUCCESS;
+        android_audioPlayer_androidBufferQueue_enqueue_l((CAudioPlayer*) this->mThis,
+                bufferId, length, event, pData);
+        break;
+    case XA_OBJECTID_MEDIAPLAYER:
+        //SL_LOGV("IAndroidBufferQueue_Enqueue()");
+        result = SL_RESULT_SUCCESS;
+        android_Player_androidBufferQueue_enqueue_l((CMediaPlayer*) this->mThis,
+                bufferId, length, event, pData);
+        break;
+    default:
+        result = SL_RESULT_PARAMETER_INVALID;
+        break;
+    }
 
     interface_unlock_exclusive(this);