surfaceflinger: add BT2020_PQ support to RenderEngine
Add Key::Y410_BT2020_ON which performs Y410/BT2020 YUV -> RGB
conversion.
Add Key::{INPUT,OUTPUT}_TF_ST2084 which performs ST2084 EOTF and
OETF conversions.
Add Key::TONE_MAP_ON which performs tone-mapping.
Flip proper bits on when the source buffer has BT2020_PQ as its
dataspace. That means,
1. convert YUV to RGB
2. apply ST 2084 EOTF
3. apply tone-mapping
4. convert to DisplayP3
5. apply relative rendering intent (i.e., clamp)
6. finally apply sRGB OETF
We still use hardcoded parameters rather than the ones from HDR
metadata. It is also likely that we will need to switch to a LUT
for better perf.
Test: manual
Change-Id: I53556a2acfc34ef55e88c5b139000be94072dd3e
diff --git a/services/surfaceflinger/RenderEngine/ProgramCache.h b/services/surfaceflinger/RenderEngine/ProgramCache.h
index 491fad3..dcc8cc6 100644
--- a/services/surfaceflinger/RenderEngine/ProgramCache.h
+++ b/services/surfaceflinger/RenderEngine/ProgramCache.h
@@ -80,11 +80,23 @@
INPUT_TF_MASK = 3 << INPUT_TF_SHIFT,
INPUT_TF_LINEAR = 0 << INPUT_TF_SHIFT,
INPUT_TF_SRGB = 1 << INPUT_TF_SHIFT,
+ INPUT_TF_ST2084 = 2 << INPUT_TF_SHIFT,
OUTPUT_TF_SHIFT = 8,
OUTPUT_TF_MASK = 3 << OUTPUT_TF_SHIFT,
OUTPUT_TF_LINEAR = 0 << OUTPUT_TF_SHIFT,
OUTPUT_TF_SRGB = 1 << OUTPUT_TF_SHIFT,
+ OUTPUT_TF_ST2084 = 2 << OUTPUT_TF_SHIFT,
+
+ TONE_MAPPING_SHIFT = 10,
+ TONE_MAPPING_MASK = 1 << TONE_MAPPING_SHIFT,
+ TONE_MAPPING_OFF = 0 << TONE_MAPPING_SHIFT,
+ TONE_MAPPING_ON = 1 << TONE_MAPPING_SHIFT,
+
+ Y410_BT2020_SHIFT = 11,
+ Y410_BT2020_MASK = 1 << Y410_BT2020_SHIFT,
+ Y410_BT2020_OFF = 0 << Y410_BT2020_SHIFT,
+ Y410_BT2020_ON = 1 << Y410_BT2020_SHIFT,
};
inline Key() : mKey(0) {}
@@ -103,6 +115,8 @@
inline bool hasColorMatrix() const { return (mKey & COLOR_MATRIX_MASK) == COLOR_MATRIX_ON; }
inline int getInputTF() const { return (mKey & INPUT_TF_MASK); }
inline int getOutputTF() const { return (mKey & OUTPUT_TF_MASK); }
+ inline bool hasToneMapping() const { return (mKey & TONE_MAPPING_MASK) == TONE_MAPPING_ON; }
+ inline bool isY410BT2020() const { return (mKey & Y410_BT2020_MASK) == Y410_BT2020_ON; }
// this is the definition of a friend function -- not a method of class Needs
friend inline int strictly_order_type(const Key& lhs, const Key& rhs) {