From fa51e09b30e884fed20b141783a7447599a6563e Mon Sep 17 00:00:00 2001
From: Rachad <rachad@google.com>
Date: Fri, 30 Aug 2013 15:52:00 -0700
Subject:   Fixed timestamp handling in ESQueue Access Unit parser.   This
 fixes bug b/10294801

Change-Id: Ie96d36e2ff6fdee0c949a85da3602ab04b34bf6e
---
 media/libstagefright/mpeg2ts/ESQueue.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'media/libstagefright/mpeg2ts')

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 @@ int64_t ElementaryStreamQueue::fetchTimestamp(size_t size) {
 
         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 @@ int64_t ElementaryStreamQueue::fetchTimestamp(size_t size) {
             info = NULL;
         }
 
-        first = false;
     }
 
     if (timeUs == 0ll) {
-- 
cgit v1.1