am ea5c0286: resolved conflicts for merge of 44a2390b to lmp-mr1-dev-plus-aosp

* commit 'ea5c0286e8a18e71608e6c6e5758b167fe0d6c26':
  Revert "HLS: QCom enhancements"

1 files changed, 2 insertions, 9 deletions

diff --git a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
index f266fe7..c579d4c 100644
--- a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
+++ b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
@@ -218,19 +218,12 @@ void AnotherPacketSource::queueAccessUnit(const sp<ABuffer> &buffer) {
     }
 
     if (mLatestEnqueuedMeta == NULL) {
-        mLatestEnqueuedMeta = buffer->meta()->dup();
+        mLatestEnqueuedMeta = buffer->meta();
     } else {
         int64_t latestTimeUs = 0;
-        int64_t frameDeltaUs = 0;
         CHECK(mLatestEnqueuedMeta->findInt64("timeUs", &latestTimeUs));
         if (lastQueuedTimeUs > latestTimeUs) {
-            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);
+            mLatestEnqueuedMeta = buffer->meta();
         }
     }
 }