Merge "Add dataSpace to buffer queues; remove old format enums." (94d5ac48) · Commits · e / os / platform_frameworks_native

include/gui/BufferItem.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,11 @@ class BufferItem : public Flattenable<BufferItem> {
		// automatically when the buffer was queued.
		bool mIsAutoTimestamp;

		// mDataSpace is the current dataSpace value for this buffer slot. This gets
		// set by queueBuffer each time this slot is queued. The meaning of the
		// dataSpace is format-dependent.
		android_dataspace mDataSpace;

		// mFrameNumber is the number of the queued frame for this slot.
		uint64_t mFrameNumber;

+7 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,13 @@ class BufferItemConsumer: public ConsumerBase
		// GraphicBuffers of a defaultFormat if no format is specified
		// in dequeueBuffer
		status_t setDefaultBufferFormat(PixelFormat defaultFormat);

		// setDefaultBufferDataSpace allows the BufferQueue to create
		// GraphicBuffers of a defaultDataSpace if no data space is specified
		// in queueBuffer.
		// The initial default is HAL_DATASPACE_UNKNOWN
		status_t setDefaultBufferDataSpace(android_dataspace defaultDataSpace);

		};

		} // namespace android

+7 −0

Original line number	Diff line number	Diff line
		@@ -128,6 +128,13 @@ public:
		// in dequeueBuffer. The initial default is HAL_PIXEL_FORMAT_RGBA_8888.
		virtual status_t setDefaultBufferFormat(PixelFormat defaultFormat);

		// setDefaultBufferDataSpace allows the BufferQueue to create
		// GraphicBuffers of a defaultDataSpace if no data space is specified
		// in queueBuffer.
		// The initial default is HAL_DATASPACE_UNKNOWN
		virtual status_t setDefaultBufferDataSpace(
		android_dataspace defaultDataSpace);

		// setConsumerUsageBits will turn on additional usage bits for dequeueBuffer.
		// These are merged with the bits passed to dequeueBuffer. The values are
		// enumerated in gralloc.h, e.g. GRALLOC_USAGE_HW_RENDER; the default is 0.

+5 −0

Original line number	Diff line number	Diff line
		@@ -209,6 +209,11 @@ private:
		// in dequeueBuffer if a width and height of 0 are specified.
		uint32_t mDefaultHeight;

		// mDefaultBufferDataSpace holds the default dataSpace of queued buffers.
		// It is used in queueBuffer if a dataspace of 0 (HAL_DATASPACE_UNKNOWN)
		// is specified.
		android_dataspace mDefaultBufferDataSpace;

		// mDefaultMaxBufferCount is the default limit on the number of buffers that
		// will be allocated at one time. This default limit is set by the consumer.
		// The limit (as opposed to the default limit) may be overriden by the

+7 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ class CpuConsumer : public ConsumerBase
		uint32_t transform;
		uint32_t scalingMode;
		int64_t timestamp;
		android_dataspace dataSpace;
		uint64_t frameNumber;
		// this is the same as format, except for formats that are compatible with
		// a flexible format (e.g. HAL_PIXEL_FORMAT_YCbCr_420_888). In the latter
		@@ -90,6 +91,12 @@ class CpuConsumer : public ConsumerBase
		// The initial default is PIXEL_FORMAT_RGBA_8888.
		status_t setDefaultBufferFormat(PixelFormat defaultFormat);

		// setDefaultBufferDataSpace allows the BufferQueue to create
		// GraphicBuffers of a defaultDataSpace if no data space is specified
		// in queueBuffer.
		// The initial default is HAL_DATASPACE_UNKNOWN
		status_t setDefaultBufferDataSpace(android_dataspace defaultDataSpace);

		// Gets the next graphics buffer from the producer and locks it for CPU use,
		// filling out the passed-in locked buffer structure with the native pointer
		// and metadata. Returns BAD_VALUE if no new buffer is available, and