diff options
| author | 2018-12-11 23:39:21 +0000 | |
|---|---|---|
| committer | 2018-12-11 23:39:21 +0000 | |
| commit | ba4d1d22c9c521aa004f7a5e476b2ef1cd920adc (patch) | |
| tree | 9769eca3bb695d03f8c6d0d3800cc01f1dcb125e /services/surfaceflinger/BufferLayer.cpp | |
| parent | 0b647b2fade9cc60aefeb685b67d4f9d79f85e3d (diff) | |
| parent | c1ccb0bf1ec523b67745890874a2e605e603538c (diff) | |
Merge changes I09f4a157,I738be45b
* changes:
[SurfaceFlinger] Remove saturation matrix of Adaptive mode.
[SurfaceFlinger] Remove usage of legacy data spaces.
Diffstat (limited to 'services/surfaceflinger/BufferLayer.cpp')
| -rw-r--r-- | services/surfaceflinger/BufferLayer.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp index 9b1c0dbc53..4e4d7dd371 100644 --- a/services/surfaceflinger/BufferLayer.cpp +++ b/services/surfaceflinger/BufferLayer.cpp @@ -431,26 +431,25 @@ Region BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime } ui::Dataspace dataSpace = getDrawingDataSpace(); - // treat modern dataspaces as legacy dataspaces whenever possible, until - // we can trust the buffer producers + // translate legacy dataspaces to modern dataspaces switch (dataSpace) { - case ui::Dataspace::V0_SRGB: - dataSpace = ui::Dataspace::SRGB; + case ui::Dataspace::SRGB: + dataSpace = ui::Dataspace::V0_SRGB; break; - case ui::Dataspace::V0_SRGB_LINEAR: - dataSpace = ui::Dataspace::SRGB_LINEAR; + case ui::Dataspace::SRGB_LINEAR: + dataSpace = ui::Dataspace::V0_SRGB_LINEAR; break; - case ui::Dataspace::V0_JFIF: - dataSpace = ui::Dataspace::JFIF; + case ui::Dataspace::JFIF: + dataSpace = ui::Dataspace::V0_JFIF; break; - case ui::Dataspace::V0_BT601_625: - dataSpace = ui::Dataspace::BT601_625; + case ui::Dataspace::BT601_625: + dataSpace = ui::Dataspace::V0_BT601_625; break; - case ui::Dataspace::V0_BT601_525: - dataSpace = ui::Dataspace::BT601_525; + case ui::Dataspace::BT601_525: + dataSpace = ui::Dataspace::V0_BT601_525; break; - case ui::Dataspace::V0_BT709: - dataSpace = ui::Dataspace::BT709; + case ui::Dataspace::BT709: + dataSpace = ui::Dataspace::V0_BT709; break; default: break; |