commit 6f0f5640d190b0187c356eb53bd96d9f9e49da60
author Jean-Michel Trivi <jmtrivi@google.com> Mon Jul 25 10:57:11 2011 -0700
committer Jean-Michel Trivi <jmtrivi@google.com> Mon Jul 25 15:32:03 2011 -0700
tree 19ef2efe917596543fbdb3655b404de59fa80d68
parent ca2e4b9b6a70d2d0e147c992c16e59b8004cc8b1

Fix bug 5022500 MP2TS format change support in OpenMAX AL

Define new command that can be queued in AndroidBufferQueue
 to signal an MP2TS format change.
This command maps directly to IStreamListener::kKeyFormatChange.

Change-Id: I67908fd9e1a7d994862ea3e41c4c0fb6e36bc804

src/itf/IAndroidBufferQueue.c

diff --git a/src/itf/IAndroidBufferQueue.c b/src/itf/IAndroidBufferQueue.c
index b6c6b26..8953802 100644
--- a/src/itf/IAndroidBufferQueue.c
+++ b/src/itf/IAndroidBufferQueue.c
@@ -72,10 +72,14 @@
           case kAndroidBufferTypeMpeg2Ts: {
             SLuint32 index = 0;
             // supported Mpeg2Ts commands are mutually exclusive
-            if (SL_ANDROID_ITEMKEY_EOS == pItems->itemKey) {
+            switch (pItems->itemKey) {
+
+              case SL_ANDROID_ITEMKEY_EOS:
                 pBuff->mItems.mTsCmdData.mTsCmdCode |= ANDROID_MP2TSEVENT_EOS;
                 //SL_LOGD("Found EOS event=%d", pBuff->mItems.mTsCmdData.mTsCmdCode);
-            } else if (SL_ANDROID_ITEMKEY_DISCONTINUITY == pItems->itemKey) {
+                break;
+
+              case SL_ANDROID_ITEMKEY_DISCONTINUITY:
                 if (pItems->itemSize == 0) {
                     pBuff->mItems.mTsCmdData.mTsCmdCode |= ANDROID_MP2TSEVENT_DISCONTINUITY;
                     //SL_LOGD("Found DISCONTINUITYevent=%d", pBuff->mItems.mTsCmdData.mTsCmdCode);
@@ -87,15 +91,25 @@
                     SL_LOGE("Invalid size for MPEG-2 PTS, ignoring value");
                     pBuff->mItems.mTsCmdData.mTsCmdCode |= ANDROID_MP2TSEVENT_DISCONTINUITY;
                 }
-            } else {
+                break;
+
+              case SL_ANDROID_ITEMKEY_FORMAT_CHANGE:
+                pBuff->mItems.mTsCmdData.mTsCmdCode |= ANDROID_MP2TSEVENT_FORMAT_CHANGE;
+                if (pItems->itemSize != 0) {
+                    SL_LOGE("Invalid item parameter size for format change, ignoring value");
+                }
+                break;
+
+              default:
+                // no event with this buffer
                 pBuff->mItems.mTsCmdData.mTsCmdCode = ANDROID_MP2TSEVENT_NONE;
-            }
-            break;
-          }
+                break;
+            }// switch (pItems->itemKey)
+          } break;
 
           default:
             return;
-        }
+        }// switch (bufferType)
     }
 }