diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 10:35:20 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 10:35:20 -0800 |
| commit | 5bf2560ce9b70bee077e0c264ac06648f0f63acc (patch) | |
| tree | f17ecec5321e8d583d045135f29f14f3c7418e71 /media/libstagefright/mpeg2ts/ESQueue.cpp | |
| parent | eb76f318e9daf91dbf195bcb74852b3bd736a32a (diff) | |
| parent | b2059ff384eee8ffb70a7ec8fc5570405201c734 (diff) | |
| download | frameworks_av-5bf2560ce9b70bee077e0c264ac06648f0f63acc.zip frameworks_av-5bf2560ce9b70bee077e0c264ac06648f0f63acc.tar.gz frameworks_av-5bf2560ce9b70bee077e0c264ac06648f0f63acc.tar.bz2 | |
Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEAD
Diffstat (limited to 'media/libstagefright/mpeg2ts/ESQueue.cpp')
| -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) { |