From 1a44c62b74c4d8a5e5b7dc41e3a55ef91839b12c Mon Sep 17 00:00:00 2001 From: Rachel Lee Date: Tue, 15 Feb 2022 18:12:01 -0800 Subject: [PATCH] Rename to VsyncCallback & presentation time. Bug: 217370454 Test: atest ChoreographerNativeTest Change-Id: Icf460a82c1f59e930bdfc456e4a75ae341ce4394 --- libs/hwui/renderthread/RenderThread.cpp | 4 ++-- native/android/choreographer.cpp | 13 ++++++------- native/android/libandroid.map.txt | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index f627a3c656d1d..01b956cb3dd57 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -152,8 +152,8 @@ public: ChoreographerSource(RenderThread* renderThread) : mRenderThread(renderThread) {} virtual void requestNextVsync() override { - AChoreographer_postExtendedFrameCallback( - mRenderThread->mChoreographer, RenderThread::extendedFrameCallback, mRenderThread); + AChoreographer_postVsyncCallback(mRenderThread->mChoreographer, + RenderThread::extendedFrameCallback, mRenderThread); } virtual void drainPendingEvents() override { diff --git a/native/android/choreographer.cpp b/native/android/choreographer.cpp index e22580d6d71a0..21c5029258c24 100644 --- a/native/android/choreographer.cpp +++ b/native/android/choreographer.cpp @@ -40,10 +40,9 @@ void AChoreographer_postFrameCallbackDelayed64(AChoreographer* choreographer, return AChoreographer_routePostFrameCallbackDelayed64(choreographer, callback, data, delayMillis); } -void AChoreographer_postExtendedFrameCallback(AChoreographer* choreographer, - AChoreographer_extendedFrameCallback callback, - void* data) { - return AChoreographer_routePostExtendedFrameCallback(choreographer, callback, data); +void AChoreographer_postVsyncCallback(AChoreographer* choreographer, + AChoreographer_vsyncCallback callback, void* data) { + return AChoreographer_routePostVsyncCallback(choreographer, callback, data); } void AChoreographer_registerRefreshRateCallback(AChoreographer* choreographer, AChoreographer_refreshRateCallback callback, @@ -71,10 +70,10 @@ AVsyncId AChoreographerFrameCallbackData_getFrameTimelineVsyncId( const AChoreographerFrameCallbackData* data, size_t index) { return AChoreographerFrameCallbackData_routeGetFrameTimelineVsyncId(data, index); } -int64_t AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTimeNanos( +int64_t AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentationTimeNanos( const AChoreographerFrameCallbackData* data, size_t index) { - return AChoreographerFrameCallbackData_routeGetFrameTimelineExpectedPresentTimeNanos(data, - index); + return AChoreographerFrameCallbackData_routeGetFrameTimelineExpectedPresentationTimeNanos( + data, index); } int64_t AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos( const AChoreographerFrameCallbackData* data, size_t index) { diff --git a/native/android/libandroid.map.txt b/native/android/libandroid.map.txt index 3009a36bae2cd..700b756ff3b1c 100644 --- a/native/android/libandroid.map.txt +++ b/native/android/libandroid.map.txt @@ -29,12 +29,12 @@ LIBANDROID { AChoreographer_postFrameCallbackDelayed64; # introduced=29 AChoreographer_registerRefreshRateCallback; # introduced=30 AChoreographer_unregisterRefreshRateCallback; # introduced=30 - AChoreographer_postExtendedFrameCallback; # introduced=33 + AChoreographer_postVsyncCallback; # introduced=33 AChoreographerFrameCallbackData_getFrameTimeNanos; # introduced=33 AChoreographerFrameCallbackData_getFrameTimelinesLength; # introduced=33 AChoreographerFrameCallbackData_getPreferredFrameTimelineIndex; # introduced=33 AChoreographerFrameCallbackData_getFrameTimelineVsyncId; # introduced=33 - AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTimeNanos; # introduced=33 + AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentationTimeNanos; # introduced=33 AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos; # introduced=33 AConfiguration_copy; AConfiguration_delete;