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

Commit 2825fa29 authored by Rachel Lee's avatar Rachel Lee
Browse files

Rename AChoreographer frame timeline methods. 

Test: atest ChoreographerNativeTest
Bug: 214303753
Change-Id: Id7c6ddcf7e0d46fb0b6eff35e46b4f937b59a058
parent 14e7dc8b

include/android/choreographer.h

+2 −2
Original line number Diff line number Diff line
@@ -209,13 +209,13 @@ int64_t AChoreographerFrameCallbackData_getFrameTimelineVsyncId( 
/**

 * The time in nanoseconds which the frame at given index is expected to be presented.

 */

int64_t AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTime(

int64_t AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTimeNanos(

        const AChoreographerFrameCallbackData* data, size_t index) __INTRODUCED_IN(33);



/**

 * The time in nanoseconds which the frame at given index needs to be ready by.

 */

int64_t AChoreographerFrameCallbackData_getFrameTimelineDeadline(

int64_t AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos(

        const AChoreographerFrameCallbackData* data, size_t index) __INTRODUCED_IN(33);



__END_DECLS

libs/nativedisplay/AChoreographer.cpp

+6 −6
Original line number Diff line number Diff line
@@ -556,13 +556,13 @@ int64_t AChoreographerFrameCallbackData_routeGetFrameTimelineVsyncId( 
        const AChoreographerFrameCallbackData* data, size_t index) {

    return AChoreographerFrameCallbackData_getFrameTimelineVsyncId(data, index);

}

int64_t AChoreographerFrameCallbackData_routeGetFrameTimelineExpectedPresentTime(

int64_t AChoreographerFrameCallbackData_routeGetFrameTimelineExpectedPresentTimeNanos(

        const AChoreographerFrameCallbackData* data, size_t index) {

    return AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTime(data, index);

    return AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTimeNanos(data, index);

}

int64_t AChoreographerFrameCallbackData_routeGetFrameTimelineDeadline(

int64_t AChoreographerFrameCallbackData_routeGetFrameTimelineDeadlineNanos(

        const AChoreographerFrameCallbackData* data, size_t index) {

    return AChoreographerFrameCallbackData_getFrameTimelineDeadline(data, index);

    return AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos(data, index);

}



int64_t AChoreographer_getFrameInterval(const AChoreographer* choreographer) {
@@ -653,7 +653,7 @@ int64_t AChoreographerFrameCallbackData_getFrameTimelineVsyncId( 
    LOG_ALWAYS_FATAL_IF(index >= frameCallbackData->frameTimelines.size(), "Index out of bounds");

    return frameCallbackData->frameTimelines[index].id;

}

int64_t AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTime(

int64_t AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTimeNanos(

        const AChoreographerFrameCallbackData* data, size_t index) {

    const ChoreographerFrameCallbackDataImpl* frameCallbackData =

            AChoreographerFrameCallbackData_to_ChoreographerFrameCallbackDataImpl(data);
@@ -662,7 +662,7 @@ int64_t AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTime( 
    LOG_ALWAYS_FATAL_IF(index >= frameCallbackData->frameTimelines.size(), "Index out of bounds");

    return frameCallbackData->frameTimelines[index].expectedPresentTime;

}

int64_t AChoreographerFrameCallbackData_getFrameTimelineDeadline(

int64_t AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos(

        const AChoreographerFrameCallbackData* data, size_t index) {

    const ChoreographerFrameCallbackDataImpl* frameCallbackData =

            AChoreographerFrameCallbackData_to_ChoreographerFrameCallbackDataImpl(data);

libs/nativedisplay/include-private/private/android/choreographer.h

+2 −2
Original line number Diff line number Diff line
@@ -67,9 +67,9 @@ size_t AChoreographerFrameCallbackData_routeGetPreferredFrameTimelineIndex( 
        const AChoreographerFrameCallbackData* data);

int64_t AChoreographerFrameCallbackData_routeGetFrameTimelineVsyncId(

        const AChoreographerFrameCallbackData* data, size_t index);

int64_t AChoreographerFrameCallbackData_routeGetFrameTimelineExpectedPresentTime(

int64_t AChoreographerFrameCallbackData_routeGetFrameTimelineExpectedPresentTimeNanos(

        const AChoreographerFrameCallbackData* data, size_t index);

int64_t AChoreographerFrameCallbackData_routeGetFrameTimelineDeadline(

int64_t AChoreographerFrameCallbackData_routeGetFrameTimelineDeadlineNanos(

        const AChoreographerFrameCallbackData* data, size_t index);



} // namespace android

libs/nativedisplay/libnativedisplay.map.txt

+4 −4
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ LIBNATIVEDISPLAY { 
    AChoreographerFrameCallbackData_getFrameTimelinesLength; # apex # introduced=33

    AChoreographerFrameCallbackData_getPreferredFrameTimelineIndex; # apex # introduced=33

    AChoreographerFrameCallbackData_getFrameTimelineVsyncId; # apex # introduced=33

    AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTime; # apex # introduced=33

    AChoreographerFrameCallbackData_getFrameTimelineDeadline; # apex # introduced=33

    AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTimeNanos; # apex # introduced=33

    AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos; # apex # introduced=33

    AChoreographer_create; # apex # introduced=30

    AChoreographer_destroy; # apex # introduced=30

    AChoreographer_getFd; # apex # introduced=30
@@ -40,8 +40,8 @@ LIBNATIVEDISPLAY_PLATFORM { 
      android::AChoreographerFrameCallbackData_routeGetFrameTimelinesLength*;

      android::AChoreographerFrameCallbackData_routeGetPreferredFrameTimelineIndex*;

      android::AChoreographerFrameCallbackData_routeGetFrameTimelineVsyncId*;

      android::AChoreographerFrameCallbackData_routeGetFrameTimelineExpectedPresentTime*;

      android::AChoreographerFrameCallbackData_routeGetFrameTimelineDeadline*;

      android::AChoreographerFrameCallbackData_routeGetFrameTimelineExpectedPresentTimeNanos*;

      android::AChoreographerFrameCallbackData_routeGetFrameTimelineDeadlineNanos*;

      android::AChoreographer_signalRefreshRateCallbacks*;

      android::AChoreographer_getFrameInterval*;

      android::ADisplay_acquirePhysicalDisplays*;