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

Commit 790ac975 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi files"

parents 53175091 cabb7da7

include/media/stagefright/MediaDefs.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ extern const char *MEDIA_MIMETYPE_CONTAINER_WAV; 
extern const char *MEDIA_MIMETYPE_CONTAINER_OGG;

extern const char *MEDIA_MIMETYPE_CONTAINER_MATROSKA;

extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2TS;

extern const char *MEDIA_MIMETYPE_CONTAINER_AVI;



extern const char *MEDIA_MIMETYPE_CONTAINER_WVM;

media/java/android/media/MediaFile.java

+3 −1
Original line number Diff line number Diff line
@@ -66,8 +66,9 @@ public class MediaFile { 
    public static final int FILE_TYPE_ASF     = 26;

    public static final int FILE_TYPE_MKV     = 27;

    public static final int FILE_TYPE_MP2TS   = 28;

    public static final int FILE_TYPE_AVI     = 29;

    private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4;

    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_MP2TS;

    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_AVI;

    

    // Image file types

    public static final int FILE_TYPE_JPEG    = 31;
@@ -198,6 +199,7 @@ public class MediaFile { 
        addFileType("MKV", FILE_TYPE_MKV, "video/x-matroska");

        addFileType("WEBM", FILE_TYPE_MKV, "video/x-matroska");

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

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



        if (isWMVEnabled()) {

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