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

Commit 006800e5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SF: Handle the empty hdr10plus metadata in setPerFrameMetadata" into... 

Merge "SF: Handle the empty hdr10plus metadata in setPerFrameMetadata" into rvc-dev am: 5f43db07 am: 07e82faf am: ba9f1dbf

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

Change-Id: I305579a7834b26399dffd2a25e7522ac00b90cb1
parents cc12f5d8 ba9f1dbf

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1676,6 +1676,7 @@ void CommandReader::takeClientTargetProperty( 
    if (found == mReturnData.end()) {

        outClientTargetProperty->pixelFormat = PixelFormat::RGBA_8888;

        outClientTargetProperty->dataspace = Dataspace::UNKNOWN;

        return;

    }



    ReturnData& data = found->second;

services/surfaceflinger/DisplayHardware/HWC2.cpp

+4 −0
Original line number Diff line number Diff line
@@ -894,6 +894,10 @@ Error Layer::setPerFrameMetadata(const int32_t supportedPerFrameMetadata, 
            mComposer.setLayerPerFrameMetadata(mDisplayId, mId, perFrameMetadatas));



    if (validTypes & HdrMetadata::HDR10PLUS) {

        if (CC_UNLIKELY(mHdrMetadata.hdr10plus.size() == 0)) {

            return Error::BAD_PARAMETER;

        }



        std::vector<Hwc2::PerFrameMetadataBlob> perFrameMetadataBlobs;

        perFrameMetadataBlobs.push_back(

                {Hwc2::PerFrameMetadataKey::HDR10_PLUS_SEI, mHdrMetadata.hdr10plus});