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

Commit eb29c85b authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

Merge "Fix HDR detection" into sc-dev am: 2eef0b65 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14516484

Change-Id: I8a6b80789feb1262df13ff565de8e97cf669528d
parents 436b8697 2eef0b65

services/surfaceflinger/SurfaceFlinger.cpp

+4 −14
Original line number Diff line number Diff line
@@ -2198,20 +2198,10 @@ void SurfaceFlinger::postComposition() { 
        mDrawingState.traverse([&, compositionDisplay = compositionDisplay](Layer* layer) {

            if (layer->isVisible() &&

                compositionDisplay->belongsInOutput(layer->getCompositionEngineLayerFE())) {

                bool isHdr = false;

                switch (layer->getDataSpace()) {

                    case ui::Dataspace::BT2020:

                    case ui::Dataspace::BT2020_HLG:

                    case ui::Dataspace::BT2020_PQ:

                    case ui::Dataspace::BT2020_ITU:

                    case ui::Dataspace::BT2020_ITU_HLG:

                    case ui::Dataspace::BT2020_ITU_PQ:

                        isHdr = true;

                        break;

                    default:

                        isHdr = false;

                        break;

                }

                const Dataspace transfer =

                        static_cast<Dataspace>(layer->getDataSpace() & Dataspace::TRANSFER_MASK);

                const bool isHdr = (transfer == Dataspace::TRANSFER_ST2084 ||

                                    transfer == Dataspace::TRANSFER_HLG);



                if (isHdr) {

                    info.numberOfHdrLayers++;