diff options
author | Narayan Kamath <narayan@google.com> | 2014-12-29 17:26:53 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-29 17:26:53 +0000 |
commit | 5d0937c663a9c3a20ca981bedf0b75e7d110eb34 (patch) | |
tree | 59debb846921e75b255c2a2dd727999f9b5f0d2c /media/libstagefright/mpeg2ts | |
parent | 17f32a27930cec82d0eff4d5fe7932bd72c869bb (diff) | |
parent | 8564e13b37d372da78bce08f34a3610795ae173c (diff) | |
download | frameworks_av-5d0937c663a9c3a20ca981bedf0b75e7d110eb34.zip frameworks_av-5d0937c663a9c3a20ca981bedf0b75e7d110eb34.tar.gz frameworks_av-5d0937c663a9c3a20ca981bedf0b75e7d110eb34.tar.bz2 |
am 8564e13b: resolved conflicts for merge of 2efb9566 to lmp-mr1-dev-plus-aosp
* commit '8564e13b37d372da78bce08f34a3610795ae173c':
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); } } } |