diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2016-08-04 05:09:03 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-08-24 07:38:31 -0400 |
| commit | dda3aeaa16434482c2aec03c54262dd2bc9c357b (patch) | |
| tree | 0142ec80dda234030425186187900c852f21bd90 /Documentation/media/uapi/v4l | |
| parent | adca8c8e251fdbdb6b28e3ef7a5ca24b597b82d8 (diff) | |
[media] pixfmt.rst: drop V4L2_YCBCR_ENC_SYCC from the documentation
The V4L2_YCBCR_ENC_SYCC encoding is identical to V4L2_YCBCR_ENC_601.
Remove V4L2_YCBCR_ENC_SYCC from the documentation since it should not
be used.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'Documentation/media/uapi/v4l')
| -rw-r--r-- | Documentation/media/uapi/v4l/pixfmt-006.rst | 10 | ||||
| -rw-r--r-- | Documentation/media/uapi/v4l/pixfmt-007.rst | 12 |
2 files changed, 6 insertions, 16 deletions
diff --git a/Documentation/media/uapi/v4l/pixfmt-006.rst b/Documentation/media/uapi/v4l/pixfmt-006.rst index 56b691300158..574294ec0a89 100644 --- a/Documentation/media/uapi/v4l/pixfmt-006.rst +++ b/Documentation/media/uapi/v4l/pixfmt-006.rst | |||
| @@ -229,23 +229,17 @@ needs to be filled in. | |||
| 229 | 229 | ||
| 230 | - .. row 7 | 230 | - .. row 7 |
| 231 | 231 | ||
| 232 | - ``V4L2_YCBCR_ENC_SYCC`` | ||
| 233 | |||
| 234 | - Use the extended gamut sYCC encoding. | ||
| 235 | |||
| 236 | - .. row 8 | ||
| 237 | |||
| 238 | - ``V4L2_YCBCR_ENC_BT2020`` | 232 | - ``V4L2_YCBCR_ENC_BT2020`` |
| 239 | 233 | ||
| 240 | - Use the default non-constant luminance BT.2020 Y'CbCr encoding. | 234 | - Use the default non-constant luminance BT.2020 Y'CbCr encoding. |
| 241 | 235 | ||
| 242 | - .. row 9 | 236 | - .. row 8 |
| 243 | 237 | ||
| 244 | - ``V4L2_YCBCR_ENC_BT2020_CONST_LUM`` | 238 | - ``V4L2_YCBCR_ENC_BT2020_CONST_LUM`` |
| 245 | 239 | ||
| 246 | - Use the constant luminance BT.2020 Yc'CbcCrc encoding. | 240 | - Use the constant luminance BT.2020 Yc'CbcCrc encoding. |
| 247 | 241 | ||
| 248 | - .. row 10 | 242 | - .. row 9 |
| 249 | 243 | ||
| 250 | - ``V4L2_YCBCR_ENC_SMPTE_240M`` | 244 | - ``V4L2_YCBCR_ENC_SMPTE_240M`` |
| 251 | 245 | ||
diff --git a/Documentation/media/uapi/v4l/pixfmt-007.rst b/Documentation/media/uapi/v4l/pixfmt-007.rst index 662302cfba8b..ab2fa3565fdd 100644 --- a/Documentation/media/uapi/v4l/pixfmt-007.rst +++ b/Documentation/media/uapi/v4l/pixfmt-007.rst | |||
| @@ -261,7 +261,7 @@ Colorspace sRGB (V4L2_COLORSPACE_SRGB) | |||
| 261 | The :ref:`srgb` standard defines the colorspace used by most webcams | 261 | The :ref:`srgb` standard defines the colorspace used by most webcams |
| 262 | and computer graphics. The default transfer function is | 262 | and computer graphics. The default transfer function is |
| 263 | ``V4L2_XFER_FUNC_SRGB``. The default Y'CbCr encoding is | 263 | ``V4L2_XFER_FUNC_SRGB``. The default Y'CbCr encoding is |
| 264 | ``V4L2_YCBCR_ENC_SYCC``. The default Y'CbCr quantization is full range. | 264 | ``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is full range. |
| 265 | The chromaticities of the primary colors and the white reference are: | 265 | The chromaticities of the primary colors and the white reference are: |
| 266 | 266 | ||
| 267 | 267 | ||
| @@ -339,8 +339,7 @@ Inverse Transfer function: | |||
| 339 | L = ((L' + 0.055) / 1.055) ^{2.4}\text{, for }L' > 0.04045 | 339 | L = ((L' + 0.055) / 1.055) ^{2.4}\text{, for }L' > 0.04045 |
| 340 | 340 | ||
| 341 | The luminance (Y') and color difference (Cb and Cr) are obtained with | 341 | The luminance (Y') and color difference (Cb and Cr) are obtained with |
| 342 | the following ``V4L2_YCBCR_ENC_SYCC`` encoding as defined by | 342 | the following ``V4L2_YCBCR_ENC_601`` encoding as defined by :ref:`sycc`: |
| 343 | :ref:`sycc`: | ||
| 344 | 343 | ||
| 345 | .. math:: | 344 | .. math:: |
| 346 | 345 | ||
| @@ -351,11 +350,8 @@ the following ``V4L2_YCBCR_ENC_SYCC`` encoding as defined by | |||
| 351 | Cr = 0.5R' - 0.4187G' - 0.0813B' | 350 | Cr = 0.5R' - 0.4187G' - 0.0813B' |
| 352 | 351 | ||
| 353 | Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range | 352 | Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range |
| 354 | [-0.5…0.5]. The ``V4L2_YCBCR_ENC_SYCC`` quantization is always full | 353 | [-0.5…0.5]. This transform is identical to one defined in SMPTE |
| 355 | range. Although this Y'CbCr encoding looks very similar to the | 354 | 170M/BT.601. The Y'CbCr quantization is full range. |
| 356 | ``V4L2_YCBCR_ENC_XV601`` encoding, it is not. The | ||
| 357 | ``V4L2_YCBCR_ENC_XV601`` scales and offsets the Y'CbCr values before | ||
| 358 | quantization, but this encoding does not do that. | ||
| 359 | 355 | ||
| 360 | 356 | ||
| 361 | .. _col-adobergb: | 357 | .. _col-adobergb: |
