diff options
| author | Vasiliy Telezhnikov <vtelezhnikov@google.com> | 2021-03-13 19:55:00 -0500 |
|---|---|---|
| committer | Vasiliy Telezhnikov <vtelezhnikov@google.com> | 2021-03-17 18:14:55 +0000 |
| commit | 5ead3aa5f26f9db786fae010cc9c055896da6e2c (patch) | |
| tree | def34ca4060093b293b4c937bbfebe208dbd80e6 | |
| parent | 11a7f13364724870996ab47288be5738263b01f2 (diff) | |
Split ASurfaceTransaction_setGeometry api
This CL adds three new methods: setSourceRect, setPosition and
setTransform.
Test: ASurfaceControlTest
Bug: 173671170
Change-Id: I00f05a45bfa2b6e53735d95977d32bdecbce3df1
| -rw-r--r-- | native/android/libandroid.map.txt | 5 | ||||
| -rw-r--r-- | native/android/surface_control.cpp | 38 |
2 files changed, 42 insertions, 1 deletions
diff --git a/native/android/libandroid.map.txt b/native/android/libandroid.map.txt index b01878b3070b..e24907a9c119 100644 --- a/native/android/libandroid.map.txt +++ b/native/android/libandroid.map.txt @@ -258,6 +258,9 @@ LIBANDROID { ASurfaceTransaction_setHdrMetadata_cta861_3; # introduced=29 ASurfaceTransaction_setHdrMetadata_smpte2086; # introduced=29 ASurfaceTransaction_setOnComplete; # introduced=29 + ASurfaceTransaction_setPosition; # introduced=31 + ASurfaceTransaction_setSourceRect; # introduced=31 + ASurfaceTransaction_setTransform; # introduced=31 ASurfaceTransaction_setVisibility; # introduced=29 ASurfaceTransaction_setZOrder; # introduced=29 ASystemFontIterator_open; # introduced=29 @@ -309,4 +312,4 @@ LIBANDROID_PLATFORM { ASurfaceControlStats_getAcquireTime*; ASurfaceControlStats_getFrameNumber*; }; -} LIBANDROID;
\ No newline at end of file +} LIBANDROID; diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp index e8cf63f64572..195fd5e60295 100644 --- a/native/android/surface_control.cpp +++ b/native/android/surface_control.cpp @@ -446,6 +446,44 @@ void ASurfaceTransaction_setGeometry(ASurfaceTransaction* aSurfaceTransaction, transaction->setTransformToDisplayInverse(surfaceControl, transformToInverseDisplay); } +void ASurfaceTransaction_setSourceRect(ASurfaceTransaction* aSurfaceTransaction, + ASurfaceControl* aSurfaceControl, const ARect& source) { + CHECK_NOT_NULL(aSurfaceTransaction); + CHECK_NOT_NULL(aSurfaceControl); + CHECK_VALID_RECT(source); + + sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl); + Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction); + + transaction->setCrop(surfaceControl, static_cast<const Rect&>(source)); +} + +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)); +} + +void ASurfaceTransaction_setTransform(ASurfaceTransaction* aSurfaceTransaction, + ASurfaceControl* aSurfaceControl, int32_t transform) { + CHECK_NOT_NULL(aSurfaceTransaction); + CHECK_NOT_NULL(aSurfaceControl); + + sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl); + Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction); + + transaction->setTransform(surfaceControl, transform); + bool transformToInverseDisplay = (NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY & transform) == + NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY; + transaction->setTransformToDisplayInverse(surfaceControl, transformToInverseDisplay); +} + void ASurfaceTransaction_setBufferTransparency(ASurfaceTransaction* aSurfaceTransaction, ASurfaceControl* aSurfaceControl, int8_t transparency) { |