diff options
author | Rachad <rachad@google.com> | 2013-08-30 15:52:00 -0700 |
---|---|---|
committer | Rachad <rachad@google.com> | 2013-08-30 15:52:00 -0700 |
commit | fa51e09b30e884fed20b141783a7447599a6563e (patch) | |
tree | f0670fb2c6e394463862f18e2e8fe41184cb3366 /media/libstagefright/mpeg2ts | |
parent | d656a4be3c3b6bc249b06599c2b02c2863d2c47f (diff) | |
download | frameworks_av-fa51e09b30e884fed20b141783a7447599a6563e.zip frameworks_av-fa51e09b30e884fed20b141783a7447599a6563e.tar.gz frameworks_av-fa51e09b30e884fed20b141783a7447599a6563e.tar.bz2 |
Fixed timestamp handling in ESQueue Access Unit parser.
This fixes bug b/10294801
Change-Id: Ie96d36e2ff6fdee0c949a85da3602ab04b34bf6e
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-rw-r--r-- | media/libstagefright/mpeg2ts/ESQueue.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
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) { |