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

Commit 1fb6385d authored by Raju Kulkarni's avatar Raju Kulkarni Committed by Automerger Merge Worker
Browse files

Merge "Fix inSampleSize != 1 gainmap decoding" into udc-dev am: 7ad4c65e 

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



Change-Id: Ia04d503eff6fed45d68450bcf119acb703863923
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7bde983 7ad4c65e

libs/hwui/jni/BitmapRegionDecoder.cpp

+16 −19
Original line number Original line Diff line number Diff line
@@ -90,8 +90,8 @@ public: 
                                           requireUnpremul, prefColorSpace);

                                           requireUnpremul, prefColorSpace);

    }

    }





    bool decodeGainmapRegion(sp<uirenderer::Gainmap>* outGainmap, const SkIRect& desiredSubset,

    bool decodeGainmapRegion(sp<uirenderer::Gainmap>* outGainmap, int outWidth, int outHeight,

                             int sampleSize, bool requireUnpremul) {

                             const SkIRect& desiredSubset, int sampleSize, bool requireUnpremul) {

        SkColorType decodeColorType = mGainmapBRD->computeOutputColorType(kN32_SkColorType);

        SkColorType decodeColorType = mGainmapBRD->computeOutputColorType(kN32_SkColorType);

        sk_sp<SkColorSpace> decodeColorSpace =

        sk_sp<SkColorSpace> decodeColorSpace =

                mGainmapBRD->computeOutputColorSpace(decodeColorType, nullptr);

                mGainmapBRD->computeOutputColorSpace(decodeColorType, nullptr);
@@ -109,9 +109,8 @@ public: 
        // kPremul_SkAlphaType is used just as a placeholder as it doesn't change the underlying

        // kPremul_SkAlphaType is used just as a placeholder as it doesn't change the underlying

        // allocation type. RecyclingClippingPixelAllocator will populate this with the

        // allocation type. RecyclingClippingPixelAllocator will populate this with the

        // actual alpha type in either allocPixelRef() or copyIfNecessary()

        // actual alpha type in either allocPixelRef() or copyIfNecessary()

        sk_sp<Bitmap> nativeBitmap = Bitmap::allocateHeapBitmap(

        sk_sp<Bitmap> nativeBitmap = Bitmap::allocateHeapBitmap(SkImageInfo::Make(

                SkImageInfo::Make(desiredSubset.width(), desiredSubset.height(), decodeColorType,

                outWidth, outHeight, decodeColorType, kPremul_SkAlphaType, decodeColorSpace));

                                  kPremul_SkAlphaType, decodeColorSpace));

        if (!nativeBitmap) {

        if (!nativeBitmap) {

            ALOGE("OOM allocating Bitmap for Gainmap");

            ALOGE("OOM allocating Bitmap for Gainmap");

            return false;

            return false;
@@ -134,9 +133,12 @@ public: 
        return true;

        return true;

    }

    }





    SkIRect calculateGainmapRegion(const SkIRect& mainImageRegion) {

    SkIRect calculateGainmapRegion(const SkIRect& mainImageRegion, int* inOutWidth,

                                   int* inOutHeight) {

        const float scaleX = ((float)mGainmapBRD->width()) / mMainImageBRD->width();

        const float scaleX = ((float)mGainmapBRD->width()) / mMainImageBRD->width();

        const float scaleY = ((float)mGainmapBRD->height()) / mMainImageBRD->height();

        const float scaleY = ((float)mGainmapBRD->height()) / mMainImageBRD->height();

        *inOutWidth *= scaleX;

        *inOutHeight *= scaleY;

        // TODO: Account for rounding error?

        // TODO: Account for rounding error?

        return SkIRect::MakeLTRB(mainImageRegion.left() * scaleX, mainImageRegion.top() * scaleY,

        return SkIRect::MakeLTRB(mainImageRegion.left() * scaleX, mainImageRegion.top() * scaleY,

                                 mainImageRegion.right() * scaleX,

                                 mainImageRegion.right() * scaleX,
@@ -328,21 +330,16 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, jlong brdHandle, jint in 
    sp<uirenderer::Gainmap> gainmap;

    sp<uirenderer::Gainmap> gainmap;

    bool hasGainmap = brd->hasGainmap();

    bool hasGainmap = brd->hasGainmap();

    if (hasGainmap) {

    if (hasGainmap) {

        SkIRect adjustedSubset{};

        int gainmapWidth = bitmap.width();

        int gainmapHeight = bitmap.height();

        if (javaBitmap) {

        if (javaBitmap) {

            // Clamp to the width/height of the recycled bitmap in case the reused bitmap

            // If we are recycling we must match the inBitmap's relative dimensions

            // was too small for the specified rectangle, in which case we need to clip

            gainmapWidth = recycledBitmap->width();

            adjustedSubset = SkIRect::MakeXYWH(inputX, inputY,

            gainmapHeight = recycledBitmap->height();

                                               std::min(subset.width(), recycledBitmap->width()),

                                               std::min(subset.height(), recycledBitmap->height()));

        } else {

            // We are not recycling, so use the decoded width/height for calculating the gainmap

            // subset instead to ensure the gainmap region proportionally matches

            adjustedSubset = SkIRect::MakeXYWH(std::max(0, inputX), std::max(0, inputY),

                                               bitmap.width(), bitmap.height());

        }

        }

        SkIRect gainmapSubset = brd->calculateGainmapRegion(adjustedSubset);

        SkIRect gainmapSubset = brd->calculateGainmapRegion(subset, &gainmapWidth, &gainmapHeight);

        if (!brd->decodeGainmapRegion(&gainmap, gainmapSubset, sampleSize, requireUnpremul)) {

        if (!brd->decodeGainmapRegion(&gainmap, gainmapWidth, gainmapHeight, gainmapSubset,

                                      sampleSize, requireUnpremul)) {

            // If there is an error decoding Gainmap - we don't fail. We just don't provide Gainmap

            // If there is an error decoding Gainmap - we don't fail. We just don't provide Gainmap

            hasGainmap = false;

            hasGainmap = false;

        }

        }