summaryrefslogtreecommitdiffstats
path: root/libc/kernel/common/media
diff options
context:
space:
mode:
authorJignesh Mehta <jigneshm@codeaurora.org>2010-10-27 11:46:27 -0700
committerJignesh Mehta <jigneshm@codeaurora.org>2010-11-09 11:35:34 -0800
commitb205a138eab8821ae9476fb50fc8c2ec0cd16a72 (patch)
tree27de11769ddfc873c10650fe8fc0be415543aea5 /libc/kernel/common/media
parenta540a151bdb6ef8d1b1308e94e118b469633c1d0 (diff)
downloadbionic-b205a138eab8821ae9476fb50fc8c2ec0cd16a72.zip
bionic-b205a138eab8821ae9476fb50fc8c2ec0cd16a72.tar.gz
bionic-b205a138eab8821ae9476fb50fc8c2ec0cd16a72.tar.bz2
bionic: camera: The support of facial framework feature
Added Region-Of-Interest information to camera frame for Face-Detection Change-Id: Iad2e8c8112eed623604346c3d426f8b590d9b97d
Diffstat (limited to 'libc/kernel/common/media')
-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 b54e283..e55315d 100644
--- a/libc/kernel/common/media/msm_camera.h
+++ b/libc/kernel/common/media/msm_camera.h
@@ -94,6 +94,8 @@
#define MSM_CAM_IOCTL_ABORT_CAPTURE _IO(MSM_CAM_IOCTL_MAGIC, 34)
+#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
@@ -284,8 +286,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
@@ -301,6 +303,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;
@@ -312,6 +319,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)