diff options
author | 2024-11-26 19:22:53 +0000 | |
---|---|---|
committer | 2024-11-26 19:22:53 +0000 | |
commit | 28929e4b66a516f605b6a7d2308b247302aeb191 (patch) | |
tree | b49efd0d5739e8ce0f9f17bb6ac6a226883ee14d | |
parent | ba2f3e93d40327f4ab7bbb43305d70784f64f1ec (diff) |
Revert "Add new ASurfaceTransaction _setFrameRateParams API"
Revert submission 30112724-asurfacetransaction-setframerateparams
Reason for revert: removing API to be landed in another release.
Reverted changes: /q/submissionid:30112724-asurfacetransaction-setframerateparams
Change-Id: I0750ac25a0371f6becc1e99297de8c7f77940bdf
-rw-r--r-- | native/android/libandroid.map.txt | 1 | ||||
-rw-r--r-- | native/android/surface_control.cpp | 22 |
2 files changed, 0 insertions, 23 deletions
diff --git a/native/android/libandroid.map.txt b/native/android/libandroid.map.txt index b025cb880ee7..202535d45191 100644 --- a/native/android/libandroid.map.txt +++ b/native/android/libandroid.map.txt @@ -283,7 +283,6 @@ LIBANDROID { ASurfaceTransaction_setEnableBackPressure; # introduced=31 ASurfaceTransaction_setFrameRate; # introduced=30 ASurfaceTransaction_setFrameRateWithChangeStrategy; # introduced=31 - ASurfaceTransaction_setFrameRateParams; # introduced=36 ASurfaceTransaction_clearFrameRate; # introduced=34 ASurfaceTransaction_setFrameTimeline; # introduced=Tiramisu ASurfaceTransaction_setGeometry; # introduced=29 diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp index 698bc84a78b9..e46db6bb3727 100644 --- a/native/android/surface_control.cpp +++ b/native/android/surface_control.cpp @@ -731,28 +731,6 @@ void ASurfaceTransaction_setFrameRateWithChangeStrategy(ASurfaceTransaction* aSu transaction->setFrameRate(surfaceControl, frameRate, compatibility, changeFrameRateStrategy); } -void ASurfaceTransaction_setFrameRateParams( - ASurfaceTransaction* aSurfaceTransaction, ASurfaceControl* aSurfaceControl, - float desiredMinRate, float desiredMaxRate, float fixedSourceRate, - ANativeWindow_ChangeFrameRateStrategy changeFrameRateStrategy) { - CHECK_NOT_NULL(aSurfaceTransaction); - CHECK_NOT_NULL(aSurfaceControl); - Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction); - sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl); - - if (desiredMaxRate < desiredMinRate) { - ALOGW("desiredMaxRate must be greater than or equal to desiredMinRate"); - return; - } - // TODO(b/362798998): Fix plumbing to send modern params - int compatibility = fixedSourceRate == 0 ? ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT - : ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE; - double frameRate = compatibility == ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE - ? fixedSourceRate - : desiredMinRate; - transaction->setFrameRate(surfaceControl, frameRate, compatibility, changeFrameRateStrategy); -} - void ASurfaceTransaction_clearFrameRate(ASurfaceTransaction* aSurfaceTransaction, ASurfaceControl* aSurfaceControl) { CHECK_NOT_NULL(aSurfaceTransaction); |