diff options
author | Oscar Rydhé <oscar.rydhe@sonyericsson.com> | 2011-01-27 14:01:24 +0100 |
---|---|---|
committer | Takeshi Aimi <takeshi.aimi@sonymobile.com> | 2014-01-16 10:25:28 +0900 |
commit | 328abde67f57c026ac44e927f9244c40832499c8 (patch) | |
tree | 6a5fac74c193cc93afbfc20cf792eafd22da49a7 /media/libstagefright/include | |
parent | 1e8a57c212d26c41325e950ed629244071acc326 (diff) | |
download | frameworks_av-328abde67f57c026ac44e927f9244c40832499c8.zip frameworks_av-328abde67f57c026ac44e927f9244c40832499c8.tar.gz frameworks_av-328abde67f57c026ac44e927f9244c40832499c8.tar.bz2 |
Added support for ID3v2 meta data in 3gp files
Added support for parsing ID3v2 meta data from
the ID32 chunk in 3gp files. The priority will be
3gpp -> ID3v2 -> iTunes per field.
Change-Id: I0282ecab58e3e5fa6bd738078d562c8bb8ce00ed
Diffstat (limited to 'media/libstagefright/include')
-rw-r--r-- | media/libstagefright/include/ID3.h | 4 | ||||
-rw-r--r-- | media/libstagefright/include/MPEG4Extractor.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/include/ID3.h b/media/libstagefright/include/ID3.h index cca83ab..e83f3ef 100644 --- a/media/libstagefright/include/ID3.h +++ b/media/libstagefright/include/ID3.h @@ -35,7 +35,7 @@ struct ID3 { ID3_V2_4, }; - ID3(const sp<DataSource> &source, bool ignoreV1 = false); + ID3(const sp<DataSource> &source, bool ignoreV1 = false, off64_t offset = 0); ID3(const uint8_t *data, size_t size, bool ignoreV1 = false); ~ID3(); @@ -86,7 +86,7 @@ private: size_t mRawSize; bool parseV1(const sp<DataSource> &source); - bool parseV2(const sp<DataSource> &source); + bool parseV2(const sp<DataSource> &source, off64_t offset); void removeUnsynchronization(); bool removeUnsynchronizationV2_4(bool iTunesHack); diff --git a/media/libstagefright/include/MPEG4Extractor.h b/media/libstagefright/include/MPEG4Extractor.h index bd5e4b9..7b4bc6d 100644 --- a/media/libstagefright/include/MPEG4Extractor.h +++ b/media/libstagefright/include/MPEG4Extractor.h @@ -97,6 +97,7 @@ private: status_t parseChunk(off64_t *offset, int depth); status_t parseITunesMetaData(off64_t offset, size_t size); status_t parse3GPPMetaData(off64_t offset, size_t size, int depth); + void parseID3v2MetaData(off64_t offset); status_t updateAudioTrackInfoFromESDS_MPEG4Audio( const void *esds_data, size_t esds_size); |