diff options
| author | Taehwan Kim <t_h.kim@samsung.com> | 2023-03-30 17:22:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-30 17:22:17 +0000 |
| commit | 5aed9948e32d358f53f38c5bb0680655c48fb9fc (patch) | |
| tree | 93faf3e79c66d7daae2060956d3a1c61a0594649 /libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp | |
| parent | f02ba951b6ce956112496cb76f4ebe18e3fb1a73 (diff) | |
| parent | 616748aae7a9481d7ed60a9adf51b965e9d86257 (diff) | |
| download | gs101-5aed9948e32d358f53f38c5bb0680655c48fb9fc.tar.gz | |
libhwc2.1: support HDR10+ full metadata am: 616748aae7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/22299683
Change-Id: I54483a037432c03d56b7af544609376d1ebac888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp')
| -rw-r--r-- | libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp index 615a0c6..e4306ae 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp @@ -561,34 +561,31 @@ void ExynosPrimaryDisplayModule::DisplaySceneInfo::setLayerHdrDynamicMetadata( layerColorData.dynamic_metadata.is_valid = true; } updateInfoSingleVal(layerColorData.dynamic_metadata.display_maximum_luminance, - exynosHdrDynamicInfo.data.display_maximum_luminance); + exynosHdrDynamicInfo.data.targeted_system_display_maximum_luminance); if (!std::equal(layerColorData.dynamic_metadata.maxscl.begin(), - layerColorData.dynamic_metadata.maxscl.end(), - exynosHdrDynamicInfo.data.maxscl)) { + layerColorData.dynamic_metadata.maxscl.end(), + exynosHdrDynamicInfo.data.maxscl[0])) { colorSettingChanged = true; for (uint32_t i = 0 ; i < layerColorData.dynamic_metadata.maxscl.size(); i++) { - layerColorData.dynamic_metadata.maxscl[i] = - exynosHdrDynamicInfo.data.maxscl[i]; + layerColorData.dynamic_metadata.maxscl[i] = exynosHdrDynamicInfo.data.maxscl[0][i]; } } static constexpr uint32_t DYNAMIC_META_DAT_SIZE = 15; updateInfoVectorVal(layerColorData.dynamic_metadata.maxrgb_percentages, - exynosHdrDynamicInfo.data.maxrgb_percentages, - DYNAMIC_META_DAT_SIZE); + exynosHdrDynamicInfo.data.maxrgb_percentages[0], DYNAMIC_META_DAT_SIZE); updateInfoVectorVal(layerColorData.dynamic_metadata.maxrgb_percentiles, - exynosHdrDynamicInfo.data.maxrgb_percentiles, - DYNAMIC_META_DAT_SIZE); + exynosHdrDynamicInfo.data.maxrgb_percentiles[0], DYNAMIC_META_DAT_SIZE); updateInfoSingleVal(layerColorData.dynamic_metadata.tm_flag, - exynosHdrDynamicInfo.data.tone_mapping.tone_mapping_flag); + exynosHdrDynamicInfo.data.tone_mapping.tone_mapping_flag[0]); updateInfoSingleVal(layerColorData.dynamic_metadata.tm_knee_x, - exynosHdrDynamicInfo.data.tone_mapping.knee_point_x); + exynosHdrDynamicInfo.data.tone_mapping.knee_point_x[0]); updateInfoSingleVal(layerColorData.dynamic_metadata.tm_knee_y, - exynosHdrDynamicInfo.data.tone_mapping.knee_point_y); + exynosHdrDynamicInfo.data.tone_mapping.knee_point_y[0]); updateInfoVectorVal(layerColorData.dynamic_metadata.bezier_curve_anchors, - exynosHdrDynamicInfo.data.tone_mapping.bezier_curve_anchors, - DYNAMIC_META_DAT_SIZE); + exynosHdrDynamicInfo.data.tone_mapping.bezier_curve_anchors[0], + DYNAMIC_META_DAT_SIZE); } int32_t ExynosPrimaryDisplayModule::DisplaySceneInfo::setClientCompositionColorData( |