diff options
| author | Andreas Huber <andih@google.com> | 2010-01-11 15:35:19 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-01-12 09:14:15 -0800 |
| commit | fc9ba09e3bb368f823d473f5e2bb9aa32dba6289 (patch) | |
| tree | e7a6e0357e39c58d050b23a94b61f734e5578af7 /include/media | |
| parent | 58e1f78683d9230932c4d5bee53b79fc685b5995 (diff) | |
| download | frameworks_av-fc9ba09e3bb368f823d473f5e2bb9aa32dba6289.zip frameworks_av-fc9ba09e3bb368f823d473f5e2bb9aa32dba6289.tar.gz frameworks_av-fc9ba09e3bb368f823d473f5e2bb9aa32dba6289.tar.bz2 | |
Squashed commit of the following:
commit f81bb1dac5ef107bb0d7d5d756fb1ffa532ba2cc
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 11 14:55:56 2010 -0800
Support for duration metadata, midi and ogg-vorbis files (in mediascanner)
commit 0b1385a0dc156ce27985a1ff757c4c142fd7ec39
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 11 14:20:45 2010 -0800
Refactor meta data logic. Container specific metadata is now also returned by the MediaExtractor.
commit f9818dfac39c96e5fefe8c8295e60580692d5990
Author: Andreas Huber <andih@google.com>
Date: Fri Jan 8 14:26:09 2010 -0800
A first pass at supporting metadata through ID3 tags.
commit 476e9e253633336ab790f943e2d6c0cd8991d76a
Author: Andreas Huber <andih@google.com>
Date: Thu Jan 7 15:48:44 2010 -0800
Initial checkin of ID3 (V2.2 and V2.3) parser for use in stagefright.
related-to-bug: 2295456
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/DataSource.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/MediaExtractor.h | 4 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 9 |
3 files changed, 15 insertions, 0 deletions
diff --git a/include/media/stagefright/DataSource.h b/include/media/stagefright/DataSource.h index b843cd9..f88666a 100644 --- a/include/media/stagefright/DataSource.h +++ b/include/media/stagefright/DataSource.h @@ -31,6 +31,8 @@ class String8; class DataSource : public RefBase { public: + static sp<DataSource> CreateFromURI(const char *uri); + DataSource() {} virtual status_t initCheck() const = 0; diff --git a/include/media/stagefright/MediaExtractor.h b/include/media/stagefright/MediaExtractor.h index d56d4b3..4bc996e 100644 --- a/include/media/stagefright/MediaExtractor.h +++ b/include/media/stagefright/MediaExtractor.h @@ -43,6 +43,10 @@ public: virtual sp<MetaData> getTrackMetaData( size_t index, uint32_t flags = 0) = 0; + // Return container specific meta-data. The default implementation + // returns an empty metadata object. + virtual sp<MetaData> getMetaData(); + protected: MediaExtractor() {} virtual ~MediaExtractor() {} diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index c6ac6c2..ef30b02 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -48,6 +48,15 @@ enum { kKeyBufferID = 'bfID', kKeyMaxInputSize = 'inpS', kKeyThumbnailTime = 'thbT', // int64_t (usecs) + + kKeyAlbum = 'albu', // cstring + kKeyArtist = 'arti', // cstring + kKeyComposer = 'comp', // cstring + kKeyGenre = 'genr', // cstring + kKeyTitle = 'titl', // cstring + kKeyYear = 'year', // cstring + kKeyAlbumArt = 'albA', // compressed image data + kKeyAlbumArtMIME = 'alAM', // cstring }; enum { |