diff options
author | Peiyong Lin <lpy@google.com> | 2018-06-06 00:16:50 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-06 00:16:50 +0000 |
commit | 3e273065386bde56c4c7710de2ceb585a5eb4784 (patch) | |
tree | c42d91c5cf156bca54ece0d1f2757b7e62289654 | |
parent | 6fa25f9d8fa003a6fb694bf8b09f1c5f316034b9 (diff) | |
parent | 3c6b7efc5204eab5701d5ab2f0ff87763cc322fa (diff) | |
download | native-3e273065386bde56c4c7710de2ceb585a5eb4784.tar.gz |
Merge "[SurfaceFlinger] Respect HDR data space." into pi-dev
-rw-r--r-- | services/surfaceflinger/DisplayDevice.cpp | 4 | ||||
-rw-r--r-- | services/surfaceflinger/DisplayDevice.h | 6 | ||||
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index 9ecbacc86b..db095a51d9 100644 --- a/services/surfaceflinger/DisplayDevice.cpp +++ b/services/surfaceflinger/DisplayDevice.cpp @@ -761,12 +761,12 @@ bool DisplayDevice::hasRenderIntent(RenderIntent intent) const { return iter != mColorModes.end() && iter->second.renderIntent == intent; } -bool DisplayDevice::hasModernHdrSupport(Dataspace dataspace) const { +bool DisplayDevice::hasLegacyHdrSupport(Dataspace dataspace) const { if ((dataspace == Dataspace::BT2020_PQ && hasHDR10Support()) || (dataspace == Dataspace::BT2020_HLG && hasHLGSupport())) { auto iter = mColorModes.find(getColorModeKey(dataspace, RenderIntent::TONE_MAP_COLORIMETRIC)); - return iter != mColorModes.end() && iter->second.dataspace == dataspace; + return iter == mColorModes.end() || iter->second.dataspace != dataspace; } return false; diff --git a/services/surfaceflinger/DisplayDevice.h b/services/surfaceflinger/DisplayDevice.h index b3859b6793..6c3bd91793 100644 --- a/services/surfaceflinger/DisplayDevice.h +++ b/services/surfaceflinger/DisplayDevice.h @@ -150,9 +150,9 @@ public: bool hasHLGSupport() const { return mHasHLG; } bool hasDolbyVisionSupport() const { return mHasDolbyVision; } - // Return true if the corresponding color mode for the HDR dataspace is - // supported. - bool hasModernHdrSupport(ui::Dataspace dataspace) const; + // Return true if the HDR dataspace is supported but + // there is no corresponding color mode. + bool hasLegacyHdrSupport(ui::Dataspace dataspace) const; // The returned HdrCapabilities is the combination of HDR capabilities from // hardware composer and RenderEngine. When the DisplayDevice supports wide diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 97edd357ed..cdd9c1804f 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1932,9 +1932,9 @@ void SurfaceFlinger::pickColorMode(const sp<DisplayDevice>& displayDevice, Dataspace hdrDataSpace; Dataspace bestDataSpace = getBestDataspace(displayDevice, &hdrDataSpace); - // respect hdrDataSpace only when there is modern HDR support + // respect hdrDataSpace only when there is no legacy HDR support const bool isHdr = hdrDataSpace != Dataspace::UNKNOWN && - displayDevice->hasModernHdrSupport(hdrDataSpace); + !displayDevice->hasLegacyHdrSupport(hdrDataSpace); if (isHdr) { bestDataSpace = hdrDataSpace; } |