Merge "Pass back transformHint on Surface Creation" (dc86ecaf) · Commits · e / os / android_frameworks_native-old

libs/gui/ISurfaceComposerClient.cpp

+8 −5

Original line number	Diff line number	Diff line
		@@ -49,25 +49,28 @@ public:

		status_t createSurface(const String8& name, uint32_t width, uint32_t height, PixelFormat format,
		uint32_t flags, const sp<IBinder>& parent, LayerMetadata metadata,
		sp<IBinder>* handle, sp<IGraphicBufferProducer>* gbp) override {
		sp<IBinder>* handle, sp<IGraphicBufferProducer>* gbp,
		uint32_t* outTransformHint) override {
		return callRemote<decltype(&ISurfaceComposerClient::createSurface)>(Tag::CREATE_SURFACE,
		name, width, height,
		format, flags, parent,
		std::move(metadata),
		handle, gbp);
		handle, gbp,
		outTransformHint);
		}

		status_t createWithSurfaceParent(const String8& name, uint32_t width, uint32_t height,
		PixelFormat format, uint32_t flags,
		const sp<IGraphicBufferProducer>& parent,
		LayerMetadata metadata, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp) override {
		sp<IGraphicBufferProducer>* gbp,
		uint32_t* outTransformHint) override {
		return callRemote<decltype(
		&ISurfaceComposerClient::createWithSurfaceParent)>(Tag::CREATE_WITH_SURFACE_PARENT,
		name, width, height, format,
		flags, parent,
		std::move(metadata), handle,
		gbp);
		std::move(metadata), handle, gbp,
		outTransformHint);
		}

		status_t clearLayerFrameStats(const sp<IBinder>& handle) const override {

libs/gui/SurfaceComposerClient.cpp

+21 −8

Original line number	Diff line number	Diff line
		@@ -224,6 +224,8 @@ void TransactionCompletedListener::onTransactionCompleted(ListenerStats listener
		surfaceStats.acquireTime,
		surfaceStats.previousReleaseFence,
		surfaceStats.transformHint);
		surfaceControls[surfaceStats.surfaceControl]->setTransformHint(
		surfaceStats.transformHint);
		}

		callbackFunction(transactionStats.latchTime, transactionStats.presentFence,
		@@ -1451,16 +1453,19 @@ void SurfaceComposerClient::dispose() {
		sp<SurfaceControl> SurfaceComposerClient::createSurface(const String8& name, uint32_t w, uint32_t h,
		PixelFormat format, uint32_t flags,
		SurfaceControl* parent,
		LayerMetadata metadata) {
		LayerMetadata metadata,
		uint32_t* outTransformHint) {
		sp<SurfaceControl> s;
		createSurfaceChecked(name, w, h, format, &s, flags, parent, std::move(metadata));
		createSurfaceChecked(name, w, h, format, &s, flags, parent, std::move(metadata),
		outTransformHint);
		return s;
		}

		sp<SurfaceControl> SurfaceComposerClient::createWithSurfaceParent(const String8& name, uint32_t w,
		uint32_t h, PixelFormat format,
		uint32_t flags, Surface* parent,
		LayerMetadata metadata) {
		LayerMetadata metadata,
		uint32_t* outTransformHint) {
		sp<SurfaceControl> sur;
		status_t err = mStatus;

		@@ -1469,8 +1474,12 @@ sp<SurfaceControl> SurfaceComposerClient::createWithSurfaceParent(const String8&
		sp<IGraphicBufferProducer> parentGbp = parent->getIGraphicBufferProducer();
		sp<IGraphicBufferProducer> gbp;

		uint32_t transformHint = 0;
		err = mClient->createWithSurfaceParent(name, w, h, format, flags, parentGbp,
		std::move(metadata), &handle, &gbp);
		std::move(metadata), &handle, &gbp, &transformHint);
		if (outTransformHint) {
		*outTransformHint = transformHint;
		}
		ALOGE_IF(err, "SurfaceComposerClient::createWithSurfaceParent error %s", strerror(-err));
		if (err == NO_ERROR) {
		return new SurfaceControl(this, handle, gbp, true /* owned */);
		@@ -1482,8 +1491,8 @@ sp<SurfaceControl> SurfaceComposerClient::createWithSurfaceParent(const String8&
		status_t SurfaceComposerClient::createSurfaceChecked(const String8& name, uint32_t w, uint32_t h,
		PixelFormat format,
		sp<SurfaceControl>* outSurface, uint32_t flags,
		SurfaceControl* parent,
		LayerMetadata metadata) {
		SurfaceControl* parent, LayerMetadata metadata,
		uint32_t* outTransformHint) {
		sp<SurfaceControl> sur;
		status_t err = mStatus;

		@@ -1496,11 +1505,15 @@ status_t SurfaceComposerClient::createSurfaceChecked(const String8& name, uint32
		parentHandle = parent->getHandle();
		}

		uint32_t transformHint = 0;
		err = mClient->createSurface(name, w, h, format, flags, parentHandle, std::move(metadata),
		&handle, &gbp);
		&handle, &gbp, &transformHint);
		if (outTransformHint) {
		*outTransformHint = transformHint;
		}
		ALOGE_IF(err, "SurfaceComposerClient::createSurface error %s", strerror(-err));
		if (err == NO_ERROR) {
		outSurface = new SurfaceControl(this, handle, gbp, true / owned */);
		outSurface = new SurfaceControl(this, handle, gbp, true / owned */, transformHint);
		}
		}
		return err;

libs/gui/SurfaceControl.cpp

+24 −10

Original line number	Diff line number	Diff line
		@@ -45,20 +45,21 @@ namespace android {
		// SurfaceControl
		// ============================================================================

		SurfaceControl::SurfaceControl(
		const sp<SurfaceComposerClient>& client,
		const sp<IBinder>& handle,
		const sp<IGraphicBufferProducer>& gbp,
		bool owned)
		: mClient(client), mHandle(handle), mGraphicBufferProducer(gbp), mOwned(owned)
		{
		}
		SurfaceControl::SurfaceControl(const sp<SurfaceComposerClient>& client, const sp<IBinder>& handle,
		const sp<IGraphicBufferProducer>& gbp, bool owned,
		uint32_t transform)
		: mClient(client),
		mHandle(handle),
		mGraphicBufferProducer(gbp),
		mOwned(owned),
		mTransformHint(transform) {}

		SurfaceControl::SurfaceControl(const sp<SurfaceControl>& other) {
		mClient = other->mClient;
		mHandle = other->mHandle;
		mGraphicBufferProducer = other->mGraphicBufferProducer;
		mOwned = false;
		mTransformHint = other->mTransformHint;
		}

		SurfaceControl::~SurfaceControl()
		@@ -171,11 +172,22 @@ sp<SurfaceComposerClient> SurfaceControl::getClient() const
		return mClient;
		}

		uint32_t SurfaceControl::getTransformHint() const {
		Mutex::Autolock _l(mLock);
		return mTransformHint;
		}

		void SurfaceControl::setTransformHint(uint32_t hint) {
		Mutex::Autolock _l(mLock);
		mTransformHint = hint;
		}

		void SurfaceControl::writeToParcel(Parcel* parcel)
		{
		parcel->writeStrongBinder(ISurfaceComposerClient::asBinder(mClient->getClient()));
		parcel->writeStrongBinder(mHandle);
		parcel->writeStrongBinder(IGraphicBufferProducer::asBinder(mGraphicBufferProducer));
		parcel->writeUint32(mTransformHint);
		}

		sp<SurfaceControl> SurfaceControl::readFromParcel(const Parcel* parcel) {
		@@ -189,10 +201,12 @@ sp<SurfaceControl> SurfaceControl::readFromParcel(const Parcel* parcel) {
		sp<IBinder> gbp;
		parcel->readNullableStrongBinder(&gbp);

		uint32_t transformHint = parcel->readUint32();
		// We aren't the original owner of the surface.
		return new SurfaceControl(new SurfaceComposerClient(
		interface_cast<ISurfaceComposerClient>(client)),
		handle.get(), interface_cast<IGraphicBufferProducer>(gbp), false /* owned */);
		handle.get(), interface_cast<IGraphicBufferProducer>(gbp),
		false /* owned */, transformHint);
		}

		// ----------------------------------------------------------------------------

libs/gui/include/gui/ISurfaceComposerClient.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ public:
		virtual status_t createSurface(const String8& name, uint32_t w, uint32_t h, PixelFormat format,
		uint32_t flags, const sp<IBinder>& parent,
		LayerMetadata metadata, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp) = 0;
		sp<IGraphicBufferProducer>* gbp, uint32_t* outTransformHint) = 0;

		/*
		* Requires ACCESS_SURFACE_FLINGER permission
		@@ -65,7 +65,8 @@ public:
		PixelFormat format, uint32_t flags,
		const sp<IGraphicBufferProducer>& parent,
		LayerMetadata metadata, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp) = 0;
		sp<IGraphicBufferProducer>* gbp,
		uint32_t* outTransformHint) = 0;

		/*
		* Requires ACCESS_SURFACE_FLINGER permission

libs/gui/include/gui/SurfaceComposerClient.h

+8 −8

Original line number	Diff line number	Diff line
		@@ -226,8 +226,8 @@ public:
		PixelFormat format, // pixel-format desired
		uint32_t flags = 0, // usage flags
		SurfaceControl* parent = nullptr, // parent
		LayerMetadata metadata = LayerMetadata() // metadata
		);
		LayerMetadata metadata = LayerMetadata(), // metadata
		uint32_t* outTransformHint = nullptr);

		status_t createSurfaceChecked(const String8& name, // name of the surface
		uint32_t w, // width in pixel
		@@ -236,8 +236,8 @@ public:
		sp<SurfaceControl>* outSurface,
		uint32_t flags = 0, // usage flags
		SurfaceControl* parent = nullptr, // parent
		LayerMetadata metadata = LayerMetadata() // metadata
		);
		LayerMetadata metadata = LayerMetadata(), // metadata
		uint32_t* outTransformHint = nullptr);

		//! Create a surface
		sp<SurfaceControl> createWithSurfaceParent(const String8& name, // name of the surface
		@@ -246,8 +246,8 @@ public:
		PixelFormat format, // pixel-format desired
		uint32_t flags = 0, // usage flags
		Surface* parent = nullptr, // parent
		LayerMetadata metadata = LayerMetadata() // metadata
		);
		LayerMetadata metadata = LayerMetadata(), // metadata
		uint32_t* outTransformHint = nullptr);

		// Creates a mirrored hierarchy for the mirrorFromSurface. This returns a SurfaceControl
		// which is a parent of the root of the mirrored hierarchy.