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

Commit 531321ad authored by Dichen Zhang's avatar Dichen Zhang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "ImageDecoder: Add AVIF to support list""" into udc-dev am: 9dfec21e 

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



Change-Id: Iac64f643886e10e74726bdb22d3640bc3287353e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14444da3 9dfec21e

graphics/java/android/graphics/ImageDecoder.java

+52 −0
Original line number Diff line number Diff line
@@ -38,8 +38,11 @@ import android.graphics.drawable.AnimatedImageDrawable; 
import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.NinePatchDrawable;

import android.media.MediaCodecInfo;

import android.media.MediaCodecList;

import android.net.Uri;

import android.os.Build;

import android.os.SystemProperties;

import android.os.Trace;

import android.system.ErrnoException;

import android.system.Os;
@@ -928,6 +931,8 @@ public final class ImageDecoder implements AutoCloseable { 
            case "image/x-pentax-pef":

            case "image/x-samsung-srw":

                return true;

            case "image/avif":

                return isP010SupportedForAV1();

            default:

                return false;

        }
@@ -2063,6 +2068,53 @@ public final class ImageDecoder implements AutoCloseable { 
        return decodeBitmapImpl(src, null);

    }



    private static boolean sIsP010SupportedForAV1 = false;

    private static boolean sIsP010SupportedForAV1Initialized = false;

    private static final Object sIsP010SupportedForAV1Lock = new Object();



    /**

     * Checks if the device supports decoding 10-bit AV1.

     */

    @SuppressWarnings("AndroidFrameworkCompatChange")  // This is not an app-visible API.

    private static boolean isP010SupportedForAV1() {

        synchronized (sIsP010SupportedForAV1Lock) {

            if (sIsP010SupportedForAV1Initialized) {

                return sIsP010SupportedForAV1;

            }



            sIsP010SupportedForAV1Initialized = true;



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

                sIsP010SupportedForAV1 = true;

                return true;

            }



            sIsP010SupportedForAV1 = Build.VERSION.DEVICE_INITIAL_SDK_INT

                    >= Build.VERSION_CODES.S;

            return sIsP010SupportedForAV1;

        }

    }



    /**

     * Checks if the device has hardware decoder for the target 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) {

                         return true;

                     }

                } catch (IllegalArgumentException e) {

                     // mime is not supported

                     return false;

                }

            }

        }

        return false;

    }



    /**

     * Private method called by JNI.

     */