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

Commit 24edaf03 authored by Xiao Huang's avatar Xiao Huang Committed by Automerger Merge Worker
Browse files

Merge "ImageDecoder: update AVIF checking criteria" into udc-dev am: 84c554c6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22572878



Change-Id: I62df954b3c1be85f5734dbf1b4c9d9e77d2f4da7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67538f24 84c554c6

graphics/java/android/graphics/ImageDecoder.java

+19 −22
Original line number Diff line number Diff line
@@ -2083,32 +2083,29 @@ public final class ImageDecoder implements AutoCloseable { 
            }



            sIsP010SupportedForAV1Initialized = true;



            if (hasHardwareDecoder("video/av01")) {

                sIsP010SupportedForAV1 = true;

                return true;

            }



            sIsP010SupportedForAV1 = Build.VERSION.DEVICE_INITIAL_SDK_INT

                    >= Build.VERSION_CODES.S;

            return sIsP010SupportedForAV1;

            return sIsP010SupportedForAV1 = isP010SupportedforMime("video/av01");

        }

    }



    /**

     * Checks if the device has hardware decoder for the target mime type.

     * Checks if the device supports decoding 10-bit for the given mime type.

     */

    private static boolean hasHardwareDecoder(String mime) {

        final MediaCodecList sMCL = new MediaCodecList(MediaCodecList.REGULAR_CODECS);

        for (MediaCodecInfo info : sMCL.getCodecInfos()) {

            if (info.isEncoder() == false && info.isHardwareAccelerated()) {

                try {

                     if (info.getCapabilitiesForType(mime) != null) {

    private static boolean isP010SupportedforMime(String mime) {

        MediaCodecList codecList = new MediaCodecList(MediaCodecList.ALL_CODECS);

        for (MediaCodecInfo mediaCodecInfo : codecList.getCodecInfos()) {

            if (mediaCodecInfo.isEncoder()) {

                continue;

            }

            for (String mediaType : mediaCodecInfo.getSupportedTypes()) {

                if (mediaType.equalsIgnoreCase(mime)) {

                    MediaCodecInfo.CodecCapabilities codecCapabilities =

                        mediaCodecInfo.getCapabilitiesForType(mediaType);

                    for (int i = 0; i < codecCapabilities.colorFormats.length; ++i) {

                        if (codecCapabilities.colorFormats[i]

                            == MediaCodecInfo.CodecCapabilities.COLOR_FormatYUVP010) {

                            return true;

                        }

                } catch (IllegalArgumentException e) {

                     // mime is not supported

                     return false;

                    }

                }

            }

        }