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

Commit cabe7e39 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "CTS of CtsMediaTestCases#android.media.cts.DecodeAccuracyTest... 

Merge "Revert "CTS of CtsMediaTestCases#android.media.cts.DecodeAccuracyTest may fail when video is cropped."" am: fbc849e9 am: 423a67e7 am: 611cfb5d am: c736d8d0

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

Change-Id: I31e6dcc0f08c151de7ee6df1ce914e22db5cf682
parents 01c5895d c736d8d0

libs/hwui/Readback.cpp

+0 −16
Original line number Original line Diff line number Diff line
@@ -32,8 +32,6 @@ 




using namespace android::uirenderer::renderthread;

using namespace android::uirenderer::renderthread;





static constexpr bool sEnableExtraCropInset = true;



namespace android {

namespace android {

namespace uirenderer {

namespace uirenderer {
@@ -66,20 +64,6 @@ CopyResult Readback::copySurfaceInto(ANativeWindow* window, const Rect& inSrcRec 
        ALOGW("Surface doesn't have any previously queued frames, nothing to readback from");

        ALOGW("Surface doesn't have any previously queued frames, nothing to readback from");

        return CopyResult::SourceEmpty;

        return CopyResult::SourceEmpty;

    }

    }



    if (sEnableExtraCropInset &&

        (cropRect.right - cropRect.left != bitmap->width() ||

        cropRect.bottom - cropRect.top != bitmap->height())) {

       /*

        * When we need use filtering, we should also make border shrink here like gui.

        * But we could not check format for YUV or RGB here... Just use 1 pix.

        */

        cropRect.left += 0.5f;

        cropRect.top  += 0.5f;

        cropRect.right -= 0.5f;

        cropRect.bottom -= 0.5f;

    }



    UniqueAHardwareBuffer sourceBuffer{rawSourceBuffer};

    UniqueAHardwareBuffer sourceBuffer{rawSourceBuffer};

    AHardwareBuffer_Desc description;

    AHardwareBuffer_Desc description;

    AHardwareBuffer_describe(sourceBuffer.get(), &description);

    AHardwareBuffer_describe(sourceBuffer.get(), &description);