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

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

Merge "Revert "Add new ASurfaceTransaction _setFrameRateParams API"" into main

parents 5a1731bf 28929e4b

native/android/libandroid.map.txt

+0 −1
Original line number Diff line number Diff line
@@ -301,7 +301,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

native/android/surface_control.cpp

+0 −22
Original line number Diff line number Diff line
@@ -794,28 +794,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);