Merge "Revert "CTS of CtsMediaTestCases#android.media.cts.DecodeAccuracyTest may fail when video is cropped.""
This commit is contained in:
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user