diff options
| author | Andreas Huber <andih@google.com> | 2010-05-07 10:35:13 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-05-07 12:01:45 -0700 |
| commit | 388379f8b4cabe7bccf280d450a6db2c3149796b (patch) | |
| tree | e874957c4767cce040920f7ed98602b872f7c447 /include | |
| parent | 75370e74629b4938c4472d6001eebf5e305dbc55 (diff) | |
| download | frameworks_base-388379f8b4cabe7bccf280d450a6db2c3149796b.zip frameworks_base-388379f8b4cabe7bccf280d450a6db2c3149796b.tar.gz frameworks_base-388379f8b4cabe7bccf280d450a6db2c3149796b.tar.bz2 | |
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Change-Id: Id5d0c1c8b1adc62896bb5ed951f7b5cfda811e95
related-to-bug: 2654400
Diffstat (limited to 'include')
| -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); |