summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/mpeg2ts
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-01-28 21:38:38 -0800
committerLajos Molnar <lajos@google.com>2015-01-28 21:52:09 -0800
commitf0d689934e70d3e5b3784265e890377db04c7c1d (patch)
tree92a7f9bf2304a7b1ced4e34c7cca6ddc569b2e55 /media/libstagefright/mpeg2ts
parentc84bc78d4244987268cbe621cecdfb72cbd48dc7 (diff)
downloadframeworks_av-f0d689934e70d3e5b3784265e890377db04c7c1d.zip
frameworks_av-f0d689934e70d3e5b3784265e890377db04c7c1d.tar.gz
frameworks_av-f0d689934e70d3e5b3784265e890377db04c7c1d.tar.bz2
Revert "HLS: QCom enhancements"
This is to restore patch attributions This reverts commit f580806d893c4631f5324ff0af5c2db68a40ef42. Bug: 18821145 Change-Id: Idc49385fffccfde2a3915388fe3fe4e2b740d787
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-rw-r--r--media/libstagefright/mpeg2ts/AnotherPacketSource.cpp11
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();
}
}
}