commit e0da95a1db1745ab9f0cc3229bdfc54408b6af2d
author Chia-I Wu <olv@google.com> Mon Apr 16 10:58:37 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 16 10:58:37 2018 -0700
tree 4b63ab65a220699917f9bb181442e256b9cfb679
parent cd302522815747ed8bc56433ed3a76949015b92e
parent 01d8fd9204e2c946a26911272e878d52dd720d78

surfaceflinger: fix video color conversion in WCG am: db06e5e561
am: 01d8fd9204

Change-Id: I4a8df4df95d71c4ba13bb224dfe44ee393cca99d

services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp

diff --git a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
index 0fb3d28..1efe0ac 100644
--- a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
+++ b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
@@ -321,10 +321,16 @@
             default:
                 // treat all other dataspaces as sRGB
                 wideColorState.setColorMatrix(mState.getColorMatrix() * mSrgbToDisplayP3);
-                if ((mDataSpace & Dataspace::TRANSFER_MASK) & Dataspace::TRANSFER_LINEAR) {
-                    wideColorState.setInputTransferFunction(Description::TransferFunction::LINEAR);
-                } else {
-                    wideColorState.setInputTransferFunction(Description::TransferFunction::SRGB);
+                switch (static_cast<Dataspace>(mDataSpace & Dataspace::TRANSFER_MASK)) {
+                    case Dataspace::TRANSFER_LINEAR:
+                        wideColorState.setInputTransferFunction(
+                                Description::TransferFunction::LINEAR);
+                        break;
+                    default:
+                        // treat all other transfer functions as sRGB
+                        wideColorState.setInputTransferFunction(
+                                Description::TransferFunction::SRGB);
+                        break;
                 }
                 wideColorState.setOutputTransferFunction(Description::TransferFunction::SRGB);
                 ALOGV("drawMesh: gamut transform applied");