commit bb832e853d4afb11b0a3287b2eb0cad87696d631
author Jean-Michel Trivi <jmtrivi@google.com> Wed Jul 27 10:00:04 2011 -0700
committer Jean-Michel Trivi <jmtrivi@google.com> Thu Aug 11 19:14:52 2011 -0700
tree ebc3a580a686423638775488e8973cbd051f22d0
parent 6263f265fa5f59477549758a170b6af469055f97

AAC buffer decode to PCM buffer queue

Implement AAC ADTS decode with buffers of compressed data being
 passed to the framework through an AndroidBufferQueue, and
 decoded PCM buffers being passed to the application through
 a BufferQueue (just like existing decode from URI/FD).

Change-Id: Id992a44a5ca7e404088b929f2b0afe9ca1f85223

src/itf/IAndroidBufferQueue.c

diff --git a/src/itf/IAndroidBufferQueue.c b/src/itf/IAndroidBufferQueue.c
index b669fa7..585b8b8 100644
--- a/src/itf/IAndroidBufferQueue.c
+++ b/src/itf/IAndroidBufferQueue.c
@@ -16,8 +16,11 @@
 
 /* AndroidBufferQueue implementation */
 
-#include "sles_allinclusive.h"
+//#define USE_LOG SLAndroidLogLevel_Verbose
 
+#include "sles_allinclusive.h"
+// for AAC ADTS verification on enqueue:
+#include "android/include/AacBqToPcmCbRenderer.h"
 
 /**
  * Determine the state of the audio player or audio recorder associated with a buffer queue.
@@ -130,12 +133,13 @@
 
         switch (InterfaceToObjectID(thiz)) {
           case SL_OBJECTID_AUDIOPLAYER:
-            result = SL_RESULT_SUCCESS;
-            android_audioPlayer_androidBufferQueue_registerCallback_l((CAudioPlayer*) thiz->mThis);
+            result = android_audioPlayer_androidBufferQueue_registerCallback_l(
+                    (CAudioPlayer*) thiz->mThis);
             break;
           case XA_OBJECTID_MEDIAPLAYER:
             SL_LOGV("IAndroidBufferQueue_RegisterCallback()");
             result = SL_RESULT_SUCCESS;
+            //FIXME return error code
             android_Player_androidBufferQueue_registerCallback_l((CMediaPlayer*) thiz->mThis);
             break;
           default:
@@ -214,6 +218,7 @@
         SLuint32 itemsLength)
 {
     SL_ENTER_INTERFACE
+    SL_LOGD("IAndroidBufferQueue_Enqueue pData=%p dataLength=%d", pData, dataLength);
 
     if ( ((NULL == pData) || (0 == dataLength))
             && ((NULL == pItems) || (0 == itemsLength))) {
@@ -229,9 +234,20 @@
             if (dataLength % MPEG2_TS_BLOCK_SIZE == 0) {
                 break;
             }
-            // intended fall-through if test failed
             SL_LOGE("Error enqueueing MPEG-2 TS data: size must be a multiple of %d (block size)",
                     MPEG2_TS_BLOCK_SIZE);
+            result = SL_RESULT_PARAMETER_INVALID;
+            SL_LEAVE_INTERFACE
+            break;
+          case kAndroidBufferTypeAacadts:
+            // FIXME allow commands as for mp2ts
+            if (!android::AacBqToPcmCbRenderer::validateBufferStartEndOnFrameBoundaries(
+                    pData, dataLength)) {
+                SL_LOGE("Error enqueueing ADTS data: data must start and end on frame boundaries");
+                result = SL_RESULT_PARAMETER_INVALID;
+                SL_LEAVE_INTERFACE
+            }
+            break;
           case kAndroidBufferTypeInvalid:
           default:
             result = SL_RESULT_PARAMETER_INVALID;