Snap for 5480912 from 40816fa4bce34fbf5f39e1ba668139084346b9e3 to qt-release (4b8d0605) · Commits · e / os / android_frameworks_native

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

+0 −17

Original line number	Diff line number	Diff line
		@@ -1158,23 +1158,6 @@ Error Composer::setLayerPerFrameMetadataBlobs(
		return Error::NONE;
		}

		Error Composer::getDisplayBrightnessSupport(Display display, bool* outSupport) {
		if (!mClient_2_3) {
		return Error::UNSUPPORTED;
		}
		Error error = kDefaultError;
		mClient_2_3->getDisplayBrightnessSupport(display,
		[&](const auto& tmpError, const auto& tmpSupport) {
		error = tmpError;
		if (error != Error::NONE) {
		return;
		}

		*outSupport = tmpSupport;
		});
		return error;
		}

		Error Composer::setDisplayBrightness(Display display, float brightness) {
		if (!mClient_2_3) {
		return Error::UNSUPPORTED;

services/surfaceflinger/DisplayHardware/ComposerHal.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -203,7 +203,6 @@ public:
		std::vector<DisplayCapability>* outCapabilities) = 0;
		virtual Error setLayerPerFrameMetadataBlobs(
		Display display, Layer layer, const std::vector<PerFrameMetadataBlob>& metadata) = 0;
		virtual Error getDisplayBrightnessSupport(Display display, bool* outSupport) = 0;
		virtual Error setDisplayBrightness(Display display, float brightness) = 0;
		};

		@@ -416,7 +415,6 @@ public:
		Error setLayerPerFrameMetadataBlobs(
		Display display, Layer layer,
		const std::vector<IComposerClient::PerFrameMetadataBlob>& metadata) override;
		Error getDisplayBrightnessSupport(Display display, bool* outSupport) override;
		Error setDisplayBrightness(Display display, float brightness) override;

		private:

services/surfaceflinger/DisplayHardware/HWC2.cpp

+0 −5

Original line number	Diff line number	Diff line
		@@ -276,11 +276,6 @@ Display::Display(android::Hwc2::Composer& composer,
		if (error == Error::None && dozeSupport) {
		mDisplayCapabilities.emplace(DisplayCapability::Doze);
		}
		bool brightnessSupport = false;
		error = static_cast<Error>(mComposer.getDisplayBrightnessSupport(mId, &brightnessSupport));
		if (error == Error::None && brightnessSupport) {
		mDisplayCapabilities.emplace(DisplayCapability::Brightness);
		}
		}
		ALOGV("Created display %" PRIu64, id);
		}

services/surfaceflinger/SurfaceFlinger.cpp

+8 −5

Original line number	Diff line number	Diff line
		@@ -2195,8 +2195,9 @@ void SurfaceFlinger::rebuildLayerStacks() {
		// - Dataspace::UNKNOWN
		// - Dataspace::BT2020_HLG
		// - Dataspace::BT2020_PQ
		Dataspace SurfaceFlinger::getBestDataspace(const sp<const DisplayDevice>& display,
		Dataspace* outHdrDataSpace) const {
		Dataspace SurfaceFlinger::getBestDataspace(const sp<DisplayDevice>& display,
		Dataspace* outHdrDataSpace,
		bool* outIsHdrClientComposition) const {
		Dataspace bestDataSpace = Dataspace::V0_SRGB;
		*outHdrDataSpace = Dataspace::UNKNOWN;

		@@ -2217,6 +2218,7 @@ Dataspace SurfaceFlinger::getBestDataspace(const sp<const DisplayDevice>& displa
		case Dataspace::BT2020_ITU_PQ:
		bestDataSpace = Dataspace::DISPLAY_P3;
		*outHdrDataSpace = Dataspace::BT2020_PQ;
		*outIsHdrClientComposition = layer->getForceClientComposition(display);
		break;
		case Dataspace::BT2020_HLG:
		case Dataspace::BT2020_ITU_HLG:
		@@ -2246,7 +2248,8 @@ void SurfaceFlinger::pickColorMode(const sp<DisplayDevice>& display, ColorMode*
		}

		Dataspace hdrDataSpace;
		Dataspace bestDataSpace = getBestDataspace(display, &hdrDataSpace);
		bool isHdrClientComposition = false;
		Dataspace bestDataSpace = getBestDataspace(display, &hdrDataSpace, &isHdrClientComposition);

		auto* profile = display->getCompositionDisplay()->getDisplayColorProfile();

		@@ -2262,8 +2265,8 @@ void SurfaceFlinger::pickColorMode(const sp<DisplayDevice>& display, ColorMode*
		}

		// respect hdrDataSpace only when there is no legacy HDR support
		const bool isHdr =
		hdrDataSpace != Dataspace::UNKNOWN && !profile->hasLegacyHdrSupport(hdrDataSpace);
		const bool isHdr = hdrDataSpace != Dataspace::UNKNOWN &&
		!profile->hasLegacyHdrSupport(hdrDataSpace) && !isHdrClientComposition;
		if (isHdr) {
		bestDataSpace = hdrDataSpace;
		}

services/surfaceflinger/SurfaceFlinger.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -734,8 +734,8 @@ private:
		nsecs_t compositeToPresentLatency);
		void rebuildLayerStacks();

		ui::Dataspace getBestDataspace(const sp<const DisplayDevice>& display,
		ui::Dataspace* outHdrDataSpace) const;
		ui::Dataspace getBestDataspace(const sp<DisplayDevice>& display, ui::Dataspace* outHdrDataSpace,
		bool* outIsHdrClientComposition) const;

		// Returns the appropriate ColorMode, Dataspace and RenderIntent for the
		// DisplayDevice. The function only returns the supported ColorMode,