Bug 5249076 When starting to stream, have at least one buffer in shared mem

[android-x86/system-media.git] / wilhelm / src / android / android_StreamPlayer.h

diff --git a/wilhelm/src/android/android_StreamPlayer.h b/wilhelm/src/android/android_StreamPlayer.h
index e0c7f78..2bd745c 100644 (file)
--- a/wilhelm/src/android/android_StreamPlayer.h
+++ b/wilhelm/src/android/android_StreamPlayer.h
@@ -14,46 +14,60 @@
  * limitations under the License.
  */
 
+#include <media/IStreamSource.h>
 #include <binder/IServiceManager.h>
+#include "android/android_GenericMediaPlayer.h"
 
+// number of SLuint32 fields to store a buffer event message in an item, by mapping each
+//   to the item key (SLuint32), the item size (SLuint32), and the item data (mask on SLuint32)
+#define NB_BUFFEREVENT_ITEM_FIELDS 3
 
 //--------------------------------------------------------------------------------------------------
 namespace android {
 
-typedef void (*cb_buffAvailable_t)(const void* user, bool userIsAudioPlayer,
-        size_t bufferId, void* bufferLoc, size_t buffSize);
-
 //--------------------------------------------------------------------------------------------------
 class StreamSourceAppProxy : public BnStreamSource {
 public:
-    StreamSourceAppProxy(slAndroidBufferQueueCallback callback,
-            cb_buffAvailable_t notify,
+    StreamSourceAppProxy(
             const void* user, bool userIsAudioPlayer,
             void *appContext,
-            const void *caller);
+            const void *caller,
+            const sp<CallbackProtector> &callbackProtector);
     virtual ~StreamSourceAppProxy();
 
+    // store an item structure to indicate a processed buffer
+    static const SLuint32 kItemProcessed[NB_BUFFEREVENT_ITEM_FIELDS];
+
     // IStreamSource implementation
     virtual void setListener(const sp<IStreamListener> &listener);
     virtual void setBuffers(const Vector<sp<IMemory> > &buffers);
     virtual void onBufferAvailable(size_t index);
 
-    void receivedFromAppCommand(IStreamListener::Command cmd);
-    void receivedFromAppBuffer(size_t buffIndex, size_t buffLength);
+    // Consumption from ABQ
+    void pullFromBuffQueue();
+
+    void receivedCmd_l(IStreamListener::Command cmd, const sp<AMessage> &msg = NULL);
+    void receivedBuffer_l(size_t buffIndex, size_t buffLength);
 
 private:
-    Mutex mListenerLock;
+    // for mListener and mAvailableBuffers
+    Mutex mLock;
     sp<IStreamListener> mListener;
+    // array of shared memory buffers
     Vector<sp<IMemory> > mBuffers;
+    // list of available buffers in shared memory, identified by their index
+    List<size_t> mAvailableBuffers;
 
-    slAndroidBufferQueueCallback mCallback; // FIXME remove
-    cb_buffAvailable_t mCbNotifyBufferAvailable;
     const void* mUser;
     bool mUserIsAudioPlayer;
+    // the Android Buffer Queue from which data is consumed and written to shared memory
+    IAndroidBufferQueue* mAndroidBufferQueue;
 
     void *mAppContext;
     const void *mCaller;
 
+    sp<CallbackProtector> mCallbackProtector;
+
     DISALLOW_EVIL_CONSTRUCTORS(StreamSourceAppProxy);
 };
 
@@ -65,22 +79,34 @@ public:
     StreamPlayer(AudioPlayback_Parameters* params, bool hasVideo);
     virtual ~StreamPlayer();
 
-    void registerQueueCallback(slAndroidBufferQueueCallback callback,
-            cb_buffAvailable_t notify,
+    // overridden from GenericPlayer
+    virtual void onMessageReceived(const sp<AMessage> &msg);
+
+    void registerQueueCallback(
             const void* user, bool userIsAudioPlayer,
             void *context,
             const void *caller);
-    void appEnqueue(SLuint32 bufferId, SLuint32 length, SLuint32 event, void *pData);
-    void appClear();
+    void queueRefilled_l();
+    void appClear_l();
 
 protected:
+
+    enum {
+        // message to asynchronously notify mAppProxy the Android Buffer Queue was refilled
+        kWhatQueueRefilled = 'qrfi'
+    };
+
     sp<StreamSourceAppProxy> mAppProxy; // application proxy for the android buffer queue source
 
     // overridden from GenericMediaPlayer
     virtual void onPrepare();
+    virtual void onPlay();
+
+    void onQueueRefilled();
 
     Mutex mAppProxyLock;
 
+
 private:
     DISALLOW_EVIL_CONSTRUCTORS(StreamPlayer);
 };
@@ -94,6 +120,3 @@ private:
  */
 extern void android_StreamPlayer_realize_l(CAudioPlayer *ap, const notif_cbf_t cbf,
         void* notifUser);
-extern void android_StreamPlayer_enqueue_l(CAudioPlayer *ap,
-        SLuint32 bufferId, SLuint32 length, SLuint32 event, void *pData);
-extern void android_StreamPlayer_clear_l(CAudioPlayer *ap);