diff options
| author | Andreas Huber <andih@google.com> | 2010-05-10 09:49:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-10 09:49:24 -0700 |
| commit | 248597ae6493ff68fc52db26b095de620a26924a (patch) | |
| tree | c479e6f6e5b08260328820a64cac761dfded6df8 /include/media | |
| parent | 4cfc21ecd914ac89a3160e5b19105b768546853f (diff) | |
| parent | 1707851090e6512a77247b0c260dd673ef687589 (diff) | |
| download | frameworks_base-248597ae6493ff68fc52db26b095de620a26924a.zip frameworks_base-248597ae6493ff68fc52db26b095de620a26924a.tar.gz frameworks_base-248597ae6493ff68fc52db26b095de620a26924a.tar.bz2 | |
am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Merge commit '1707851090e6512a77247b0c260dd673ef687589' into kraken
* commit '1707851090e6512a77247b0c260dd673ef687589':
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/MediaDefs.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/Utils.h | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h index 4edfb88..207195a 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -32,11 +32,12 @@ extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB; extern const char *MEDIA_MIMETYPE_AUDIO_MPEG; 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_RAW; extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4; extern const char *MEDIA_MIMETYPE_CONTAINER_WAV; -extern const char *MEDIA_MIMETYPE_CONTAINER_VORBIS; +extern const char *MEDIA_MIMETYPE_CONTAINER_OGG; } // namespace android diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 45cc4f6..dc2bd50 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -37,6 +37,8 @@ enum { kKeyBitRate = 'brte', // int32_t (bps) kKeyESDS = 'esds', // raw data kKeyAVCC = 'avcc', // raw data + kKeyVorbisInfo = 'vinf', // raw data + kKeyVorbisBooks = 'vboo', // raw data kKeyWantsNALFragments = 'NALf', kKeyIsSyncFrame = 'sync', // int32_t (bool) kKeyIsCodecConfig = 'conf', // int32_t (bool) diff --git a/include/media/stagefright/Utils.h b/include/media/stagefright/Utils.h index 30c7f11..498b525 100644 --- a/include/media/stagefright/Utils.h +++ b/include/media/stagefright/Utils.h @@ -29,6 +29,10 @@ uint16_t U16_AT(const uint8_t *ptr); uint32_t U32_AT(const uint8_t *ptr); uint64_t U64_AT(const uint8_t *ptr); +uint16_t U16LE_AT(const uint8_t *ptr); +uint32_t U32LE_AT(const uint8_t *ptr); +uint64_t U64LE_AT(const uint8_t *ptr); + uint64_t ntoh64(uint64_t x); uint64_t hton64(uint64_t x); |