commit c85d61964cb6f9b23cd2e82e43d7052b3e7d4fbc
author Rachad <rachad@google.com> Wed Sep 04 16:21:35 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 04 16:21:35 2013 +0000
tree cf2acf7760e9285c884732f5b2bdd2947c32f106
parent df60eff872f276c1a94ab0355b252b73fe61faa9
parent fa51e09b30e884fed20b141783a7447599a6563e

Merge "  Fixed timestamp handling in ESQueue Access Unit parser.   This fixes bug b/10294801" into klp-dev

media/libstagefright/mpeg2ts/ESQueue.cpp

diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp
index 9f3b19c..8f9c9c8 100644
--- a/media/libstagefright/mpeg2ts/ESQueue.cpp
+++ b/media/libstagefright/mpeg2ts/ESQueue.cpp
@@ -504,15 +504,11 @@
 
         if (first) {
             timeUs = info->mTimestampUs;
+            first = false;
         }
 
         if (info->mLength > size) {
             info->mLength -= size;
-
-            if (first) {
-                info->mTimestampUs = -1;
-            }
-
             size = 0;
         } else {
             size -= info->mLength;
@@ -521,7 +517,6 @@
             info = NULL;
         }
 
-        first = false;
     }
 
     if (timeUs == 0ll) {