diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-16 16:34:22 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-16 16:34:22 -0700 |
| commit | 339312a17b4b0723c629b6560cf8875f8fb3d1e4 (patch) | |
| tree | 060419f4ef99c0d7dc4fafd6a796d93e3fa3f029 /include/uapi | |
| parent | 3e58ad8cc1ad33ec3367d2a8dd89ec57d79e287c (diff) | |
| parent | d40e78e9bef33a6b533828b49b2f93259c9c668e (diff) | |
Merge "msm: camera: sensor: Add META10 fourcc"
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/media/msm_cam_sensor.h | 1 | ||||
| -rw-r--r-- | include/uapi/media/msmb_isp.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/media/msm_cam_sensor.h b/include/uapi/media/msm_cam_sensor.h index 5d340b9a2523..540a96c57e5b 100644 --- a/include/uapi/media/msm_cam_sensor.h +++ b/include/uapi/media/msm_cam_sensor.h @@ -35,6 +35,7 @@ #define MAX_REGULATOR 5 #define MSM_V4L2_PIX_FMT_META v4l2_fourcc('M', 'E', 'T', 'A') /* META */ +#define MSM_V4L2_PIX_FMT_META10 v4l2_fourcc('M', 'E', '1', '0') /* META10 */ #define MSM_V4L2_PIX_FMT_SBGGR14 v4l2_fourcc('B', 'G', '1', '4') /* 14 BGBG.. GRGR.. */ #define MSM_V4L2_PIX_FMT_SGBRG14 v4l2_fourcc('G', 'B', '1', '4') diff --git a/include/uapi/media/msmb_isp.h b/include/uapi/media/msmb_isp.h index 93613855228e..9f933dc7e84f 100644 --- a/include/uapi/media/msmb_isp.h +++ b/include/uapi/media/msmb_isp.h @@ -802,6 +802,7 @@ struct msm_isp_ahb_clk_cfg { #define V4L2_PIX_FMT_NV14 v4l2_fourcc('N', 'V', '1', '4') #define V4L2_PIX_FMT_NV41 v4l2_fourcc('N', 'V', '4', '1') #define V4L2_PIX_FMT_META v4l2_fourcc('Q', 'M', 'E', 'T') +#define V4L2_PIX_FMT_META10 v4l2_fourcc('Q', 'M', '1', '0') #define V4L2_PIX_FMT_SBGGR14 v4l2_fourcc('B', 'G', '1', '4') /* 14 BGBG.GRGR.*/ #define V4L2_PIX_FMT_SGBRG14 v4l2_fourcc('G', 'B', '1', '4') /* 14 GBGB.RGRG.*/ #define V4L2_PIX_FMT_SGRBG14 v4l2_fourcc('B', 'A', '1', '4') /* 14 GRGR.BGBG.*/ |