From f8bd851cc652501239a8e3759b21890dfa2afdea Mon Sep 17 00:00:00 2001 From: Robert Shih Date: Thu, 23 Apr 2015 16:39:18 -0700 Subject: Copy sei offset/size during ABuffer/MediaBuffer conversion Bug: 20537676 Change-Id: I0bd11527ccd022c39d94b7877df81de4da1b14a6 --- include/media/stagefright/MetaData.h | 3 +++ media/libmediaplayerservice/nuplayer/GenericSource.cpp | 8 ++++++++ media/libstagefright/mpeg2ts/AnotherPacketSource.cpp | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 8bdebf6..ca80123 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -176,6 +176,9 @@ enum { kKeyTrackIsDefault = 'dflt', // bool (int32_t) // Similar to MediaFormat.KEY_IS_FORCED_SUBTITLE but pertains to av tracks as well. kKeyTrackIsForced = 'frcd', // bool (int32_t) + + // H264 supplemental enhancement information offsets/sizes + kKeySEI = 'sei ', // raw data }; enum { diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index b7a88e7..7eaa0e0 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -1400,6 +1400,14 @@ sp NuPlayer::GenericSource::mediaBufferToABuffer( meta->setInt32("trackIndex", mSubtitleTrack.mIndex); } + uint32_t dataType; // unused + const void *seiData; + size_t seiLength; + if (mb->meta_data()->findData(kKeySEI, &dataType, &seiData, &seiLength)) { + sp sei = ABuffer::CreateAsCopy(seiData, seiLength);; + meta->setBuffer("sei", sei); + } + if (actualTimeUs) { *actualTimeUs = timeUs; } diff --git a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp index f74b859..0878a1b 100644 --- a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp +++ b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp @@ -211,6 +211,11 @@ status_t AnotherPacketSource::read( mediaBuffer->meta_data()->setInt32(kKeyIsSyncFrame, isSync); } + sp sei; + if (buffer->meta()->findBuffer("sei", &sei) && sei != NULL) { + mediaBuffer->meta_data()->setData(kKeySEI, 0, sei->data(), sei->size()); + } + *out = mediaBuffer; return OK; } -- cgit v1.1