diff options
author | Robert Shih <robertshih@google.com> | 2015-04-24 15:33:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-24 15:33:14 +0000 |
commit | a739165147bd58f7396d605fed1dfa8b68aaf6a8 (patch) | |
tree | 1a4eedd42858a27613f2a28d257357ae017e0f6c /media | |
parent | e2e2cb08acf267b5151e61cda261cdda25afac38 (diff) | |
parent | f8bd851cc652501239a8e3759b21890dfa2afdea (diff) | |
download | frameworks_av-a739165147bd58f7396d605fed1dfa8b68aaf6a8.zip frameworks_av-a739165147bd58f7396d605fed1dfa8b68aaf6a8.tar.gz frameworks_av-a739165147bd58f7396d605fed1dfa8b68aaf6a8.tar.bz2 |
Merge "Copy sei offset/size during ABuffer/MediaBuffer conversion"
Diffstat (limited to 'media')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 8 | ||||
-rw-r--r-- | media/libstagefright/mpeg2ts/AnotherPacketSource.cpp | 5 |
2 files changed, 13 insertions, 0 deletions
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<ABuffer> 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<ABuffer> 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<ABuffer> sei; + if (buffer->meta()->findBuffer("sei", &sei) && sei != NULL) { + mediaBuffer->meta_data()->setData(kKeySEI, 0, sei->data(), sei->size()); + } + *out = mediaBuffer; return OK; } |