diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-19 07:45:21 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-19 07:45:21 -0800 |
| commit | 04e4c990b1960764dfb4d11b5a2ade7d36a647a0 (patch) | |
| tree | 345765d59aef9b4f5026b14b6fc62a1de5dd35c3 /include | |
| parent | 594c9a979d7d6bd903e4150cc37b095f09746366 (diff) | |
| parent | 3375a292eaf2230a2ad3b90dfc16c9c3ad1f9ce7 (diff) | |
Merge "ais: query field info and pass to user space"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/msm_ba.h | 3 | ||||
| -rw-r--r-- | include/uapi/media/ais/msm_ais_isp.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/media/msm_ba.h b/include/media/msm_ba.h index d630e441590f..e13509585e5a 100644 --- a/include/media/msm_ba.h +++ b/include/media/msm_ba.h @@ -18,6 +18,9 @@ #include <media/v4l2-device.h> #include <linux/poll.h> +/* Control ID to fetch register Values */ +#define VIDIOC_CVBS_G_FIELD_STATUS _IOR('V', BASE_VIDIOC_PRIVATE + 5, int) + enum msm_ba_ip { BA_IP_CVBS_0 = 0, BA_IP_CVBS_1, diff --git a/include/uapi/media/ais/msm_ais_isp.h b/include/uapi/media/ais/msm_ais_isp.h index 7c9daafc404d..e093e84ed3f8 100644 --- a/include/uapi/media/ais/msm_ais_isp.h +++ b/include/uapi/media/ais/msm_ais_isp.h @@ -23,6 +23,9 @@ #define ISP_STATS_STREAM_BIT 0x80000000 +#define INTERLACE_SUPPORT +#define INTERLACE_OFFSET (1) + struct msm_vfe_cfg_cmd_list; enum ISP_START_PIXEL_PATTERN { @@ -733,6 +736,7 @@ struct msm_isp_buf_event { uint32_t handle; uint32_t output_format; int8_t buf_idx; + uint8_t field_type; }; struct msm_isp_fetch_eng_event { uint32_t session_id; |