diff options
| author | Andreas Huber <andih@google.com> | 2011-09-20 15:39:58 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-03-22 13:18:08 -0700 |
| commit | afed0e1fa37473a4cd30018577b560acc79d9a3f (patch) | |
| tree | 60e3a06c0cc8266f4ecaa45eb7d08c0c47a8b2dd /media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | |
| parent | 898b11f2aeaaa2bed84d963a3fcfd3b229e00b99 (diff) | |
| download | frameworks_av-afed0e1fa37473a4cd30018577b560acc79d9a3f.zip frameworks_av-afed0e1fa37473a4cd30018577b560acc79d9a3f.tar.gz frameworks_av-afed0e1fa37473a4cd30018577b560acc79d9a3f.tar.bz2 | |
Use NuPlayer for media playback everywhere
if media.stagefright.use-nuplayer is set to true.
Change-Id: Ibb217e7d7d5195b7feeea557554fe78e1585744c
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp index 460fc98..1600141 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp @@ -228,6 +228,20 @@ sp<AMessage> NuPlayer::Decoder::makeFormat(const sp<MetaData> &meta) { buffer->meta()->setInt32("csd", true); mCSD.push(buffer); + } else if (meta->findData(kKeyVorbisInfo, &type, &data, &size)) { + sp<ABuffer> buffer = new ABuffer(size); + memcpy(buffer->data(), data, size); + + buffer->meta()->setInt32("csd", true); + mCSD.push(buffer); + + CHECK(meta->findData(kKeyVorbisBooks, &type, &data, &size)); + + buffer = new ABuffer(size); + memcpy(buffer->data(), data, size); + + buffer->meta()->setInt32("csd", true); + mCSD.push(buffer); } return msg; |