Merge "Add support for the TPOS/TPA (disc number) id3 tag."

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...
 };
 

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
 };

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]);
 

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 },

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 },