From 9d51856d71b4aa25ca925b1ee7d9950878847f63 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Tue, 30 Jul 2013 14:58:31 -0700 Subject: Camera: Add new 3.1 device version - Add new definition to camera_common - Update comment in camera3.h Change-Id: I9d8c594cfdaff40c543e8f9017091b0c06bbf022 --- include/hardware/camera3.h | 6 +++--- include/hardware/camera_common.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/hardware/camera3.h b/include/hardware/camera3.h index ddb7426..01203ff 100644 --- a/include/hardware/camera3.h +++ b/include/hardware/camera3.h @@ -21,17 +21,17 @@ #include "camera_common.h" /** - * Camera device HAL 3.0 [ CAMERA_DEVICE_API_VERSION_3_0 ] + * Camera device HAL 3.1 [ CAMERA_DEVICE_API_VERSION_3_1 ] * * EXPERIMENTAL. * * Supports the android.hardware.Camera API. * * Camera devices that support this version of the HAL must return - * CAMERA_DEVICE_API_VERSION_3_0 in camera_device_t.common.version and in + * CAMERA_DEVICE_API_VERSION_3_1 in camera_device_t.common.version and in * camera_info_t.device_version (from camera_module_t.get_camera_info). * - * Camera modules that may contain version 3.0 devices must implement at least + * Camera modules that may contain version 3.1 devices must implement at least * version 2.0 of the camera module interface (as defined by * camera_module_t.common.module_api_version). * diff --git a/include/hardware/camera_common.h b/include/hardware/camera_common.h index 62c5740..a2171ce 100644 --- a/include/hardware/camera_common.h +++ b/include/hardware/camera_common.h @@ -91,6 +91,7 @@ __BEGIN_DECLS #define CAMERA_DEVICE_API_VERSION_2_0 HARDWARE_DEVICE_API_VERSION(2, 0) #define CAMERA_DEVICE_API_VERSION_2_1 HARDWARE_DEVICE_API_VERSION(2, 1) #define CAMERA_DEVICE_API_VERSION_3_0 HARDWARE_DEVICE_API_VERSION(3, 0) +#define CAMERA_DEVICE_API_VERSION_3_1 HARDWARE_DEVICE_API_VERSION(3, 1) // Device version 2.x is outdated; device version 3.0 is experimental #define CAMERA_DEVICE_API_VERSION_CURRENT CAMERA_DEVICE_API_VERSION_1_0 -- cgit v1.1