diff options
| author | Lad, Prabhakar <prabhakar.lad@ti.com> | 2012-10-01 07:17:36 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 20:44:26 -0400 |
| commit | 5ebef0fbe0f72fa911088800c5d0bc7a872c35de (patch) | |
| tree | 02b76cf6fc36c613da5a2e7139189f416f656ba9 | |
| parent | ab7ef22419927910e563170db41f0a428d20b0a2 (diff) | |
[media] media: v4l2-ctrls: add control for test pattern
add V4L2_CID_TEST_PATTERN of type menu, which determines
the internal test pattern selected by the device.
Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | Documentation/DocBook/media/v4l/controls.xml | 10 | ||||
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-ctrls.c | 2 | ||||
| -rw-r--r-- | include/linux/v4l2-controls.h | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index 272a5f718509..a84a08ca51dc 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml | |||
| @@ -4267,6 +4267,16 @@ interface and may change in the future.</para> | |||
| 4267 | pixels / second. | 4267 | pixels / second. |
| 4268 | </entry> | 4268 | </entry> |
| 4269 | </row> | 4269 | </row> |
| 4270 | <row> | ||
| 4271 | <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN</constant></entry> | ||
| 4272 | <entry>menu</entry> | ||
| 4273 | </row> | ||
| 4274 | <row id="v4l2-test-pattern"> | ||
| 4275 | <entry spanname="descr"> Some capture/display/sensor devices have | ||
| 4276 | the capability to generate test pattern images. These hardware | ||
| 4277 | specific test patterns can be used to test if a device is working | ||
| 4278 | properly.</entry> | ||
| 4279 | </row> | ||
| 4270 | <row><entry></entry></row> | 4280 | <row><entry></entry></row> |
| 4271 | </tbody> | 4281 | </tbody> |
| 4272 | </tgroup> | 4282 | </tgroup> |
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 631cdc0e0bda..0bcef2b52cb1 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c | |||
| @@ -749,6 +749,7 @@ const char *v4l2_ctrl_get_name(u32 id) | |||
| 749 | case V4L2_CID_IMAGE_PROC_CLASS: return "Image Processing Controls"; | 749 | case V4L2_CID_IMAGE_PROC_CLASS: return "Image Processing Controls"; |
| 750 | case V4L2_CID_LINK_FREQ: return "Link Frequency"; | 750 | case V4L2_CID_LINK_FREQ: return "Link Frequency"; |
| 751 | case V4L2_CID_PIXEL_RATE: return "Pixel Rate"; | 751 | case V4L2_CID_PIXEL_RATE: return "Pixel Rate"; |
| 752 | case V4L2_CID_TEST_PATTERN: return "Test Pattern"; | ||
| 752 | 753 | ||
| 753 | /* DV controls */ | 754 | /* DV controls */ |
| 754 | case V4L2_CID_DV_CLASS: return "Digital Video Controls"; | 755 | case V4L2_CID_DV_CLASS: return "Digital Video Controls"; |
| @@ -862,6 +863,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, | |||
| 862 | case V4L2_CID_DV_TX_MODE: | 863 | case V4L2_CID_DV_TX_MODE: |
| 863 | case V4L2_CID_DV_TX_RGB_RANGE: | 864 | case V4L2_CID_DV_TX_RGB_RANGE: |
| 864 | case V4L2_CID_DV_RX_RGB_RANGE: | 865 | case V4L2_CID_DV_RX_RGB_RANGE: |
| 866 | case V4L2_CID_TEST_PATTERN: | ||
| 865 | *type = V4L2_CTRL_TYPE_MENU; | 867 | *type = V4L2_CTRL_TYPE_MENU; |
| 866 | break; | 868 | break; |
| 867 | case V4L2_CID_LINK_FREQ: | 869 | case V4L2_CID_LINK_FREQ: |
diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h index 421d24c7f686..e1b36809c21b 100644 --- a/include/linux/v4l2-controls.h +++ b/include/linux/v4l2-controls.h | |||
| @@ -757,5 +757,6 @@ enum v4l2_jpeg_chroma_subsampling { | |||
| 757 | 757 | ||
| 758 | #define V4L2_CID_LINK_FREQ (V4L2_CID_IMAGE_PROC_CLASS_BASE + 1) | 758 | #define V4L2_CID_LINK_FREQ (V4L2_CID_IMAGE_PROC_CLASS_BASE + 1) |
| 759 | #define V4L2_CID_PIXEL_RATE (V4L2_CID_IMAGE_PROC_CLASS_BASE + 2) | 759 | #define V4L2_CID_PIXEL_RATE (V4L2_CID_IMAGE_PROC_CLASS_BASE + 2) |
| 760 | #define V4L2_CID_TEST_PATTERN (V4L2_CID_IMAGE_PROC_CLASS_BASE + 3) | ||
| 760 | 761 | ||
| 761 | #endif | 762 | #endif |
