aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-Antoine Couret <charles-antoine.couret@nexvision.fr>2016-09-15 09:53:55 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-09-19 13:34:41 -0400
commite74c8cda4ca0c697dd8f0cc5928fe8403fb58f7c (patch)
treeaed10022552ca02aa9fb20e2d1da38eb0799c414
parent7389e6ef347443ac90116c2208bbdfb4f9d135ba (diff)
[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>
-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``.
272 272
273 - .. row 11 273 - .. row 11
274 274
275 - :cspan:`2` Digital Video 275 - ``V4L2_IN_ST_NO_V_LOCK``
276
277 - 0x00000400
278
279 - No vertical sync lock.
276 280
277 - .. row 12 281 - .. row 12
278 282
283 - ``V4L2_IN_ST_NO_STD_LOCK``
284
285 - 0x00000800
286
287 - No standard format lock in case of auto-detection format
288 by the component.
289
290 - .. row 13
291
292 - :cspan:`2` Digital Video
293
294 - .. row 14
295
279 - ``V4L2_IN_ST_NO_SYNC`` 296 - ``V4L2_IN_ST_NO_SYNC``
280 297
281 - 0x00010000 298 - 0x00010000
282 299
283 - No synchronization lock. 300 - No synchronization lock.
284 301
285 - .. row 13 302 - .. row 15
286 303
287 - ``V4L2_IN_ST_NO_EQU`` 304 - ``V4L2_IN_ST_NO_EQU``
288 305
@@ -290,7 +307,7 @@ at index zero, incrementing by one until the driver returns ``EINVAL``.
290 307
291 - No equalizer lock. 308 - No equalizer lock.
292 309
293 - .. row 14 310 - .. row 16
294 311
295 - ``V4L2_IN_ST_NO_CARRIER`` 312 - ``V4L2_IN_ST_NO_CARRIER``
296 313
@@ -298,11 +315,11 @@ at index zero, incrementing by one until the driver returns ``EINVAL``.
298 315
299 - Carrier recovery failed. 316 - Carrier recovery failed.
300 317
301 - .. row 15 318 - .. row 17
302 319
303 - :cspan:`2` VCR and Set-Top Box 320 - :cspan:`2` VCR and Set-Top Box
304 321
305 - .. row 16 322 - .. row 18
306 323
307 - ``V4L2_IN_ST_MACROVISION`` 324 - ``V4L2_IN_ST_MACROVISION``
308 325
@@ -312,7 +329,7 @@ at index zero, incrementing by one until the driver returns ``EINVAL``.
312 signal to confuse video recorders. When this flag is set 329 signal to confuse video recorders. When this flag is set
313 Macrovision has been detected. 330 Macrovision has been detected.
314 331
315 - .. row 17 332 - .. row 19
316 333
317 - ``V4L2_IN_ST_NO_ACCESS`` 334 - ``V4L2_IN_ST_NO_ACCESS``
318 335
@@ -320,7 +337,7 @@ at index zero, incrementing by one until the driver returns ``EINVAL``.
320 337
321 - Conditional access denied. 338 - Conditional access denied.
322 339
323 - .. row 18 340 - .. row 20
324 341
325 - ``V4L2_IN_ST_VTR`` 342 - ``V4L2_IN_ST_VTR``
326 343
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
352 352
353 - The timings follow the VESA Generalized Timings Formula standard 353 - The timings follow the VESA Generalized Timings Formula standard
354 354
355 - .. row 7
356
357 - ``V4L2_DV_BT_STD_SDI``
358
359 - The timings follow the SDI Timings standard.
360 There are no horizontal syncs/porches at all in this format.
361 Total blanking timings must be set in hsync or vsync fields only.
355 362
356.. tabularcolumns:: |p{6.0cm}|p{11.5cm}| 363.. tabularcolumns:: |p{6.0cm}|p{11.5cm}|
357 364
@@ -424,3 +431,11 @@ EBUSY
424 R'G'B' values use limited range (i.e. 16-235) as opposed to full 431 R'G'B' values use limited range (i.e. 16-235) as opposed to full
425 range (i.e. 0-255). All formats defined in CEA-861 except for the 432 range (i.e. 0-255). All formats defined in CEA-861 except for the
426 640x480p59.94 format are CE formats. 433 640x480p59.94 format are CE formats.
434
435 - .. row 8
436
437 - ``V4L2_DV_FL_FIRST_FIELD_EXTRA_LINE``
438
439 - Some formats like SMPTE-125M have an interlaced signal with a odd
440 total height. For these formats, if this flag is set, the first
441 field has the extra line. Else, it is the second field.