commit 64c4e0264a5fb1bf4700b85668d0fb50146f28e9
author Chong Zhang <chz@google.com> Mon Mar 09 21:57:59 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 09 21:58:01 2015 +0000
tree 1b1757786b55db072e963aed7f84445a93e28e3c
parent 434a6094f69542257864b4f4223ce915c77976b1
parent 5bb7e181d9156135e56ce44a3d0bd42eb31a9ee8

Merge "AnotherPacketSource: return format of first non-discontinuity packet"

media/libstagefright/mpeg2ts/AnotherPacketSource.cpp

diff --git a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
index f266fe7..bb05417 100644
--- a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
+++ b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
@@ -91,13 +91,11 @@
     while (it != mBuffers.end()) {
         sp<ABuffer> buffer = *it;
         int32_t discontinuity;
-        if (buffer->meta()->findInt32("discontinuity", &discontinuity)) {
-            break;
-        }
-
-        sp<RefBase> object;
-        if (buffer->meta()->findObject("format", &object)) {
-            return mFormat = static_cast<MetaData*>(object.get());
+        if (!buffer->meta()->findInt32("discontinuity", &discontinuity)) {
+            sp<RefBase> object;
+            if (buffer->meta()->findObject("format", &object)) {
+                return mFormat = static_cast<MetaData*>(object.get());
+            }
         }
 
         ++it;