diff options
| author | Linux Build Service Account <lnxbuild@qualcomm.com> | 2010-11-09 12:58:51 -0800 |
|---|---|---|
| committer | QuIC Gerrit Code Review <code-review@localhost> | 2010-11-09 12:58:51 -0800 |
| commit | 8a49e38436ad5f590c213f48685e2b2264b0c1cf (patch) | |
| tree | f877e02db9b79e76dc164af0f602baa864b2beaa | |
| parent | 0553c2313afa8e5b5e7ca4d75f66670c92e4bf44 (diff) | |
| parent | b205a138eab8821ae9476fb50fc8c2ec0cd16a72 (diff) | |
| download | bionic-8a49e38436ad5f590c213f48685e2b2264b0c1cf.zip bionic-8a49e38436ad5f590c213f48685e2b2264b0c1cf.tar.gz bionic-8a49e38436ad5f590c213f48685e2b2264b0c1cf.tar.bz2 | |
Merge "bionic: camera: The support of facial framework feature" into froyo
| -rw-r--r-- | libc/kernel/common/media/msm_camera.h | 12 |
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) |