Revert "CTS of CtsMediaTestCases#android.media.cts.DecodeAccuracyTest may fail when video is cropped."

This reverts commit b48d4d10ab.

Reason for revert: the original CL caused regression on many devices.

Bug: 206079174
Bug: 207083066
Bug: 192912975
Bug: 208373431
Bug: 209522191
Bug: 208140353
Bug: 208741105
Bug: 211528580
Bug: 211837929
Bug: 211566842
Change-Id: I65206c683f1f067365a4993fa8d2dbd3cffc17cb
This commit is contained in:
Hung-ying Tyan
2022-01-25 08:48:34 +00:00
parent b48d4d10ab
commit ef8060fcad

View File

@@ -32,8 +32,6 @@
using namespace android::uirenderer::renderthread;
static constexpr bool sEnableExtraCropInset = true;
namespace android {
namespace uirenderer {
@@ -73,20 +71,6 @@ CopyResult Readback::copySurfaceInto(ANativeWindow* window, const Rect& inSrcRec
ALOGW("Surface doesn't have any previously queued frames, nothing to readback from");
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};
AHardwareBuffer_Desc description;
AHardwareBuffer_describe(sourceBuffer.get(), &description);