summaryrefslogtreecommitdiff
path: root/Documentation/media
diff options
context:
space:
mode:
authorCharles-Antoine Couret <charles-antoine.couret@nexvision.fr>2016-09-15 16:53:55 +0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-09-19 20:34:41 +0300
commite74c8cda4ca0c697dd8f0cc5928fe8403fb58f7c (patch)
treeaed10022552ca02aa9fb20e2d1da38eb0799c414 /Documentation/media
parent7389e6ef347443ac90116c2208bbdfb4f9d135ba (diff)
downloadlinux-e74c8cda4ca0c697dd8f0cc5928fe8403fb58f7c.tar.xz
[media] V4L2: Add documentation for SDI timings and related flags
Describe new needed constants defined by SDI format. Signed-off-by: Charles-Antoine Couret <charles-antoine.couret@nexvision.fr> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'Documentation/media')
-rw-r--r--Documentation/media/uapi/v4l/vidioc-enuminput.rst31
-rw-r--r--Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst15
2 files changed, 39 insertions, 7 deletions
diff --git a/Documentation/media/uapi/v4l/vidioc-enuminput.rst b/Documentation/media/uapi/v4l/vidioc-enuminput.rst
index be03e04e3dac..c38bde400dc1 100644
--- a/Documentation/media/uapi/v4l/vidioc-enuminput.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enuminput.rst
@@ -272,17 +272,34 @@ at index zero, incrementing by one until the driver returns ``EINVAL``.
- .. row 11
- - :cspan:`2` Digital Video
+ - ``V4L2_IN_ST_NO_V_LOCK``
+
+ - 0x00000400
+
+ - No vertical sync lock.
- .. row 12
+ - ``V4L2_IN_ST_NO_STD_LOCK``
+
+ - 0x00000800
+
+ - No standard format lock in case of auto-detection format
+ by the component.
+
+ - .. row 13
+
+ - :cspan:`2` Digital Video
+
+ - .. row 14
+
- ``V4L2_IN_ST_NO_SYNC``
- 0x00010000
- No synchronization lock.
- - .. row 13
+ - .. row 15
- ``V4L2_IN_ST_NO_EQU``
@@ -290,7 +307,7 @@ at index zero, incrementing by one until the driver returns ``EINVAL``.
- No equalizer lock.
- - .. row 14
+ - .. row 16
- ``V4L2_IN_ST_NO_CARRIER``
@@ -298,11 +315,11 @@ at index zero, incrementing by one until the driver returns ``EINVAL``.
- Carrier recovery failed.
- - .. row 15
+ - .. row 17
- :cspan:`2` VCR and Set-Top Box
- - .. row 16
+ - .. row 18
- ``V4L2_IN_ST_MACROVISION``
@@ -312,7 +329,7 @@ at index zero, incrementing by one until the driver returns ``EINVAL``.
signal to confuse video recorders. When this flag is set
Macrovision has been detected.
- - .. row 17
+ - .. row 19
- ``V4L2_IN_ST_NO_ACCESS``
@@ -320,7 +337,7 @@ at index zero, incrementing by one until the driver returns ``EINVAL``.
- Conditional access denied.
- - .. row 18
+ - .. row 20
- ``V4L2_IN_ST_VTR``
diff --git a/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst b/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst
index 379f2be0bc92..a2f58319cebe 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst
@@ -352,6 +352,13 @@ EBUSY
- The timings follow the VESA Generalized Timings Formula standard
+ - .. row 7
+
+ - ``V4L2_DV_BT_STD_SDI``
+
+ - The timings follow the SDI Timings standard.
+ There are no horizontal syncs/porches at all in this format.
+ Total blanking timings must be set in hsync or vsync fields only.
.. tabularcolumns:: |p{6.0cm}|p{11.5cm}|
@@ -424,3 +431,11 @@ EBUSY
R'G'B' values use limited range (i.e. 16-235) as opposed to full
range (i.e. 0-255). All formats defined in CEA-861 except for the
640x480p59.94 format are CE formats.
+
+ - .. row 8
+
+ - ``V4L2_DV_FL_FIRST_FIELD_EXTRA_LINE``
+
+ - Some formats like SMPTE-125M have an interlaced signal with a odd
+ total height. For these formats, if this flag is set, the first
+ field has the extra line. Else, it is the second field.