commit a3fb7d6b631c9ecab70ff68443cbdee872ed649f
author Peiyong Lin <lpy@google.com> Wed Apr 11 17:41:47 2018 -0700
committer Peiyong Lin <lpy@google.com> Mon Apr 16 13:18:03 2018 -0700
tree e666f4fe2feec5f0afe2759b7ccccfc8daff9be5
parent 8cafb0cc57cedf3012b4b7f99519f4a9150dc38b

[RenderEngine] Add hybrid Log-Gamma support.

Previously we already added support for BT2020 PQ, this patch adds BT2020 HLG
transfer function to render engine.

BUG: 73825729
Test: Build and flash
Change-Id: I70d974b3f8fb43c8de4c527f328dbb2f8725e8ec

services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp

diff --git a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
index 1efe0ac..6e0fa32 100644
--- a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
+++ b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
@@ -316,7 +316,12 @@
                 wideColorState.setColorMatrix(mState.getColorMatrix() * mBt2020ToDisplayP3);
                 wideColorState.setInputTransferFunction(Description::TransferFunction::ST2084);
                 wideColorState.setOutputTransferFunction(Description::TransferFunction::SRGB);
-                wideColorState.enableToneMapping(true);
+                break;
+            case Dataspace::BT2020_HLG:
+            case Dataspace::BT2020_ITU_HLG:
+                wideColorState.setColorMatrix(mState.getColorMatrix() * mBt2020ToDisplayP3);
+                wideColorState.setInputTransferFunction(Description::TransferFunction::HLG);
+                wideColorState.setOutputTransferFunction(Description::TransferFunction::SRGB);
                 break;
             default:
                 // treat all other dataspaces as sRGB