diff options
| author | Robert Shih <robertshih@google.com> | 2014-12-23 00:27:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-23 00:27:53 +0000 |
| commit | 2efb95665d00d422b2a84f575e8acddd598311ad (patch) | |
| tree | bcb818e65e7702333bfb70103b63cf19ec90455f /media/libstagefright/mpeg2ts | |
| parent | 572216352498c702651567b3b299a1f7ed725429 (diff) | |
| parent | f580806d893c4631f5324ff0af5c2db68a40ef42 (diff) | |
| download | frameworks_av-2efb95665d00d422b2a84f575e8acddd598311ad.zip frameworks_av-2efb95665d00d422b2a84f575e8acddd598311ad.tar.gz frameworks_av-2efb95665d00d422b2a84f575e8acddd598311ad.tar.bz2 | |
am f580806d: HLS: QCom enhancements
* commit 'f580806d893c4631f5324ff0af5c2db68a40ef42':
HLS: QCom enhancements
Diffstat (limited to 'media/libstagefright/mpeg2ts')
| -rw-r--r-- | media/libstagefright/mpeg2ts/AnotherPacketSource.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp index c579d4c..f266fe7 100644 --- a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp +++ b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp @@ -218,12 +218,19 @@ void AnotherPacketSource::queueAccessUnit(const sp<ABuffer> &buffer) { } if (mLatestEnqueuedMeta == NULL) { - mLatestEnqueuedMeta = buffer->meta(); + mLatestEnqueuedMeta = buffer->meta()->dup(); } else { int64_t latestTimeUs = 0; + int64_t frameDeltaUs = 0; CHECK(mLatestEnqueuedMeta->findInt64("timeUs", &latestTimeUs)); if (lastQueuedTimeUs > latestTimeUs) { - mLatestEnqueuedMeta = buffer->meta(); + mLatestEnqueuedMeta = buffer->meta()->dup(); + frameDeltaUs = lastQueuedTimeUs - latestTimeUs; + mLatestEnqueuedMeta->setInt64("durationUs", frameDeltaUs); + } else if (!mLatestEnqueuedMeta->findInt64("durationUs", &frameDeltaUs)) { + // For B frames + frameDeltaUs = latestTimeUs - lastQueuedTimeUs; + mLatestEnqueuedMeta->setInt64("durationUs", frameDeltaUs); } } } |