diff options
author | 2023-01-06 14:06:29 -0800 | |
---|---|---|
committer | 2023-02-02 18:28:11 -0800 | |
commit | 93d2d0b43ec3e07cfe6b8c32a900f8d433b5f6d5 (patch) | |
tree | 0d1a000757c3a51b2a29d3c5988d83b8e62667c6 /native | |
parent | 18f2966f065e6942677d38b20b1f258bc245e245 (diff) |
NDK attached Choreographer from SurfaceControl.
The API to get a native attached choreographer from
ASurfaceControl.
Bug: 255838011
Test: atest ChoreographerTests
Test: atest ChoreographerNativeTest
Change-Id: I7ed0ebea9f735e102f2285edb3a1cc35b338c3c9
Diffstat (limited to 'native')
-rw-r--r-- | native/android/libandroid.map.txt | 1 | ||||
-rw-r--r-- | native/android/surface_control.cpp | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/native/android/libandroid.map.txt b/native/android/libandroid.map.txt index 987b23fdd1fd..f258c27aa070 100644 --- a/native/android/libandroid.map.txt +++ b/native/android/libandroid.map.txt @@ -345,6 +345,7 @@ LIBANDROID_PLATFORM { extern "C++" { ASurfaceControl_registerSurfaceStatsListener*; ASurfaceControl_unregisterSurfaceStatsListener*; + ASurfaceControl_getChoreographer*; ASurfaceControlStats_getAcquireTime*; ASurfaceControlStats_getFrameNumber*; }; diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp index ea20c6c9e0b1..b7f359602a5d 100644 --- a/native/android/surface_control.cpp +++ b/native/android/surface_control.cpp @@ -180,6 +180,18 @@ void ASurfaceControl_unregisterSurfaceStatsListener(void* context, reinterpret_cast<void*>(func)); } +AChoreographer* ASurfaceControl_getChoreographer(ASurfaceControl* aSurfaceControl) { + LOG_ALWAYS_FATAL_IF(aSurfaceControl == nullptr, "aSurfaceControl should not be nullptr"); + SurfaceControl* surfaceControl = + ASurfaceControl_to_SurfaceControl(reinterpret_cast<ASurfaceControl*>(aSurfaceControl)); + if (!surfaceControl->isValid()) { + ALOGE("Attempted to get choreographer from invalid surface control"); + return nullptr; + } + SurfaceControl_acquire(surfaceControl); + return reinterpret_cast<AChoreographer*>(surfaceControl->getChoreographer().get()); +} + int64_t ASurfaceControlStats_getAcquireTime(ASurfaceControlStats* stats) { if (const auto* fence = std::get_if<sp<Fence>>(&stats->acquireTimeOrFence)) { // We got a fence instead of the acquire time due to latch unsignaled. |