Merge "Camera3: fix HAL3.x version check issue" (5bdb3c4d) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/CameraDeviceFactory.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,8 @@ sp<CameraDeviceBase> CameraDeviceFactory::createDevice(int cameraId) {
		device = new Camera2Device(cameraId);
		break;
		case CAMERA_DEVICE_API_VERSION_3_0:
		case CAMERA_DEVICE_API_VERSION_3_1:
		case CAMERA_DEVICE_API_VERSION_3_2:
		device = new Camera3Device(cameraId);
		break;
		default:

+8 −0

Original line number	Diff line number	Diff line
		@@ -324,6 +324,8 @@ bool CameraService::isValidCameraId(int cameraId) {
		case CAMERA_DEVICE_API_VERSION_2_0:
		case CAMERA_DEVICE_API_VERSION_2_1:
		case CAMERA_DEVICE_API_VERSION_3_0:
		case CAMERA_DEVICE_API_VERSION_3_1:
		case CAMERA_DEVICE_API_VERSION_3_2:
		return true;
		default:
		return false;
		@@ -519,6 +521,8 @@ status_t CameraService::connect(
		case CAMERA_DEVICE_API_VERSION_2_0:
		case CAMERA_DEVICE_API_VERSION_2_1:
		case CAMERA_DEVICE_API_VERSION_3_0:
		case CAMERA_DEVICE_API_VERSION_3_1:
		case CAMERA_DEVICE_API_VERSION_3_2:
		client = new Camera2Client(this, cameraClient,
		clientPackageName, cameraId,
		facing, callingPid, clientUid, getpid(),
		@@ -605,6 +609,8 @@ status_t CameraService::connectPro(
		case CAMERA_DEVICE_API_VERSION_2_0:
		case CAMERA_DEVICE_API_VERSION_2_1:
		case CAMERA_DEVICE_API_VERSION_3_0:
		case CAMERA_DEVICE_API_VERSION_3_1:
		case CAMERA_DEVICE_API_VERSION_3_2:
		client = new ProCamera2Client(this, cameraCb, String16(),
		cameraId, facing, callingPid, USE_CALLING_UID, getpid());
		break;
		@@ -683,6 +689,8 @@ status_t CameraService::connectDevice(
		case CAMERA_DEVICE_API_VERSION_2_0:
		case CAMERA_DEVICE_API_VERSION_2_1:
		case CAMERA_DEVICE_API_VERSION_3_0:
		case CAMERA_DEVICE_API_VERSION_3_1:
		case CAMERA_DEVICE_API_VERSION_3_2:
		client = new CameraDeviceClient(this, cameraCb, String16(),
		cameraId, facing, callingPid, USE_CALLING_UID, getpid());
		break;

+3 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,9 @@ status_t Camera2Client::initialize(camera_module_t *module)
		mZslProcessorThread = zslProc;
		break;
		}
		case CAMERA_DEVICE_API_VERSION_3_0:{
		case CAMERA_DEVICE_API_VERSION_3_0:
		case CAMERA_DEVICE_API_VERSION_3_1:
		case CAMERA_DEVICE_API_VERSION_3_2: {
		sp<ZslProcessor3> zslProc =
		new ZslProcessor3(this, mCaptureSequencer);
		mZslProcessor = zslProc;

+3 −3

Original line number	Diff line number	Diff line
		@@ -114,9 +114,9 @@ status_t Camera3Device::initialize(camera_module_t *module)

		/** Cross-check device version */

		if (device->common.version != CAMERA_DEVICE_API_VERSION_3_0) {
		if (device->common.version < CAMERA_DEVICE_API_VERSION_3_0) {
		SET_ERR_L("Could not open camera: "
		"Camera device is not version %x, reports %x instead",
		"Camera device should be at least %x, reports %x instead",
		CAMERA_DEVICE_API_VERSION_3_0,
		device->common.version);
		device->common.close(&device->common);
		@@ -130,7 +130,7 @@ status_t Camera3Device::initialize(camera_module_t *module)
		if (info.device_version != device->common.version) {
		SET_ERR_L("HAL reporting mismatched camera_info version (%x)"
		" and device version (%x).",
		device->common.version, info.device_version);
		info.device_version, device->common.version);
		device->common.close(&device->common);
		return BAD_VALUE;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ class Camera3StreamInterface;
		}

		/**
		* CameraDevice for HAL devices with version CAMERA_DEVICE_API_VERSION_3_0
		* CameraDevice for HAL devices with version CAMERA_DEVICE_API_VERSION_3_0 or higher.
		*/
		class Camera3Device :
		public CameraDeviceBase,