diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-05 04:09:22 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2015-11-05 12:58:33 -0800 |
| commit | 0114ae3c7de8d149efd9bdee4ec47ec9629e274e (patch) | |
| tree | 75315e7d92c40dbf6315d3f9bfed38bfc8f15b4e /include/system | |
| parent | 31756a19f79d62b71fa87c4e656e00bfbb9a5385 (diff) | |
| download | system_core-0114ae3c7de8d149efd9bdee4ec47ec9629e274e.zip system_core-0114ae3c7de8d149efd9bdee4ec47ec9629e274e.tar.gz system_core-0114ae3c7de8d149efd9bdee4ec47ec9629e274e.tar.bz2 | |
camera: Add L-compatible camera feature enums
* These QC-specific features have been renumbered in M, so add
a compilation flag to permit using the old versions in case we
can't rebuild the driver.
Change-Id: I3f5a545fde8b27684b1b8ea490c09bb66e3b4cd9
Diffstat (limited to 'include/system')
| -rw-r--r-- | include/system/camera.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/system/camera.h b/include/system/camera.h index 6de0203..0570ca0 100644 --- a/include/system/camera.h +++ b/include/system/camera.h @@ -200,6 +200,7 @@ enum { * IMPLEMENTATION_DEFINED, then HALv3 devices will use gralloc usage flags * of SW_READ_OFTEN. */ +#ifndef CAMERA_VENDOR_L_COMPAT CAMERA_CMD_SET_VIDEO_FORMAT = 11, CAMERA_CMD_VENDOR_START = 20, @@ -219,6 +220,21 @@ enum { CAMERA_CMD_METADATA_ON = CAMERA_CMD_VENDOR_START + 6, CAMERA_CMD_METADATA_OFF = CAMERA_CMD_VENDOR_START + 7, CAMERA_CMD_VENDOR_END = 200, +#else + + /** + * Values used by older HALs, provided as an option for compatibility + */ + CAMERA_CMD_HISTOGRAM_ON = 11, + CAMERA_CMD_HISTOGRAM_OFF = 12, + CAMERA_CMD_HISTOGRAM_SEND_DATA = 13, + CAMERA_CMD_LONGSHOT_ON = 14, + CAMERA_CMD_LONGSHOT_OFF = 15, + CAMERA_CMD_STOP_LONGSHOT = 16, + CAMERA_CMD_METADATA_ON = 100, + CAMERA_CMD_METADATA_OFF = 101, + CAMERA_CMD_SET_VIDEO_FORMAT = 102, +#endif }; /** camera fatal errors */ |