Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a52e963d authored by Rachel Lee's avatar Rachel Lee Committed by Android (Google) Code Review
Browse files

Merge "Rename to VsyncCallback & presentation time."

parents ef2b4cb5 1a44c62b

libs/hwui/renderthread/RenderThread.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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 {

native/android/choreographer.cpp

+6 −7
Original line number Diff line number Diff line
@@ -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) {

native/android/libandroid.map.txt

+2 −2
Original line number Diff line number Diff line
@@ -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;