Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix HDR colorspace crash during tonemapping"

Browse Source
This commit is contained in:
Sally Qi
2023-01-26 17:16:30 +00:00
committed by Android (Google) Code Review
parent c44d4ea4cc a1672b6e88
commit 80b335b285
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libs/hwui/utils/Color.cpp
View File

@@ -155,23 +155,12 @@ android_dataspace ColorSpaceToADataSpace(SkColorSpace* colorSpace, SkColorType c
skcms_TransferFunction fn;
if (!colorSpace->isNumericalTransferFn(&fn)) {
// pq with the default white point
auto rec2020PQ = SkColorSpace::MakeRGB(GetPQSkTransferFunction(), SkNamedGamut::kRec2020);
if (SkColorSpace::Equals(colorSpace, rec2020PQ.get())) {
auto res = skcms_TransferFunction_getType(&fn);
if (res == skcms_TFType_PQish) {
return HAL_DATASPACE_BT2020_PQ;
}
// standard PQ
rec2020PQ = SkColorSpace::MakeRGB(SkNamedTransferFn::kPQ, SkNamedGamut::kRec2020);
if (SkColorSpace::Equals(colorSpace, rec2020PQ.get())) {
return HAL_DATASPACE_BT2020_PQ;
}
// HLG
const auto hlgFn = GetHLGScaleTransferFunction();
if (hlgFn.has_value()) {
auto rec2020HLG = SkColorSpace::MakeRGB(hlgFn.value(), SkNamedGamut::kRec2020);
if (SkColorSpace::Equals(colorSpace, rec2020HLG.get())) {
return static_cast<android_dataspace>(HAL_DATASPACE_BT2020_HLG);
}
if (res == skcms_TFType_HLGish) {
return static_cast<android_dataspace>(HAL_DATASPACE_BT2020_HLG);
}
LOG_ALWAYS_FATAL("Only select non-numerical transfer functions are supported");
}