ports@,
I'd like to simplify fswebcam patches by switching it to OpenBSD videoio.h.
Tested on -current/amd64.
Ok?
Index: graphics/fswebcam/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/fswebcam/Makefile,v
diff -u -p -r1.20 Makefile
--- graphics/fswebcam/Makefile 26 Sep 2023 11:39:03 -0000 1.20
+++ graphics/fswebcam/Makefile 15 Jan 2025 21:41:29 -0000
@@ -1,6 +1,7 @@
COMMENT= fswebcam is a small and simple webcam app
DISTNAME= fswebcam-20200725
+REVISION= 0
CATEGORIES= graphics
Index: graphics/fswebcam/patches/patch-src_v4l2_c
===================================================================
RCS file: /home/cvs/ports/graphics/fswebcam/patches/patch-src_v4l2_c,v
diff -u -p -r1.2 patch-src_v4l2_c
--- graphics/fswebcam/patches/patch-src_v4l2_c 11 Mar 2022 19:22:19 -0000
1.2
+++ graphics/fswebcam/patches/patch-src_v4l2_c 15 Jan 2025 21:47:35 -0000
@@ -1,24 +1,12 @@
-make these conditional, they're not in older videodev.h
-
Index: src_v4l2.c
--- src_v4l2.c.orig
+++ src_v4l2.c
-@@ -61,14 +61,18 @@ v4l2_palette_t v4l2_palette[] = {
- { SRC_PAL_BGR24, V4L2_PIX_FMT_BGR24 },
- { SRC_PAL_RGB32, V4L2_PIX_FMT_RGB32 },
- { SRC_PAL_BGR32, V4L2_PIX_FMT_BGR32 },
-+#ifdef V4L2_PIX_FMT_ABGR32
- { SRC_PAL_ABGR32, V4L2_PIX_FMT_ABGR32 },
-+#endif
- { SRC_PAL_YUYV, V4L2_PIX_FMT_YUYV },
- { SRC_PAL_UYVY, V4L2_PIX_FMT_UYVY },
- { SRC_PAL_VYUY, V4L2_PIX_FMT_VYUY },
- { SRC_PAL_YUV420P, V4L2_PIX_FMT_YUV420 },
- { SRC_PAL_BAYER, V4L2_PIX_FMT_SBGGR8 },
- { SRC_PAL_SBGGR8, V4L2_PIX_FMT_SBGGR8 },
-+#ifdef V4L2_PIX_FMT_SRGGB8
- { SRC_PAL_SRGGB8, V4L2_PIX_FMT_SRGGB8 },
-+#endif
- { SRC_PAL_SGBRG8, V4L2_PIX_FMT_SGBRG8 },
- { SRC_PAL_SGRBG8, V4L2_PIX_FMT_SGRBG8 },
- { SRC_PAL_RGB565, V4L2_PIX_FMT_RGB565 },
+@@ -19,7 +19,7 @@
+ #include <errno.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+-#include "videodev2.h"
++#include <sys/videoio.h>
+ #include "src.h"
+ #include "log.h"
+
Index: graphics/fswebcam/patches/patch-videodev2_h
===================================================================
RCS file: graphics/fswebcam/patches/patch-videodev2_h
diff -N graphics/fswebcam/patches/patch-videodev2_h
--- graphics/fswebcam/patches/patch-videodev2_h 11 Mar 2022 19:22:19 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2808 +0,0 @@
-revert videodev2.h header to the version in 20140113 (backout 042e72b
-"update videodev2.h header") plus OpenBSD port patches - the newer one
-pulls in Linux system headers that we don't have
-
-Index: videodev2.h
---- videodev2.h.orig
-+++ videodev2.h
-@@ -1,8 +1,7 @@
--/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR
BSD-3-Clause) */
- /*
- * Video for Linux Two header file
- *
-- * Copyright (C) 1999-2012 the contributors
-+ * Copyright (C) 1999-2007 the contributors
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
-@@ -47,7 +46,7 @@
- * All kernel-specific stuff were moved to media/v4l2-dev.h, so
- * no #if __KERNEL tests are allowed here
- *
-- * See https://linuxtv.org for more info
-+ * See http://linuxtv.org for more info
- *
- * Author: Bill Dirks <[email protected]>
- * Justin Schoeman
-@@ -59,26 +58,41 @@
-
- #include <sys/time.h>
-
--#include <linux/ioctl.h>
--#include <linux/types.h>
--#include <linux/v4l2-common.h>
--#include <linux/v4l2-controls.h>
-+#include <sys/ioctl.h>
-+#include <sys/types.h>
-
- /*
- * Common stuff for both V4L1 and V4L2
- * Moved from videodev.h
- */
- #define VIDEO_MAX_FRAME 32
--#define VIDEO_MAX_PLANES 8
-
-+
-+/* These defines are V4L1 specific and should not be used with the V4L2 API!
-+ They will be removed from this header in the future. */
-+
-+#define VID_TYPE_CAPTURE 1 /* Can capture */
-+#define VID_TYPE_TUNER 2 /* Can tune */
-+#define VID_TYPE_TELETEXT 4 /* Does teletext */
-+#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */
-+#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */
-+#define VID_TYPE_CLIPPING 32 /* Can clip */
-+#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */
-+#define VID_TYPE_SCALES 128 /* Scalable */
-+#define VID_TYPE_MONOCHROME 256 /* Monochrome only */
-+#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */
-+#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */
-+#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */
-+#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */
-+#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */
-+
- /*
- * M I S C E L L A N E O U S
- */
-
- /* 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))
-+ ((uint32_t)(a) | ((uint32_t)(b) << 8) | ((uint32_t)(c) << 16) |
((uint32_t)(d) << 24))
-
- /*
- * E N U M S
-@@ -124,10 +138,6 @@ enum v4l2_field {
- (field) == V4L2_FIELD_INTERLACED_BT ||\
- (field) == V4L2_FIELD_SEQ_TB ||\
- (field) == V4L2_FIELD_SEQ_BT)
--#define V4L2_FIELD_HAS_T_OR_B(field) \
-- ((field) == V4L2_FIELD_BOTTOM ||\
-- (field) == V4L2_FIELD_TOP ||\
-- (field) == V4L2_FIELD_ALTERNATE)
-
- enum v4l2_buf_type {
- V4L2_BUF_TYPE_VIDEO_CAPTURE = 1,
-@@ -137,247 +147,62 @@ enum v4l2_buf_type {
- V4L2_BUF_TYPE_VBI_OUTPUT = 5,
- V4L2_BUF_TYPE_SLICED_VBI_CAPTURE = 6,
- V4L2_BUF_TYPE_SLICED_VBI_OUTPUT = 7,
-+#if 1
-+ /* Experimental */
- V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8,
-- V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
-- V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE = 10,
-- V4L2_BUF_TYPE_SDR_CAPTURE = 11,
-- V4L2_BUF_TYPE_SDR_OUTPUT = 12,
-- V4L2_BUF_TYPE_META_CAPTURE = 13,
-- /* Deprecated, do not use */
-+#endif
- V4L2_BUF_TYPE_PRIVATE = 0x80,
- };
-
--#define V4L2_TYPE_IS_MULTIPLANAR(type) \
-- ((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE \
-- || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
-+enum v4l2_ctrl_type {
-+ V4L2_CTRL_TYPE_INTEGER = 1,
-+ V4L2_CTRL_TYPE_BOOLEAN = 2,
-+ V4L2_CTRL_TYPE_MENU = 3,
-+ V4L2_CTRL_TYPE_BUTTON = 4,
-+ V4L2_CTRL_TYPE_INTEGER64 = 5,
-+ V4L2_CTRL_TYPE_CTRL_CLASS = 6,
-+};
-
--#define V4L2_TYPE_IS_OUTPUT(type) \
-- ((type) == V4L2_BUF_TYPE_VIDEO_OUTPUT \
-- || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE \
-- || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY \
-- || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY \
-- || (type) == V4L2_BUF_TYPE_VBI_OUTPUT \
-- || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT \
-- || (type) == V4L2_BUF_TYPE_SDR_OUTPUT)
--
- enum v4l2_tuner_type {
- V4L2_TUNER_RADIO = 1,
- V4L2_TUNER_ANALOG_TV = 2,
- V4L2_TUNER_DIGITAL_TV = 3,
-- V4L2_TUNER_SDR = 4,
-- V4L2_TUNER_RF = 5,
- };
-
--/* Deprecated, do not use */
--#define V4L2_TUNER_ADC V4L2_TUNER_SDR
--
- enum v4l2_memory {
- V4L2_MEMORY_MMAP = 1,
- V4L2_MEMORY_USERPTR = 2,
- V4L2_MEMORY_OVERLAY = 3,
-- V4L2_MEMORY_DMABUF = 4,
- };
-
- /* see also http://vektor.theorem.ca/graphics/ycbcr/ */
- enum v4l2_colorspace {
-- /*
-- * Default colorspace, i.e. let the driver figure it out.
-- * Can only be used with video capture.
-- */
-- V4L2_COLORSPACE_DEFAULT = 0,
--
-- /* SMPTE 170M: used for broadcast NTSC/PAL SDTV */
-+ /* ITU-R 601 -- broadcast NTSC/PAL */
- V4L2_COLORSPACE_SMPTE170M = 1,
-
-- /* Obsolete pre-1998 SMPTE 240M HDTV standard, superseded by Rec 709 */
-+ /* 1125-Line (US) HDTV */
- V4L2_COLORSPACE_SMPTE240M = 2,
-
-- /* Rec.709: used for HDTV */
-+ /* HD and modern captures. */
- V4L2_COLORSPACE_REC709 = 3,
-
-- /*
-- * Deprecated, do not use. No driver will ever return this. This was
-- * based on a misunderstanding of the bt878 datasheet.
-- */
-+ /* broken BT878 extents (601, luma range 16-253 instead of 16-235) */
- V4L2_COLORSPACE_BT878 = 4,
-
-- /*
-- * NTSC 1953 colorspace. This only makes sense when dealing with
-- * really, really old NTSC recordings. Superseded by SMPTE 170M.
-- */
-+ /* These should be useful. Assume 601 extents. */
- 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,
-
-- /*
-- * Effectively shorthand for V4L2_COLORSPACE_SRGB, V4L2_YCBCR_ENC_601
-- * and V4L2_QUANTIZATION_FULL_RANGE. To be used for (Motion-)JPEG.
-+ /* 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
- */
- V4L2_COLORSPACE_JPEG = 7,
-
-- /* For RGB colorspaces such as produces by most webcams. */
-+ /* For RGB colourspaces, this is probably a good start. */
- V4L2_COLORSPACE_SRGB = 8,
--
-- /* AdobeRGB colorspace */
-- V4L2_COLORSPACE_ADOBERGB = 9,
--
-- /* BT.2020 colorspace, used for UHDTV. */
-- V4L2_COLORSPACE_BT2020 = 10,
--
-- /* Raw colorspace: for RAW unprocessed images */
-- V4L2_COLORSPACE_RAW = 11,
--
-- /* DCI-P3 colorspace, used by cinema projectors */
-- V4L2_COLORSPACE_DCI_P3 = 12,
- };
-
--/*
-- * Determine how COLORSPACE_DEFAULT should map to a proper colorspace.
-- * This depends on whether this is a SDTV image (use SMPTE 170M), an
-- * HDTV image (use Rec. 709), or something else (use sRGB).
-- */
--#define V4L2_MAP_COLORSPACE_DEFAULT(is_sdtv, is_hdtv) \
-- ((is_sdtv) ? V4L2_COLORSPACE_SMPTE170M : \
-- ((is_hdtv) ? V4L2_COLORSPACE_REC709 : V4L2_COLORSPACE_SRGB))
--
--enum v4l2_xfer_func {
-- /*
-- * Mapping of V4L2_XFER_FUNC_DEFAULT to actual transfer functions
-- * for the various colorspaces:
-- *
-- * V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_470_SYSTEM_M,
-- * V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_REC709 and
-- * V4L2_COLORSPACE_BT2020: V4L2_XFER_FUNC_709
-- *
-- * V4L2_COLORSPACE_SRGB, V4L2_COLORSPACE_JPEG: V4L2_XFER_FUNC_SRGB
-- *
-- * V4L2_COLORSPACE_ADOBERGB: V4L2_XFER_FUNC_ADOBERGB
-- *
-- * V4L2_COLORSPACE_SMPTE240M: V4L2_XFER_FUNC_SMPTE240M
-- *
-- * V4L2_COLORSPACE_RAW: V4L2_XFER_FUNC_NONE
-- *
-- * V4L2_COLORSPACE_DCI_P3: V4L2_XFER_FUNC_DCI_P3
-- */
-- V4L2_XFER_FUNC_DEFAULT = 0,
-- V4L2_XFER_FUNC_709 = 1,
-- V4L2_XFER_FUNC_SRGB = 2,
-- V4L2_XFER_FUNC_ADOBERGB = 3,
-- V4L2_XFER_FUNC_SMPTE240M = 4,
-- V4L2_XFER_FUNC_NONE = 5,
-- V4L2_XFER_FUNC_DCI_P3 = 6,
-- V4L2_XFER_FUNC_SMPTE2084 = 7,
--};
--
--/*
-- * Determine how XFER_FUNC_DEFAULT should map to a proper transfer function.
-- * This depends on the colorspace.
-- */
--#define V4L2_MAP_XFER_FUNC_DEFAULT(colsp) \
-- ((colsp) == V4L2_COLORSPACE_ADOBERGB ? V4L2_XFER_FUNC_ADOBERGB : \
-- ((colsp) == V4L2_COLORSPACE_SMPTE240M ? V4L2_XFER_FUNC_SMPTE240M : \
-- ((colsp) == V4L2_COLORSPACE_DCI_P3 ? V4L2_XFER_FUNC_DCI_P3 : \
-- ((colsp) == V4L2_COLORSPACE_RAW ? V4L2_XFER_FUNC_NONE : \
-- ((colsp) == V4L2_COLORSPACE_SRGB || (colsp) == V4L2_COLORSPACE_JPEG
? \
-- V4L2_XFER_FUNC_SRGB : V4L2_XFER_FUNC_709)))))
--
--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_SRGB,
-- * V4L2_COLORSPACE_ADOBERGB and V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601
-- *
-- * V4L2_COLORSPACE_REC709 and V4L2_COLORSPACE_DCI_P3: V4L2_YCBCR_ENC_709
-- *
-- * 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), identical to ENC_601. It was added
-- * originally due to a misunderstanding of the sYCC standard. It should
-- * not be used, instead use V4L2_YCBCR_ENC_601.
-- */
-- 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_hsv_encoding values should not collide with the ones from
-- * enum v4l2_ycbcr_encoding.
-- */
--enum v4l2_hsv_encoding {
--
-- /* Hue mapped to 0 - 179 */
-- V4L2_HSV_ENC_180 = 128,
--
-- /* Hue mapped to 0-255 */
-- V4L2_HSV_ENC_256 = 129,
--};
--
--/*
-- * Determine how YCBCR_ENC_DEFAULT should map to a proper Y'CbCr encoding.
-- * This depends on the colorspace.
-- */
--#define V4L2_MAP_YCBCR_ENC_DEFAULT(colsp) \
-- (((colsp) == V4L2_COLORSPACE_REC709 || \
-- (colsp) == V4L2_COLORSPACE_DCI_P3) ? V4L2_YCBCR_ENC_709 : \
-- ((colsp) == V4L2_COLORSPACE_BT2020 ? V4L2_YCBCR_ENC_BT2020 : \
-- ((colsp) == V4L2_COLORSPACE_SMPTE240M ? V4L2_YCBCR_ENC_SMPTE240M : \
-- V4L2_YCBCR_ENC_601)))
--
--enum v4l2_quantization {
-- /*
-- * The default for R'G'B' quantization is always full range, except
-- * for the BT2020 colorspace. For Y'CbCr the quantization is always
-- * limited range, except for COLORSPACE_JPEG: this is full range.
-- */
-- V4L2_QUANTIZATION_DEFAULT = 0,
-- V4L2_QUANTIZATION_FULL_RANGE = 1,
-- V4L2_QUANTIZATION_LIM_RANGE = 2,
--};
--
--/*
-- * Determine how QUANTIZATION_DEFAULT should map to a proper quantization.
-- * This depends on whether the image is RGB or not, the colorspace and the
-- * Y'CbCr encoding.
-- */
--#define V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb_or_hsv, colsp, ycbcr_enc) \
-- (((is_rgb_or_hsv) && (colsp) == V4L2_COLORSPACE_BT2020) ? \
-- V4L2_QUANTIZATION_LIM_RANGE : \
-- (((is_rgb_or_hsv) || (colsp) == V4L2_COLORSPACE_JPEG) ? \
-- V4L2_QUANTIZATION_FULL_RANGE : V4L2_QUANTIZATION_LIM_RANGE))
--
- enum v4l2_priority {
- V4L2_PRIORITY_UNSET = 0, /* not initialized */
- V4L2_PRIORITY_BACKGROUND = 1,
-@@ -387,36 +212,27 @@ enum v4l2_priority {
- };
-
- struct v4l2_rect {
-- __s32 left;
-- __s32 top;
-- __u32 width;
-- __u32 height;
-+ int32_t left;
-+ int32_t top;
-+ int32_t width;
-+ int32_t height;
- };
-
- struct v4l2_fract {
-- __u32 numerator;
-- __u32 denominator;
-+ uint32_t numerator;
-+ uint32_t denominator;
- };
-
--/**
-- * struct v4l2_capability - Describes V4L2 device caps returned by
VIDIOC_QUERYCAP
-- *
-- * @driver: name of the driver module (e.g. "bttv")
-- * @card: name of the card (e.g. "Hauppauge WinTV")
-- * @bus_info: name of the bus (e.g. "PCI:" + pci_name(pci_dev) )
-- * @version: KERNEL_VERSION
-- * @capabilities: capabilities of the physical device as a whole
-- * @device_caps: capabilities accessed via this particular device (node)
-- * @reserved: reserved fields for future extensions
-- */
-+/*
-+ * D R I V E R C A P A B I L I T I E S
-+ */
- struct v4l2_capability {
-- __u8 driver[16];
-- __u8 card[32];
-- __u8 bus_info[32];
-- __u32 version;
-- __u32 capabilities;
-- __u32 device_caps;
-- __u32 reserved[3];
-+ uint8_t driver[16]; /* i.e. "bttv" */
-+ uint8_t card[32]; /* i.e. "Hauppauge WinTV" */
-+ uint8_t bus_info[32]; /* "PCI:" + pci_name(pci_dev) */
-+ uint32_t version; /* should use KERNEL_VERSION() */
-+ uint32_t capabilities; /* Device capabilities */
-+ uint32_t reserved[4];
- };
-
- /* Values for 'capabilities' field */
-@@ -430,211 +246,90 @@ struct v4l2_capability {
- #define V4L2_CAP_RDS_CAPTURE 0x00000100 /* RDS data capture */
- #define V4L2_CAP_VIDEO_OUTPUT_OVERLAY 0x00000200 /* Can do video output
overlay */
- #define V4L2_CAP_HW_FREQ_SEEK 0x00000400 /* Can do hardware
frequency seek */
--#define V4L2_CAP_RDS_OUTPUT 0x00000800 /* Is an RDS encoder */
-
--/* Is a video capture device that supports multiplanar formats */
--#define V4L2_CAP_VIDEO_CAPTURE_MPLANE 0x00001000
--/* Is a video output device that supports multiplanar formats */
--#define V4L2_CAP_VIDEO_OUTPUT_MPLANE 0x00002000
--/* Is a video mem-to-mem device that supports multiplanar formats */
--#define V4L2_CAP_VIDEO_M2M_MPLANE 0x00004000
--/* Is a video mem-to-mem device */
--#define V4L2_CAP_VIDEO_M2M 0x00008000
--
- #define V4L2_CAP_TUNER 0x00010000 /* has a tuner */
- #define V4L2_CAP_AUDIO 0x00020000 /* has audio
support */
- #define V4L2_CAP_RADIO 0x00040000 /* is a radio
device */
--#define V4L2_CAP_MODULATOR 0x00080000 /* has a modulator */
-
--#define V4L2_CAP_SDR_CAPTURE 0x00100000 /* Is a SDR capture device
*/
--#define V4L2_CAP_EXT_PIX_FORMAT 0x00200000 /* Supports the
extended pixel format */
--#define V4L2_CAP_SDR_OUTPUT 0x00400000 /* Is a SDR output device */
--#define V4L2_CAP_META_CAPTURE 0x00800000 /* Is a metadata capture
device */
--
- #define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls
*/
- #define V4L2_CAP_ASYNCIO 0x02000000 /* async I/O */
- #define V4L2_CAP_STREAMING 0x04000000 /* streaming I/O ioctls */
-
--#define V4L2_CAP_TOUCH 0x10000000 /* Is a touch device */
--
--#define V4L2_CAP_DEVICE_CAPS 0x80000000 /* sets device
capabilities field */
--
- /*
- * V I D E O I M A G E F O R M A T
- */
- struct v4l2_pix_format {
-- __u32 width;
-- __u32 height;
-- __u32 pixelformat;
-- __u32 field; /* enum v4l2_field */
-- __u32 bytesperline; /* for padding, zero if unused
*/
-- __u32 sizeimage;
-- __u32 colorspace; /* enum v4l2_colorspace */
-- __u32 priv; /* private data, depends on
pixelformat */
-- __u32 flags; /* format flags
(V4L2_PIX_FMT_FLAG_*) */
-- union {
-- /* enum v4l2_ycbcr_encoding */
-- __u32 ycbcr_enc;
-- /* enum v4l2_hsv_encoding */
-- __u32 hsv_enc;
-- };
-- __u32 quantization; /* enum v4l2_quantization */
-- __u32 xfer_func; /* enum v4l2_xfer_func */
-+ uint32_t width;
-+ uint32_t height;
-+ uint32_t pixelformat;
-+ enum v4l2_field field;
-+ uint32_t bytesperline; /* for padding, zero if unused
*/
-+ uint32_t sizeimage;
-+ enum v4l2_colorspace colorspace;
-+ uint32_t priv; /* private data,
depends on pixelformat */
- };
-
--/* Pixel format FOURCC depth
Description */
--
--/* RGB formats */
-+/* Pixel format FOURCC depth Description
*/
- #define V4L2_PIX_FMT_RGB332 v4l2_fourcc('R', 'G', 'B', '1') /* 8 RGB-3-3-2
*/
- #define V4L2_PIX_FMT_RGB444 v4l2_fourcc('R', '4', '4', '4') /* 16 xxxxrrrr
ggggbbbb */
--#define V4L2_PIX_FMT_ARGB444 v4l2_fourcc('A', 'R', '1', '2') /* 16 aaaarrrr
ggggbbbb */
--#define V4L2_PIX_FMT_XRGB444 v4l2_fourcc('X', 'R', '1', '2') /* 16 xxxxrrrr
ggggbbbb */
- #define V4L2_PIX_FMT_RGB555 v4l2_fourcc('R', 'G', 'B', 'O') /* 16 RGB-5-5-5
*/
--#define V4L2_PIX_FMT_ARGB555 v4l2_fourcc('A', 'R', '1', '5') /* 16
ARGB-1-5-5-5 */
--#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
*/
- #define V4L2_PIX_FMT_RGB24 v4l2_fourcc('R', 'G', 'B', '3') /* 24 RGB-8-8-8
*/
- #define V4L2_PIX_FMT_BGR32 v4l2_fourcc('B', 'G', 'R', '4') /* 32
BGR-8-8-8-8 */
--#define V4L2_PIX_FMT_ABGR32 v4l2_fourcc('A', 'R', '2', '4') /* 32
BGRA-8-8-8-8 */
--#define V4L2_PIX_FMT_XBGR32 v4l2_fourcc('X', 'R', '2', '4') /* 32
BGRX-8-8-8-8 */
- #define V4L2_PIX_FMT_RGB32 v4l2_fourcc('R', 'G', 'B', '4') /* 32
RGB-8-8-8-8 */
--#define V4L2_PIX_FMT_ARGB32 v4l2_fourcc('B', 'A', '2', '4') /* 32
ARGB-8-8-8-8 */
--#define V4L2_PIX_FMT_XRGB32 v4l2_fourcc('B', 'X', '2', '4') /* 32
XRGB-8-8-8-8 */
--
--/* Grey formats */
- #define V4L2_PIX_FMT_GREY v4l2_fourcc('G', 'R', 'E', 'Y') /* 8 Greyscale
*/
--#define V4L2_PIX_FMT_Y4 v4l2_fourcc('Y', '0', '4', ' ') /* 4 Greyscale
*/
--#define V4L2_PIX_FMT_Y6 v4l2_fourcc('Y', '0', '6', ' ') /* 6 Greyscale
*/
--#define V4L2_PIX_FMT_Y10 v4l2_fourcc('Y', '1', '0', ' ') /* 10 Greyscale
*/
--#define V4L2_PIX_FMT_Y12 v4l2_fourcc('Y', '1', '2', ' ') /* 12 Greyscale
*/
- #define V4L2_PIX_FMT_Y16 v4l2_fourcc('Y', '1', '6', ' ') /* 16 Greyscale
*/
--#define V4L2_PIX_FMT_Y16_BE v4l2_fourcc_be('Y', '1', '6', ' ') /* 16
Greyscale BE */
--
--/* Grey bit-packed formats */
--#define V4L2_PIX_FMT_Y10BPACK v4l2_fourcc('Y', '1', '0', 'B') /* 10
Greyscale bit-packed */
--
--/* Palette formats */
- #define V4L2_PIX_FMT_PAL8 v4l2_fourcc('P', 'A', 'L', '8') /* 8 8-bit
palette */
--
--/* Chrominance formats */
--#define V4L2_PIX_FMT_UV8 v4l2_fourcc('U', 'V', '8', ' ') /* 8 UV 4:4 */
--
--/* Luminance+Chrominance formats */
-+#define V4L2_PIX_FMT_YVU410 v4l2_fourcc('Y', 'V', 'U', '9') /* 9 YVU 4:1:0
*/
-+#define V4L2_PIX_FMT_YVU420 v4l2_fourcc('Y', 'V', '1', '2') /* 12 YVU 4:2:0
*/
- #define V4L2_PIX_FMT_YUYV v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16 YUV 4:2:2
*/
--#define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16 YUV 4:2:2
*/
--#define V4L2_PIX_FMT_YVYU v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2
*/
- #define V4L2_PIX_FMT_UYVY v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16 YUV 4:2:2
*/
- #define V4L2_PIX_FMT_VYUY v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16 YUV 4:2:2
*/
-+#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16 YVU422
planar */
-+#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16 YVU411
planar */
- #define V4L2_PIX_FMT_Y41P v4l2_fourcc('Y', '4', '1', 'P') /* 12 YUV 4:1:1
*/
- #define V4L2_PIX_FMT_YUV444 v4l2_fourcc('Y', '4', '4', '4') /* 16 xxxxyyyy
uuuuvvvv */
- #define V4L2_PIX_FMT_YUV555 v4l2_fourcc('Y', 'U', 'V', 'O') /* 16 YUV-5-5-5
*/
- #define V4L2_PIX_FMT_YUV565 v4l2_fourcc('Y', 'U', 'V', 'P') /* 16 YUV-5-6-5
*/
- #define V4L2_PIX_FMT_YUV32 v4l2_fourcc('Y', 'U', 'V', '4') /* 32
YUV-8-8-8-8 */
--#define V4L2_PIX_FMT_HI240 v4l2_fourcc('H', 'I', '2', '4') /* 8 8-bit
color */
--#define V4L2_PIX_FMT_HM12 v4l2_fourcc('H', 'M', '1', '2') /* 8 YUV 4:2:0
16x16 macroblocks */
--#define V4L2_PIX_FMT_M420 v4l2_fourcc('M', '4', '2', '0') /* 12 YUV 4:2:0
2 lines y, 1 line uv interleaved */
-
- /* two planes -- one Y, one Cr + Cb interleaved */
- #define V4L2_PIX_FMT_NV12 v4l2_fourcc('N', 'V', '1', '2') /* 12 Y/CbCr
4:2:0 */
- #define V4L2_PIX_FMT_NV21 v4l2_fourcc('N', 'V', '2', '1') /* 12 Y/CrCb
4:2:0 */
- #define V4L2_PIX_FMT_NV16 v4l2_fourcc('N', 'V', '1', '6') /* 16 Y/CbCr
4:2:2 */
- #define V4L2_PIX_FMT_NV61 v4l2_fourcc('N', 'V', '6', '1') /* 16 Y/CrCb
4:2:2 */
--#define V4L2_PIX_FMT_NV24 v4l2_fourcc('N', 'V', '2', '4') /* 24 Y/CbCr
4:4:4 */
--#define V4L2_PIX_FMT_NV42 v4l2_fourcc('N', 'V', '4', '2') /* 24 Y/CrCb
4:4:4 */
-
--/* two non contiguous planes - one Y, one Cr + Cb interleaved */
--#define V4L2_PIX_FMT_NV12M v4l2_fourcc('N', 'M', '1', '2') /* 12 Y/CbCr
4:2:0 */
--#define V4L2_PIX_FMT_NV21M v4l2_fourcc('N', 'M', '2', '1') /* 21 Y/CrCb
4:2:0 */
--#define V4L2_PIX_FMT_NV16M v4l2_fourcc('N', 'M', '1', '6') /* 16 Y/CbCr
4:2:2 */
--#define V4L2_PIX_FMT_NV61M v4l2_fourcc('N', 'M', '6', '1') /* 16 Y/CrCb
4:2:2 */
--#define V4L2_PIX_FMT_NV12MT v4l2_fourcc('T', 'M', '1', '2') /* 12 Y/CbCr
4:2:0 64x32 macroblocks */
--#define V4L2_PIX_FMT_NV12MT_16X16 v4l2_fourcc('V', 'M', '1', '2') /* 12
Y/CbCr 4:2:0 16x16 macroblocks */
--
--/* three planes - Y Cb, Cr */
-+/* The following formats are not defined in the V4L2 specification */
- #define V4L2_PIX_FMT_YUV410 v4l2_fourcc('Y', 'U', 'V', '9') /* 9 YUV 4:1:0
*/
--#define V4L2_PIX_FMT_YVU410 v4l2_fourcc('Y', 'V', 'U', '9') /* 9 YVU 4:1:0
*/
--#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 12 YVU411
planar */
- #define V4L2_PIX_FMT_YUV420 v4l2_fourcc('Y', 'U', '1', '2') /* 12 YUV 4:2:0
*/
--#define V4L2_PIX_FMT_YVU420 v4l2_fourcc('Y', 'V', '1', '2') /* 12 YVU 4:2:0
*/
--#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16 YVU422
planar */
-+#define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16 YUV 4:2:2
*/
-+#define V4L2_PIX_FMT_HI240 v4l2_fourcc('H', 'I', '2', '4') /* 8 8-bit
color */
-+#define V4L2_PIX_FMT_HM12 v4l2_fourcc('H', 'M', '1', '2') /* 8 YUV 4:2:0
16x16 macroblocks */
-
--/* three non contiguous planes - Y, Cb, Cr */
--#define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12 YUV420
planar */
--#define V4L2_PIX_FMT_YVU420M v4l2_fourcc('Y', 'M', '2', '1') /* 12 YVU420
planar */
--#define V4L2_PIX_FMT_YUV422M v4l2_fourcc('Y', 'M', '1', '6') /* 16 YUV422
planar */
--#define V4L2_PIX_FMT_YVU422M v4l2_fourcc('Y', 'M', '6', '1') /* 16 YVU422
planar */
--#define V4L2_PIX_FMT_YUV444M v4l2_fourcc('Y', 'M', '2', '4') /* 24 YUV444
planar */
--#define V4L2_PIX_FMT_YVU444M v4l2_fourcc('Y', 'M', '4', '2') /* 24 YVU444
planar */
--
--
--/* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
-+/* see http://www.siliconimaging.com/RGB%20Bayer.htm */
- #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B', 'A', '8', '1') /* 8 BGBG..
GRGR.. */
- #define V4L2_PIX_FMT_SGBRG8 v4l2_fourcc('G', 'B', 'R', 'G') /* 8 GBGB..
RGRG.. */
- #define V4L2_PIX_FMT_SGRBG8 v4l2_fourcc('G', 'R', 'B', 'G') /* 8 GRGR..
BGBG.. */
--#define V4L2_PIX_FMT_SRGGB8 v4l2_fourcc('R', 'G', 'G', 'B') /* 8 RGRG..
GBGB.. */
--#define V4L2_PIX_FMT_SBGGR10 v4l2_fourcc('B', 'G', '1', '0') /* 10 BGBG..
GRGR.. */
--#define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10 GBGB..
RGRG.. */
--#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10 GRGR..
BGBG.. */
--#define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10 RGRG..
GBGB.. */
-- /* 10bit raw bayer packed, 5 bytes for every 4 pixels */
--#define V4L2_PIX_FMT_SBGGR10P v4l2_fourcc('p', 'B', 'A', 'A')
--#define V4L2_PIX_FMT_SGBRG10P v4l2_fourcc('p', 'G', 'A', 'A')
--#define V4L2_PIX_FMT_SGRBG10P v4l2_fourcc('p', 'g', 'A', 'A')
--#define V4L2_PIX_FMT_SRGGB10P v4l2_fourcc('p', 'R', 'A', 'A')
-- /* 10bit raw bayer a-law compressed to 8 bits */
--#define V4L2_PIX_FMT_SBGGR10ALAW8 v4l2_fourcc('a', 'B', 'A', '8')
--#define V4L2_PIX_FMT_SGBRG10ALAW8 v4l2_fourcc('a', 'G', 'A', '8')
--#define V4L2_PIX_FMT_SGRBG10ALAW8 v4l2_fourcc('a', 'g', 'A', '8')
--#define V4L2_PIX_FMT_SRGGB10ALAW8 v4l2_fourcc('a', 'R', 'A', '8')
-- /* 10bit raw bayer DPCM compressed to 8 bits */
--#define V4L2_PIX_FMT_SBGGR10DPCM8 v4l2_fourcc('b', 'B', 'A', '8')
--#define V4L2_PIX_FMT_SGBRG10DPCM8 v4l2_fourcc('b', 'G', 'A', '8')
-+
-+/*
-+ * 10bit raw bayer, expanded to 16 bits
-+ * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb...
-+ */
-+#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0')
-+/* 10bit raw bayer DPCM compressed to 8 bits */
- #define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
--#define V4L2_PIX_FMT_SRGGB10DPCM8 v4l2_fourcc('b', 'R', 'A', '8')
--#define V4L2_PIX_FMT_SBGGR12 v4l2_fourcc('B', 'G', '1', '2') /* 12 BGBG..
GRGR.. */
--#define V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12 GBGB..
RGRG.. */
--#define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12 GRGR..
BGBG.. */
--#define V4L2_PIX_FMT_SRGGB12 v4l2_fourcc('R', 'G', '1', '2') /* 12 RGRG..
GBGB.. */
-- /* 12bit raw bayer packed, 6 bytes for every 4 pixels */
--#define V4L2_PIX_FMT_SBGGR12P v4l2_fourcc('p', 'B', 'C', 'C')
--#define V4L2_PIX_FMT_SGBRG12P v4l2_fourcc('p', 'G', 'C', 'C')
--#define V4L2_PIX_FMT_SGRBG12P v4l2_fourcc('p', 'g', 'C', 'C')
--#define V4L2_PIX_FMT_SRGGB12P v4l2_fourcc('p', 'R', 'C', 'C')
- #define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16 BGBG..
GRGR.. */
--#define V4L2_PIX_FMT_SGBRG16 v4l2_fourcc('G', 'B', '1', '6') /* 16 GBGB..
RGRG.. */
--#define V4L2_PIX_FMT_SGRBG16 v4l2_fourcc('G', 'R', '1', '6') /* 16 GRGR..
BGBG.. */
--#define V4L2_PIX_FMT_SRGGB16 v4l2_fourcc('R', 'G', '1', '6') /* 16 RGRG..
GBGB.. */
-
--/* HSV formats */
--#define V4L2_PIX_FMT_HSV24 v4l2_fourcc('H', 'S', 'V', '3')
--#define V4L2_PIX_FMT_HSV32 v4l2_fourcc('H', 'S', 'V', '4')
--
- /* compressed formats */
- #define V4L2_PIX_FMT_MJPEG v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG
*/
- #define V4L2_PIX_FMT_JPEG v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG
*/
- #define V4L2_PIX_FMT_DV v4l2_fourcc('d', 'v', 's', 'd') /* 1394
*/
--#define V4L2_PIX_FMT_MPEG v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4
Multiplexed */
--#define V4L2_PIX_FMT_H264 v4l2_fourcc('H', '2', '6', '4') /* H264 with
start codes */
--#define V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264
without start codes */
--#define V4L2_PIX_FMT_H264_MVC v4l2_fourcc('M', '2', '6', '4') /* H264 MVC */
--#define V4L2_PIX_FMT_H263 v4l2_fourcc('H', '2', '6', '3') /* H263
*/
--#define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES
*/
--#define V4L2_PIX_FMT_MPEG2 v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES
*/
--#define V4L2_PIX_FMT_MPEG4 v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 part
2 ES */
--#define V4L2_PIX_FMT_XVID v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid
*/
--#define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE
421M Annex G compliant stream */
--#define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE
421M Annex L compliant stream */
--#define V4L2_PIX_FMT_VP8 v4l2_fourcc('V', 'P', '8', '0') /* VP8 */
--#define V4L2_PIX_FMT_VP9 v4l2_fourcc('V', 'P', '9', '0') /* VP9 */
-+#define V4L2_PIX_FMT_MPEG v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4
*/
-
- /* Vendor-specific formats */
--#define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */
- #define V4L2_PIX_FMT_WNVA v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw
compress */
- #define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S', '9', '1', '0') /* SN9C10x
compression */
- #define V4L2_PIX_FMT_SN9C20X_I420 v4l2_fourcc('S', '9', '2', '0') /* SN9C20x
YUV 4:2:0 */
-@@ -647,67 +342,28 @@ struct v4l2_pix_format {
- #define V4L2_PIX_FMT_SPCA561 v4l2_fourcc('S', '5', '6', '1') /* compressed
GBRG bayer */
- #define V4L2_PIX_FMT_PAC207 v4l2_fourcc('P', '2', '0', '7') /* compressed
BGGR bayer */
- #define V4L2_PIX_FMT_MR97310A v4l2_fourcc('M', '3', '1', '0') /* compressed
BGGR bayer */
--#define V4L2_PIX_FMT_JL2005BCD v4l2_fourcc('J', 'L', '2', '0') /* compressed
RGGB bayer */
--#define V4L2_PIX_FMT_SN9C2028 v4l2_fourcc('S', 'O', 'N', 'X') /* compressed
GBRG bayer */
- #define V4L2_PIX_FMT_SQ905C v4l2_fourcc('9', '0', '5', 'C') /* compressed
RGGB bayer */
- #define V4L2_PIX_FMT_PJPG v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx
JPEG */
-+#define V4L2_PIX_FMT_YVYU v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2
*/
- #define V4L2_PIX_FMT_OV511 v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */
- #define V4L2_PIX_FMT_OV518 v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
--#define V4L2_PIX_FMT_STV0680 v4l2_fourcc('S', '6', '8', '0') /* stv0680
bayer */
--#define V4L2_PIX_FMT_TM6000 v4l2_fourcc('T', 'M', '6', '0') /*
tm5600/tm60x0 */
--#define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line
of Y then 1 line of VYUY */
--#define V4L2_PIX_FMT_KONICA420 v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420
planar in blocks of 256 pixels */
--#define V4L2_PIX_FMT_JPGL v4l2_fourcc('J', 'P', 'G', 'L') /* JPEG-Lite */
--#define V4L2_PIX_FMT_SE401 v4l2_fourcc('S', '4', '0', '1') /* se401
janggu compressed rgb */
--#define V4L2_PIX_FMT_S5C_UYVY_JPG v4l2_fourcc('S', '5', 'C', 'I') /* S5C73M3
interleaved UYVY/JPEG */
--#define V4L2_PIX_FMT_Y8I v4l2_fourcc('Y', '8', 'I', ' ') /* Greyscale
8-bit L/R interleaved */
--#define V4L2_PIX_FMT_Y12I v4l2_fourcc('Y', '1', '2', 'I') /* Greyscale
12-bit L/R interleaved */
--#define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ') /* Depth data
16-bit */
--#define V4L2_PIX_FMT_MT21C v4l2_fourcc('M', 'T', '2', '1') /* Mediatek
compressed block mode */
--#define V4L2_PIX_FMT_INZI v4l2_fourcc('I', 'N', 'Z', 'I') /* Intel Planar
Greyscale 10-bit and Depth 16-bit */
-
--/* SDR formats - used only for Software Defined Radio devices */
--#define V4L2_SDR_FMT_CU8 v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */
--#define V4L2_SDR_FMT_CU16LE v4l2_fourcc('C', 'U', '1', '6') /* IQ u16le
*/
--#define V4L2_SDR_FMT_CS8 v4l2_fourcc('C', 'S', '0', '8') /* complex
s8 */
--#define V4L2_SDR_FMT_CS14LE v4l2_fourcc('C', 'S', '1', '4') /* complex
s14le */
--#define V4L2_SDR_FMT_RU12LE v4l2_fourcc('R', 'U', '1', '2') /* real
u12le */
--#define V4L2_SDR_FMT_PCU16BE v4l2_fourcc('P', 'C', '1', '6') /* planar
complex u16be */
--#define V4L2_SDR_FMT_PCU18BE v4l2_fourcc('P', 'C', '1', '8') /* planar
complex u18be */
--#define V4L2_SDR_FMT_PCU20BE v4l2_fourcc('P', 'C', '2', '0') /* planar
complex u20be */
--
--/* Touch formats - used for Touch devices */
--#define V4L2_TCH_FMT_DELTA_TD16 v4l2_fourcc('T', 'D', '1', '6') /*
16-bit signed deltas */
--#define V4L2_TCH_FMT_DELTA_TD08 v4l2_fourcc('T', 'D', '0', '8') /*
8-bit signed deltas */
--#define V4L2_TCH_FMT_TU16 v4l2_fourcc('T', 'U', '1', '6') /* 16-bit
unsigned touch data */
--#define V4L2_TCH_FMT_TU08 v4l2_fourcc('T', 'U', '0', '8') /* 8-bit
unsigned touch data */
--
--/* Meta-data formats */
--#define V4L2_META_FMT_VSP1_HGO v4l2_fourcc('V', 'S', 'P', 'H') /* R-Car
VSP1 1-D Histogram */
--#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T') /* R-Car
VSP1 2-D Histogram */
--
--/* priv field value to indicates that subsequent fields are valid. */
--#define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe
--
--/* Flags */
--#define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA 0x00000001
--
- /*
- * F O R M A T E N U M E R A T I O N
- */
- struct v4l2_fmtdesc {
-- __u32 index; /* Format number */
-- __u32 type; /* enum v4l2_buf_type */
-- __u32 flags;
-- __u8 description[32]; /* Description string */
-- __u32 pixelformat; /* Format fourcc */
-- __u32 reserved[4];
-+ uint32_t index; /* Format number */
-+ enum v4l2_buf_type type; /* buffer type */
-+ uint32_t flags;
-+ uint8_t description[32]; /* Description string */
-+ uint32_t pixelformat; /* Format fourcc */
-+ uint32_t reserved[4];
- };
-
- #define V4L2_FMT_FLAG_COMPRESSED 0x0001
--#define V4L2_FMT_FLAG_EMULATED 0x0002
-
-- /* Frame Size and frame rate enumeration */
-+#if 1
-+ /* Experimental Frame Size and frame rate enumeration */
- /*
- * F R A M E S I Z E E N U M E R A T I O N
- */
-@@ -718,30 +374,30 @@ enum v4l2_frmsizetypes {
- };
-
- struct v4l2_frmsize_discrete {
-- __u32 width; /* Frame width [pixel] */
-- __u32 height; /* Frame height [pixel] */
-+ uint32_t width; /* Frame width [pixel]
*/
-+ uint32_t height; /* Frame height [pixel]
*/
- };
-
- struct v4l2_frmsize_stepwise {
-- __u32 min_width; /* Minimum frame width [pixel]
*/
-- __u32 max_width; /* Maximum frame width [pixel]
*/
-- __u32 step_width; /* Frame width step size
[pixel] */
-- __u32 min_height; /* Minimum frame height [pixel]
*/
-- __u32 max_height; /* Maximum frame height [pixel]
*/
-- __u32 step_height; /* Frame height step size
[pixel] */
-+ uint32_t min_width; /* Minimum frame width
[pixel] */
-+ uint32_t max_width; /* Maximum frame width
[pixel] */
-+ uint32_t step_width; /* Frame width step
size [pixel] */
-+ uint32_t min_height; /* Minimum frame height
[pixel] */
-+ uint32_t max_height; /* Maximum frame height
[pixel] */
-+ uint32_t step_height; /* Frame height step
size [pixel] */
- };
-
- struct v4l2_frmsizeenum {
-- __u32 index; /* Frame size number */
-- __u32 pixel_format; /* Pixel format */
-- __u32 type; /* Frame size type the device
supports. */
-+ uint32_t index; /* Frame size number */
-+ uint32_t pixel_format; /* Pixel format */
-+ uint32_t type; /* Frame size type the
device supports. */
-
- union { /* Frame size */
- struct v4l2_frmsize_discrete discrete;
- struct v4l2_frmsize_stepwise stepwise;
- };
-
-- __u32 reserved[2]; /* Reserved space for future
use */
-+ uint32_t reserved[2]; /* Reserved space for future
use */
- };
-
- /*
-@@ -760,31 +416,32 @@ struct v4l2_frmival_stepwise {
- };
-
- struct v4l2_frmivalenum {
-- __u32 index; /* Frame format index */
-- __u32 pixel_format; /* Pixel format */
-- __u32 width; /* Frame width */
-- __u32 height; /* Frame height */
-- __u32 type; /* Frame interval type the
device supports. */
-+ uint32_t index; /* Frame format index */
-+ uint32_t pixel_format; /* Pixel format */
-+ uint32_t width; /* Frame width */
-+ uint32_t height; /* Frame height */
-+ uint32_t type; /* Frame interval type
the device supports. */
-
- union { /* Frame interval */
- struct v4l2_fract discrete;
- struct v4l2_frmival_stepwise stepwise;
- };
-
-- __u32 reserved[2]; /* Reserved space for future
use */
-+ uint32_t reserved[2]; /* Reserved space for
future use */
- };
-+#endif
-
- /*
- * T I M E C O D E
- */
- struct v4l2_timecode {
-- __u32 type;
-- __u32 flags;
-- __u8 frames;
-- __u8 seconds;
-- __u8 minutes;
-- __u8 hours;
-- __u8 userbits[4];
-+ uint32_t type;
-+ uint32_t flags;
-+ uint8_t frames;
-+ uint8_t seconds;
-+ uint8_t minutes;
-+ uint8_t hours;
-+ uint8_t userbits[4];
- };
-
- /* Type */
-@@ -813,12 +470,12 @@ struct v4l2_jpegcompression {
- int COM_len; /* Length of data in JPEG COM segment */
- char COM_data[60]; /* Data in JPEG COM segment */
-
-- __u32 jpeg_markers; /* Which markers should go into the JPEG
-+ uint32_t jpeg_markers; /* Which markers should go into the JPEG
- * output. Unless you exactly know what
- * you do, leave them untouched.
-- * Including less markers will make the
-+ * Inluding less markers will make the
- * resulting code smaller, but there will
-- * be fewer applications which can read it.
-+ * be fewer aplications which can read it.
- * The presence of the APP and COM marker
- * is influenced by APP_len and COM_len
- * ONLY, not by this property! */
-@@ -828,184 +485,60 @@ struct v4l2_jpegcompression {
- #define V4L2_JPEG_MARKER_DRI (1<<5) /* Define Restart Interval */
- #define V4L2_JPEG_MARKER_COM (1<<6) /* Comment segment */
- #define V4L2_JPEG_MARKER_APP (1<<7) /* App segment, driver will
-- * always use APP0 */
-+ * allways use APP0 */
- };
-
- /*
- * M E M O R Y - M A P P I N G B U F F E R S
- */
- struct v4l2_requestbuffers {
-- __u32 count;
-- __u32 type; /* enum v4l2_buf_type */
-- __u32 memory; /* enum v4l2_memory */
-- __u32 reserved[2];
-+ uint32_t count;
-+ enum v4l2_buf_type type;
-+ enum v4l2_memory memory;
-+ uint32_t reserved[2];
- };
-
--/**
-- * struct v4l2_plane - plane info for multi-planar buffers
-- * @bytesused: number of bytes occupied by data in the plane
(payload)
-- * @length: size of this plane (NOT the payload) in bytes
-- * @mem_offset: when memory in the associated struct
v4l2_buffer is
-- * V4L2_MEMORY_MMAP, equals the offset from the start of
-- * the device memory for this plane (or is a "cookie" that
-- * should be passed to mmap() called on the video node)
-- * @userptr: when memory is V4L2_MEMORY_USERPTR, a userspace pointer
-- * pointing to this plane
-- * @fd: when memory is V4L2_MEMORY_DMABUF, a userspace
file
-- * descriptor associated with this plane
-- * @data_offset: offset in the plane to the start of data; usually 0,
-- * unless there is a header in front of the data
-- *
-- * Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer
-- * with two planes can have one plane for Y, and another for interleaved CbCr
-- * components. Each plane can reside in a separate memory buffer, or even in
-- * a completely separate memory node (e.g. in embedded devices).
-- */
--struct v4l2_plane {
-- __u32 bytesused;
-- __u32 length;
-- union {
-- __u32 mem_offset;
-- unsigned long userptr;
-- __s32 fd;
-- } m;
-- __u32 data_offset;
-- __u32 reserved[11];
--};
--
--/**
-- * struct v4l2_buffer - video buffer info
-- * @index: id number of the buffer
-- * @type: enum v4l2_buf_type; buffer type (type == *_MPLANE for
-- * multiplanar buffers);
-- * @bytesused: number of bytes occupied by data in the buffer
(payload);
-- * unused (set to 0) for multiplanar buffers
-- * @flags: buffer informational flags
-- * @field: enum v4l2_field; field order of the image in the buffer
-- * @timestamp: frame timestamp
-- * @timecode: frame timecode
-- * @sequence: sequence count of this frame
-- * @memory: enum v4l2_memory; the method, in which the actual video data is
-- * passed
-- * @offset: for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP;
-- * offset from the start of the device memory for this plane,
-- * (or a "cookie" that should be passed to mmap() as offset)
-- * @userptr: for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
-- * a userspace pointer pointing to this buffer
-- * @fd: for non-multiplanar buffers with memory ==
V4L2_MEMORY_DMABUF;
-- * a userspace file descriptor associated with this buffer
-- * @planes: for multiplanar buffers; userspace pointer to the array of plane
-- * info structs for this buffer
-- * @length: size in bytes of the buffer (NOT its payload) for single-plane
-- * buffers (when type != *_MPLANE); number of elements in the
-- * planes array for multi-plane buffers
-- *
-- * Contains data exchanged by application and driver using one of the
Streaming
-- * I/O methods.
-- */
- struct v4l2_buffer {
-- __u32 index;
-- __u32 type;
-- __u32 bytesused;
-- __u32 flags;
-- __u32 field;
-+ uint32_t index;
-+ enum v4l2_buf_type type;
-+ uint32_t bytesused;
-+ uint32_t flags;
-+ enum v4l2_field field;
- struct timeval timestamp;
- struct v4l2_timecode timecode;
-- __u32 sequence;
-+ uint32_t sequence;
-
- /* memory location */
-- __u32 memory;
-+ enum v4l2_memory memory;
- union {
-- __u32 offset;
-+ uint32_t offset;
- unsigned long userptr;
-- struct v4l2_plane *planes;
-- __s32 fd;
- } m;
-- __u32 length;
-- __u32 reserved2;
-- __u32 reserved;
-+ uint32_t length;
-+ uint32_t input;
-+ uint32_t reserved;
- };
-
- /* Flags for 'flags' field */
--/* Buffer is mapped (flag) */
--#define V4L2_BUF_FLAG_MAPPED 0x00000001
--/* Buffer is queued for processing */
--#define V4L2_BUF_FLAG_QUEUED 0x00000002
--/* Buffer is ready */
--#define V4L2_BUF_FLAG_DONE 0x00000004
--/* Image is a keyframe (I-frame) */
--#define V4L2_BUF_FLAG_KEYFRAME 0x00000008
--/* Image is a P-frame */
--#define V4L2_BUF_FLAG_PFRAME 0x00000010
--/* Image is a B-frame */
--#define V4L2_BUF_FLAG_BFRAME 0x00000020
--/* Buffer is ready, but the data contained within is corrupted. */
--#define V4L2_BUF_FLAG_ERROR 0x00000040
--/* timecode field is valid */
--#define V4L2_BUF_FLAG_TIMECODE 0x00000100
--/* Buffer is prepared for queuing */
--#define V4L2_BUF_FLAG_PREPARED 0x00000400
--/* Cache handling flags */
--#define V4L2_BUF_FLAG_NO_CACHE_INVALIDATE 0x00000800
--#define V4L2_BUF_FLAG_NO_CACHE_CLEAN 0x00001000
--/* Timestamp type */
--#define V4L2_BUF_FLAG_TIMESTAMP_MASK 0x0000e000
--#define V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN 0x00000000
--#define V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC 0x00002000
--#define V4L2_BUF_FLAG_TIMESTAMP_COPY 0x00004000
--/* Timestamp sources. */
--#define V4L2_BUF_FLAG_TSTAMP_SRC_MASK 0x00070000
--#define V4L2_BUF_FLAG_TSTAMP_SRC_EOF 0x00000000
--#define V4L2_BUF_FLAG_TSTAMP_SRC_SOE 0x00010000
--/* mem2mem encoder/decoder */
--#define V4L2_BUF_FLAG_LAST 0x00100000
-+#define V4L2_BUF_FLAG_MAPPED 0x0001 /* Buffer is mapped (flag) */
-+#define V4L2_BUF_FLAG_QUEUED 0x0002 /* Buffer is queued for processing */
-+#define V4L2_BUF_FLAG_DONE 0x0004 /* Buffer is ready */
-+#define V4L2_BUF_FLAG_KEYFRAME 0x0008 /* Image is a keyframe
(I-frame) */
-+#define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */
-+#define V4L2_BUF_FLAG_BFRAME 0x0020 /* Image is a B-frame */
-+#define V4L2_BUF_FLAG_TIMECODE 0x0100 /* timecode field is valid */
-+#define V4L2_BUF_FLAG_INPUT 0x0200 /* input field is valid */
-
--/**
-- * struct v4l2_exportbuffer - export of video buffer as DMABUF file descriptor
-- *
-- * @index: id number of the buffer
-- * @type: enum v4l2_buf_type; buffer type (type == *_MPLANE for
-- * multiplanar buffers);
-- * @plane: index of the plane to be exported, 0 for single plane queues
-- * @flags: flags for newly created file, currently only O_CLOEXEC is
-- * supported, refer to manual of open syscall for more details
-- * @fd: file descriptor associated with DMABUF (set by driver)
-- *
-- * Contains data used for exporting a video buffer as DMABUF file descriptor.
-- * The buffer is identified by a 'cookie' returned by VIDIOC_QUERYBUF
-- * (identical to the cookie used to mmap() the buffer to userspace). All
-- * reserved fields must be set to zero. The field reserved0 is expected to
-- * become a structure 'type' allowing an alternative layout of the structure
-- * content. Therefore this field should not be used for any other extensions.
-- */
--struct v4l2_exportbuffer {
-- __u32 type; /* enum v4l2_buf_type */
-- __u32 index;
-- __u32 plane;
-- __u32 flags;
-- __s32 fd;
-- __u32 reserved[11];
--};
--
- /*
- * O V E R L A Y P R E V I E W
- */
- struct v4l2_framebuffer {
-- __u32 capability;
-- __u32 flags;
-+ uint32_t capability;
-+ uint32_t flags;
- /* FIXME: in theory we should pass something like PCI device + memory
- * region + offset instead of some physical address */
- void *base;
-- struct {
-- __u32 width;
-- __u32 height;
-- __u32 pixelformat;
-- __u32 field; /* enum v4l2_field */
-- __u32 bytesperline; /* for padding, zero if unused
*/
-- __u32 sizeimage;
-- __u32 colorspace; /* enum v4l2_colorspace */
-- __u32 priv; /* reserved field, set to 0 */
-- } fmt;
-+ struct v4l2_pix_format fmt;
- };
- /* Flags for the 'capability' field. Read only */
- #define V4L2_FBUF_CAP_EXTERNOVERLAY 0x0001
-@@ -1015,7 +548,6 @@ struct v4l2_framebuffer {
- #define V4L2_FBUF_CAP_LOCAL_ALPHA 0x0010
- #define V4L2_FBUF_CAP_GLOBAL_ALPHA 0x0020
- #define V4L2_FBUF_CAP_LOCAL_INV_ALPHA 0x0040
--#define V4L2_FBUF_CAP_SRC_CHROMAKEY 0x0080
- /* Flags for the 'flags' field. */
- #define V4L2_FBUF_FLAG_PRIMARY 0x0001
- #define V4L2_FBUF_FLAG_OVERLAY 0x0002
-@@ -1023,7 +555,6 @@ struct v4l2_framebuffer {
- #define V4L2_FBUF_FLAG_LOCAL_ALPHA 0x0008
- #define V4L2_FBUF_FLAG_GLOBAL_ALPHA 0x0010
- #define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA 0x0020
--#define V4L2_FBUF_FLAG_SRC_CHROMAKEY 0x0040
-
- struct v4l2_clip {
- struct v4l2_rect c;
-@@ -1032,24 +563,24 @@ struct v4l2_clip {
-
- struct v4l2_window {
- struct v4l2_rect w;
-- __u32 field; /* enum v4l2_field */
-- __u32 chromakey;
-+ enum v4l2_field field;
-+ uint32_t chromakey;
- struct v4l2_clip *clips;
-- __u32 clipcount;
-+ uint32_t clipcount;
- void *bitmap;
-- __u8 global_alpha;
-+ uint8_t global_alpha;
- };
-
- /*
- * C A P T U R E P A R A M E T E R S
- */
- struct v4l2_captureparm {
-- __u32 capability; /* Supported modes */
-- __u32 capturemode; /* Current mode */
-- struct v4l2_fract timeperframe; /* Time per frame in seconds */
-- __u32 extendedmode; /* Driver-specific extensions */
-- __u32 readbuffers; /* # of buffers for read */
-- __u32 reserved[4];
-+ uint32_t capability; /* Supported modes */
-+ uint32_t capturemode; /* Current mode */
-+ struct v4l2_fract timeperframe; /* Time per frame in .1us units */
-+ uint32_t extendedmode; /* Driver-specific
extensions */
-+ uint32_t readbuffers; /* # of buffers for read */
-+ uint32_t reserved[4];
- };
-
- /* Flags for 'capability' and 'capturemode' fields */
-@@ -1057,56 +588,34 @@ struct v4l2_captureparm {
- #define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */
-
- struct v4l2_outputparm {
-- __u32 capability; /* Supported modes */
-- __u32 outputmode; /* Current mode */
-+ uint32_t capability; /* Supported modes */
-+ uint32_t outputmode; /* Current mode */
- struct v4l2_fract timeperframe; /* Time per frame in seconds */
-- __u32 extendedmode; /* Driver-specific extensions */
-- __u32 writebuffers; /* # of buffers for write */
-- __u32 reserved[4];
-+ uint32_t extendedmode; /* Driver-specific extensions
*/
-+ uint32_t writebuffers; /* # of buffers for write */
-+ uint32_t reserved[4];
- };
-
- /*
- * I N P U T I M A G E C R O P P I N G
- */
- struct v4l2_cropcap {
-- __u32 type; /* enum v4l2_buf_type */
-+ enum v4l2_buf_type type;
- struct v4l2_rect bounds;
- struct v4l2_rect defrect;
- struct v4l2_fract pixelaspect;
- };
-
- struct v4l2_crop {
-- __u32 type; /* enum v4l2_buf_type */
-+ enum v4l2_buf_type type;
- struct v4l2_rect c;
- };
-
--/**
-- * struct v4l2_selection - selection info
-- * @type: buffer type (do not use *_MPLANE types)
-- * @target: Selection target, used to choose one of possible rectangles;
-- * defined in v4l2-common.h; V4L2_SEL_TGT_* .
-- * @flags: constraints flags, defined in v4l2-common.h; V4L2_SEL_FLAG_*.
-- * @r: coordinates of selection window
-- * @reserved: for future use, rounds structure size to 64 bytes, set to zero
-- *
-- * Hardware may use multiple helper windows to process a video stream.
-- * The structure is used to exchange this selection areas between
-- * an application and a driver.
-- */
--struct v4l2_selection {
-- __u32 type;
-- __u32 target;
-- __u32 flags;
-- struct v4l2_rect r;
-- __u32 reserved[9];
--};
--
--
- /*
- * A N A L O G V I D E O S T A N D A R D
- */
-
--typedef __u64 v4l2_std_id;
-+typedef uint64_t v4l2_std_id;
-
- /* one bit for each */
- #define V4L2_STD_PAL_B ((v4l2_std_id)0x00000001)
-@@ -1123,10 +632,10 @@ typedef __u64 v4l2_std_id;
- #define V4L2_STD_PAL_Nc ((v4l2_std_id)0x00000400)
- #define V4L2_STD_PAL_60 ((v4l2_std_id)0x00000800)
-
--#define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000) /* BTSC */
--#define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000) /* EIA-J */
-+#define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000)
-+#define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000)
- #define V4L2_STD_NTSC_443 ((v4l2_std_id)0x00004000)
--#define V4L2_STD_NTSC_M_KR ((v4l2_std_id)0x00008000) /* FM A2 */
-+#define V4L2_STD_NTSC_M_KR ((v4l2_std_id)0x00008000)
-
- #define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000)
- #define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000)
-@@ -1143,355 +652,84 @@ typedef __u64 v4l2_std_id;
-
- /* FIXME:
- Although std_id is 64 bits, there is an issue on PPC32 architecture that
-- makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding
-+ makes switch(uint64_t) to break. So, there's a hack on v4l2-common.c
rounding
- this value to 32 bits.
- As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide),
- it should work fine. However, if needed to add more than two standards,
- v4l2-common.c should be fixed.
- */
-
--/*
-- * Some macros to merge video standards in order to make live easier for the
-- * drivers and V4L2 applications
-- */
-+/* some merged standards */
-+#define V4L2_STD_MN
(V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC)
-+#define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B)
-+#define V4L2_STD_GH
(V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H)
-+#define V4L2_STD_DK (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK)
-
--/*
-- * "Common" NTSC/M - It should be noticed that V4L2_STD_NTSC_443 is
-- * Missing here.
-- */
-+/* some common needed stuff */
-+#define V4L2_STD_PAL_BG (V4L2_STD_PAL_B |\
-+ V4L2_STD_PAL_B1 |\
-+ V4L2_STD_PAL_G)
-+#define V4L2_STD_PAL_DK (V4L2_STD_PAL_D |\
-+ V4L2_STD_PAL_D1 |\
-+ V4L2_STD_PAL_K)
-+#define V4L2_STD_PAL (V4L2_STD_PAL_BG |\
-+ V4L2_STD_PAL_DK |\
-+ V4L2_STD_PAL_H |\
-+ V4L2_STD_PAL_I)
- #define V4L2_STD_NTSC (V4L2_STD_NTSC_M |\
- V4L2_STD_NTSC_M_JP |\
- V4L2_STD_NTSC_M_KR)
--/* Secam macros */
- #define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\
- V4L2_STD_SECAM_K |\
- V4L2_STD_SECAM_K1)
--/* All Secam Standards */
- #define V4L2_STD_SECAM (V4L2_STD_SECAM_B |\
- V4L2_STD_SECAM_G |\
- V4L2_STD_SECAM_H |\
- V4L2_STD_SECAM_DK |\
- V4L2_STD_SECAM_L |\
- V4L2_STD_SECAM_LC)
--/* PAL macros */
--#define V4L2_STD_PAL_BG (V4L2_STD_PAL_B |\
-- V4L2_STD_PAL_B1 |\
-- V4L2_STD_PAL_G)
--#define V4L2_STD_PAL_DK (V4L2_STD_PAL_D |\
-- V4L2_STD_PAL_D1 |\
-- V4L2_STD_PAL_K)
--/*
-- * "Common" PAL - This macro is there to be compatible with the old
-- * V4L1 concept of "PAL": /BGDKHI.
-- * Several PAL standards are missing here: /M, /N and /Nc
-- */
--#define V4L2_STD_PAL (V4L2_STD_PAL_BG |\
-- V4L2_STD_PAL_DK |\
-- V4L2_STD_PAL_H |\
-- V4L2_STD_PAL_I)
--/* Chroma "agnostic" standards */
--#define V4L2_STD_B (V4L2_STD_PAL_B |\
-- V4L2_STD_PAL_B1 |\
-- V4L2_STD_SECAM_B)
--#define V4L2_STD_G (V4L2_STD_PAL_G |\
-- V4L2_STD_SECAM_G)
--#define V4L2_STD_H (V4L2_STD_PAL_H |\
-- V4L2_STD_SECAM_H)
--#define V4L2_STD_L (V4L2_STD_SECAM_L |\
-- V4L2_STD_SECAM_LC)
--#define V4L2_STD_GH (V4L2_STD_G |\
-- V4L2_STD_H)
--#define V4L2_STD_DK (V4L2_STD_PAL_DK |\
-- V4L2_STD_SECAM_DK)
--#define V4L2_STD_BG (V4L2_STD_B |\
-- V4L2_STD_G)
--#define V4L2_STD_MN (V4L2_STD_PAL_M |\
-- V4L2_STD_PAL_N |\
-- V4L2_STD_PAL_Nc |\
-- V4L2_STD_NTSC)
-
--/* Standards where MTS/BTSC stereo could be found */
--#define V4L2_STD_MTS (V4L2_STD_NTSC_M |\
-- V4L2_STD_PAL_M |\
-- V4L2_STD_PAL_N |\
-- V4L2_STD_PAL_Nc)
--
--/* Standards for Countries with 60Hz Line frequency */
- #define V4L2_STD_525_60 (V4L2_STD_PAL_M |\
- V4L2_STD_PAL_60 |\
- V4L2_STD_NTSC |\
- V4L2_STD_NTSC_443)
--/* Standards for Countries with 50Hz Line frequency */
- #define V4L2_STD_625_50 (V4L2_STD_PAL |\
- V4L2_STD_PAL_N |\
- V4L2_STD_PAL_Nc |\
- V4L2_STD_SECAM)
--
- #define V4L2_STD_ATSC (V4L2_STD_ATSC_8_VSB |\
- V4L2_STD_ATSC_16_VSB)
--/* Macros with none and all analog standards */
-+
- #define V4L2_STD_UNKNOWN 0
- #define V4L2_STD_ALL (V4L2_STD_525_60 |\
- V4L2_STD_625_50)
-
- struct v4l2_standard {
-- __u32 index;
-+ uint32_t index;
- v4l2_std_id id;
-- __u8 name[24];
-+ uint8_t name[24];
- struct v4l2_fract frameperiod; /* Frames, not fields */
-- __u32 framelines;
-- __u32 reserved[4];
-+ uint32_t framelines;
-+ uint32_t reserved[4];
- };
-
- /*
-- * D V B T T I M I N G S
-- */
--
--/** struct v4l2_bt_timings - BT.656/BT.1120 timing data
-- * @width: total width of the active video in pixels
-- * @height: total height of the active video in lines
-- * @interlaced: Interlaced or progressive
-- * @polarities: Positive or negative polarities
-- * @pixelclock: Pixel clock in HZ. Ex. 74.25MHz->74250000
-- * @hfrontporch:Horizontal front porch in pixels
-- * @hsync: Horizontal Sync length in pixels
-- * @hbackporch: Horizontal back porch in pixels
-- * @vfrontporch:Vertical front porch in lines
-- * @vsync: Vertical Sync length in lines
-- * @vbackporch: Vertical back porch in lines
-- * @il_vfrontporch:Vertical front porch for the even field
-- * (aka field 2) of interlaced field formats
-- * @il_vsync: Vertical Sync length for the even field
-- * (aka field 2) of interlaced field formats
-- * @il_vbackporch:Vertical back porch for the even field
-- * (aka field 2) of interlaced field formats
-- * @standards: Standards the timing belongs to
-- * @flags: Flags
-- * @picture_aspect: The picture aspect ratio (hor/vert).
-- * @cea861_vic: VIC code as per the CEA-861 standard.
-- * @hdmi_vic: VIC code as per the HDMI standard.
-- * @reserved: Reserved fields, must be zeroed.
-- *
-- * A note regarding vertical interlaced timings: height refers to the total
-- * height of the active video frame (= two fields). The blanking timings refer
-- * to the blanking of each field. So the height of the total frame is
-- * calculated as follows:
-- *
-- * tot_height = height + vfrontporch + vsync + vbackporch +
-- * il_vfrontporch + il_vsync + il_vbackporch
-- *
-- * The active height of each field is height / 2.
-- */
--struct v4l2_bt_timings {
-- __u32 width;
-- __u32 height;
-- __u32 interlaced;
-- __u32 polarities;
-- __u64 pixelclock;
-- __u32 hfrontporch;
-- __u32 hsync;
-- __u32 hbackporch;
-- __u32 vfrontporch;
-- __u32 vsync;
-- __u32 vbackporch;
-- __u32 il_vfrontporch;
-- __u32 il_vsync;
-- __u32 il_vbackporch;
-- __u32 standards;
-- __u32 flags;
-- struct v4l2_fract picture_aspect;
-- __u8 cea861_vic;
-- __u8 hdmi_vic;
-- __u8 reserved[46];
--} __attribute__ ((packed));
--
--/* Interlaced or progressive format */
--#define V4L2_DV_PROGRESSIVE 0
--#define V4L2_DV_INTERLACED 1
--
--/* Polarities. If bit is not set, it is assumed to be negative polarity */
--#define V4L2_DV_VSYNC_POS_POL 0x00000001
--#define V4L2_DV_HSYNC_POS_POL 0x00000002
--
--/* Timings standards */
--#define V4L2_DV_BT_STD_CEA861 (1 << 0) /* CEA-861 Digital TV Profile */
--#define V4L2_DV_BT_STD_DMT (1 << 1) /* VESA Discrete Monitor Timings */
--#define V4L2_DV_BT_STD_CVT (1 << 2) /* VESA Coordinated Video Timings */
--#define V4L2_DV_BT_STD_GTF (1 << 3) /* VESA Generalized Timings Formula */
--#define V4L2_DV_BT_STD_SDI (1 << 4) /* SDI Timings */
--
--/* Flags */
--
--/*
-- * CVT/GTF specific: timing uses reduced blanking (CVT) or the 'Secondary
-- * GTF' curve (GTF). In both cases the horizontal and/or vertical blanking
-- * intervals are reduced, allowing a higher resolution over the same
-- * bandwidth. This is a read-only flag.
-- */
--#define V4L2_DV_FL_REDUCED_BLANKING (1 << 0)
--/*
-- * CEA-861 specific: set for CEA-861 formats with a framerate of a multiple
-- * of six. These formats can be optionally played at 1 / 1.001 speed.
-- * This is a read-only flag.
-- */
--#define V4L2_DV_FL_CAN_REDUCE_FPS (1 << 1)
--/*
-- * CEA-861 specific: only valid for video transmitters, the flag is cleared
-- * by receivers.
-- * If the framerate of the format is a multiple of six, then the pixelclock
-- * used to set up the transmitter is divided by 1.001 to make it compatible
-- * with 60 Hz based standards such as NTSC and PAL-M that use a framerate of
-- * 29.97 Hz. Otherwise this flag is cleared. If the transmitter can't generate
-- * such frequencies, then the flag will also be cleared.
-- */
--#define V4L2_DV_FL_REDUCED_FPS (1 << 2)
--/*
-- * Specific to interlaced formats: if set, then field 1 is really one
half-line
-- * longer and field 2 is really one half-line shorter, so each field has
-- * exactly the same number of half-lines. Whether half-lines can be detected
-- * or used depends on the hardware.
-- */
--#define V4L2_DV_FL_HALF_LINE (1 << 3)
--/*
-- * If set, then this is a Consumer Electronics (CE) video format. Such formats
-- * differ from other formats (commonly called IT formats) in that if RGB
-- * encoding is used then by default the RGB values use limited range (i.e.
-- * use the range 16-235) as opposed to 0-255. All formats defined in CEA-861
-- * except for the 640x480 format are CE formats.
-- */
--#define V4L2_DV_FL_IS_CE_VIDEO (1 << 4)
--/* 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. If not, it is the second field.
-- */
--#define V4L2_DV_FL_FIRST_FIELD_EXTRA_LINE (1 << 5)
--/*
-- * If set, then the picture_aspect field is valid. Otherwise assume that the
-- * pixels are square, so the picture aspect ratio is the same as the width to
-- * height ratio.
-- */
--#define V4L2_DV_FL_HAS_PICTURE_ASPECT (1 << 6)
--/*
-- * If set, then the cea861_vic field is valid and contains the Video
-- * Identification Code as per the CEA-861 standard.
-- */
--#define V4L2_DV_FL_HAS_CEA861_VIC (1 << 7)
--/*
-- * If set, then the hdmi_vic field is valid and contains the Video
-- * Identification Code as per the HDMI standard (HDMI Vendor Specific
-- * InfoFrame).
-- */
--#define V4L2_DV_FL_HAS_HDMI_VIC (1 << 8)
--
--/* A few useful defines to calculate the total blanking and frame sizes */
--#define V4L2_DV_BT_BLANKING_WIDTH(bt) \
-- ((bt)->hfrontporch + (bt)->hsync + (bt)->hbackporch)
--#define V4L2_DV_BT_FRAME_WIDTH(bt) \
-- ((bt)->width + V4L2_DV_BT_BLANKING_WIDTH(bt))
--#define V4L2_DV_BT_BLANKING_HEIGHT(bt) \
-- ((bt)->vfrontporch + (bt)->vsync + (bt)->vbackporch + \
-- (bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch)
--#define V4L2_DV_BT_FRAME_HEIGHT(bt) \
-- ((bt)->height + V4L2_DV_BT_BLANKING_HEIGHT(bt))
--
--/** struct v4l2_dv_timings - DV timings
-- * @type: the type of the timings
-- * @bt: BT656/1120 timings
-- */
--struct v4l2_dv_timings {
-- __u32 type;
-- union {
-- struct v4l2_bt_timings bt;
-- __u32 reserved[32];
-- };
--} __attribute__ ((packed));
--
--/* Values for the type field */
--#define V4L2_DV_BT_656_1120 0 /* BT.656/1120 timing type */
--
--
--/** struct v4l2_enum_dv_timings - DV timings enumeration
-- * @index: enumeration index
-- * @pad: the pad number for which to enumerate timings (used with
-- * v4l-subdev nodes only)
-- * @reserved: must be zeroed
-- * @timings: the timings for the given index
-- */
--struct v4l2_enum_dv_timings {
-- __u32 index;
-- __u32 pad;
-- __u32 reserved[2];
-- struct v4l2_dv_timings timings;
--};
--
--/** struct v4l2_bt_timings_cap - BT.656/BT.1120 timing capabilities
-- * @min_width: width in pixels
-- * @max_width: width in pixels
-- * @min_height: height in lines
-- * @max_height: height in lines
-- * @min_pixelclock: Pixel clock in HZ. Ex. 74.25MHz->74250000
-- * @max_pixelclock: Pixel clock in HZ. Ex. 74.25MHz->74250000
-- * @standards: Supported standards
-- * @capabilities: Supported capabilities
-- * @reserved: Must be zeroed
-- */
--struct v4l2_bt_timings_cap {
-- __u32 min_width;
-- __u32 max_width;
-- __u32 min_height;
-- __u32 max_height;
-- __u64 min_pixelclock;
-- __u64 max_pixelclock;
-- __u32 standards;
-- __u32 capabilities;
-- __u32 reserved[16];
--} __attribute__ ((packed));
--
--/* Supports interlaced formats */
--#define V4L2_DV_BT_CAP_INTERLACED (1 << 0)
--/* Supports progressive formats */
--#define V4L2_DV_BT_CAP_PROGRESSIVE (1 << 1)
--/* Supports CVT/GTF reduced blanking */
--#define V4L2_DV_BT_CAP_REDUCED_BLANKING (1 << 2)
--/* Supports custom formats */
--#define V4L2_DV_BT_CAP_CUSTOM (1 << 3)
--
--/** struct v4l2_dv_timings_cap - DV timings capabilities
-- * @type: the type of the timings (same as in struct v4l2_dv_timings)
-- * @pad: the pad number for which to query capabilities (used with
-- * v4l-subdev nodes only)
-- * @bt: the BT656/1120 timings capabilities
-- */
--struct v4l2_dv_timings_cap {
-- __u32 type;
-- __u32 pad;
-- __u32 reserved[2];
-- union {
-- struct v4l2_bt_timings_cap bt;
-- __u32 raw_data[32];
-- };
--};
--
--
--/*
- * V I D E O I N P U T S
- */
- struct v4l2_input {
-- __u32 index; /* Which input */
-- __u8 name[32]; /* Label */
-- __u32 type; /* Type of input */
-- __u32 audioset; /* Associated audios (bitfield) */
-- __u32 tuner; /* enum v4l2_tuner_type */
-+ uint32_t index; /* Which input */
-+ uint8_t name[32]; /* Label */
-+ uint32_t type; /* Type of input */
-+ uint32_t audioset; /* Associated audios
(bitfield) */
-+ uint32_t tuner; /* Associated tuner */
- v4l2_std_id std;
-- __u32 status;
-- __u32 capabilities;
-- __u32 reserved[3];
-+ uint32_t status;
-+ uint32_t reserved[4];
- };
-
- /* Values for the 'type' field */
- #define V4L2_INPUT_TYPE_TUNER 1
- #define V4L2_INPUT_TYPE_CAMERA 2
--#define V4L2_INPUT_TYPE_TOUCH 3
-
- /* field 'status' - general */
- #define V4L2_IN_ST_NO_POWER 0x00000001 /* Attached device is off */
-@@ -1506,8 +744,6 @@ struct v4l2_input {
- /* field 'status' - analog */
- #define V4L2_IN_ST_NO_H_LOCK 0x00000100 /* No horizontal sync lock */
- #define V4L2_IN_ST_COLOR_KILL 0x00000200 /* Color killer is active */
--#define V4L2_IN_ST_NO_V_LOCK 0x00000400 /* No vertical sync lock */
--#define V4L2_IN_ST_NO_STD_LOCK 0x00000800 /* No standard format lock */
-
- /* field 'status' - digital */
- #define V4L2_IN_ST_NO_SYNC 0x00010000 /* No synchronization lock */
-@@ -1519,136 +755,78 @@ struct v4l2_input {
- #define V4L2_IN_ST_NO_ACCESS 0x02000000 /* Conditional access denied */
- #define V4L2_IN_ST_VTR 0x04000000 /* VTR time constant */
-
--/* capabilities flags */
--#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
- */
- struct v4l2_output {
-- __u32 index; /* Which output */
-- __u8 name[32]; /* Label */
-- __u32 type; /* Type of output */
-- __u32 audioset; /* Associated audios (bitfield) */
-- __u32 modulator; /* Associated modulator */
-+ uint32_t index; /* Which output */
-+ uint8_t name[32]; /* Label */
-+ uint32_t type; /* Type of output */
-+ uint32_t audioset; /* Associated audios
(bitfield) */
-+ uint32_t modulator; /* Associated modulator */
- v4l2_std_id std;
-- __u32 capabilities;
-- __u32 reserved[3];
-+ uint32_t reserved[4];
- };
- /* Values for the 'type' field */
- #define V4L2_OUTPUT_TYPE_MODULATOR 1
- #define V4L2_OUTPUT_TYPE_ANALOG 2
- #define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY 3
-
--/* capabilities flags */
--#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
- */
- struct v4l2_control {
-- __u32 id;
-- __s32 value;
-+ uint32_t id;
-+ int32_t value;
- };
-
- struct v4l2_ext_control {
-- __u32 id;
-- __u32 size;
-- __u32 reserved2[1];
-+ uint32_t id;
-+ uint32_t reserved2[2];
- union {
-- __s32 value;
-- __s64 value64;
-- char *string;
-- __u8 *p_u8;
-- __u16 *p_u16;
-- __u32 *p_u32;
-- void *ptr;
-+ int32_t value;
-+ int64_t value64;
-+ void *reserved;
- };
- } __attribute__ ((packed));
-
- struct v4l2_ext_controls {
-- union {
-- __u32 ctrl_class;
-- __u32 which;
-- };
-- __u32 count;
-- __u32 error_idx;
-- __u32 reserved[2];
-+ uint32_t ctrl_class;
-+ uint32_t count;
-+ uint32_t error_idx;
-+ uint32_t reserved[2];
- struct v4l2_ext_control *controls;
- };
-
-+/* Values for ctrl_class field */
-+#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */
-+#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */
-+#define V4L2_CTRL_CLASS_CAMERA 0x009a0000 /* Camera class controls */
-+
- #define V4L2_CTRL_ID_MASK (0x0fffffff)
- #define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL)
--#define V4L2_CTRL_ID2WHICH(id) ((id) & 0x0fff0000UL)
- #define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
--#define V4L2_CTRL_MAX_DIMS (4)
--#define V4L2_CTRL_WHICH_CUR_VAL 0
--#define V4L2_CTRL_WHICH_DEF_VAL 0x0f000000
-
--enum v4l2_ctrl_type {
-- V4L2_CTRL_TYPE_INTEGER = 1,
-- V4L2_CTRL_TYPE_BOOLEAN = 2,
-- V4L2_CTRL_TYPE_MENU = 3,
-- V4L2_CTRL_TYPE_BUTTON = 4,
-- V4L2_CTRL_TYPE_INTEGER64 = 5,
-- V4L2_CTRL_TYPE_CTRL_CLASS = 6,
-- V4L2_CTRL_TYPE_STRING = 7,
-- V4L2_CTRL_TYPE_BITMASK = 8,
-- V4L2_CTRL_TYPE_INTEGER_MENU = 9,
--
-- /* Compound types are >= 0x0100 */
-- V4L2_CTRL_COMPOUND_TYPES = 0x0100,
-- V4L2_CTRL_TYPE_U8 = 0x0100,
-- V4L2_CTRL_TYPE_U16 = 0x0101,
-- V4L2_CTRL_TYPE_U32 = 0x0102,
--};
--
- /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
- struct v4l2_queryctrl {
-- __u32 id;
-- __u32 type; /* enum v4l2_ctrl_type */
-- __u8 name[32]; /* Whatever */
-- __s32 minimum; /* Note signedness */
-- __s32 maximum;
-- __s32 step;
-- __s32 default_value;
-- __u32 flags;
-- __u32 reserved[2];
-+ uint32_t id;
-+ enum v4l2_ctrl_type type;
-+ uint8_t name[32]; /* Whatever */
-+ int32_t minimum; /* Note signedness */
-+ int32_t maximum;
-+ int32_t step;
-+ int32_t default_value;
-+ uint32_t flags;
-+ uint32_t reserved[2];
- };
-
--/* Used in the VIDIOC_QUERY_EXT_CTRL ioctl for querying extended controls */
--struct v4l2_query_ext_ctrl {
-- __u32 id;
-- __u32 type;
-- char name[32];
-- __s64 minimum;
-- __s64 maximum;
-- __u64 step;
-- __s64 default_value;
-- __u32 flags;
-- __u32 elem_size;
-- __u32 elems;
-- __u32 nr_of_dims;
-- __u32 dims[V4L2_CTRL_MAX_DIMS];
-- __u32 reserved[32];
--};
--
- /* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
- struct v4l2_querymenu {
-- __u32 id;
-- __u32 index;
-- union {
-- __u8 name[32]; /* Whatever */
-- __s64 value;
-- };
-- __u32 reserved;
--} __attribute__ ((packed));
-+ uint32_t id;
-+ uint32_t index;
-+ uint8_t name[32]; /* Whatever */
-+ uint32_t reserved;
-+};
-
- /* Control flags */
- #define V4L2_CTRL_FLAG_DISABLED 0x0001
-@@ -1658,64 +836,345 @@ struct v4l2_querymenu {
- #define V4L2_CTRL_FLAG_INACTIVE 0x0010
- #define V4L2_CTRL_FLAG_SLIDER 0x0020
- #define V4L2_CTRL_FLAG_WRITE_ONLY 0x0040
--#define V4L2_CTRL_FLAG_VOLATILE 0x0080
--#define V4L2_CTRL_FLAG_HAS_PAYLOAD 0x0100
--#define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE 0x0200
--#define V4L2_CTRL_FLAG_MODIFY_LAYOUT 0x0400
-
--/* Query flags, to be ORed with the control ID */
-+/* Query flag, to be ORed with the control ID */
- #define V4L2_CTRL_FLAG_NEXT_CTRL 0x80000000
--#define V4L2_CTRL_FLAG_NEXT_COMPOUND 0x40000000
-
- /* User-class control IDs defined by V4L2 */
--#define V4L2_CID_MAX_CTRLS 1024
-+#define V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900)
-+#define V4L2_CID_USER_BASE V4L2_CID_BASE
- /* IDs reserved for driver specific controls */
- #define V4L2_CID_PRIVATE_BASE 0x08000000
-
-+#define V4L2_CID_USER_CLASS (V4L2_CTRL_CLASS_USER | 1)
-+#define V4L2_CID_BRIGHTNESS (V4L2_CID_BASE+0)
-+#define V4L2_CID_CONTRAST (V4L2_CID_BASE+1)
-+#define V4L2_CID_SATURATION (V4L2_CID_BASE+2)
-+#define V4L2_CID_HUE (V4L2_CID_BASE+3)
-+#define V4L2_CID_AUDIO_VOLUME (V4L2_CID_BASE+5)
-+#define V4L2_CID_AUDIO_BALANCE (V4L2_CID_BASE+6)
-+#define V4L2_CID_AUDIO_BASS (V4L2_CID_BASE+7)
-+#define V4L2_CID_AUDIO_TREBLE (V4L2_CID_BASE+8)
-+#define V4L2_CID_AUDIO_MUTE (V4L2_CID_BASE+9)
-+#define V4L2_CID_AUDIO_LOUDNESS (V4L2_CID_BASE+10)
-+#define V4L2_CID_BLACK_LEVEL (V4L2_CID_BASE+11) /* Deprecated */
-+#define V4L2_CID_AUTO_WHITE_BALANCE (V4L2_CID_BASE+12)
-+#define V4L2_CID_DO_WHITE_BALANCE (V4L2_CID_BASE+13)
-+#define V4L2_CID_RED_BALANCE (V4L2_CID_BASE+14)
-+#define V4L2_CID_BLUE_BALANCE (V4L2_CID_BASE+15)
-+#define V4L2_CID_GAMMA (V4L2_CID_BASE+16)
-+#define V4L2_CID_WHITENESS (V4L2_CID_GAMMA) /* Deprecated */
-+#define V4L2_CID_EXPOSURE (V4L2_CID_BASE+17)
-+#define V4L2_CID_AUTOGAIN (V4L2_CID_BASE+18)
-+#define V4L2_CID_GAIN (V4L2_CID_BASE+19)
-+#define V4L2_CID_HFLIP (V4L2_CID_BASE+20)
-+#define V4L2_CID_VFLIP (V4L2_CID_BASE+21)
-
-+/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */
-+#define V4L2_CID_HCENTER (V4L2_CID_BASE+22)
-+#define V4L2_CID_VCENTER (V4L2_CID_BASE+23)
-+
-+#define V4L2_CID_POWER_LINE_FREQUENCY (V4L2_CID_BASE+24)
-+enum v4l2_power_line_frequency {
-+ V4L2_CID_POWER_LINE_FREQUENCY_DISABLED = 0,
-+ V4L2_CID_POWER_LINE_FREQUENCY_50HZ = 1,
-+ V4L2_CID_POWER_LINE_FREQUENCY_60HZ = 2,
-+};
-+#define V4L2_CID_HUE_AUTO (V4L2_CID_BASE+25)
-+#define V4L2_CID_WHITE_BALANCE_TEMPERATURE (V4L2_CID_BASE+26)
-+#define V4L2_CID_SHARPNESS (V4L2_CID_BASE+27)
-+#define V4L2_CID_BACKLIGHT_COMPENSATION (V4L2_CID_BASE+28)
-+#define V4L2_CID_CHROMA_AGC (V4L2_CID_BASE+29)
-+#define V4L2_CID_COLOR_KILLER (V4L2_CID_BASE+30)
-+#define V4L2_CID_COLORFX (V4L2_CID_BASE+31)
-+enum v4l2_colorfx {
-+ V4L2_COLORFX_NONE = 0,
-+ V4L2_COLORFX_BW = 1,
-+ V4L2_COLORFX_SEPIA = 2,
-+};
-+#define V4L2_CID_AUTOBRIGHTNESS (V4L2_CID_BASE+32)
-+
-+/* last CID + 1 */
-+#define V4L2_CID_LASTP1 (V4L2_CID_BASE+33)
-+
-+/* MPEG-class control IDs defined by V4L2 */
-+#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)
-+#define V4L2_CID_MPEG_CLASS (V4L2_CTRL_CLASS_MPEG | 1)
-+
-+/* MPEG streams */
-+#define V4L2_CID_MPEG_STREAM_TYPE (V4L2_CID_MPEG_BASE+0)
-+enum v4l2_mpeg_stream_type {
-+ V4L2_MPEG_STREAM_TYPE_MPEG2_PS = 0, /* MPEG-2 program stream */
-+ V4L2_MPEG_STREAM_TYPE_MPEG2_TS = 1, /* MPEG-2 transport stream */
-+ V4L2_MPEG_STREAM_TYPE_MPEG1_SS = 2, /* MPEG-1 system stream */
-+ V4L2_MPEG_STREAM_TYPE_MPEG2_DVD = 3, /* MPEG-2 DVD-compatible stream */
-+ V4L2_MPEG_STREAM_TYPE_MPEG1_VCD = 4, /* MPEG-1 VCD-compatible stream */
-+ V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream
*/
-+};
-+#define V4L2_CID_MPEG_STREAM_PID_PMT (V4L2_CID_MPEG_BASE+1)
-+#define V4L2_CID_MPEG_STREAM_PID_AUDIO (V4L2_CID_MPEG_BASE+2)
-+#define V4L2_CID_MPEG_STREAM_PID_VIDEO (V4L2_CID_MPEG_BASE+3)
-+#define V4L2_CID_MPEG_STREAM_PID_PCR (V4L2_CID_MPEG_BASE+4)
-+#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO (V4L2_CID_MPEG_BASE+5)
-+#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO (V4L2_CID_MPEG_BASE+6)
-+#define V4L2_CID_MPEG_STREAM_VBI_FMT (V4L2_CID_MPEG_BASE+7)
-+enum v4l2_mpeg_stream_vbi_fmt {
-+ V4L2_MPEG_STREAM_VBI_FMT_NONE = 0, /* No VBI in the MPEG stream */
-+ V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1, /* VBI in private packets, IVTV
format */
-+};
-+
-+/* MPEG audio */
-+#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ (V4L2_CID_MPEG_BASE+100)
-+enum v4l2_mpeg_audio_sampling_freq {
-+ V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
-+ V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
-+ V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
-+};
-+#define V4L2_CID_MPEG_AUDIO_ENCODING (V4L2_CID_MPEG_BASE+101)
-+enum v4l2_mpeg_audio_encoding {
-+ V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
-+ V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
-+ V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
-+ V4L2_MPEG_AUDIO_ENCODING_AAC = 3,
-+ V4L2_MPEG_AUDIO_ENCODING_AC3 = 4,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L1_BITRATE (V4L2_CID_MPEG_BASE+102)
-+enum v4l2_mpeg_audio_l1_bitrate {
-+ V4L2_MPEG_AUDIO_L1_BITRATE_32K = 0,
-+ V4L2_MPEG_AUDIO_L1_BITRATE_64K = 1,
-+ V4L2_MPEG_AUDIO_L1_BITRATE_96K = 2,
-+ V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3,
-+ V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4,
-+ V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5,
-+ V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6,
-+ V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7,
-+ V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8,
-+ V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9,
-+ V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10,
-+ V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11,
-+ V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
-+ V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L2_BITRATE (V4L2_CID_MPEG_BASE+103)
-+enum v4l2_mpeg_audio_l2_bitrate {
-+ V4L2_MPEG_AUDIO_L2_BITRATE_32K = 0,
-+ V4L2_MPEG_AUDIO_L2_BITRATE_48K = 1,
-+ V4L2_MPEG_AUDIO_L2_BITRATE_56K = 2,
-+ V4L2_MPEG_AUDIO_L2_BITRATE_64K = 3,
-+ V4L2_MPEG_AUDIO_L2_BITRATE_80K = 4,
-+ V4L2_MPEG_AUDIO_L2_BITRATE_96K = 5,
-+ V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6,
-+ V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7,
-+ V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8,
-+ V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9,
-+ V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10,
-+ V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11,
-+ V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
-+ V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L3_BITRATE (V4L2_CID_MPEG_BASE+104)
-+enum v4l2_mpeg_audio_l3_bitrate {
-+ V4L2_MPEG_AUDIO_L3_BITRATE_32K = 0,
-+ V4L2_MPEG_AUDIO_L3_BITRATE_40K = 1,
-+ V4L2_MPEG_AUDIO_L3_BITRATE_48K = 2,
-+ V4L2_MPEG_AUDIO_L3_BITRATE_56K = 3,
-+ V4L2_MPEG_AUDIO_L3_BITRATE_64K = 4,
-+ V4L2_MPEG_AUDIO_L3_BITRATE_80K = 5,
-+ V4L2_MPEG_AUDIO_L3_BITRATE_96K = 6,
-+ V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7,
-+ V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8,
-+ V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9,
-+ V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10,
-+ V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11,
-+ V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
-+ V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MODE (V4L2_CID_MPEG_BASE+105)
-+enum v4l2_mpeg_audio_mode {
-+ V4L2_MPEG_AUDIO_MODE_STEREO = 0,
-+ V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
-+ V4L2_MPEG_AUDIO_MODE_DUAL = 2,
-+ V4L2_MPEG_AUDIO_MODE_MONO = 3,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION (V4L2_CID_MPEG_BASE+106)
-+enum v4l2_mpeg_audio_mode_extension {
-+ V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4 = 0,
-+ V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8 = 1,
-+ V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
-+ V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
-+};
-+#define V4L2_CID_MPEG_AUDIO_EMPHASIS (V4L2_CID_MPEG_BASE+107)
-+enum v4l2_mpeg_audio_emphasis {
-+ V4L2_MPEG_AUDIO_EMPHASIS_NONE = 0,
-+ V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
-+ V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17 = 2,
-+};
-+#define V4L2_CID_MPEG_AUDIO_CRC (V4L2_CID_MPEG_BASE+108)
-+enum v4l2_mpeg_audio_crc {
-+ V4L2_MPEG_AUDIO_CRC_NONE = 0,
-+ V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MUTE (V4L2_CID_MPEG_BASE+109)
-+#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE (V4L2_CID_MPEG_BASE+110)
-+#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE (V4L2_CID_MPEG_BASE+111)
-+enum v4l2_mpeg_audio_ac3_bitrate {
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_32K = 0,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_40K = 1,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_48K = 2,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_56K = 3,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_64K = 4,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_80K = 5,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_96K = 6,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_112K = 7,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_128K = 8,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_160K = 9,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_192K = 10,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_224K = 11,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_256K = 12,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_320K = 13,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_384K = 14,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_448K = 15,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_512K = 16,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_576K = 17,
-+ V4L2_MPEG_AUDIO_AC3_BITRATE_640K = 18,
-+};
-+
-+/* MPEG video */
-+#define V4L2_CID_MPEG_VIDEO_ENCODING (V4L2_CID_MPEG_BASE+200)
-+enum v4l2_mpeg_video_encoding {
-+ V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0,
-+ V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1,
-+ V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
-+};
-+#define V4L2_CID_MPEG_VIDEO_ASPECT (V4L2_CID_MPEG_BASE+201)
-+enum v4l2_mpeg_video_aspect {
-+ V4L2_MPEG_VIDEO_ASPECT_1x1 = 0,
-+ V4L2_MPEG_VIDEO_ASPECT_4x3 = 1,
-+ V4L2_MPEG_VIDEO_ASPECT_16x9 = 2,
-+ V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
-+};
-+#define V4L2_CID_MPEG_VIDEO_B_FRAMES (V4L2_CID_MPEG_BASE+202)
-+#define V4L2_CID_MPEG_VIDEO_GOP_SIZE (V4L2_CID_MPEG_BASE+203)
-+#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE (V4L2_CID_MPEG_BASE+204)
-+#define V4L2_CID_MPEG_VIDEO_PULLDOWN (V4L2_CID_MPEG_BASE+205)
-+#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE (V4L2_CID_MPEG_BASE+206)
-+enum v4l2_mpeg_video_bitrate_mode {
-+ V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
-+ V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
-+};
-+#define V4L2_CID_MPEG_VIDEO_BITRATE (V4L2_CID_MPEG_BASE+207)
-+#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK (V4L2_CID_MPEG_BASE+208)
-+#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
-+#define V4L2_CID_MPEG_VIDEO_MUTE (V4L2_CID_MPEG_BASE+210)
-+#define V4L2_CID_MPEG_VIDEO_MUTE_YUV (V4L2_CID_MPEG_BASE+211)
-+
-+/* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2
*/
-+#define V4L2_CID_MPEG_CX2341X_BASE
(V4L2_CTRL_CLASS_MPEG | 0x1000)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE
(V4L2_CID_MPEG_CX2341X_BASE+0)
-+enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
-+ V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
-+ V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER
(V4L2_CID_MPEG_CX2341X_BASE+1)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE
(V4L2_CID_MPEG_CX2341X_BASE+2)
-+enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
-+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF =
0,
-+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR =
1,
-+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT =
2,
-+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE =
3,
-+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE =
4,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE
(V4L2_CID_MPEG_CX2341X_BASE+3)
-+enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type {
-+ V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF = 0,
-+ V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE
(V4L2_CID_MPEG_CX2341X_BASE+4)
-+enum v4l2_mpeg_cx2341x_video_temporal_filter_mode {
-+ V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
-+ V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER
(V4L2_CID_MPEG_CX2341X_BASE+5)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE
(V4L2_CID_MPEG_CX2341X_BASE+6)
-+enum v4l2_mpeg_cx2341x_video_median_filter_type {
-+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF = 0,
-+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR = 1,
-+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT = 2,
-+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
-+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG = 4,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM
(V4L2_CID_MPEG_CX2341X_BASE+7)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP
(V4L2_CID_MPEG_CX2341X_BASE+8)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM
(V4L2_CID_MPEG_CX2341X_BASE+9)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP
(V4L2_CID_MPEG_CX2341X_BASE+10)
-+#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS
(V4L2_CID_MPEG_CX2341X_BASE+11)
-+
-+/* Camera class control IDs */
-+#define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900)
-+#define V4L2_CID_CAMERA_CLASS (V4L2_CTRL_CLASS_CAMERA | 1)
-+
-+#define V4L2_CID_EXPOSURE_AUTO
(V4L2_CID_CAMERA_CLASS_BASE+1)
-+enum v4l2_exposure_auto_type {
-+ V4L2_EXPOSURE_AUTO = 0,
-+ V4L2_EXPOSURE_MANUAL = 1,
-+ V4L2_EXPOSURE_SHUTTER_PRIORITY = 2,
-+ V4L2_EXPOSURE_APERTURE_PRIORITY = 3
-+};
-+#define V4L2_CID_EXPOSURE_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+2)
-+#define V4L2_CID_EXPOSURE_AUTO_PRIORITY
(V4L2_CID_CAMERA_CLASS_BASE+3)
-+
-+#define V4L2_CID_PAN_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+4)
-+#define V4L2_CID_TILT_RELATIVE
(V4L2_CID_CAMERA_CLASS_BASE+5)
-+#define V4L2_CID_PAN_RESET (V4L2_CID_CAMERA_CLASS_BASE+6)
-+#define V4L2_CID_TILT_RESET (V4L2_CID_CAMERA_CLASS_BASE+7)
-+
-+#define V4L2_CID_PAN_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+8)
-+#define V4L2_CID_TILT_ABSOLUTE
(V4L2_CID_CAMERA_CLASS_BASE+9)
-+
-+#define V4L2_CID_FOCUS_ABSOLUTE
(V4L2_CID_CAMERA_CLASS_BASE+10)
-+#define V4L2_CID_FOCUS_RELATIVE
(V4L2_CID_CAMERA_CLASS_BASE+11)
-+#define V4L2_CID_FOCUS_AUTO (V4L2_CID_CAMERA_CLASS_BASE+12)
-+
-+#define V4L2_CID_ZOOM_ABSOLUTE
(V4L2_CID_CAMERA_CLASS_BASE+13)
-+#define V4L2_CID_ZOOM_RELATIVE
(V4L2_CID_CAMERA_CLASS_BASE+14)
-+#define V4L2_CID_ZOOM_CONTINUOUS (V4L2_CID_CAMERA_CLASS_BASE+15)
-+
-+#define V4L2_CID_PRIVACY (V4L2_CID_CAMERA_CLASS_BASE+16)
-+
- /*
- * T U N I N G
- */
- struct v4l2_tuner {
-- __u32 index;
-- __u8 name[32];
-- __u32 type; /* enum v4l2_tuner_type */
-- __u32 capability;
-- __u32 rangelow;
-- __u32 rangehigh;
-- __u32 rxsubchans;
-- __u32 audmode;
-- __s32 signal;
-- __s32 afc;
-- __u32 reserved[4];
-+ uint32_t index;
-+ uint8_t name[32];
-+ enum v4l2_tuner_type type;
-+ uint32_t capability;
-+ uint32_t rangelow;
-+ uint32_t rangehigh;
-+ uint32_t rxsubchans;
-+ uint32_t audmode;
-+ int32_t signal;
-+ int32_t afc;
-+ uint32_t reserved[4];
- };
-
- struct v4l2_modulator {
-- __u32 index;
-- __u8 name[32];
-- __u32 capability;
-- __u32 rangelow;
-- __u32 rangehigh;
-- __u32 txsubchans;
-- __u32 type; /* enum v4l2_tuner_type */
-- __u32 reserved[3];
-+ uint32_t index;
-+ uint8_t name[32];
-+ uint32_t capability;
-+ uint32_t rangelow;
-+ uint32_t rangehigh;
-+ uint32_t txsubchans;
-+ uint32_t reserved[4];
- };
-
- /* Flags for the 'capability' field */
- #define V4L2_TUNER_CAP_LOW 0x0001
- #define V4L2_TUNER_CAP_NORM 0x0002
--#define V4L2_TUNER_CAP_HWSEEK_BOUNDED 0x0004
--#define V4L2_TUNER_CAP_HWSEEK_WRAP 0x0008
- #define V4L2_TUNER_CAP_STEREO 0x0010
- #define V4L2_TUNER_CAP_LANG2 0x0020
- #define V4L2_TUNER_CAP_SAP 0x0020
- #define V4L2_TUNER_CAP_LANG1 0x0040
--#define V4L2_TUNER_CAP_RDS 0x0080
--#define V4L2_TUNER_CAP_RDS_BLOCK_IO 0x0100
--#define V4L2_TUNER_CAP_RDS_CONTROLS 0x0200
--#define V4L2_TUNER_CAP_FREQ_BANDS 0x0400
--#define V4L2_TUNER_CAP_HWSEEK_PROG_LIM 0x0800
--#define V4L2_TUNER_CAP_1HZ 0x1000
-
- /* Flags for the 'rxsubchans' field */
- #define V4L2_TUNER_SUB_MONO 0x0001
-@@ -1723,7 +1182,6 @@ struct v4l2_modulator {
- #define V4L2_TUNER_SUB_LANG2 0x0004
- #define V4L2_TUNER_SUB_SAP 0x0004
- #define V4L2_TUNER_SUB_LANG1 0x0008
--#define V4L2_TUNER_SUB_RDS 0x0010
-
- /* Values for the 'audmode' field */
- #define V4L2_TUNER_MODE_MONO 0x0000
-@@ -1734,68 +1192,29 @@ struct v4l2_modulator {
- #define V4L2_TUNER_MODE_LANG1_LANG2 0x0004
-
- struct v4l2_frequency {
-- __u32 tuner;
-- __u32 type; /* enum v4l2_tuner_type */
-- __u32 frequency;
-- __u32 reserved[8];
-+ uint32_t tuner;
-+ enum v4l2_tuner_type type;
-+ uint32_t frequency;
-+ uint32_t reserved[8];
- };
-
--#define V4L2_BAND_MODULATION_VSB (1 << 1)
--#define V4L2_BAND_MODULATION_FM (1 << 2)
--#define V4L2_BAND_MODULATION_AM (1 << 3)
--
--struct v4l2_frequency_band {
-- __u32 tuner;
-- __u32 type; /* enum v4l2_tuner_type */
-- __u32 index;
-- __u32 capability;
-- __u32 rangelow;
-- __u32 rangehigh;
-- __u32 modulation;
-- __u32 reserved[9];
--};
--
- struct v4l2_hw_freq_seek {
-- __u32 tuner;
-- __u32 type; /* enum v4l2_tuner_type */
-- __u32 seek_upward;
-- __u32 wrap_around;
-- __u32 spacing;
-- __u32 rangelow;
-- __u32 rangehigh;
-- __u32 reserved[5];
-+ uint32_t tuner;
-+ enum v4l2_tuner_type type;
-+ uint32_t seek_upward;
-+ uint32_t wrap_around;
-+ uint32_t reserved[8];
- };
-
- /*
-- * R D S
-- */
--
--struct v4l2_rds_data {
-- __u8 lsb;
-- __u8 msb;
-- __u8 block;
--} __attribute__ ((packed));
--
--#define V4L2_RDS_BLOCK_MSK 0x7
--#define V4L2_RDS_BLOCK_A 0
--#define V4L2_RDS_BLOCK_B 1
--#define V4L2_RDS_BLOCK_C 2
--#define V4L2_RDS_BLOCK_D 3
--#define V4L2_RDS_BLOCK_C_ALT 4
--#define V4L2_RDS_BLOCK_INVALID 7
--
--#define V4L2_RDS_BLOCK_CORRECTED 0x40
--#define V4L2_RDS_BLOCK_ERROR 0x80
--
--/*
- * A U D I O
- */
- struct v4l2_audio {
-- __u32 index;
-- __u8 name[32];
-- __u32 capability;
-- __u32 mode;
-- __u32 reserved[2];
-+ uint32_t index;
-+ uint8_t name[32];
-+ uint32_t capability;
-+ uint32_t mode;
-+ uint32_t reserved[2];
- };
-
- /* Flags for the 'capability' field */
-@@ -1806,15 +1225,17 @@ struct v4l2_audio {
- #define V4L2_AUDMODE_AVL 0x00001
-
- struct v4l2_audioout {
-- __u32 index;
-- __u8 name[32];
-- __u32 capability;
-- __u32 mode;
-- __u32 reserved[2];
-+ uint32_t index;
-+ uint8_t name[32];
-+ uint32_t capability;
-+ uint32_t mode;
-+ uint32_t reserved[2];
- };
-
- /*
- * M P E G S E R V I C E S
-+ *
-+ * NOTE: EXPERIMENTAL API
- */
- #if 1
- #define V4L2_ENC_IDX_FRAME_I (0)
-@@ -1823,18 +1244,18 @@ struct v4l2_audioout {
- #define V4L2_ENC_IDX_FRAME_MASK (0xf)
-
- struct v4l2_enc_idx_entry {
-- __u64 offset;
-- __u64 pts;
-- __u32 length;
-- __u32 flags;
-- __u32 reserved[2];
-+ uint64_t offset;
-+ uint64_t pts;
-+ uint32_t length;
-+ uint32_t flags;
-+ uint32_t reserved[2];
- };
-
- #define V4L2_ENC_IDX_ENTRIES (64)
- struct v4l2_enc_idx {
-- __u32 entries;
-- __u32 entries_cap;
-- __u32 reserved[4];
-+ uint32_t entries;
-+ uint32_t entries_cap;
-+ uint32_t reserved[4];
- struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES];
- };
-
-@@ -1848,63 +1269,15 @@ struct v4l2_enc_idx {
- #define V4L2_ENC_CMD_STOP_AT_GOP_END (1 << 0)
-
- struct v4l2_encoder_cmd {
-- __u32 cmd;
-- __u32 flags;
-+ uint32_t cmd;
-+ uint32_t flags;
- union {
- struct {
-- __u32 data[8];
-+ uint32_t data[8];
- } raw;
- };
- };
-
--/* Decoder commands */
--#define V4L2_DEC_CMD_START (0)
--#define V4L2_DEC_CMD_STOP (1)
--#define V4L2_DEC_CMD_PAUSE (2)
--#define V4L2_DEC_CMD_RESUME (3)
--
--/* Flags for V4L2_DEC_CMD_START */
--#define V4L2_DEC_CMD_START_MUTE_AUDIO (1 << 0)
--
--/* Flags for V4L2_DEC_CMD_PAUSE */
--#define V4L2_DEC_CMD_PAUSE_TO_BLACK (1 << 0)
--
--/* Flags for V4L2_DEC_CMD_STOP */
--#define V4L2_DEC_CMD_STOP_TO_BLACK (1 << 0)
--#define V4L2_DEC_CMD_STOP_IMMEDIATELY (1 << 1)
--
--/* Play format requirements (returned by the driver): */
--
--/* The decoder has no special format requirements */
--#define V4L2_DEC_START_FMT_NONE (0)
--/* The decoder requires full GOPs */
--#define V4L2_DEC_START_FMT_GOP (1)
--
--/* The structure must be zeroed before use by the application
-- This ensures it can be extended safely in the future. */
--struct v4l2_decoder_cmd {
-- __u32 cmd;
-- __u32 flags;
-- union {
-- struct {
-- __u64 pts;
-- } stop;
--
-- struct {
-- /* 0 or 1000 specifies normal speed,
-- 1 specifies forward single stepping,
-- -1 specifies backward single stepping,
-- >1: playback at speed/1000 of the normal speed,
-- <-1: reverse playback at (-speed/1000) of the normal
speed. */
-- __s32 speed;
-- __u32 format;
-- } start;
--
-- struct {
-- __u32 data[16];
-- } raw;
-- };
--};
- #endif
-
-
-@@ -1916,26 +1289,20 @@ struct v4l2_decoder_cmd {
-
- /* Raw VBI */
- struct v4l2_vbi_format {
-- __u32 sampling_rate; /* in 1 Hz */
-- __u32 offset;
-- __u32 samples_per_line;
-- __u32 sample_format; /* V4L2_PIX_FMT_* */
-- __s32 start[2];
-- __u32 count[2];
-- __u32 flags; /* V4L2_VBI_* */
-- __u32 reserved[2]; /* must be zero */
-+ uint32_t sampling_rate; /* in 1 Hz */
-+ uint32_t offset;
-+ uint32_t samples_per_line;
-+ uint32_t sample_format; /* V4L2_PIX_FMT_* */
-+ int32_t start[2];
-+ uint32_t count[2];
-+ uint32_t flags; /* V4L2_VBI_* */
-+ uint32_t reserved[2]; /* must be zero */
- };
-
- /* VBI flags */
- #define V4L2_VBI_UNSYNC (1 << 0)
- #define V4L2_VBI_INTERLACED (1 << 1)
-
--/* ITU-R start lines for each field */
--#define V4L2_VBI_ITU_525_F1_START (1)
--#define V4L2_VBI_ITU_525_F2_START (264)
--#define V4L2_VBI_ITU_625_F1_START (1)
--#define V4L2_VBI_ITU_625_F2_START (314)
--
- /* Sliced VBI
- *
- * This implements is a proposal V4L2 API to allow SLICED VBI
-@@ -1944,14 +1311,14 @@ struct v4l2_vbi_format {
- */
-
- struct v4l2_sliced_vbi_format {
-- __u16 service_set;
-+ uint16_t service_set;
- /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first
field
- service_lines[1][...] specifies lines 0-23 (1-23 used) of the second
field
- (equals frame lines 313-336 for 625 line video
- standards, 263-286 for 525 line standards) */
-- __u16 service_lines[2][24];
-- __u32 io_size;
-- __u32 reserved[2]; /* must be zero */
-+ uint16_t service_lines[2][24];
-+ uint32_t io_size;
-+ uint32_t reserved[2]; /* must be zero */
- };
-
- /* Teletext World System Teletext
-@@ -1968,22 +1335,22 @@ struct v4l2_sliced_vbi_format {
- #define V4L2_SLICED_VBI_625 (V4L2_SLICED_TELETEXT_B |
V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
-
- struct v4l2_sliced_vbi_cap {
-- __u16 service_set;
-+ uint16_t service_set;
- /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first
field
- service_lines[1][...] specifies lines 0-23 (1-23 used) of the second
field
- (equals frame lines 313-336 for 625 line video
- standards, 263-286 for 525 line standards) */
-- __u16 service_lines[2][24];
-- __u32 type; /* enum v4l2_buf_type */
-- __u32 reserved[3]; /* must be 0 */
-+ uint16_t service_lines[2][24];
-+ enum v4l2_buf_type type;
-+ uint32_t reserved[3]; /* must be 0 */
- };
-
- struct v4l2_sliced_vbi_data {
-- __u32 id;
-- __u32 field; /* 0: first field, 1: second field */
-- __u32 line; /* 1-23 */
-- __u32 reserved; /* must be 0 */
-- __u8 data[48];
-+ uint32_t id;
-+ uint32_t field; /* 0: first field, 1: second field */
-+ uint32_t line; /* 1-23 */
-+ uint32_t reserved; /* must be 0 */
-+ uint8_t data[48];
- };
-
- /*
-@@ -2009,12 +1376,12 @@ struct v4l2_sliced_vbi_data {
- #define V4L2_MPEG_VBI_IVTV_VPS (7)
-
- struct v4l2_mpeg_vbi_itv0_line {
-- __u8 id; /* One of V4L2_MPEG_VBI_IVTV_* above */
-- __u8 data[42]; /* Sliced VBI data for the line */
-+ uint8_t id; /* One of V4L2_MPEG_VBI_IVTV_* above */
-+ uint8_t data[42]; /* Sliced VBI data for the line */
- } __attribute__ ((packed));
-
- struct v4l2_mpeg_vbi_itv0 {
-- __le32 linemask[2]; /* Bitmasks of VBI service lines present */
-+ uint32_t linemask[2]; /* Bitmasks of VBI service lines present */
- struct v4l2_mpeg_vbi_itv0_line line[35];
- } __attribute__ ((packed));
-
-@@ -2026,7 +1393,7 @@ struct v4l2_mpeg_vbi_ITV0 {
- #define V4L2_MPEG_VBI_IVTV_MAGIC1 "ITV0"
-
- struct v4l2_mpeg_vbi_fmt_ivtv {
-- __u8 magic[4];
-+ uint8_t magic[4];
- union {
- struct v4l2_mpeg_vbi_itv0 itv0;
- struct v4l2_mpeg_vbi_ITV0 ITV0;
-@@ -2037,199 +1404,32 @@ struct v4l2_mpeg_vbi_fmt_ivtv {
- * A G G R E G A T E S T R U C T U R E S
- */
-
--/**
-- * struct v4l2_plane_pix_format - additional, per-plane format definition
-- * @sizeimage: maximum size in bytes required for data, for
which
-- * this plane will be used
-- * @bytesperline: distance in bytes between the leftmost pixels in two
-- * adjacent lines
-+/* Stream data format
- */
--struct v4l2_plane_pix_format {
-- __u32 sizeimage;
-- __u32 bytesperline;
-- __u16 reserved[6];
--} __attribute__ ((packed));
--
--/**
-- * struct v4l2_pix_format_mplane - multiplanar format definition
-- * @width: image width in pixels
-- * @height: image height in pixels
-- * @pixelformat: little endian four character code (fourcc)
-- * @field: enum v4l2_field; field order (for interlaced video)
-- * @colorspace: enum v4l2_colorspace; supplemental to
pixelformat
-- * @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
-- * @xfer_func: enum v4l2_xfer_func, colorspace transfer
function
-- */
--struct v4l2_pix_format_mplane {
-- __u32 width;
-- __u32 height;
-- __u32 pixelformat;
-- __u32 field;
-- __u32 colorspace;
--
-- struct v4l2_plane_pix_format plane_fmt[VIDEO_MAX_PLANES];
-- __u8 num_planes;
-- __u8 flags;
-- union {
-- __u8 ycbcr_enc;
-- __u8 hsv_enc;
-- };
-- __u8 quantization;
-- __u8 xfer_func;
-- __u8 reserved[7];
--} __attribute__ ((packed));
--
--/**
-- * struct v4l2_sdr_format - SDR format definition
-- * @pixelformat: little endian four character code (fourcc)
-- * @buffersize: maximum size in bytes required for data
-- */
--struct v4l2_sdr_format {
-- __u32 pixelformat;
-- __u32 buffersize;
-- __u8 reserved[24];
--} __attribute__ ((packed));
--
--/**
-- * struct v4l2_meta_format - metadata format definition
-- * @dataformat: little endian four character code (fourcc)
-- * @buffersize: maximum size in bytes required for data
-- */
--struct v4l2_meta_format {
-- __u32 dataformat;
-- __u32 buffersize;
--} __attribute__ ((packed));
--
--/**
-- * struct v4l2_format - stream data format
-- * @type: enum v4l2_buf_type; type of the data stream
-- * @pix: definition of an image format
-- * @pix_mp: definition of a multiplanar image format
-- * @win: definition of an overlaid image
-- * @vbi: raw VBI capture or output parameters
-- * @sliced: sliced VBI capture or output parameters
-- * @raw_data: placeholder for future extensions and custom formats
-- */
- struct v4l2_format {
-- __u32 type;
-+ enum v4l2_buf_type type;
- union {
- struct v4l2_pix_format pix; /*
V4L2_BUF_TYPE_VIDEO_CAPTURE */
-- struct v4l2_pix_format_mplane pix_mp; /*
V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE */
- struct v4l2_window win; /*
V4L2_BUF_TYPE_VIDEO_OVERLAY */
- struct v4l2_vbi_format vbi; /*
V4L2_BUF_TYPE_VBI_CAPTURE */
- struct v4l2_sliced_vbi_format sliced; /*
V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
-- struct v4l2_sdr_format sdr; /*
V4L2_BUF_TYPE_SDR_CAPTURE */
-- struct v4l2_meta_format meta; /*
V4L2_BUF_TYPE_META_CAPTURE */
-- __u8 raw_data[200]; /* user-defined */
-+ uint8_t raw_data[200]; /* user-defined */
- } fmt;
- };
-
-+
- /* Stream type-dependent parameters
- */
- struct v4l2_streamparm {
-- __u32 type; /* enum v4l2_buf_type */
-+ enum v4l2_buf_type type;
- union {
- struct v4l2_captureparm capture;
- struct v4l2_outputparm output;
-- __u8 raw_data[200]; /* user-defined */
-+ uint8_t raw_data[200]; /* user-defined */
- } parm;
- };
-
- /*
-- * E V E N T S
-- */
--
--#define V4L2_EVENT_ALL 0
--#define V4L2_EVENT_VSYNC 1
--#define V4L2_EVENT_EOS 2
--#define V4L2_EVENT_CTRL 3
--#define V4L2_EVENT_FRAME_SYNC 4
--#define V4L2_EVENT_SOURCE_CHANGE 5
--#define V4L2_EVENT_MOTION_DET 6
--#define V4L2_EVENT_PRIVATE_START 0x08000000
--
--/* Payload for V4L2_EVENT_VSYNC */
--struct v4l2_event_vsync {
-- /* Can be V4L2_FIELD_ANY, _NONE, _TOP or _BOTTOM */
-- __u8 field;
--} __attribute__ ((packed));
--
--/* Payload for V4L2_EVENT_CTRL */
--#define V4L2_EVENT_CTRL_CH_VALUE (1 << 0)
--#define V4L2_EVENT_CTRL_CH_FLAGS (1 << 1)
--#define V4L2_EVENT_CTRL_CH_RANGE (1 << 2)
--
--struct v4l2_event_ctrl {
-- __u32 changes;
-- __u32 type;
-- union {
-- __s32 value;
-- __s64 value64;
-- };
-- __u32 flags;
-- __s32 minimum;
-- __s32 maximum;
-- __s32 step;
-- __s32 default_value;
--};
--
--struct v4l2_event_frame_sync {
-- __u32 frame_sequence;
--};
--
--#define V4L2_EVENT_SRC_CH_RESOLUTION (1 << 0)
--
--struct v4l2_event_src_change {
-- __u32 changes;
--};
--
--#define V4L2_EVENT_MD_FL_HAVE_FRAME_SEQ (1 << 0)
--
--/**
-- * struct v4l2_event_motion_det - motion detection event
-- * @flags: if V4L2_EVENT_MD_FL_HAVE_FRAME_SEQ is set, then the
-- * frame_sequence field is valid.
-- * @frame_sequence: the frame sequence number associated with this event.
-- * @region_mask: which regions detected motion.
-- */
--struct v4l2_event_motion_det {
-- __u32 flags;
-- __u32 frame_sequence;
-- __u32 region_mask;
--};
--
--struct v4l2_event {
-- __u32 type;
-- union {
-- struct v4l2_event_vsync vsync;
-- struct v4l2_event_ctrl ctrl;
-- struct v4l2_event_frame_sync frame_sync;
-- struct v4l2_event_src_change src_change;
-- struct v4l2_event_motion_det motion_det;
-- __u8 data[64];
-- } u;
-- __u32 pending;
-- __u32 sequence;
-- struct timespec timestamp;
-- __u32 id;
-- __u32 reserved[8];
--};
--
--#define V4L2_EVENT_SUB_FL_SEND_INITIAL (1 << 0)
--#define V4L2_EVENT_SUB_FL_ALLOW_FEEDBACK (1 << 1)
--
--struct v4l2_event_subscription {
-- __u32 type;
-- __u32 id;
-- __u32 flags;
-- __u32 reserved[5];
--};
--
--/*
- * A D V A N C E D D E B U G G I N G
- *
- * NOTE: EXPERIMENTAL API, NEVER RELY ON THIS IN APPLICATIONS!
-@@ -2238,58 +1438,33 @@ struct v4l2_event_subscription {
-
- /* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
-
--#define V4L2_CHIP_MATCH_BRIDGE 0 /* Match against chip ID on the bridge
(0 for the bridge) */
--#define V4L2_CHIP_MATCH_SUBDEV 4 /* Match against subdev index */
-+#define V4L2_CHIP_MATCH_HOST 0 /* Match against chip ID on host (0 for
the host) */
-+#define V4L2_CHIP_MATCH_I2C_DRIVER 1 /* Match against I2C driver name */
-+#define V4L2_CHIP_MATCH_I2C_ADDR 2 /* Match against I2C 7-bit address */
-+#define V4L2_CHIP_MATCH_AC97 3 /* Match against anciliary AC97 chip */
-
--/* The following four defines are no longer in use */
--#define V4L2_CHIP_MATCH_HOST V4L2_CHIP_MATCH_BRIDGE
--#define V4L2_CHIP_MATCH_I2C_DRIVER 1 /* Match against I2C driver name */
--#define V4L2_CHIP_MATCH_I2C_ADDR 2 /* Match against I2C 7-bit address */
--#define V4L2_CHIP_MATCH_AC97 3 /* Match against ancillary AC97 chip */
--
- struct v4l2_dbg_match {
-- __u32 type; /* Match type */
-+ uint32_t type; /* Match type */
- union { /* Match this chip, meaning determined by type */
-- __u32 addr;
-+ uint32_t addr;
- char name[32];
- };
- } __attribute__ ((packed));
-
- struct v4l2_dbg_register {
- struct v4l2_dbg_match match;
-- __u32 size; /* register size in bytes */
-- __u64 reg;
-- __u64 val;
-+ uint32_t size; /* register size in bytes */
-+ uint64_t reg;
-+ uint64_t val;
- } __attribute__ ((packed));
-
--#define V4L2_CHIP_FL_READABLE (1 << 0)
--#define V4L2_CHIP_FL_WRITABLE (1 << 1)
--
--/* VIDIOC_DBG_G_CHIP_INFO */
--struct v4l2_dbg_chip_info {
-+/* VIDIOC_DBG_G_CHIP_IDENT */
-+struct v4l2_dbg_chip_ident {
- struct v4l2_dbg_match match;
-- char name[32];
-- __u32 flags;
-- __u32 reserved[32];
-+ uint32_t ident; /* chip identifier as specified in
<media/v4l2-chip-ident.h> */
-+ uint32_t revision; /* chip revision, chip specific */
- } __attribute__ ((packed));
-
--/**
-- * struct v4l2_create_buffers - VIDIOC_CREATE_BUFS argument
-- * @index: on return, index of the first created buffer
-- * @count: entry: number of requested buffers,
-- * return: number of created buffers
-- * @memory: enum v4l2_memory; buffer memory type
-- * @format: frame format, for which buffers are requested
-- * @reserved: future extensions
-- */
--struct v4l2_create_buffers {
-- __u32 index;
-- __u32 count;
-- __u32 memory;
-- struct v4l2_format format;
-- __u32 reserved[8];
--};
--
- /*
- * I O C T L C O D E S F O R V I D E O D E V I C E S
- *
-@@ -2305,7 +1480,6 @@ struct v4l2_create_buffers {
- #define VIDIOC_S_FBUF _IOW('V', 11, struct v4l2_framebuffer)
- #define VIDIOC_OVERLAY _IOW('V', 14, int)
- #define VIDIOC_QBUF _IOWR('V', 15, struct v4l2_buffer)
--#define VIDIOC_EXPBUF _IOWR('V', 16, struct v4l2_exportbuffer)
- #define VIDIOC_DQBUF _IOWR('V', 17, struct v4l2_buffer)
- #define VIDIOC_STREAMON _IOW('V', 18, int)
- #define VIDIOC_STREAMOFF _IOW('V', 19, int)
-@@ -2325,8 +1499,6 @@ struct v4l2_create_buffers {
- #define VIDIOC_QUERYMENU _IOWR('V', 37, struct v4l2_querymenu)
- #define VIDIOC_G_INPUT _IOR('V', 38, int)
- #define VIDIOC_S_INPUT _IOWR('V', 39, int)
--#define VIDIOC_G_EDID _IOWR('V', 40, struct v4l2_edid)
--#define VIDIOC_S_EDID _IOWR('V', 41, struct v4l2_edid)
- #define VIDIOC_G_OUTPUT _IOR('V', 46, int)
- #define VIDIOC_S_OUTPUT _IOWR('V', 47, int)
- #define VIDIOC_ENUMOUTPUT _IOWR('V', 48, struct v4l2_output)
-@@ -2345,54 +1517,46 @@ struct v4l2_create_buffers {
- #define VIDIOC_TRY_FMT _IOWR('V', 64, struct v4l2_format)
- #define VIDIOC_ENUMAUDIO _IOWR('V', 65, struct v4l2_audio)
- #define VIDIOC_ENUMAUDOUT _IOWR('V', 66, struct v4l2_audioout)
--#define VIDIOC_G_PRIORITY _IOR('V', 67, __u32) /* enum v4l2_priority */
--#define VIDIOC_S_PRIORITY _IOW('V', 68, __u32) /* enum v4l2_priority */
-+#define VIDIOC_G_PRIORITY _IOR('V', 67, enum v4l2_priority)
-+#define VIDIOC_S_PRIORITY _IOW('V', 68, enum v4l2_priority)
- #define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap)
- #define VIDIOC_LOG_STATUS _IO('V', 70)
- #define VIDIOC_G_EXT_CTRLS _IOWR('V', 71, struct v4l2_ext_controls)
- #define VIDIOC_S_EXT_CTRLS _IOWR('V', 72, struct v4l2_ext_controls)
- #define VIDIOC_TRY_EXT_CTRLS _IOWR('V', 73, struct v4l2_ext_controls)
-+#if 1
- #define VIDIOC_ENUM_FRAMESIZES _IOWR('V', 74, struct v4l2_frmsizeenum)
- #define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum)
- #define VIDIOC_G_ENC_INDEX _IOR('V', 76, struct v4l2_enc_idx)
- #define VIDIOC_ENCODER_CMD _IOWR('V', 77, struct v4l2_encoder_cmd)
- #define VIDIOC_TRY_ENCODER_CMD _IOWR('V', 78, struct v4l2_encoder_cmd)
-+#endif
-
--/*
-- * Experimental, meant for debugging, testing and internal use.
-- * Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
-- * You must be root to use these ioctls. Never use these in applications!
-- */
-+#if 1
-+/* Experimental, meant for debugging, testing and internal use.
-+ Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
-+ You must be root to use these ioctls. Never use these in applications! */
- #define VIDIOC_DBG_S_REGISTER _IOW('V', 79, struct v4l2_dbg_register)
- #define VIDIOC_DBG_G_REGISTER _IOWR('V', 80, struct v4l2_dbg_register)
-
--#define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek)
--#define VIDIOC_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings)
--#define VIDIOC_G_DV_TIMINGS _IOWR('V', 88, struct v4l2_dv_timings)
--#define VIDIOC_DQEVENT _IOR('V', 89, struct v4l2_event)
--#define VIDIOC_SUBSCRIBE_EVENT _IOW('V', 90, struct
v4l2_event_subscription)
--#define VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct
v4l2_event_subscription)
--#define VIDIOC_CREATE_BUFS _IOWR('V', 92, struct v4l2_create_buffers)
--#define VIDIOC_PREPARE_BUF _IOWR('V', 93, struct v4l2_buffer)
--#define VIDIOC_G_SELECTION _IOWR('V', 94, struct v4l2_selection)
--#define VIDIOC_S_SELECTION _IOWR('V', 95, struct v4l2_selection)
--#define VIDIOC_DECODER_CMD _IOWR('V', 96, struct v4l2_decoder_cmd)
--#define VIDIOC_TRY_DECODER_CMD _IOWR('V', 97, struct v4l2_decoder_cmd)
--#define VIDIOC_ENUM_DV_TIMINGS _IOWR('V', 98, struct v4l2_enum_dv_timings)
--#define VIDIOC_QUERY_DV_TIMINGS _IOR('V', 99, struct v4l2_dv_timings)
--#define VIDIOC_DV_TIMINGS_CAP _IOWR('V', 100, struct v4l2_dv_timings_cap)
--#define VIDIOC_ENUM_FREQ_BANDS _IOWR('V', 101, struct
v4l2_frequency_band)
-+/* Experimental, meant for debugging, testing and internal use.
-+ Never use this ioctl in applications! */
-+#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
-+#endif
-
--/*
-- * Experimental, meant for debugging, testing and internal use.
-- * Never use this in applications!
-- */
--#define VIDIOC_DBG_G_CHIP_INFO _IOWR('V', 102, struct v4l2_dbg_chip_info)
--
--#define VIDIOC_QUERY_EXT_CTRL _IOWR('V', 103, struct v4l2_query_ext_ctrl)
--
-+#define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek)
- /* Reminder: when adding new ioctls please add support for them to
-- drivers/media/v4l2-core/v4l2-compat-ioctl32.c as well! */
-+ drivers/media/video/v4l2-compat-ioctl32.c as well! */
-+
-+#ifdef __OLD_VIDIOC_
-+/* for compatibility, will go away some day */
-+#define VIDIOC_OVERLAY_OLD _IOWR('V', 14, int)
-+#define VIDIOC_S_PARM_OLD _IOW('V', 22, struct v4l2_streamparm)
-+#define VIDIOC_S_CTRL_OLD _IOW('V', 28, struct v4l2_control)
-+#define VIDIOC_G_AUDIO_OLD _IOWR('V', 33, struct v4l2_audio)
-+#define VIDIOC_G_AUDOUT_OLD _IOWR('V', 49, struct v4l2_audioout)
-+#define VIDIOC_CROPCAP_OLD _IOR('V', 58, struct v4l2_cropcap)
-+#endif
-
- #define BASE_VIDIOC_PRIVATE 192 /* 192-255 are private */
-
--
wbr, Kirill
