1 files changed, 99 insertions, 15 deletions

diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 778a3298fb34..d279c1b75cf7 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -79,6 +79,7 @@
 /*  Four-character-code (FOURCC) */
 #define v4l2_fourcc(a, b, c, d)\
         ((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
+#define v4l2_fourcc_be(a, b, c, d)      (v4l2_fourcc(a, b, c, d) | (1 << 31))
 
 /*
  *      E N U M S
@@ -177,30 +178,103 @@ enum v4l2_memory {
 
 /* see also http://vektor.theorem.ca/graphics/ycbcr/ */
 enum v4l2_colorspace {
-        /* ITU-R 601 -- broadcast NTSC/PAL */
+        /* SMPTE 170M: used for broadcast NTSC/PAL SDTV */
         V4L2_COLORSPACE_SMPTE170M     = 1,
 
-        /* 1125-Line (US) HDTV */
+        /* Obsolete pre-1998 SMPTE 240M HDTV standard, superseded by Rec 709 */
         V4L2_COLORSPACE_SMPTE240M     = 2,
 
-        /* HD and modern captures. */
+        /* Rec.709: used for HDTV */
         V4L2_COLORSPACE_REC709        = 3,
 
-        /* broken BT878 extents (601, luma range 16-253 instead of 16-235) */
+        /*
+         * Deprecated, do not use. No driver will ever return this. This was
+         * based on a misunderstanding of the bt878 datasheet.
+         */
         V4L2_COLORSPACE_BT878         = 4,
 
-        /* These should be useful.  Assume 601 extents. */
+        /*
+         * NTSC 1953 colorspace. This only makes sense when dealing with
+         * really, really old NTSC recordings. Superseded by SMPTE 170M.
+         */
         V4L2_COLORSPACE_470_SYSTEM_M  = 5,
+
+        /*
+         * EBU Tech 3213 PAL/SECAM colorspace. This only makes sense when
+         * dealing with really old PAL/SECAM recordings. Superseded by
+         * SMPTE 170M.
+         */
         V4L2_COLORSPACE_470_SYSTEM_BG = 6,
 
-        /* I know there will be cameras that send this.  So, this is
-         * unspecified chromaticities and full 0-255 on each of the
-         * Y'CbCr components
+        /*
+         * Effectively shorthand for V4L2_COLORSPACE_SRGB, V4L2_YCBCR_ENC_601
+         * and V4L2_QUANTIZATION_FULL_RANGE. To be used for (Motion-)JPEG.
          */
         V4L2_COLORSPACE_JPEG          = 7,
 
-        /* For RGB colourspaces, this is probably a good start. */
+        /* For RGB colorspaces such as produces by most webcams. */
         V4L2_COLORSPACE_SRGB          = 8,
+
+        /* AdobeRGB colorspace */
+        V4L2_COLORSPACE_ADOBERGB      = 9,
+
+        /* BT.2020 colorspace, used for UHDTV. */
+        V4L2_COLORSPACE_BT2020        = 10,
+};
+
+enum v4l2_ycbcr_encoding {
+        /*
+         * Mapping of V4L2_YCBCR_ENC_DEFAULT to actual encodings for the
+         * various colorspaces:
+         *
+         * V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_470_SYSTEM_M,
+         * V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_ADOBERGB and
+         * V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601
+         *
+         * V4L2_COLORSPACE_REC709: V4L2_YCBCR_ENC_709
+         *
+         * V4L2_COLORSPACE_SRGB: V4L2_YCBCR_ENC_SYCC
+         *
+         * V4L2_COLORSPACE_BT2020: V4L2_YCBCR_ENC_BT2020
+         *
+         * V4L2_COLORSPACE_SMPTE240M: V4L2_YCBCR_ENC_SMPTE240M
+         */
+        V4L2_YCBCR_ENC_DEFAULT        = 0,
+
+        /* ITU-R 601 -- SDTV */
+        V4L2_YCBCR_ENC_601            = 1,
+
+        /* Rec. 709 -- HDTV */
+        V4L2_YCBCR_ENC_709            = 2,
+
+        /* ITU-R 601/EN 61966-2-4 Extended Gamut -- SDTV */
+        V4L2_YCBCR_ENC_XV601          = 3,
+
+        /* Rec. 709/EN 61966-2-4 Extended Gamut -- HDTV */
+        V4L2_YCBCR_ENC_XV709          = 4,
+
+        /* sYCC (Y'CbCr encoding of sRGB) */
+        V4L2_YCBCR_ENC_SYCC           = 5,
+
+        /* BT.2020 Non-constant Luminance Y'CbCr */
+        V4L2_YCBCR_ENC_BT2020         = 6,
+
+        /* BT.2020 Constant Luminance Y'CbcCrc */
+        V4L2_YCBCR_ENC_BT2020_CONST_LUM = 7,
+
+        /* SMPTE 240M -- Obsolete HDTV */
+        V4L2_YCBCR_ENC_SMPTE240M      = 8,
+};
+
+enum v4l2_quantization {
+        /*
+         * The default for R'G'B' quantization is always full range. For
+         * Y'CbCr the quantization is always limited range, except for
+         * SYCC, XV601, XV709 or JPEG: those are full range.
+         */
+        V4L2_QUANTIZATION_DEFAULT     = 0,
+        V4L2_QUANTIZATION_FULL_RANGE  = 1,
+        V4L2_QUANTIZATION_LIM_RANGE   = 2,
 };
 
 enum v4l2_priority {
@@ -293,6 +367,8 @@ struct v4l2_pix_format {
         __u32                   colorspace;     /* enum v4l2_colorspace */
         __u32                   priv;           /* private data, depends on pixelformat */
         __u32                   flags;          /* format flags (V4L2_PIX_FMT_FLAG_*) */
+        __u32                   ycbcr_enc;      /* enum v4l2_ycbcr_encoding */
+        __u32                   quantization;   /* enum v4l2_quantization */
 };
 
 /*      Pixel format         FOURCC                          depth  Description  */
@@ -307,6 +383,8 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_XRGB555 v4l2_fourcc('X', 'R', '1', '5') /* 16  XRGB-1-5-5-5  */
 #define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
 #define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
+#define V4L2_PIX_FMT_ARGB555X v4l2_fourcc_be('A', 'R', '1', '5') /* 16  ARGB-5-5-5 BE */
+#define V4L2_PIX_FMT_XRGB555X v4l2_fourcc_be('X', 'R', '1', '5') /* 16  XRGB-5-5-5 BE */
 #define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
 #define V4L2_PIX_FMT_BGR666  v4l2_fourcc('B', 'G', 'R', 'H') /* 18  BGR-6-6-6     */
 #define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
@@ -1246,6 +1324,7 @@ struct v4l2_input {
 #define V4L2_IN_CAP_DV_TIMINGS          0x00000002 /* Supports S_DV_TIMINGS */
 #define V4L2_IN_CAP_CUSTOM_TIMINGS      V4L2_IN_CAP_DV_TIMINGS /* For compatibility */
 #define V4L2_IN_CAP_STD                 0x00000004 /* Supports S_STD */
+#define V4L2_IN_CAP_NATIVE_SIZE         0x00000008 /* Supports setting native size */
 
 /*
  *      V I D E O   O U T P U T S
@@ -1269,6 +1348,7 @@ struct v4l2_output {
 #define V4L2_OUT_CAP_DV_TIMINGS         0x00000002 /* Supports S_DV_TIMINGS */
 #define V4L2_OUT_CAP_CUSTOM_TIMINGS     V4L2_OUT_CAP_DV_TIMINGS /* For compatibility */
 #define V4L2_OUT_CAP_STD                0x00000004 /* Supports S_STD */
+#define V4L2_OUT_CAP_NATIVE_SIZE        0x00000008 /* Supports setting native size */
 
 /*
  *      C O N T R O L S
@@ -1285,11 +1365,11 @@ struct v4l2_ext_control {
         union {
                 __s32 value;
                 __s64 value64;
-                char *string;
-                __u8 *p_u8;
-                __u16 *p_u16;
-                __u32 *p_u32;
-                void *ptr;
+                char __user *string;
+                __u8 __user *p_u8;
+                __u16 __user *p_u16;
+                __u32 __user *p_u32;
+                void __user *ptr;
         };
 } __attribute__ ((packed));
 
@@ -1774,6 +1854,8 @@ struct v4l2_plane_pix_format {
  * @plane_fmt:          per-plane information
  * @num_planes:         number of planes for this format
  * @flags:              format flags (V4L2_PIX_FMT_FLAG_*)
+ * @ycbcr_enc:          enum v4l2_ycbcr_encoding, Y'CbCr encoding
+ * @quantization:       enum v4l2_quantization, colorspace quantization
  */
 struct v4l2_pix_format_mplane {
         __u32                           width;
@@ -1785,7 +1867,9 @@ struct v4l2_pix_format_mplane {
         struct v4l2_plane_pix_format    plane_fmt[VIDEO_MAX_PLANES];
         __u8                            num_planes;
         __u8                            flags;
-        __u8                            reserved[10];
+        __u8                            ycbcr_enc;
+        __u8                            quantization;
+        __u8                            reserved[8];
 } __attribute__ ((packed));
 
 /**