diff options
| author | Long Ling <longling@google.com> | 2022-03-10 12:07:52 -0800 |
|---|---|---|
| committer | Long Ling <longling@google.com> | 2022-03-10 12:07:52 -0800 |
| commit | a880b5e3a1d16bc0d4b159c41fa442fa1a5ae29a (patch) | |
| tree | e58091d9ceab692866c6851bfdff84eb61351d27 | |
| parent | 03dde6b4cb97ee84716e13af6a25ff1670968c35 (diff) | |
| download | gs101-a880b5e3a1d16bc0d4b159c41fa442fa1a5ae29a.tar.gz | |
libhwc2.1: pass hdr layer with null metadata to displaycolor
Let displaycolor handle the case instead of fallback to GPU composition.
Bug: 204917392
Change-Id: I202bc0418e981b6afdd60b2ef576cdb07a45ca37
| -rw-r--r-- | libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp index e9d1972..ff9e581 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp @@ -604,11 +604,7 @@ int32_t ExynosPrimaryDisplayModule::DisplaySceneInfo::setLayerColorData( layerData.dim_ratio = layer->mPreprocessedInfo.sdrDimRatio; setLayerDataspace(layerData, static_cast<hwc::Dataspace>(layer->mDataSpace)); - if (layer->mIsHdrLayer) { - if (layer->getMetaParcel() == nullptr) { - HDEBUGLOGE("%s:: meta data parcel is null", __func__); - return -EINVAL; - } + if (layer->mIsHdrLayer && layer->getMetaParcel() != nullptr) { if (layer->getMetaParcel()->eType & VIDEO_INFO_TYPE_HDR_STATIC) setLayerHdrStaticMetadata(layerData, layer->getMetaParcel()->sHdrStaticInfo); else |