diff options
| author | 2010-02-08 14:50:19 -0800 | |
|---|---|---|
| committer | 2010-02-08 14:50:19 -0800 | |
| commit | 655306f8a80b3e9fc52daf458ef319a8ed8c564c (patch) | |
| tree | 800ca65dd3b7153dccb2cd08f254c44779a97571 | |
| parent | 836a1f2cb99600c26a1a928a9e3240b9dec3079b (diff) | |
Add support for the TPOS/TPA (disc number) id3 tag.
| -rw-r--r-- | include/media/mediametadataretriever.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 1 | ||||
| -rw-r--r-- | media/libstagefright/MP3Extractor.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/StagefrightMediaScanner.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/StagefrightMetadataRetriever.cpp | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h index 113c452e9537..022b849352b6 100644 --- a/include/media/mediametadataretriever.h +++ b/include/media/mediametadataretriever.h @@ -54,6 +54,7 @@ enum { METADATA_KEY_VIDEO_WIDTH = 20, METADATA_KEY_WRITER = 21, METADATA_KEY_MIMETYPE = 22, + METADATA_KEY_DISC_NUMBER = 23, // Add more here... }; diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 3b2146868f6f..8f423f750c79 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -59,6 +59,7 @@ enum { kKeyAlbumArtMIME = 'alAM', // cstring kKeyAuthor = 'auth', // cstring kKeyCDTrackNumber = 'cdtr', // cstring + kKeyDiscNumber = 'dnum', // cstring kKeyDate = 'date', // cstring kKeyWriter = 'writ', // cstring }; diff --git a/media/libstagefright/MP3Extractor.cpp b/media/libstagefright/MP3Extractor.cpp index accd94d5947f..79b76744681a 100644 --- a/media/libstagefright/MP3Extractor.cpp +++ b/media/libstagefright/MP3Extractor.cpp @@ -737,6 +737,7 @@ sp<MetaData> MP3Extractor::getMetaData() { { kKeyYear, "TYE", "TYER" }, { kKeyAuthor, "TXT", "TEXT" }, { kKeyCDTrackNumber, "TRK", "TRCK" }, + { kKeyDiscNumber, "TPA", "TPOS" }, }; static const size_t kNumMapEntries = sizeof(kMap) / sizeof(kMap[0]); diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp index 345138395f76..22f701c589a2 100644 --- a/media/libstagefright/StagefrightMediaScanner.cpp +++ b/media/libstagefright/StagefrightMediaScanner.cpp @@ -191,6 +191,7 @@ status_t StagefrightMediaScanner::processFile( }; static const KeyMap kKeyMap[] = { { "tracknumber", METADATA_KEY_CD_TRACK_NUMBER }, + { "discnumber", METADATA_KEY_DISC_NUMBER }, { "album", METADATA_KEY_ALBUM }, { "artist", METADATA_KEY_ARTIST }, { "composer", METADATA_KEY_COMPOSER }, diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp index dfba74f3c0d3..f617fe8da859 100644 --- a/media/libstagefright/StagefrightMetadataRetriever.cpp +++ b/media/libstagefright/StagefrightMetadataRetriever.cpp @@ -305,6 +305,7 @@ void StagefrightMetadataRetriever::parseMetaData() { static const Map kMap[] = { { kKeyMIMEType, METADATA_KEY_MIMETYPE }, { kKeyCDTrackNumber, METADATA_KEY_CD_TRACK_NUMBER }, + { kKeyDiscNumber, METADATA_KEY_DISC_NUMBER }, { kKeyAlbum, METADATA_KEY_ALBUM }, { kKeyArtist, METADATA_KEY_ARTIST }, { kKeyAuthor, METADATA_KEY_AUTHOR }, |