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

Commit 5ea4f3ce authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "ASurfaceControl: dataspace (1/2)"

parents 3d6592b7 7f24f79b

native/android/libandroid.map.txt

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ LIBANDROID { 
    ASurfaceTransaction_reparent; # introduced=29

    ASurfaceTransaction_setBuffer; # introduced=29

    ASurfaceTransaction_setBufferAlpha; # introduced=29

    ASurfaceTransaction_setBufferDataSpace; # introduced=29

    ASurfaceTransaction_setBufferTransparency; # introduced=29

    ASurfaceTransaction_setColor; # introduced=29

    ASurfaceTransaction_setDamageRegion; # introduced=29

native/android/surface_control.cpp

+14 −0
Original line number Diff line number Diff line
@@ -440,6 +440,20 @@ void ASurfaceTransaction_setBufferAlpha(ASurfaceTransaction* aSurfaceTransaction 
    transaction->setAlpha(surfaceControl, alpha);

}



void ASurfaceTransaction_setBufferDataSpace(ASurfaceTransaction* aSurfaceTransaction,

                                         ASurfaceControl* aSurfaceControl,

                                         ADataSpace aDataSpace) {

    CHECK_NOT_NULL(aSurfaceTransaction);

    CHECK_NOT_NULL(aSurfaceControl);



    sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl);

    LOG_ALWAYS_FATAL_IF(!isDataSpaceValid(surfaceControl, aDataSpace), "invalid dataspace");



    Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction);



    transaction->setDataspace(surfaceControl, static_cast<ui::Dataspace>(aDataSpace));

}



void ASurfaceTransaction_setHdrMetadata_smpte2086(ASurfaceTransaction* aSurfaceTransaction,

                                                  ASurfaceControl* aSurfaceControl,

                                                  struct AHdrMetadata_smpte2086* metadata) {