Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PixelCopy: align with legacy GLConsumer::computeTransformMatrix" am: 178f91656b am: 031b2963f1 am: ab99d914c5 am: 4ee48e14af

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

Change-Id: I75a7f1e69c91e91567d6d355c3add76d311c97ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-07-06 18:57:01 +00:00
committed by Automerger Merge Worker
parent 969d5a5b02 4ee48e14af
commit 79f7066a46
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
libs/hwui/Readback.cpp
View File

@@ -90,11 +90,36 @@ CopyResult Readback::copySurfaceInto(ANativeWindow* window, const Rect& inSrcRec
SkRect srcRect = inSrcRect.toSkRect(); SkRect srcRect = inSrcRect.toSkRect();
SkRect imageSrcRect = SkRect imageSrcRect = SkRect::MakeIWH(description.width, description.height);
SkISize imageWH = SkISize::Make(description.width, description.height);
if (cropRect.left < cropRect.right && cropRect.top < cropRect.bottom) {
imageSrcRect =
SkRect::MakeLTRB(cropRect.left, cropRect.top, cropRect.right, cropRect.bottom); SkRect::MakeLTRB(cropRect.left, cropRect.top, cropRect.right, cropRect.bottom);
if (imageSrcRect.isEmpty()) { imageWH = SkISize::Make(cropRect.right - cropRect.left, cropRect.bottom - cropRect.top);
imageSrcRect = SkRect::MakeIWH(description.width, description.height);
// Chroma channels of YUV420 images are subsampled we may need to shrink the crop region by
// a whole texel on each side. Since skia still adds its own 0.5 inset, we apply an
// additional 0.5 inset. See GLConsumer::computeTransformMatrix for details.
float shrinkAmount = 0.0f;
switch (description.format) {
// Use HAL formats since some AHB formats are only available in vndk
case HAL_PIXEL_FORMAT_YCBCR_420_888:
case HAL_PIXEL_FORMAT_YV12:
case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:
shrinkAmount = 0.5f;
break;
default:
break;
} }
// Shrink the crop if it has more than 1-px and differs from the buffer size.
if (imageWH.width() > 1 && imageWH.width() < (int32_t)description.width)
imageSrcRect = imageSrcRect.makeInset(shrinkAmount, 0);
if (imageWH.height() > 1 && imageWH.height() < (int32_t)description.height)
imageSrcRect = imageSrcRect.makeInset(0, shrinkAmount);
}
ALOGV("imageSrcRect = " RECT_STRING, SK_RECT_ARGS(imageSrcRect)); ALOGV("imageSrcRect = " RECT_STRING, SK_RECT_ARGS(imageSrcRect));
// Represents the "logical" width/height of the texture. That is, the dimensions of the buffer // Represents the "logical" width/height of the texture. That is, the dimensions of the buffer
@@ -153,7 +178,7 @@ CopyResult Readback::copySurfaceInto(ANativeWindow* window, const Rect& inSrcRec
*/ */
SkMatrix m; SkMatrix m;
const SkRect imageDstRect = SkRect::MakeIWH(imageSrcRect.width(), imageSrcRect.height()); const SkRect imageDstRect = SkRect::Make(imageWH);
const float px = imageDstRect.centerX(); const float px = imageDstRect.centerX();
const float py = imageDstRect.centerY(); const float py = imageDstRect.centerY();
if (windowTransform & NATIVE_WINDOW_TRANSFORM_FLIP_H) { if (windowTransform & NATIVE_WINDOW_TRANSFORM_FLIP_H) {