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

Commit f4238e7e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "frameworks/base: Add support for flv container"

parents 27f7325a 29ae2933

media/java/android/media/MediaFile.java

+3 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public class MediaFile { 
    private static final int LAST_MIDI_FILE_TYPE = FILE_TYPE_IMY;

   

    // Video file types

    public static final int FILE_TYPE_FLV     = 20;

    public static final int FILE_TYPE_MP4     = 21;

    public static final int FILE_TYPE_M4V     = 22;

    public static final int FILE_TYPE_3GPP    = 23;
@@ -82,7 +83,7 @@ public class MediaFile { 
    public static final int FILE_TYPE_MP2TS   = 28;

    public static final int FILE_TYPE_AVI     = 29;

    public static final int FILE_TYPE_WEBM    = 30;

    private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4;

    private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_FLV;

    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_WEBM;

    

    // More video file types
@@ -228,6 +229,7 @@ public class MediaFile { 
        addFileType("WEBM", FILE_TYPE_WEBM, "video/webm");

        addFileType("TS", FILE_TYPE_MP2TS, "video/mp2ts");

        addFileType("AVI", FILE_TYPE_AVI, "video/avi");

        addFileType("FLV", FILE_TYPE_FLV, "video/flv");



        if (isWMVEnabled()) {

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