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

Commit 06d66fbc authored by Riaz Rahaman's avatar Riaz Rahaman Committed by Steve Kondik
Browse files

frameworks/base: media: add support for DIVX files 

Change-Id: I6e922c5d6e17ee590606268af97b7894f35d19ae
(cherry picked from commit 47fea00316203aebba194644f95ca58ef4ff4400)
(cherry picked from commit 1f3ab64cf5bb19ec2e8a996750f44389d4d07187)
(cherry picked from commit 066dff510ec44ee06c3a375e32133e21fbedf9fb)
parent f2d7e51e

media/java/android/media/MediaFile.java

+3 −1
Original line number Diff line number Diff line
@@ -74,8 +74,9 @@ public class MediaFile { 
    

    // More video file types

    public static final int FILE_TYPE_MP2PS   = 200;

    public static final int FILE_TYPE_DIVX    = 201;

    private static final int FIRST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS;

    private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS;

    private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_DIVX;



    // Image file types

    public static final int FILE_TYPE_JPEG    = 31;
@@ -245,6 +246,7 @@ public class MediaFile { 
        addFileType("ZIP", FILE_TYPE_ZIP, "application/zip");

        addFileType("MPG", FILE_TYPE_MP2PS, "video/mp2p");

        addFileType("MPEG", FILE_TYPE_MP2PS, "video/mp2p");

        addFileType("DIVX", FILE_TYPE_DIVX, "video/divx");

    }



    public static boolean isAudioFileType(int fileType) {