diff options
| author | Lajos Molnar <lajos@google.com> | 2014-03-04 00:05:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-04 00:05:15 +0000 |
| commit | b4350af65dd66ed57f1ff79b1b426507f0e73b7b (patch) | |
| tree | 47c385021c247ebc3faaf99ffdb2174dba5d8597 /media/libstagefright/Utils.cpp | |
| parent | feac1a43c8b674c4b526214fa8061452fd6e4846 (diff) | |
| parent | bf927f8ec7979f2b64331c2b2f12a6a5dba05bca (diff) | |
| download | frameworks_av-b4350af65dd66ed57f1ff79b1b426507f0e73b7b.zip frameworks_av-b4350af65dd66ed57f1ff79b1b426507f0e73b7b.tar.gz frameworks_av-b4350af65dd66ed57f1ff79b1b426507f0e73b7b.tar.bz2 | |
Merge "Opus Matroska support in OpenMax"
Diffstat (limited to 'media/libstagefright/Utils.cpp')
| -rw-r--r-- | media/libstagefright/Utils.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp index 451e907..4ff805f 100644 --- a/media/libstagefright/Utils.cpp +++ b/media/libstagefright/Utils.cpp @@ -251,6 +251,13 @@ status_t convertMetaDataToMessage( buffer->meta()->setInt32("csd", true); buffer->meta()->setInt64("timeUs", 0); msg->setBuffer("csd-1", buffer); + } else if (meta->findData(kKeyOpusHeader, &type, &data, &size)) { + sp<ABuffer> buffer = new ABuffer(size); + memcpy(buffer->data(), data, size); + + buffer->meta()->setInt32("csd", true); + buffer->meta()->setInt64("timeUs", 0); + msg->setBuffer("csd-0", buffer); } *format = msg; @@ -528,6 +535,7 @@ static const struct mime_conv_t mimeLookup[] = { { MEDIA_MIMETYPE_AUDIO_AMR_WB, AUDIO_FORMAT_AMR_WB }, { MEDIA_MIMETYPE_AUDIO_AAC, AUDIO_FORMAT_AAC }, { MEDIA_MIMETYPE_AUDIO_VORBIS, AUDIO_FORMAT_VORBIS }, + { MEDIA_MIMETYPE_AUDIO_OPUS, AUDIO_FORMAT_OPUS}, { 0, AUDIO_FORMAT_INVALID } }; |