diff options
| author | Orion Hodson <oth@google.com> | 2021-04-09 07:34:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-09 07:34:01 +0000 |
| commit | 397cb14bd3201e44e8ddf38592a637d6547c26ec (patch) | |
| tree | 4ae570b87c6df0287b5f9d584b577f4f333ab725 /native/android/surface_control.cpp | |
| parent | c22aff4e4d4de8fcb95e1544db952aa1bdfd999a (diff) | |
| parent | 98aa7d4c88834987d5102f0137d206e921583ace (diff) | |
Merge "Revert "Remove setFrame from surface_control setGeometry"" into sc-dev
Diffstat (limited to 'native/android/surface_control.cpp')
| -rw-r--r-- | native/android/surface_control.cpp | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp index 7433cf970566..e0f637959cfb 100644 --- a/native/android/surface_control.cpp +++ b/native/android/surface_control.cpp @@ -432,27 +432,14 @@ 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, 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->setCrop(surfaceControl, static_cast<const Rect&>(source)); + transaction->setFrame(surfaceControl, static_cast<const Rect&>(destination)); transaction->setTransform(surfaceControl, transform); bool transformToInverseDisplay = (NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY & transform) == NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY; @@ -471,18 +458,16 @@ void ASurfaceTransaction_setSourceRect(ASurfaceTransaction* aSurfaceTransaction, transaction->setCrop(surfaceControl, static_cast<const Rect&>(source)); } -void ASurfaceTransaction_setPosition(ASurfaceTransaction* /* aSurfaceTransaction */, - ASurfaceControl* /* aSurfaceControl */, - const ARect& /* destination */) { - // TODO: Fix this function - /* CHECK_NOT_NULL(aSurfaceTransaction); +void ASurfaceTransaction_setPosition(ASurfaceTransaction* aSurfaceTransaction, + ASurfaceControl* aSurfaceControl, const ARect& destination) { + 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, |