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 /include | |
| 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 '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) |