Merge branch 'master' into honeycomb-release (bd9d0199) · Commits · e / os / platform_frameworks_native

include/surfaceflinger/ISurfaceComposer.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,8 @@ public:
		virtual status_t captureScreen(DisplayID dpy,
		sp<IMemoryHeap>* heap,
		uint32_t* width, uint32_t* height, PixelFormat* format,
		uint32_t reqWidth, uint32_t reqHeight) = 0;
		uint32_t reqWidth, uint32_t reqHeight,
		uint32_t minLayerZ, uint32_t maxLayerZ) = 0;

		virtual status_t turnElectronBeamOff(int32_t mode) = 0;
		virtual status_t turnElectronBeamOn(int32_t mode) = 0;

include/surfaceflinger/SurfaceComposerClient.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -183,6 +183,8 @@ public:
		// frees the previous screenshot and capture a new one
		status_t update();
		status_t update(uint32_t reqWidth, uint32_t reqHeight);
		status_t update(uint32_t reqWidth, uint32_t reqHeight,
		uint32_t minLayerZ, uint32_t maxLayerZ);

		// release memory occupied by the screenshot
		void release();

libs/surfaceflinger_client/ISurfaceComposer.cpp

+7 −2

Original line number	Diff line number	Diff line
		@@ -127,13 +127,16 @@ public:
		virtual status_t captureScreen(DisplayID dpy,
		sp<IMemoryHeap>* heap,
		uint32_t* width, uint32_t* height, PixelFormat* format,
		uint32_t reqWidth, uint32_t reqHeight)
		uint32_t reqWidth, uint32_t reqHeight,
		uint32_t minLayerZ, uint32_t maxLayerZ)
		{
		Parcel data, reply;
		data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
		data.writeInt32(dpy);
		data.writeInt32(reqWidth);
		data.writeInt32(reqHeight);
		data.writeInt32(minLayerZ);
		data.writeInt32(maxLayerZ);
		remote()->transact(BnSurfaceComposer::CAPTURE_SCREEN, data, &reply);
		*heap = interface_cast<IMemoryHeap>(reply.readStrongBinder());
		*width = reply.readInt32();
		@@ -231,11 +234,13 @@ status_t BnSurfaceComposer::onTransact(
		DisplayID dpy = data.readInt32();
		uint32_t reqWidth = data.readInt32();
		uint32_t reqHeight = data.readInt32();
		uint32_t minLayerZ = data.readInt32();
		uint32_t maxLayerZ = data.readInt32();
		sp<IMemoryHeap> heap;
		uint32_t w, h;
		PixelFormat f;
		status_t res = captureScreen(dpy, &heap, &w, &h, &f,
		reqWidth, reqHeight);
		reqWidth, reqHeight, minLayerZ, maxLayerZ);
		reply->writeStrongBinder(heap->asBinder());
		reply->writeInt32(w);
		reply->writeInt32(h);

libs/surfaceflinger_client/SurfaceComposerClient.cpp

+14 −2

Original line number	Diff line number	Diff line
		@@ -555,7 +555,8 @@ status_t ScreenshotClient::update() {
		if (s == NULL) return NO_INIT;
		mHeap = 0;
		return s->captureScreen(0, &mHeap,
		&mWidth, &mHeight, &mFormat, 0, 0);
		&mWidth, &mHeight, &mFormat, 0, 0,
		0, -1UL);
		}

		status_t ScreenshotClient::update(uint32_t reqWidth, uint32_t reqHeight) {
		@@ -563,7 +564,18 @@ status_t ScreenshotClient::update(uint32_t reqWidth, uint32_t reqHeight) {
		if (s == NULL) return NO_INIT;
		mHeap = 0;
		return s->captureScreen(0, &mHeap,
		&mWidth, &mHeight, &mFormat, reqWidth, reqHeight);
		&mWidth, &mHeight, &mFormat, reqWidth, reqHeight,
		0, -1UL);
		}

		status_t ScreenshotClient::update(uint32_t reqWidth, uint32_t reqHeight,
		uint32_t minLayerZ, uint32_t maxLayerZ) {
		sp<ISurfaceComposer> s(ComposerService::getComposerService());
		if (s == NULL) return NO_INIT;
		mHeap = 0;
		return s->captureScreen(0, &mHeap,
		&mWidth, &mHeight, &mFormat, reqWidth, reqHeight,
		minLayerZ, maxLayerZ);
		}

		void ScreenshotClient::release() {

services/surfaceflinger/SurfaceFlinger.cpp

+17 −7

Original line number	Diff line number	Diff line
		@@ -2078,7 +2078,8 @@ status_t SurfaceFlinger::turnElectronBeamOn(int32_t mode)
		status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
		sp<IMemoryHeap>* heap,
		uint32_t* w, uint32_t* h, PixelFormat* f,
		uint32_t sw, uint32_t sh)
		uint32_t sw, uint32_t sh,
		uint32_t minLayerZ, uint32_t maxLayerZ)
		{
		status_t result = PERMISSION_DENIED;

		@@ -2132,8 +2133,11 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
		const size_t count = layers.size();
		for (size_t i=0 ; i<count ; ++i) {
		const sp<LayerBase>& layer(layers[i]);
		const uint32_t z = layer->drawingState().z;
		if (z >= minLayerZ && z <= maxLayerZ) {
		layer->drawForSreenShot();
		}
		}

		// XXX: this is needed on tegra
		glScissor(0, 0, sw, sh);
		@@ -2185,7 +2189,8 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
		status_t SurfaceFlinger::captureScreen(DisplayID dpy,
		sp<IMemoryHeap>* heap,
		uint32_t* width, uint32_t* height, PixelFormat* format,
		uint32_t sw, uint32_t sh)
		uint32_t sw, uint32_t sh,
		uint32_t minLayerZ, uint32_t maxLayerZ)
		{
		// only one display supported for now
		if (UNLIKELY(uint32_t(dpy) >= DISPLAY_COUNT))
		@@ -2203,13 +2208,18 @@ status_t SurfaceFlinger::captureScreen(DisplayID dpy,
		PixelFormat* f;
		uint32_t sw;
		uint32_t sh;
		uint32_t minLayerZ;
		uint32_t maxLayerZ;
		status_t result;
		public:
		MessageCaptureScreen(SurfaceFlinger* flinger, DisplayID dpy,
		sp<IMemoryHeap>* heap, uint32_t* w, uint32_t* h, PixelFormat* f,
		uint32_t sw, uint32_t sh)
		uint32_t sw, uint32_t sh,
		uint32_t minLayerZ, uint32_t maxLayerZ)
		: flinger(flinger), dpy(dpy),
		heap(heap), w(w), h(h), f(f), sw(sw), sh(sh), result(PERMISSION_DENIED)
		heap(heap), w(w), h(h), f(f), sw(sw), sh(sh),
		minLayerZ(minLayerZ), maxLayerZ(maxLayerZ),
		result(PERMISSION_DENIED)
		{
		}
		status_t getResult() const {
		@@ -2223,14 +2233,14 @@ status_t SurfaceFlinger::captureScreen(DisplayID dpy,
		return true;

		result = flinger->captureScreenImplLocked(dpy,
		heap, w, h, f, sw, sh);
		heap, w, h, f, sw, sh, minLayerZ, maxLayerZ);

		return true;
		}
		};

		sp<MessageBase> msg = new MessageCaptureScreen(this,
		dpy, heap, width, height, format, sw, sh);
		dpy, heap, width, height, format, sw, sh, minLayerZ, maxLayerZ);
		status_t res = postMessageSync(msg);
		if (res == NO_ERROR) {
		res = static_cast<MessageCaptureScreen*>( msg.get() )->getResult();