Merge "Camera: Relax RGBA format override" (f11edb6f) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+4 −3

Original line number	Diff line number	Diff line
		@@ -1083,9 +1083,10 @@ binder::Status CameraDeviceClient::createSurfaceFromGbp(
		}

		// FIXME: remove this override since the default format should be
		// IMPLEMENTATION_DEFINED. b/9487482
		if (format >= HAL_PIXEL_FORMAT_RGBA_8888 &&
		format <= HAL_PIXEL_FORMAT_BGRA_8888) {
		// IMPLEMENTATION_DEFINED. b/9487482 & b/35317944
		if ((format >= HAL_PIXEL_FORMAT_RGBA_8888 && format <= HAL_PIXEL_FORMAT_BGRA_8888) &&
		((consumerUsage & GRALLOC_USAGE_HW_MASK) &&
		((consumerUsage & GRALLOC_USAGE_SW_READ_MASK) == 0))) {
		ALOGW("%s: Camera %s: Overriding format %#x to IMPLEMENTATION_DEFINED",
		__FUNCTION__, mCameraIdStr.string(), format);
		format = HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED;