diff options
| author | Chavi Weingarten <chaviw@google.com> | 2021-04-12 13:51:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-12 13:51:01 +0000 |
| commit | a6d011d092ccb5ef8310d532239e9a9a962ebacf (patch) | |
| tree | 549db7083d5b5ff161b051bfa7698e71a8bb2e03 /native | |
| parent | 7529cef66eb039356a2a9f694295f94aa13d6582 (diff) | |
| parent | 305ec1d5c87f7a2c9d9190c3977813c2bcf0da3a (diff) | |
Merge "Revert^2 "Remove setFrame from surface_control setGeometry"" into sc-dev
Diffstat (limited to 'native')
| -rw-r--r-- | native/android/surface_control.cpp | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp index e0f637959cfb..7433cf970566 100644 --- a/native/android/surface_control.cpp +++ b/native/android/surface_control.cpp @@ -432,14 +432,27 @@ void ASurfaceTransaction_setGeometry(ASurfaceTransaction* aSurfaceTransaction, const ARect& destination, int32_t transform) { CHECK_NOT_NULL(aSurfaceTransaction); CHECK_NOT_NULL(aSurfaceControl); - CHECK_VALID_RECT(source); 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); Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction); - transaction->setCrop(surfaceControl, static_cast<const Rect&>(source)); - transaction->setFrame(surfaceControl, static_cast<const Rect&>(destination)); + transaction->setCrop(surfaceControl, sourceRect); + + 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); bool transformToInverseDisplay = (NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY & transform) == NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY; @@ -458,16 +471,18 @@ void ASurfaceTransaction_setSourceRect(ASurfaceTransaction* aSurfaceTransaction, transaction->setCrop(surfaceControl, static_cast<const Rect&>(source)); } -void ASurfaceTransaction_setPosition(ASurfaceTransaction* aSurfaceTransaction, - ASurfaceControl* aSurfaceControl, const ARect& destination) { - CHECK_NOT_NULL(aSurfaceTransaction); +void ASurfaceTransaction_setPosition(ASurfaceTransaction* /* aSurfaceTransaction */, + ASurfaceControl* /* aSurfaceControl */, + const ARect& /* destination */) { + // TODO: Fix this function + /* CHECK_NOT_NULL(aSurfaceTransaction); CHECK_NOT_NULL(aSurfaceControl); CHECK_VALID_RECT(destination); sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl); 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, |