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

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

Merge "libmediaplayer: update MIME types to include DASH support"

parents f3b7c05d f16e49e9

media/java/android/media/MediaFile.java

+3 −1
Original line number Diff line number Diff line
@@ -106,9 +106,10 @@ public class MediaFile { 
    public static final int FILE_TYPE_PLS      = 42;

    public static final int FILE_TYPE_WPL      = 43;

    public static final int FILE_TYPE_HTTPLIVE = 44;

    public static final int FILE_TYPE_DASH     = 45;



    private static final int FIRST_PLAYLIST_FILE_TYPE = FILE_TYPE_M3U;

    private static final int LAST_PLAYLIST_FILE_TYPE = FILE_TYPE_HTTPLIVE;

    private static final int LAST_PLAYLIST_FILE_TYPE = FILE_TYPE_DASH;



    // Drm file types

    public static final int FILE_TYPE_FL      = 51;
@@ -247,6 +248,7 @@ public class MediaFile { 
        addFileType("M3U8", FILE_TYPE_HTTPLIVE, "application/vnd.apple.mpegurl");

        addFileType("M3U8", FILE_TYPE_HTTPLIVE, "audio/mpegurl");

        addFileType("M3U8", FILE_TYPE_HTTPLIVE, "audio/x-mpegurl");

        addFileType("MPD", FILE_TYPE_DASH, "application/dash+xml");



        addFileType("FL", FILE_TYPE_FL, "application/x-android-drm-fl");