diff options
| author | Long Ling <longling@google.com> | 2022-03-14 21:10:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-14 21:10:18 +0000 |
| commit | ad2121120566776d1da6a516009233b4fae8c4e2 (patch) | |
| tree | b25cd331ca2da9e1858d65a9db433fc9a385a1f8 | |
| parent | 2ad8099c9424c5b224e534c2f8f94c9c890ee2cd (diff) | |
| parent | c083cbd249801a8225c255a2b5a497a40c08bff5 (diff) | |
| download | gs101-ad2121120566776d1da6a516009233b4fae8c4e2.tar.gz | |
Merge "libhwc2.1: pass hdr layer with null metadata to displaycolor" into tm-dev am: c083cbd249
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/17156654
Change-Id: I7e4c8843c8337f3c58c84002f917f2bb33a494a6
| -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 1dd2fc5..e4779a6 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp @@ -605,11 +605,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 |