Merge "SF: Consolidate layer-to-output filtering" (501c4866) · Commits · e / os / android_frameworks_native-old

cmds/surfacereplayer/replayer/Replayer.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -528,7 +528,7 @@ void Replayer::setTransparentRegionHint(SurfaceComposerClient::Transaction& t,
		void Replayer::setLayerStack(SurfaceComposerClient::Transaction& t,
		layer_id id, const LayerStackChange& lsc) {
		ALOGV("Layer %d: Setting LayerStack -- layer_stack=%d", id, lsc.layer_stack());
		t.setLayerStack(mLayers[id], lsc.layer_stack());
		t.setLayerStack(mLayers[id], ui::LayerStack::fromValue(lsc.layer_stack()));
		}

		void Replayer::setHiddenFlag(SurfaceComposerClient::Transaction& t,
		@@ -566,7 +566,7 @@ void Replayer::setDisplaySurface(SurfaceComposerClient::Transaction& t,

		void Replayer::setDisplayLayerStack(SurfaceComposerClient::Transaction& t,
		display_id id, const LayerStackChange& lsc) {
		t.setDisplayLayerStack(mDisplays[id], lsc.layer_stack());
		t.setDisplayLayerStack(mDisplays[id], ui::LayerStack::fromValue(lsc.layer_stack()));
		}

		void Replayer::setDisplaySize(SurfaceComposerClient::Transaction& t,

libs/gui/LayerState.cpp

+5 −13

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ layer_state_t::layer_state_t()
		z(0),
		w(0),
		h(0),
		layerStack(0),
		alpha(0),
		flags(0),
		mask(0),
		@@ -86,7 +85,7 @@ status_t layer_state_t::write(Parcel& output) const
		SAFE_PARCEL(output.writeInt32, z);
		SAFE_PARCEL(output.writeUint32, w);
		SAFE_PARCEL(output.writeUint32, h);
		SAFE_PARCEL(output.writeUint32, layerStack);
		SAFE_PARCEL(output.writeUint32, layerStack.id);
		SAFE_PARCEL(output.writeFloat, alpha);
		SAFE_PARCEL(output.writeUint32, flags);
		SAFE_PARCEL(output.writeUint32, mask);
		@@ -188,7 +187,7 @@ status_t layer_state_t::read(const Parcel& input)
		SAFE_PARCEL(input.readInt32, &z);
		SAFE_PARCEL(input.readUint32, &w);
		SAFE_PARCEL(input.readUint32, &h);
		SAFE_PARCEL(input.readUint32, &layerStack);
		SAFE_PARCEL(input.readUint32, &layerStack.id);
		SAFE_PARCEL(input.readFloat, &alpha);

		SAFE_PARCEL(input.readUint32, &flags);
		@@ -316,21 +315,14 @@ status_t ComposerState::read(const Parcel& input) {
		return state.read(input);
		}

		DisplayState::DisplayState()
		: what(0),
		layerStack(0),
		flags(0),
		layerStackSpaceRect(Rect::EMPTY_RECT),
		orientedDisplaySpaceRect(Rect::EMPTY_RECT),
		width(0),
		height(0) {}
		DisplayState::DisplayState() = default;

		status_t DisplayState::write(Parcel& output) const {
		SAFE_PARCEL(output.writeStrongBinder, token);
		SAFE_PARCEL(output.writeStrongBinder, IInterface::asBinder(surface));
		SAFE_PARCEL(output.writeUint32, what);
		SAFE_PARCEL(output.writeUint32, layerStack);
		SAFE_PARCEL(output.writeUint32, flags);
		SAFE_PARCEL(output.writeUint32, layerStack.id);
		SAFE_PARCEL(output.writeUint32, toRotationInt(orientation));
		SAFE_PARCEL(output.write, layerStackSpaceRect);
		SAFE_PARCEL(output.write, orientedDisplaySpaceRect);
		@@ -346,8 +338,8 @@ status_t DisplayState::read(const Parcel& input) {
		surface = interface_cast<IGraphicBufferProducer>(tmpBinder);

		SAFE_PARCEL(input.readUint32, &what);
		SAFE_PARCEL(input.readUint32, &layerStack);
		SAFE_PARCEL(input.readUint32, &flags);
		SAFE_PARCEL(input.readUint32, &layerStack.id);
		uint32_t tmpUint = 0;
		SAFE_PARCEL(input.readUint32, &tmpUint);
		orientation = ui::toRotation(tmpUint);

libs/gui/SurfaceComposerClient.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -1095,7 +1095,7 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setAlpha
		}

		SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setLayerStack(
		const sp<SurfaceControl>& sc, uint32_t layerStack) {
		const sp<SurfaceControl>& sc, ui::LayerStack layerStack) {
		layer_state_t* s = getLayerState(sc);
		if (!s) {
		mStatus = BAD_INDEX;
		@@ -1760,7 +1760,7 @@ status_t SurfaceComposerClient::Transaction::setDisplaySurface(const sp<IBinder>
		}

		void SurfaceComposerClient::Transaction::setDisplayLayerStack(const sp<IBinder>& token,
		uint32_t layerStack) {
		ui::LayerStack layerStack) {
		DisplayState& s(getDisplayState(token));
		s.layerStack = layerStack;
		s.what \|= DisplayState::eLayerStackChanged;

libs/gui/include/gui/LayerState.h

+10 −7

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		#include <math/vec3.h>
		#include <ui/BlurRegion.h>
		#include <ui/GraphicTypes.h>
		#include <ui/LayerStack.h>
		#include <ui/Rect.h>
		#include <ui/Region.h>
		#include <ui/Rotation.h>
		@@ -143,7 +144,7 @@ struct layer_state_t {
		int32_t z;
		uint32_t w;
		uint32_t h;
		uint32_t layerStack;
		ui::LayerStack layerStack = ui::DEFAULT_LAYER_STACK;
		float alpha;
		uint32_t flags;
		uint32_t mask;
		@@ -267,11 +268,12 @@ struct DisplayState {
		DisplayState();
		void merge(const DisplayState& other);

		uint32_t what;
		uint32_t what = 0;
		uint32_t flags = 0;
		sp<IBinder> token;
		sp<IGraphicBufferProducer> surface;
		uint32_t layerStack;
		uint32_t flags;

		ui::LayerStack layerStack = ui::DEFAULT_LAYER_STACK;

		// These states define how layers are projected onto the physical display.
		//
		@@ -285,10 +287,11 @@ struct DisplayState {
		// will be additionally rotated by 90 degrees around the origin clockwise and translated by (W,
		// 0).
		ui::Rotation orientation = ui::ROTATION_0;
		Rect layerStackSpaceRect;
		Rect orientedDisplaySpaceRect;
		Rect layerStackSpaceRect = Rect::EMPTY_RECT;
		Rect orientedDisplaySpaceRect = Rect::EMPTY_RECT;

		uint32_t width, height;
		uint32_t width = 0;
		uint32_t height = 0;

		status_t write(Parcel& output) const;
		status_t read(const Parcel& input);

libs/gui/include/gui/SurfaceComposerClient.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -456,7 +456,7 @@ public:
		int backgroundBlurRadius);
		Transaction& setBlurRegions(const sp<SurfaceControl>& sc,
		const std::vector<BlurRegion>& regions);
		Transaction& setLayerStack(const sp<SurfaceControl>& sc, uint32_t layerStack);
		Transaction& setLayerStack(const sp<SurfaceControl>&, ui::LayerStack);
		Transaction& setMetadata(const sp<SurfaceControl>& sc, uint32_t key, const Parcel& p);

		/// Reparents the current layer to the new parent handle. The new parent must not be null.
		@@ -566,7 +566,7 @@ public:
		status_t setDisplaySurface(const sp<IBinder>& token,
		const sp<IGraphicBufferProducer>& bufferProducer);

		void setDisplayLayerStack(const sp<IBinder>& token, uint32_t layerStack);
		void setDisplayLayerStack(const sp<IBinder>& token, ui::LayerStack);

		void setDisplayFlags(const sp<IBinder>& token, uint32_t flags);