Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67c12cc2 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

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

parents 1fa2d46f 655306f8

include/media/mediametadataretriever.h

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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 },