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

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

Merge "Add support for "album artist" tag."

parents 000479f9 c5d5ee34

include/media/mediametadataretriever.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ enum { 
    METADATA_KEY_WRITER          = 21,

    METADATA_KEY_MIMETYPE        = 22,

    METADATA_KEY_DISC_NUMBER     = 23,

    METADATA_KEY_ALBUMARTIST     = 24,

    // Add more here...

};

include/media/stagefright/MetaData.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ enum { 


    kKeyAlbum             = 'albu',  // cstring

    kKeyArtist            = 'arti',  // cstring

    kKeyAlbumArtist       = 'aart',  // cstring

    kKeyComposer          = 'comp',  // cstring

    kKeyGenre             = 'genr',  // cstring

    kKeyTitle             = 'titl',  // cstring

media/java/android/media/MediaMetadataRetriever.java

+4 −2
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ import android.content.Context; 
import android.content.res.AssetFileDescriptor;

import android.graphics.Bitmap;

import android.net.Uri;

import android.os.ParcelFileDescriptor;



import java.io.FileDescriptor;

import java.io.IOException;

import java.io.FileNotFoundException;

import java.io.IOException;



/**

 * MediaMetadataRetriever class provides a unified interface for retrieving
@@ -256,5 +256,7 @@ public class MediaMetadataRetriever 
    public static final int METADATA_KEY_VIDEO_WIDTH     = 20;

    public static final int METADATA_KEY_WRITER          = 21;

    public static final int METADATA_KEY_MIMETYPE        = 22;

    public static final int METADATA_KEY_DISCNUMBER      = 23;

    public static final int METADATA_KEY_ALBUMARTIST     = 24;

    // Add more here...

}

media/libstagefright/MP3Extractor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -731,6 +731,7 @@ sp<MetaData> MP3Extractor::getMetaData() { 
    static const Map kMap[] = {

        { kKeyAlbum, "TALB", "TAL" },

        { kKeyArtist, "TPE1", "TP1" },

        { kKeyAlbumArtist, "TPE2", "TP2" },

        { kKeyComposer, "TCOM", "TCM" },

        { kKeyGenre, "TCON", "TCO" },

        { kKeyTitle, "TIT2", "TT2" },

media/libstagefright/MPEG4Extractor.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1045,6 +1045,11 @@ status_t MPEG4Extractor::parseMetaData(off_t offset, size_t size) { 
            metadataKey = kKeyArtist;

            break;

        }

        case FOURCC('a', 'A', 'R', 'T'):

        {

            metadataKey = kKeyAlbumArtist;

            break;

        }

        case FOURCC(0xa9, 'd', 'a', 'y'):

        {

            metadataKey = kKeyYear;