Merge change 9070 (abcfe357) · Commits · e / os / android_frameworks_native

include/ui/Overlay.h

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -82,10 +82,16 @@ public:
	/* release the overlay buffer and post it */		/* release the overlay buffer and post it */
	status_t queueBuffer(overlay_buffer_t buffer);		status_t queueBuffer(overlay_buffer_t buffer);

			/* change the width and height of the overlay */
			status_t resizeInput(uint32_t width, uint32_t height);

	status_t setCrop(uint32_t x, uint32_t y, uint32_t w, uint32_t h) ;		status_t setCrop(uint32_t x, uint32_t y, uint32_t w, uint32_t h) ;

	status_t getCrop(uint32_t* x, uint32_t* y, uint32_t* w, uint32_t* h) ;		status_t getCrop(uint32_t* x, uint32_t* y, uint32_t* w, uint32_t* h) ;

			/* set the buffer attributes */
			status_t setParameter(int param, int value);

	/* returns the address of a given buffer if supported, NULL otherwise. */		/* returns the address of a given buffer if supported, NULL otherwise. */
	void* getBufferAddress(overlay_buffer_t buffer);		void* getBufferAddress(overlay_buffer_t buffer);

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -59,6 +59,18 @@ status_t Overlay::queueBuffer(overlay_buffer_t buffer)
	return mOverlayData->queueBuffer(mOverlayData, buffer);		return mOverlayData->queueBuffer(mOverlayData, buffer);
	}		}

			status_t Overlay::resizeInput(uint32_t width, uint32_t height)
			{
			if (mStatus != NO_ERROR) return mStatus;
			return mOverlayData->resizeInput(mOverlayData, width, height);
			}

			status_t Overlay::setParameter(int param, int value)
			{
			if (mStatus != NO_ERROR) return mStatus;
			return mOverlayData->setParameter(mOverlayData, param, value);
			}

	status_t Overlay::setCrop(uint32_t x, uint32_t y, uint32_t w, uint32_t h)		status_t Overlay::setCrop(uint32_t x, uint32_t y, uint32_t w, uint32_t h)
	{		{
	if (mStatus != NO_ERROR) return mStatus;		if (mStatus != NO_ERROR) return mStatus;