summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJignesh Mehta <jigneshm@codeaurora.org>2010-10-27 11:46:27 -0700
committerMansoor Aftab <maftab@codeaurora.org>2010-12-07 16:34:25 -0800
commitacc2378c2e696b515b1dbc54ba82c242f1edd01f (patch)
treedbbd4f7a02e6b40a4688c6cf8d4607478ec5a2d7
parentb7bc08e97cc13ee9f4095a229ca53705156600bd (diff)
downloadbionic-M7630AABBQMLZA203006.zip
bionic-M7630AABBQMLZA203006.tar.gz
bionic-M7630AABBQMLZA203006.tar.bz2
Added Region-Of-Interest information to camera frame for Face-Detection Change-Id: Iec2650865da881133df514c731e894834c2beed4
-rw-r--r--libc/kernel/common/media/msm_camera.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/libc/kernel/common/media/msm_camera.h b/libc/kernel/common/media/msm_camera.h
index f6397a2..fab4aa1 100644
--- a/libc/kernel/common/media/msm_camera.h
+++ b/libc/kernel/common/media/msm_camera.h
@@ -92,6 +92,8 @@
#define MSM_CAM_IOCTL_ABORT_CAPTURE _IO(MSM_CAM_IOCTL_MAGIC, 33)
+#define MSM_CAM_IOCTL_SET_FD_ROI _IOW(MSM_CAM_IOCTL_MAGIC, 35, struct fd_roi_info *)
+
#define MSM_CAMERA_LED_OFF 0
#define MSM_CAMERA_LED_LOW 1
#define MSM_CAMERA_LED_HIGH 2
@@ -282,8 +284,8 @@ struct outputCfg {
#define OUTPUT_1 0
#define OUTPUT_2 1
-#define OUTPUT_1_AND_2 2
-#define OUTPUT_1_AND_3 3
+#define OUTPUT_1_AND_2 2
+#define OUTPUT_1_AND_3 3
#define CAMIF_TO_AXI_VIA_OUTPUT_2 4
#define OUTPUT_1_AND_CAMIF_TO_AXI_VIA_OUTPUT_2 5
#define OUTPUT_2_AND_CAMIF_TO_AXI_VIA_OUTPUT_1 6
@@ -299,6 +301,11 @@ struct outputCfg {
#define OUTPUT_TYPE_V (1<<3)
#define OUTPUT_TYPE_L (1<<4)
+struct fd_roi_info {
+ void *info;
+ int info_len;
+};
+
struct msm_frame {
struct timespec ts;
int path;
@@ -310,6 +317,7 @@ struct msm_frame {
void *cropinfo;
int croplen;
uint32_t error_code;
+ struct fd_roi_info roi_info;
};
#define MSM_CAMERA_ERR_MASK (0xFFFFFFFF & 1)