Merge "[SurfaceFlinger] Add setColorSpaceAgnostic API." (d38d8876) · Commits · e / os / android_frameworks_native-old

libs/gui/LayerState.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ status_t layer_state_t::write(Parcel& output) const

		output.writeFloat(bgColorAlpha);
		output.writeUint32(static_cast<uint32_t>(bgColorDataspace));
		output.writeBool(colorSpaceAgnostic);

		return NO_ERROR;
		}
		@@ -177,6 +178,7 @@ status_t layer_state_t::read(const Parcel& input)

		bgColorAlpha = input.readFloat();
		bgColorDataspace = static_cast<ui::Dataspace>(input.readUint32());
		colorSpaceAgnostic = input.readBool();

		return NO_ERROR;
		}

+14 −0

Original line number	Diff line number	Diff line
		@@ -989,6 +989,20 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setDesir
		return *this;
		}

		SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setColorSpaceAgnostic(
		const sp<SurfaceControl>& sc, const bool agnostic) {
		layer_state_t* s = getLayerState(sc);
		if (!s) {
		mStatus = BAD_INDEX;
		return *this;
		}
		s->what \|= layer_state_t::eColorSpaceAgnosticChanged;
		s->colorSpaceAgnostic = agnostic;

		registerSurfaceControlForCallback(sc);
		return *this;
		}

		SurfaceComposerClient::Transaction&
		SurfaceComposerClient::Transaction::addTransactionCompletedCallback(
		TransactionCompletedCallbackTakesContext callback, void* callbackContext) {

+7 −1

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ struct layer_state_t {
		eCachedBufferChanged = 0x2'00000000,
		eBackgroundColorChanged = 0x4'00000000,
		eMetadataChanged = 0x8'00000000,
		eColorSpaceAgnosticChanged = 0x10'00000000,
		};

		layer_state_t()
		@@ -115,7 +116,8 @@ struct layer_state_t {
		api(-1),
		colorTransform(mat4()),
		bgColorAlpha(0),
		bgColorDataspace(ui::Dataspace::UNKNOWN) {
		bgColorDataspace(ui::Dataspace::UNKNOWN),
		colorSpaceAgnostic(false) {
		matrix.dsdx = matrix.dtdy = 1.0f;
		matrix.dsdy = matrix.dtdx = 0.0f;
		hdrMetadata.validTypes = 0;
		@@ -192,6 +194,10 @@ struct layer_state_t {
		// the background color layer
		float bgColorAlpha;
		ui::Dataspace bgColorDataspace;

		// A color space agnostic layer means the color of this layer can be
		// interpreted in any color space.
		bool colorSpaceAgnostic;
		};

		struct ComposerState {

+1 −0

Original line number	Diff line number	Diff line
		@@ -360,6 +360,7 @@ public:
		Transaction& setSidebandStream(const sp<SurfaceControl>& sc,
		const sp<NativeHandle>& sidebandStream);
		Transaction& setDesiredPresentTime(nsecs_t desiredPresentTime);
		Transaction& setColorSpaceAgnostic(const sp<SurfaceControl>& sc, const bool agnostic);

		Transaction& addTransactionCompletedCallback(
		TransactionCompletedCallbackTakesContext callback, void* callbackContext);

+5 −4

Original line number	Diff line number	Diff line
		@@ -239,7 +239,8 @@ bool BufferLayer::isHdrY410() const {

		void BufferLayer::setPerFrameData(const sp<const DisplayDevice>& displayDevice,
		const ui::Transform& transform, const Rect& viewport,
		int32_t supportedPerFrameMetadata) {
		int32_t supportedPerFrameMetadata,
		const ui::Dataspace targetDataspace) {
		RETURN_IF_NO_HWC_LAYER(displayDevice);

		// Apply this display's projection's viewport to the visible region
		@@ -291,10 +292,10 @@ void BufferLayer::setPerFrameData(const sp<const DisplayDevice>& displayDevice,
		setCompositionType(displayDevice, Hwc2::IComposerClient::Composition::DEVICE);
		}

		ALOGV("setPerFrameData: dataspace = %d", mCurrentDataSpace);
		error = hwcLayer->setDataspace(mCurrentDataSpace);
		ui::Dataspace dataspace = isColorSpaceAgnostic() ? targetDataspace : mCurrentDataSpace;
		error = hwcLayer->setDataspace(dataspace);
		if (error != HWC2::Error::None) {
		ALOGE("[%s] Failed to set dataspace %d: %s (%d)", mName.string(), mCurrentDataSpace,
		ALOGE("[%s] Failed to set dataspace %d: %s (%d)", mName.string(), dataspace,
		to_string(error).c_str(), static_cast<int32_t>(error));
		}