| From 7dcbc52ee91271e807daf73208caaf859a3e7a41 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Thu, 4 Aug 2016 13:14:02 -0300 |
| Subject: [PATCH 267/299] [media] v4l: ctrls: Add deinterlacing mode control |
| |
| The menu control selects the operation mode of a video deinterlacer. The |
| menu entries are driver specific. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Reviewed-by: Kieran Bingham <kieran@bingham.xyz> |
| Acked-by: Hans Verkuil <hans.verkuil@cisco.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> |
| (cherry picked from commit 446e412597217e937d33296e77eeba7379ab3008) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| Documentation/media/uapi/v4l/extended-controls.rst | 4 ++++ |
| Documentation/media/v4l-drivers/index.rst | 2 ++ |
| drivers/media/v4l2-core/v4l2-ctrls.c | 2 ++ |
| include/uapi/linux/v4l2-controls.h | 1 + |
| 4 files changed, 9 insertions(+) |
| |
| --- a/Documentation/media/uapi/v4l/extended-controls.rst |
| +++ b/Documentation/media/uapi/v4l/extended-controls.rst |
| @@ -3017,6 +3017,10 @@ Image Process Control IDs |
| test pattern images. These hardware specific test patterns can be |
| used to test if a device is working properly. |
| |
| +``V4L2_CID_DEINTERLACING_MODE (menu)`` |
| + The video deinterlacing mode (such as Bob, Weave, ...). The menu items are |
| + driver specific and are documented in :ref:`v4l-drivers`. |
| + |
| |
| .. _dv-controls: |
| |
| --- a/Documentation/media/v4l-drivers/index.rst |
| +++ b/Documentation/media/v4l-drivers/index.rst |
| @@ -2,6 +2,8 @@ |
| |
| .. include:: <isonum.txt> |
| |
| +.. _v4l-drivers: |
| + |
| ################################################ |
| Video4Linux (V4L) driver-specific documentation |
| ################################################ |
| --- a/drivers/media/v4l2-core/v4l2-ctrls.c |
| +++ b/drivers/media/v4l2-core/v4l2-ctrls.c |
| @@ -885,6 +885,7 @@ const char *v4l2_ctrl_get_name(u32 id) |
| case V4L2_CID_LINK_FREQ: return "Link Frequency"; |
| case V4L2_CID_PIXEL_RATE: return "Pixel Rate"; |
| case V4L2_CID_TEST_PATTERN: return "Test Pattern"; |
| + case V4L2_CID_DEINTERLACING_MODE: return "Deinterlacing Mode"; |
| |
| /* DV controls */ |
| /* Keep the order of the 'case's the same as in v4l2-controls.h! */ |
| @@ -1058,6 +1059,7 @@ void v4l2_ctrl_fill(u32 id, const char * |
| case V4L2_CID_DV_RX_RGB_RANGE: |
| case V4L2_CID_DV_RX_IT_CONTENT_TYPE: |
| case V4L2_CID_TEST_PATTERN: |
| + case V4L2_CID_DEINTERLACING_MODE: |
| case V4L2_CID_TUNE_DEEMPHASIS: |
| case V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_SEL: |
| case V4L2_CID_DETECT_MD_MODE: |
| --- a/include/uapi/linux/v4l2-controls.h |
| +++ b/include/uapi/linux/v4l2-controls.h |
| @@ -892,6 +892,7 @@ enum v4l2_jpeg_chroma_subsampling { |
| #define V4L2_CID_LINK_FREQ (V4L2_CID_IMAGE_PROC_CLASS_BASE + 1) |
| #define V4L2_CID_PIXEL_RATE (V4L2_CID_IMAGE_PROC_CLASS_BASE + 2) |
| #define V4L2_CID_TEST_PATTERN (V4L2_CID_IMAGE_PROC_CLASS_BASE + 3) |
| +#define V4L2_CID_DEINTERLACING_MODE (V4L2_CID_IMAGE_PROC_CLASS_BASE + 4) |
| |
| |
| /* DV-class control IDs defined by V4L2 */ |
