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

Commit 16dc3073 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Don't treat WMV and ASF files as video files unless WMV is supported 



Change-Id: I512d1db67e06273d9c23d10fa30d2d62f9f75a75
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 5fb008e3

media/java/android/media/MediaFile.java

+19 −3
Original line number Diff line number Diff line
@@ -141,7 +141,9 @@ public class MediaFile { 


    private static boolean isWMAEnabled() {

        List<AudioDecoder> decoders = DecoderCapabilities.getAudioDecoders();

        for (AudioDecoder decoder: decoders) {

        int count = decoders.size();

        for (int i = 0; i < count; i++) {

            AudioDecoder decoder = decoders.get(i);

            if (decoder == AudioDecoder.AUDIO_DECODER_WMA) {

                return true;

            }
@@ -149,6 +151,18 @@ public class MediaFile { 
        return false;

    }



    private static boolean isWMVEnabled() {

        List<VideoDecoder> decoders = DecoderCapabilities.getVideoDecoders();

        int count = decoders.size();

        for (int i = 0; i < count; i++) {

            VideoDecoder decoder = decoders.get(i);

            if (decoder == VideoDecoder.VIDEO_DECODER_WMV) {

                return true;

            }

        }

        return false;

    }



    static {

        addFileType("MP3", FILE_TYPE_MP3, "audio/mpeg", MtpConstants.FORMAT_MP3);

        addFileType("M4A", FILE_TYPE_M4A, "audio/mp4", MtpConstants.FORMAT_MPEG);
@@ -184,8 +198,10 @@ public class MediaFile { 
        addFileType("WEBM", FILE_TYPE_MKV, "video/x-matroska");

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



        if (isWMVEnabled()) {

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

            addFileType("ASF", FILE_TYPE_ASF, "video/x-ms-asf");

        }



        addFileType("JPG", FILE_TYPE_JPEG, "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG);

        addFileType("JPEG", FILE_TYPE_JPEG, "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG);