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

Commit d1da80a4 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and... 

am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831

* commit 'ba77a3f9':
  Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
parents 240cf3d1 ba77a3f9

core/java/android/provider/MediaStore.java

+7 −0
Original line number Diff line number Diff line
@@ -899,6 +899,13 @@ public final class MediaStore { 
             */

            public static final String ALBUM_ARTIST = "album_artist";



            /**

             * Whether the song is part of a compilation

             * <P>Type: TEXT</P>

             * @hide

             */

            public static final String COMPILATION = "compilation";



            /**

             * A non human readable key calculated from the ARTIST, used for

             * searching, sorting and grouping

include/media/mediametadataretriever.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ enum { 
    METADATA_KEY_MIMETYPE        = 22,

    METADATA_KEY_DISC_NUMBER     = 23,

    METADATA_KEY_ALBUMARTIST     = 24,

    METADATA_KEY_COMPILATION     = 25,

    // Add more here...

};

include/media/stagefright/MetaData.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ enum { 
    kKeyDiscNumber        = 'dnum',  // cstring

    kKeyDate              = 'date',  // cstring

    kKeyWriter            = 'writ',  // cstring

    kKeyCompilation       = 'cpil',  // cstring

    kKeyTimeScale         = 'tmsl',  // int32_t



    // video profile and level

media/java/android/media/MediaMetadataRetriever.java

+1 −0
Original line number Diff line number Diff line
@@ -258,5 +258,6 @@ public class MediaMetadataRetriever 
    public static final int METADATA_KEY_MIMETYPE        = 22;

    public static final int METADATA_KEY_DISCNUMBER      = 23;

    public static final int METADATA_KEY_ALBUMARTIST     = 24;

    public static final int METADATA_KEY_COMPILATION     = 25;

    // Add more here...

}

media/libstagefright/MP3Extractor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -743,6 +743,7 @@ sp<MetaData> MP3Extractor::getMetaData() { 
        { kKeyAuthor, "TXT", "TEXT" },

        { kKeyCDTrackNumber, "TRK", "TRCK" },

        { kKeyDiscNumber, "TPA", "TPOS" },

        { kKeyCompilation, "TCP", "TCMP" },

    };

    static const size_t kNumMapEntries = sizeof(kMap) / sizeof(kMap[0]);