Merge "AHB: add camera usage bits to vndk" (9f0e60e6) · Commits · e / devices / smdk4412 / android_frameworks_native

libs/nativewindow/AHardwareBuffer.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -688,6 +688,10 @@ uint64_t AHardwareBuffer_convertToGrallocUsageBits(uint64_t usage) {
		"gralloc and AHardwareBuffer flags don't match");
		static_assert(AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE == (uint64_t)BufferUsage::GPU_MIPMAP_COMPLETE,
		"gralloc and AHardwareBuffer flags don't match");
		static_assert(AHARDWAREBUFFER_USAGE_CAMERA_WRITE == (uint64_t)BufferUsage::CAMERA_OUTPUT,
		"gralloc and AHardwareBuffer flags don't match");
		static_assert(AHARDWAREBUFFER_USAGE_CAMERA_READ == (uint64_t)BufferUsage::CAMERA_INPUT,
		"gralloc and AHardwareBuffer flags don't match");
		return usage;
		}

+14 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,20 @@ enum {
		AHARDWAREBUFFER_FORMAT_YCbCr_422_I = 0x14,
		};

		/**
		* Buffer usage flags.
		*/
		enum {
		/* for future proofing, keep these in sync with hardware/gralloc.h */

		/* The buffer will be written by the HW camera pipeline. */
		AHARDWAREBUFFER_USAGE_CAMERA_WRITE = 2UL << 16,
		/* The buffer will be read by the HW camera pipeline. */
		AHARDWAREBUFFER_USAGE_CAMERA_READ = 4UL << 16,
		/* Mask for the camera access values. */
		AHARDWAREBUFFER_USAGE_CAMERA_MASK = 6UL << 16,
		};

		__END_DECLS

		#endif /* ANDROID_VNDK_NATIVEWINDOW_AHARDWAREBUFFER_H */