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

Commit b8af454a authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 8515 

* changes:
  Add support for .aac and .asf extensions.
parents 55048a98 974ff946

media/java/android/media/MediaFile.java

+6 −2
Original line number Diff line number Diff line
@@ -41,8 +41,9 @@ public class MediaFile { 
    public static final int FILE_TYPE_AWB     = 5;

    public static final int FILE_TYPE_WMA     = 6;

    public static final int FILE_TYPE_OGG     = 7;

    public static final int FILE_TYPE_AAC     = 8;

    private static final int FIRST_AUDIO_FILE_TYPE = FILE_TYPE_MP3;

    private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_OGG;

    private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_AAC;



    // MIDI file types

    public static final int FILE_TYPE_MID     = 11;
@@ -57,8 +58,9 @@ public class MediaFile { 
    public static final int FILE_TYPE_3GPP    = 23;

    public static final int FILE_TYPE_3GPP2   = 24;

    public static final int FILE_TYPE_WMV     = 25;

    public static final int FILE_TYPE_ASF     = 26;

    private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4;

    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_WMV;

    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_ASF;

    

    // Image file types

    public static final int FILE_TYPE_JPEG    = 31;
@@ -104,6 +106,7 @@ public class MediaFile { 
        addFileType("WMA", FILE_TYPE_WMA, "audio/x-ms-wma");    

        addFileType("OGG", FILE_TYPE_OGG, "application/ogg");

        addFileType("OGA", FILE_TYPE_OGG, "application/ogg");

        addFileType("AAC", FILE_TYPE_AAC, "audio/aac");

 

        addFileType("MID", FILE_TYPE_MID, "audio/midi");

        addFileType("MIDI", FILE_TYPE_MID, "audio/midi");
@@ -121,6 +124,7 @@ public class MediaFile { 
        addFileType("3G2", FILE_TYPE_3GPP2, "video/3gpp2");

        addFileType("3GPP2", FILE_TYPE_3GPP2, "video/3gpp2");

        addFileType("WMV", FILE_TYPE_WMV, "video/x-ms-wmv");

        addFileType("ASF", FILE_TYPE_ASF, "video/x-ms-asf");



        addFileType("JPG", FILE_TYPE_JPEG, "image/jpeg");

        addFileType("JPEG", FILE_TYPE_JPEG, "image/jpeg");