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

Merge "Revert "Remove setFrame from surface_control setGeometry"" into sc-dev

Browse Source
This commit is contained in:
Orion Hodson
2021-04-09 07:34:01 +00:00
committed by Android (Google) Code Review
parent c22aff4e4d 98aa7d4c88
commit 397cb14bd3
1 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
native/android/surface_control.cpp
View File

@@ -432,27 +432,14 @@ void ASurfaceTransaction_setGeometry(ASurfaceTransaction* aSurfaceTransaction,
const ARect& destination, int32_t transform) { const ARect& destination, int32_t transform) {
CHECK_NOT_NULL(aSurfaceTransaction); CHECK_NOT_NULL(aSurfaceTransaction);
CHECK_NOT_NULL(aSurfaceControl); CHECK_NOT_NULL(aSurfaceControl);
CHECK_VALID_RECT(source);
CHECK_VALID_RECT(destination); CHECK_VALID_RECT(destination);
Rect sourceRect = static_cast<const Rect&>(source);
// Adjust the source so its top and left are not negative
sourceRect.left = std::max(sourceRect.left, 0);
sourceRect.top = std::max(sourceRect.top, 0);
LOG_ALWAYS_FATAL_IF(sourceRect.isEmpty(), "invalid arg passed as source argument");
sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl); sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl);
Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction); Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction);
transaction->setCrop(surfaceControl, sourceRect); transaction->setCrop(surfaceControl, static_cast<const Rect&>(source));
transaction->setFrame(surfaceControl, static_cast<const Rect&>(destination));
float dsdx = (destination.right - destination.left) /
static_cast<float>(sourceRect.right - sourceRect.left);
float dsdy = (destination.bottom - destination.top) /
static_cast<float>(sourceRect.bottom - sourceRect.top);
transaction->setPosition(surfaceControl, destination.left - (sourceRect.left * dsdx),
destination.top - (sourceRect.top * dsdy));
transaction->setMatrix(surfaceControl, dsdx, 0, 0, dsdy);
transaction->setTransform(surfaceControl, transform); transaction->setTransform(surfaceControl, transform);
bool transformToInverseDisplay = (NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY & transform) == bool transformToInverseDisplay = (NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY & transform) ==
NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY; NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY;
@@ -471,18 +458,16 @@ void ASurfaceTransaction_setSourceRect(ASurfaceTransaction* aSurfaceTransaction,
transaction->setCrop(surfaceControl, static_cast<const Rect&>(source)); transaction->setCrop(surfaceControl, static_cast<const Rect&>(source));
} }
void ASurfaceTransaction_setPosition(ASurfaceTransaction* /* aSurfaceTransaction */, void ASurfaceTransaction_setPosition(ASurfaceTransaction* aSurfaceTransaction,
ASurfaceControl* /* aSurfaceControl */, ASurfaceControl* aSurfaceControl, const ARect& destination) {
const ARect& /* destination */) { CHECK_NOT_NULL(aSurfaceTransaction);
// TODO: Fix this function
/* CHECK_NOT_NULL(aSurfaceTransaction);
CHECK_NOT_NULL(aSurfaceControl); CHECK_NOT_NULL(aSurfaceControl);
CHECK_VALID_RECT(destination); CHECK_VALID_RECT(destination);
sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl); sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl);
Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction); Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction);
transaction->setFrame(surfaceControl, static_cast<const Rect&>(destination));*/ transaction->setFrame(surfaceControl, static_cast<const Rect&>(destination));
} }
void ASurfaceTransaction_setTransform(ASurfaceTransaction* aSurfaceTransaction, void ASurfaceTransaction_setTransform(ASurfaceTransaction* aSurfaceTransaction,