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

Commit ea978db1 authored by Leon Scroggins III's avatar Leon Scroggins III Committed by Leon Scroggins
Browse files

Switch to SkAndroidCodec::computeSampleSize 

Bug: 63909536
Test: CtsGraphicsTestCases(ImageDecoderTest) and Skia

Depends on https://skia-review.googlesource.com/94620 in Skia.

Move the code for determining the actual sample size to Skia.
That code includes tests which caught bugs that are hard to
test for from the Java API. (Previously, we could end up using
the wrong sample size and then scaling unnecessarily.)

Change-Id: Ib3a5d70e4845e95b18af77668383d38746cb21fc
parent 52aa9801

core/jni/android/graphics/ImageDecoder.cpp

+8 −32
Original line number Diff line number Diff line
@@ -160,11 +160,6 @@ static jobject ImageDecoder_nCreateByteArray(JNIEnv* env, jobject /*clazz*/, jby 
    return native_create(env, std::move(stream));

}



static bool supports_any_down_scale(const SkAndroidCodec* codec) {

    return codec->getEncodedFormat() == SkEncodedImageFormat::kWEBP;

}



// This method should never return null. Instead, it should throw an exception.

static jobject ImageDecoder_nDecodeBitmap(JNIEnv* env, jobject /*clazz*/, jlong nativePtr,

                                          jobject jcallback, jobject jpostProcess,

                                          jint desiredWidth, jint desiredHeight, jobject jsubset,
@@ -173,34 +168,15 @@ static jobject ImageDecoder_nDecodeBitmap(JNIEnv* env, jobject /*clazz*/, jlong 
                                          jboolean asAlphaMask) {

    auto* decoder = reinterpret_cast<ImageDecoder*>(nativePtr);

    SkAndroidCodec* codec = decoder->mCodec.get();

    SkImageInfo decodeInfo = codec->getInfo();

    bool scale = false;

    int sampleSize = 1;

    if (desiredWidth != decodeInfo.width() || desiredHeight != decodeInfo.height()) {

        bool match = false;

        if (desiredWidth < decodeInfo.width() && desiredHeight < decodeInfo.height()) {

            if (supports_any_down_scale(codec)) {

                match = true;

                decodeInfo = decodeInfo.makeWH(desiredWidth, desiredHeight);

            } else {

                int sampleX = decodeInfo.width()  / desiredWidth;

                int sampleY = decodeInfo.height() / desiredHeight;

                sampleSize = std::min(sampleX, sampleY);

                SkISize sampledSize = codec->getSampledDimensions(sampleSize);

                decodeInfo = decodeInfo.makeWH(sampledSize.width(), sampledSize.height());

                if (decodeInfo.width() == desiredWidth && decodeInfo.height() == desiredHeight) {

                    match = true;

                }

            }

        }

        if (!match) {

            scale = true;

            if (requireUnpremul && kOpaque_SkAlphaType != decodeInfo.alphaType()) {

    const SkISize desiredSize = SkISize::Make(desiredWidth, desiredHeight);

    SkISize decodeSize = desiredSize;

    const int sampleSize = codec->computeSampleSize(&decodeSize);

    const bool scale = desiredSize != decodeSize;

    SkImageInfo decodeInfo = codec->getInfo().makeWH(decodeSize.width(), decodeSize.height());

    if (scale && requireUnpremul && kOpaque_SkAlphaType != decodeInfo.alphaType()) {

        doThrowISE(env, "Cannot scale unpremultiplied pixels!");

        return nullptr;

    }

        }

    }



    switch (decodeInfo.alphaType()) {

        case kUnpremul_SkAlphaType: