diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-09-09 16:42:27 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2014-09-10 11:13:16 -0700 |
| commit | b5459839759300ce7b6fca3313ac130e1ed9c309 (patch) | |
| tree | e44e5b42c60ab5a6c884d741b49f2f9cf4d5d536 | |
| parent | 110d2f2713490c8c8ae5ce3d66ac7364eb2002a4 (diff) | |
| download | libhardware-b5459839759300ce7b6fca3313ac130e1ed9c309.tar.gz | |
Camera HALs: Promote device HAL v3.2
And deprecate older HALs.
Bug: 17445920
Change-Id: I37a5e53fda3c93080e37ec848f84c702a2c9120b
| -rw-r--r-- | include/hardware/camera.h | 5 | ||||
| -rw-r--r-- | include/hardware/camera2.h | 5 | ||||
| -rw-r--r-- | include/hardware/camera3.h | 5 | ||||
| -rw-r--r-- | include/hardware/camera_common.h | 5 |
4 files changed, 13 insertions, 7 deletions
diff --git a/include/hardware/camera.h b/include/hardware/camera.h index b7182f8a..b1f18fff 100644 --- a/include/hardware/camera.h +++ b/include/hardware/camera.h @@ -22,7 +22,10 @@ /** * Camera device HAL, initial version [ CAMERA_DEVICE_API_VERSION_1_0 ] * - * Supports the android.hardware.Camera API. + * DEPRECATED. New devices should use Camera HAL v3.2 or newer. + * + * Supports the android.hardware.Camera API, and the android.hardware.camera2 + * API in legacy mode only. * * Camera devices that support this version of the HAL must return a value in * the range HARDWARE_DEVICE_API_VERSION(0,0)-(1,FF) in diff --git a/include/hardware/camera2.h b/include/hardware/camera2.h index 5b182a8a..d920d4b6 100644 --- a/include/hardware/camera2.h +++ b/include/hardware/camera2.h @@ -23,9 +23,10 @@ /** * Camera device HAL 2.1 [ CAMERA_DEVICE_API_VERSION_2_0, CAMERA_DEVICE_API_VERSION_2_1 ] * - * EXPERIMENTAL. + * DEPRECATED. New devices should use Camera HAL v3.2 or newer. * - * Supports the android.hardware.Camera APIs. + * Supports the android.hardware.Camera API, and the android.hardware.camera2 + * API in legacy mode only. * * Camera devices that support this version of the HAL must return * CAMERA_DEVICE_API_VERSION_2_1 in camera_device_t.common.version and in diff --git a/include/hardware/camera3.h b/include/hardware/camera3.h index b0240901..b7051031 100644 --- a/include/hardware/camera3.h +++ b/include/hardware/camera3.h @@ -23,9 +23,10 @@ /** * Camera device HAL 3.2 [ CAMERA_DEVICE_API_VERSION_3_2 ] * - * EXPERIMENTAL. + * This is the current recommended version of the camera device HAL. * - * Supports the android.hardware.Camera API. + * Supports the android.hardware.Camera API, and as of v3.2, the + * android.hardware.camera2 API in LIMITED or FULL modes. * * Camera devices that support this version of the HAL must return * CAMERA_DEVICE_API_VERSION_3_2 in camera_device_t.common.version and in diff --git a/include/hardware/camera_common.h b/include/hardware/camera_common.h index 322ed93f..dadbc8f1 100644 --- a/include/hardware/camera_common.h +++ b/include/hardware/camera_common.h @@ -114,8 +114,9 @@ __BEGIN_DECLS #define CAMERA_DEVICE_API_VERSION_3_1 HARDWARE_DEVICE_API_VERSION(3, 1) #define CAMERA_DEVICE_API_VERSION_3_2 HARDWARE_DEVICE_API_VERSION(3, 2) -// Device version 2.x is outdated; device version 3.x is experimental -#define CAMERA_DEVICE_API_VERSION_CURRENT CAMERA_DEVICE_API_VERSION_1_0 +// Device version 3.2 is current, older HAL camera device versions are not +// recommended for new devices. +#define CAMERA_DEVICE_API_VERSION_CURRENT CAMERA_DEVICE_API_VERSION_3_2 /** * Defined in /system/media/camera/include/system/camera_metadata.h |