History

[media] videodev2.h: put V4L2_YCBCR_ENC_SYCC under #ifndef __KERNEL__

This define is a duplicate of V4L2_YCBCR_ENC_601. So mark it as 'should not be used' and put it under #ifndef __KERNEL__ to prevent drivers from referring to it.

Hans Verkuil committed 10 years ago

Commit adca8c81 parent 9ddbf681 file · +9 −5Browse files

Showing the changes to include/uapi/linux (1 of 1 file). Show all

Unified · Split

include/uapi/linux/videodev2.h+9−5
@@ -292,13 +292,11 @@ enum v4l2_ycbcr_encoding { · 291 unmodified lines
292292 * various colorspaces:
293293 *
294294 * V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_470_SYSTEM_M,
295− * V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_ADOBERGB and
296− * V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601
295+ * V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_SRGB,
296+ * V4L2_COLORSPACE_ADOBERGB and V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601
297297 *
298298 * V4L2_COLORSPACE_REC709 and V4L2_COLORSPACE_DCI_P3: V4L2_YCBCR_ENC_709
299299 *
300− * V4L2_COLORSPACE_SRGB: V4L2_YCBCR_ENC_SYCC
301− *
302300 * V4L2_COLORSPACE_BT2020: V4L2_YCBCR_ENC_BT2020
303301 *
304302 * V4L2_COLORSPACE_SMPTE240M: V4L2_YCBCR_ENC_SMPTE240M
@@ -317,8 +315,14 @@ enum v4l2_ycbcr_encoding { · 12 unmodified lines
317315 /* Rec. 709/EN 61966-2-4 Extended Gamut -- HDTV */
318316 V4L2_YCBCR_ENC_XV709 = 4,
319317
320− /* sYCC (Y'CbCr encoding of sRGB) */
318+#ifndef __KERNEL__
319+ /*
320+ * sYCC (Y'CbCr encoding of sRGB), identical to ENC_601. It was added
321+ * originally due to a misunderstanding of the sYCC standard. It should
322+ * not be used, instead use V4L2_YCBCR_ENC_601.
323+ */
321324 V4L2_YCBCR_ENC_SYCC = 5,
325+#endif
322326
323327 /* BT.2020 Non-constant Luminance Y'CbCr */
324328 V4L2_YCBCR_ENC_BT2020 = 6,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t