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

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

Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser."

parents c86b5a6a 5dffd0e3

core/java/android/webkit/WebViewCore.java

+3 −1
Original line number Diff line number Diff line
@@ -283,7 +283,9 @@ final class WebViewCore { 
     */

    /* package */ static boolean isSupportedMediaMimeType(String mimeType) {

        int fileType = MediaFile.getFileTypeForMimeType(mimeType);

        return MediaFile.isAudioFileType(fileType) || MediaFile.isVideoFileType(fileType);

        return MediaFile.isAudioFileType(fileType)

            || MediaFile.isVideoFileType(fileType)

            || MediaFile.isPlayListFileType(fileType);

    }



    /**

media/java/android/media/MediaFile.java

+9 −4
Original line number Diff line number Diff line
@@ -80,8 +80,10 @@ public class MediaFile { 
    public static final int FILE_TYPE_M3U      = 41;

    public static final int FILE_TYPE_PLS      = 42;

    public static final int FILE_TYPE_WPL      = 43;

    public static final int FILE_TYPE_HTTPLIVE = 44;



    private static final int FIRST_PLAYLIST_FILE_TYPE = FILE_TYPE_M3U;

    private static final int LAST_PLAYLIST_FILE_TYPE = FILE_TYPE_WPL;

    private static final int LAST_PLAYLIST_FILE_TYPE = FILE_TYPE_HTTPLIVE;



    // Drm file types

    public static final int FILE_TYPE_FL      = 51;
@@ -194,6 +196,9 @@ public class MediaFile { 
        addFileType("M3U", FILE_TYPE_M3U, "audio/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST);

        addFileType("PLS", FILE_TYPE_PLS, "audio/x-scpls", MtpConstants.FORMAT_PLS_PLAYLIST);

        addFileType("WPL", FILE_TYPE_WPL, "application/vnd.ms-wpl", MtpConstants.FORMAT_WPL_PLAYLIST);

        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("FL", FILE_TYPE_FL, "application/x-android-drm-fl");