diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-01-29 09:00:46 -0800 |
|---|---|---|
| committer | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-03 13:30:38 -0800 |
| commit | bf927f8ec7979f2b64331c2b2f12a6a5dba05bca (patch) | |
| tree | 74cd06e798e79839ab872ede1f57ab35a3b6afdf /include | |
| parent | 3a005b3b19b750afe24577ae322aff4602ca2740 (diff) | |
| download | frameworks_av-bf927f8ec7979f2b64331c2b2f12a6a5dba05bca.zip frameworks_av-bf927f8ec7979f2b64331c2b2f12a6a5dba05bca.tar.gz frameworks_av-bf927f8ec7979f2b64331c2b2f12a6a5dba05bca.tar.bz2 | |
Opus Matroska support in OpenMax
Adding Openmax component for libopus software decoder. This can
decode opus audio files embedded in matroska containers.
Change-Id: I7e0691cfc6d719c4e927b9efbd05a3143be49abc
Note: This CL is part of adding Opus support to Android.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaDefs.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h index cf5beda..678d642 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -38,6 +38,7 @@ extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II; extern const char *MEDIA_MIMETYPE_AUDIO_AAC; extern const char *MEDIA_MIMETYPE_AUDIO_QCELP; extern const char *MEDIA_MIMETYPE_AUDIO_VORBIS; +extern const char *MEDIA_MIMETYPE_AUDIO_OPUS; extern const char *MEDIA_MIMETYPE_AUDIO_G711_ALAW; extern const char *MEDIA_MIMETYPE_AUDIO_G711_MLAW; extern const char *MEDIA_MIMETYPE_AUDIO_RAW; diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index db8216b..e862ec3 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -56,6 +56,9 @@ enum { kKeyD263 = 'd263', // raw data kKeyVorbisInfo = 'vinf', // raw data kKeyVorbisBooks = 'vboo', // raw data + kKeyOpusHeader = 'ohdr', // raw data + kKeyOpusCodecDelay = 'ocod', // uint64_t (codec delay in ns) + kKeyOpusSeekPreRoll = 'ospr', // uint64_t (seek preroll in ns) kKeyWantsNALFragments = 'NALf', kKeyIsSyncFrame = 'sync', // int32_t (bool) kKeyIsCodecConfig = 'conf', // int32_t (bool) |