]> granicus.if.org Git - strace/commitdiff
projects / strace / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 79377ee)
xlat: provide fallback definitions for V4L2_CID_* constants
authorEugene Syromyatnikov <evgsyr@gmail.com>
Tue, 10 Apr 2018 06:52:25 +0000 (08:52 +0200)
committerDmitry V. Levin <ldv@altlinux.org>
Sun, 6 May 2018 15:34:41 +0000 (15:34 +0000)
* xlat/v4l2_control_id_bases.in: New file with fallback definitions.
* xlat/v4l2_control_ids.in: Add fallback definitions.
* v4l2.c: Reorder includes, include "xlat/v4l2_control_id_bases.h",
remove legacy V4L2_CID_* constant definitions.

v4l2.c patch | blob | history
xlat/v4l2_control_id_bases.in [new file with mode: 0644] patch | blob
xlat/v4l2_control_ids.in patch | blob | history

diff --git a/v4l2.c b/v4l2.c
index 5a9d25813104f29f831f841b6a4142147184d46e..f845fb4dee74dc841edaf14408c002212254e004 100644 (file)
--- a/v4l2.c
+++ b/v4l2.c
@@ -64,17 +64,6 @@ typedef struct v4l2_standard struct_v4l2_standard;
 #include "print_fields.h"
 #include "xstring.h"
 
-/* some historical constants */
-#ifndef V4L2_CID_HCENTER
-#define V4L2_CID_HCENTER (V4L2_CID_BASE+22)
-#endif
-#ifndef V4L2_CID_VCENTER
-#define V4L2_CID_VCENTER (V4L2_CID_BASE+23)
-#endif
-#ifndef V4L2_CID_BAND_STOP_FILTER
-#define V4L2_CID_BAND_STOP_FILTER (V4L2_CID_BASE+33)
-#endif
-
 /* v4l2_fourcc_be was added by Linux commit v3.18-rc1~101^2^2~127 */
 #ifndef v4l2_fourcc_be
 # define v4l2_fourcc_be(a, b, c, d) (v4l2_fourcc(a, b, c, d) | (1 << 31))
@@ -624,6 +613,12 @@ print_v4l2_input(struct tcb *const tcp, const kernel_ulong_t arg)
        return RVAL_IOCTL_DECODED;
 }
 
+/*
+ * We include it here and not before print_v4l2_ext_controls as we need
+ * V4L2_CTRL_CLASS_* definitions for V4L2_CID_*_BASE ones.
+ */
+#include "xlat/v4l2_control_classes.h"
+#include "xlat/v4l2_control_id_bases.h"
 #include "xlat/v4l2_control_ids.h"
 
 static int
@@ -825,8 +820,6 @@ print_v4l2_ext_control(struct tcb *tcp, void *elem_buf, size_t elem_size, void *
        return true;
 }
 
-#include "xlat/v4l2_control_classes.h"
-
 static int
 print_v4l2_ext_controls(struct tcb *const tcp, const kernel_ulong_t arg,
                        const bool is_get)
diff --git a/xlat/v4l2_control_id_bases.in b/xlat/v4l2_control_id_bases.in
new file mode 100644 (file)
index 0000000..a0359be
--- /dev/null
+++ b/xlat/v4l2_control_id_bases.in
@@ -0,0 +1,18 @@
+V4L2_CID_BASE                          (V4L2_CTRL_CLASS_USER | 0x900)
+V4L2_CID_USER_MEYE_BASE                        (V4L2_CID_BASE + 0x1000)
+V4L2_CID_USER_BTTV_BASE                        (V4L2_CID_BASE + 0x1010)
+V4L2_CID_USER_TI_VPE_BASE              (V4L2_CID_BASE + 0x1050)
+V4L2_CID_USER_IMX_BASE                 (V4L2_CID_BASE + 0x1090)
+V4L2_CID_MPEG_BASE                     (V4L2_CTRL_CLASS_MPEG | 0x900)
+V4L2_CID_MPEG_CX2341X_BASE             (V4L2_CTRL_CLASS_MPEG | 0x1000)
+V4L2_CID_MPEG_MFC51_BASE               (V4L2_CTRL_CLASS_MPEG | 0x1100)
+V4L2_CID_CAMERA_CLASS_BASE             (V4L2_CTRL_CLASS_CAMERA | 0x900)
+V4L2_CID_FM_TX_CLASS_BASE              (V4L2_CTRL_CLASS_FM_TX | 0x900)
+V4L2_CID_FLASH_CLASS_BASE              (V4L2_CTRL_CLASS_FLASH | 0x900)
+V4L2_CID_JPEG_CLASS_BASE               (V4L2_CTRL_CLASS_JPEG | 0x900)
+V4L2_CID_IMAGE_SOURCE_CLASS_BASE       (V4L2_CTRL_CLASS_IMAGE_SOURCE | 0x900)
+V4L2_CID_IMAGE_PROC_CLASS_BASE         (V4L2_CTRL_CLASS_IMAGE_PROC | 0x900)
+V4L2_CID_DV_CLASS_BASE                 (V4L2_CTRL_CLASS_DV | 0x900)
+V4L2_CID_FM_RX_CLASS_BASE              (V4L2_CTRL_CLASS_FM_RX | 0x900)
+V4L2_CID_RF_TUNER_CLASS_BASE           (V4L2_CTRL_CLASS_RF_TUNER | 0x900)
+V4L2_CID_DETECT_CLASS_BASE             (V4L2_CTRL_CLASS_DETECT | 0x900)
diff --git a/xlat/v4l2_control_ids.in b/xlat/v4l2_control_ids.in
index d15909b01788ae670db57b95b0eca4d7b3fae6a8..08859443ce0b85498103c4d2fbae2fdbf28a1e09 100644 (file)
--- a/xlat/v4l2_control_ids.in
+++ b/xlat/v4l2_control_ids.in
@@ -1,349 +1,349 @@
 /* User-class control IDs */
-V4L2_CID_BRIGHTNESS
-V4L2_CID_CONTRAST
-V4L2_CID_SATURATION
-V4L2_CID_HUE
-V4L2_CID_AUDIO_VOLUME
-V4L2_CID_AUDIO_BALANCE
-V4L2_CID_AUDIO_BASS
-V4L2_CID_AUDIO_TREBLE
-V4L2_CID_AUDIO_MUTE
-V4L2_CID_AUDIO_LOUDNESS
-V4L2_CID_BLACK_LEVEL
-V4L2_CID_AUTO_WHITE_BALANCE
-V4L2_CID_DO_WHITE_BALANCE
-V4L2_CID_RED_BALANCE
-V4L2_CID_BLUE_BALANCE
-V4L2_CID_GAMMA
-V4L2_CID_EXPOSURE
-V4L2_CID_AUTOGAIN
-V4L2_CID_GAIN
-V4L2_CID_HFLIP
-V4L2_CID_VFLIP
-V4L2_CID_HCENTER
-V4L2_CID_VCENTER
-V4L2_CID_POWER_LINE_FREQUENCY
-V4L2_CID_HUE_AUTO
-V4L2_CID_WHITE_BALANCE_TEMPERATURE
-V4L2_CID_SHARPNESS
-V4L2_CID_BACKLIGHT_COMPENSATION
-V4L2_CID_CHROMA_AGC
-V4L2_CID_COLOR_KILLER
-V4L2_CID_COLORFX
-V4L2_CID_AUTOBRIGHTNESS
-V4L2_CID_BAND_STOP_FILTER
-V4L2_CID_ROTATE
-V4L2_CID_BG_COLOR
-V4L2_CID_CHROMA_GAIN
-V4L2_CID_ILLUMINATORS_1
-V4L2_CID_ILLUMINATORS_2
-V4L2_CID_MIN_BUFFERS_FOR_CAPTURE
-V4L2_CID_MIN_BUFFERS_FOR_OUTPUT
-V4L2_CID_ALPHA_COMPONENT
-V4L2_CID_COLORFX_CBCR
+V4L2_CID_BRIGHTNESS                    (V4L2_CID_BASE+0)
+V4L2_CID_CONTRAST                      (V4L2_CID_BASE+1)
+V4L2_CID_SATURATION                    (V4L2_CID_BASE+2)
+V4L2_CID_HUE                           (V4L2_CID_BASE+3)
+V4L2_CID_AUDIO_VOLUME                  (V4L2_CID_BASE+5)
+V4L2_CID_AUDIO_BALANCE                 (V4L2_CID_BASE+6)
+V4L2_CID_AUDIO_BASS                    (V4L2_CID_BASE+7)
+V4L2_CID_AUDIO_TREBLE                  (V4L2_CID_BASE+8)
+V4L2_CID_AUDIO_MUTE                    (V4L2_CID_BASE+9)
+V4L2_CID_AUDIO_LOUDNESS                        (V4L2_CID_BASE+10)
+V4L2_CID_BLACK_LEVEL                   (V4L2_CID_BASE+11) /* Deprecated */
+V4L2_CID_AUTO_WHITE_BALANCE            (V4L2_CID_BASE+12)
+V4L2_CID_DO_WHITE_BALANCE              (V4L2_CID_BASE+13)
+V4L2_CID_RED_BALANCE                   (V4L2_CID_BASE+14)
+V4L2_CID_BLUE_BALANCE                  (V4L2_CID_BASE+15)
+V4L2_CID_GAMMA                         (V4L2_CID_BASE+16)
+V4L2_CID_EXPOSURE                      (V4L2_CID_BASE+17)
+V4L2_CID_AUTOGAIN                      (V4L2_CID_BASE+18)
+V4L2_CID_GAIN                          (V4L2_CID_BASE+19)
+V4L2_CID_HFLIP                         (V4L2_CID_BASE+20)
+V4L2_CID_VFLIP                         (V4L2_CID_BASE+21)
+V4L2_CID_HCENTER                       (V4L2_CID_BASE+22)
+V4L2_CID_VCENTER                       (V4L2_CID_BASE+23)
+V4L2_CID_POWER_LINE_FREQUENCY          (V4L2_CID_BASE+24)
+V4L2_CID_HUE_AUTO                      (V4L2_CID_BASE+25)
+V4L2_CID_WHITE_BALANCE_TEMPERATURE     (V4L2_CID_BASE+26)
+V4L2_CID_SHARPNESS                     (V4L2_CID_BASE+27)
+V4L2_CID_BACKLIGHT_COMPENSATION                (V4L2_CID_BASE+28)
+V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
+V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
+V4L2_CID_COLORFX                       (V4L2_CID_BASE+31)
+V4L2_CID_AUTOBRIGHTNESS                        (V4L2_CID_BASE+32)
+V4L2_CID_BAND_STOP_FILTER              (V4L2_CID_BASE+33)
+V4L2_CID_ROTATE                                (V4L2_CID_BASE+34)
+V4L2_CID_BG_COLOR                      (V4L2_CID_BASE+35)
+V4L2_CID_CHROMA_GAIN                    (V4L2_CID_BASE+36)
+V4L2_CID_ILLUMINATORS_1                        (V4L2_CID_BASE+37)
+V4L2_CID_ILLUMINATORS_2                        (V4L2_CID_BASE+38)
+V4L2_CID_MIN_BUFFERS_FOR_CAPTURE       (V4L2_CID_BASE+39)
+V4L2_CID_MIN_BUFFERS_FOR_OUTPUT                (V4L2_CID_BASE+40)
+V4L2_CID_ALPHA_COMPONENT               (V4L2_CID_BASE+41)
+V4L2_CID_COLORFX_CBCR                  (V4L2_CID_BASE+42)
 /* MPEG-class control IDs */
 /*  MPEG streams, specific to multiplexed streams */
-V4L2_CID_MPEG_STREAM_TYPE
-V4L2_CID_MPEG_STREAM_PID_PMT
-V4L2_CID_MPEG_STREAM_PID_AUDIO
-V4L2_CID_MPEG_STREAM_PID_VIDEO
-V4L2_CID_MPEG_STREAM_PID_PCR
-V4L2_CID_MPEG_STREAM_PES_ID_AUDIO
-V4L2_CID_MPEG_STREAM_PES_ID_VIDEO
-V4L2_CID_MPEG_STREAM_VBI_FMT
+V4L2_CID_MPEG_STREAM_TYPE              (V4L2_CID_MPEG_BASE+0)
+V4L2_CID_MPEG_STREAM_PID_PMT           (V4L2_CID_MPEG_BASE+1)
+V4L2_CID_MPEG_STREAM_PID_AUDIO         (V4L2_CID_MPEG_BASE+2)
+V4L2_CID_MPEG_STREAM_PID_VIDEO         (V4L2_CID_MPEG_BASE+3)
+V4L2_CID_MPEG_STREAM_PID_PCR           (V4L2_CID_MPEG_BASE+4)
+V4L2_CID_MPEG_STREAM_PES_ID_AUDIO      (V4L2_CID_MPEG_BASE+5)
+V4L2_CID_MPEG_STREAM_PES_ID_VIDEO      (V4L2_CID_MPEG_BASE+6)
+V4L2_CID_MPEG_STREAM_VBI_FMT           (V4L2_CID_MPEG_BASE+7)
 /*  MPEG audio controls specific to multiplexed streams  */
-V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ
-V4L2_CID_MPEG_AUDIO_ENCODING
-V4L2_CID_MPEG_AUDIO_L1_BITRATE
-V4L2_CID_MPEG_AUDIO_L2_BITRATE
-V4L2_CID_MPEG_AUDIO_L3_BITRATE
-V4L2_CID_MPEG_AUDIO_MODE
-V4L2_CID_MPEG_AUDIO_MODE_EXTENSION
-V4L2_CID_MPEG_AUDIO_EMPHASIS
-V4L2_CID_MPEG_AUDIO_CRC
-V4L2_CID_MPEG_AUDIO_MUTE
-V4L2_CID_MPEG_AUDIO_AAC_BITRATE
-V4L2_CID_MPEG_AUDIO_AC3_BITRATE
-V4L2_CID_MPEG_AUDIO_DEC_PLAYBACK
-V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK
+V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ      (V4L2_CID_MPEG_BASE+100)
+V4L2_CID_MPEG_AUDIO_ENCODING           (V4L2_CID_MPEG_BASE+101)
+V4L2_CID_MPEG_AUDIO_L1_BITRATE         (V4L2_CID_MPEG_BASE+102)
+V4L2_CID_MPEG_AUDIO_L2_BITRATE         (V4L2_CID_MPEG_BASE+103)
+V4L2_CID_MPEG_AUDIO_L3_BITRATE         (V4L2_CID_MPEG_BASE+104)
+V4L2_CID_MPEG_AUDIO_MODE               (V4L2_CID_MPEG_BASE+105)
+V4L2_CID_MPEG_AUDIO_MODE_EXTENSION     (V4L2_CID_MPEG_BASE+106)
+V4L2_CID_MPEG_AUDIO_EMPHASIS           (V4L2_CID_MPEG_BASE+107)
+V4L2_CID_MPEG_AUDIO_CRC                        (V4L2_CID_MPEG_BASE+108)
+V4L2_CID_MPEG_AUDIO_MUTE               (V4L2_CID_MPEG_BASE+109)
+V4L2_CID_MPEG_AUDIO_AAC_BITRATE                (V4L2_CID_MPEG_BASE+110)
+V4L2_CID_MPEG_AUDIO_AC3_BITRATE                (V4L2_CID_MPEG_BASE+111)
+V4L2_CID_MPEG_AUDIO_DEC_PLAYBACK       (V4L2_CID_MPEG_BASE+112)
+V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK  (V4L2_CID_MPEG_BASE+113)
 /*  MPEG video controls specific to multiplexed streams */
-V4L2_CID_MPEG_VIDEO_ENCODING
-V4L2_CID_MPEG_VIDEO_ASPECT
-V4L2_CID_MPEG_VIDEO_B_FRAMES
-V4L2_CID_MPEG_VIDEO_GOP_SIZE
-V4L2_CID_MPEG_VIDEO_GOP_CLOSURE
-V4L2_CID_MPEG_VIDEO_PULLDOWN
-V4L2_CID_MPEG_VIDEO_BITRATE_MODE
-V4L2_CID_MPEG_VIDEO_BITRATE
-V4L2_CID_MPEG_VIDEO_BITRATE_PEAK
-V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION
-V4L2_CID_MPEG_VIDEO_MUTE
-V4L2_CID_MPEG_VIDEO_MUTE_YUV
-V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE
-V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER
-V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB
-V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE
-V4L2_CID_MPEG_VIDEO_HEADER_MODE
-V4L2_CID_MPEG_VIDEO_MAX_REF_PIC
-V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE
-V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES
-V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB
-V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE
-V4L2_CID_MPEG_VIDEO_VBV_SIZE
-V4L2_CID_MPEG_VIDEO_DEC_PTS
-V4L2_CID_MPEG_VIDEO_DEC_FRAME
-V4L2_CID_MPEG_VIDEO_VBV_DELAY
-V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER
-V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE
-V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE
-V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME
-V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP
-V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP
-V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP
-V4L2_CID_MPEG_VIDEO_H263_MIN_QP
-V4L2_CID_MPEG_VIDEO_H263_MAX_QP
-V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP
-V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP
-V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP
-V4L2_CID_MPEG_VIDEO_H264_MIN_QP
-V4L2_CID_MPEG_VIDEO_H264_MAX_QP
-V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM
-V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE
-V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE
-V4L2_CID_MPEG_VIDEO_H264_I_PERIOD
-V4L2_CID_MPEG_VIDEO_H264_LEVEL
-V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA
-V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA
-V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE
-V4L2_CID_MPEG_VIDEO_H264_PROFILE
-V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT
-V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH
-V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_ENABLE
-V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC
-V4L2_CID_MPEG_VIDEO_H264_SEI_FRAME_PACKING
-V4L2_CID_MPEG_VIDEO_H264_SEI_FP_CURRENT_FRAME_0
-V4L2_CID_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE
-V4L2_CID_MPEG_VIDEO_H264_FMO
-V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE
-V4L2_CID_MPEG_VIDEO_H264_FMO_SLICE_GROUP
-V4L2_CID_MPEG_VIDEO_H264_FMO_CHANGE_DIRECTION
-V4L2_CID_MPEG_VIDEO_H264_FMO_CHANGE_RATE
-V4L2_CID_MPEG_VIDEO_H264_FMO_RUN_LENGTH
-V4L2_CID_MPEG_VIDEO_H264_ASO
-V4L2_CID_MPEG_VIDEO_H264_ASO_SLICE_ORDER
-V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING
-V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE
-V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER
-V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP
-V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP
-V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP
-V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP
-V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP
-V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP
-V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL
-V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE
-V4L2_CID_MPEG_VIDEO_MPEG4_QPEL
+V4L2_CID_MPEG_VIDEO_ENCODING           (V4L2_CID_MPEG_BASE+200)
+V4L2_CID_MPEG_VIDEO_ASPECT             (V4L2_CID_MPEG_BASE+201)
+V4L2_CID_MPEG_VIDEO_B_FRAMES           (V4L2_CID_MPEG_BASE+202)
+V4L2_CID_MPEG_VIDEO_GOP_SIZE           (V4L2_CID_MPEG_BASE+203)
+V4L2_CID_MPEG_VIDEO_GOP_CLOSURE                (V4L2_CID_MPEG_BASE+204)
+V4L2_CID_MPEG_VIDEO_PULLDOWN           (V4L2_CID_MPEG_BASE+205)
+V4L2_CID_MPEG_VIDEO_BITRATE_MODE       (V4L2_CID_MPEG_BASE+206)
+V4L2_CID_MPEG_VIDEO_BITRATE            (V4L2_CID_MPEG_BASE+207)
+V4L2_CID_MPEG_VIDEO_BITRATE_PEAK       (V4L2_CID_MPEG_BASE+208)
+V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION        (V4L2_CID_MPEG_BASE+209)
+V4L2_CID_MPEG_VIDEO_MUTE               (V4L2_CID_MPEG_BASE+210)
+V4L2_CID_MPEG_VIDEO_MUTE_YUV           (V4L2_CID_MPEG_BASE+211)
+V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE            (V4L2_CID_MPEG_BASE+212)
+V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER       (V4L2_CID_MPEG_BASE+213)
+V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB            (V4L2_CID_MPEG_BASE+214)
+V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE                    (V4L2_CID_MPEG_BASE+215)
+V4L2_CID_MPEG_VIDEO_HEADER_MODE                                (V4L2_CID_MPEG_BASE+216)
+V4L2_CID_MPEG_VIDEO_MAX_REF_PIC                        (V4L2_CID_MPEG_BASE+217)
+V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE               (V4L2_CID_MPEG_BASE+218)
+V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES      (V4L2_CID_MPEG_BASE+219)
+V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB         (V4L2_CID_MPEG_BASE+220)
+V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE           (V4L2_CID_MPEG_BASE+221)
+V4L2_CID_MPEG_VIDEO_VBV_SIZE                   (V4L2_CID_MPEG_BASE+222)
+V4L2_CID_MPEG_VIDEO_DEC_PTS                    (V4L2_CID_MPEG_BASE+223)
+V4L2_CID_MPEG_VIDEO_DEC_FRAME                  (V4L2_CID_MPEG_BASE+224)
+V4L2_CID_MPEG_VIDEO_VBV_DELAY                  (V4L2_CID_MPEG_BASE+225)
+V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER          (V4L2_CID_MPEG_BASE+226)
+V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE          (V4L2_CID_MPEG_BASE+227)
+V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE          (V4L2_CID_MPEG_BASE+228)
+V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME            (V4L2_CID_MPEG_BASE+229)
+V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP            (V4L2_CID_MPEG_BASE+300)
+V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP            (V4L2_CID_MPEG_BASE+301)
+V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP            (V4L2_CID_MPEG_BASE+302)
+V4L2_CID_MPEG_VIDEO_H263_MIN_QP                        (V4L2_CID_MPEG_BASE+303)
+V4L2_CID_MPEG_VIDEO_H263_MAX_QP                        (V4L2_CID_MPEG_BASE+304)
+V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP            (V4L2_CID_MPEG_BASE+350)
+V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP            (V4L2_CID_MPEG_BASE+351)
+V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP            (V4L2_CID_MPEG_BASE+352)
+V4L2_CID_MPEG_VIDEO_H264_MIN_QP                        (V4L2_CID_MPEG_BASE+353)
+V4L2_CID_MPEG_VIDEO_H264_MAX_QP                        (V4L2_CID_MPEG_BASE+354)
+V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM         (V4L2_CID_MPEG_BASE+355)
+V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE              (V4L2_CID_MPEG_BASE+356)
+V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE          (V4L2_CID_MPEG_BASE+357)
+V4L2_CID_MPEG_VIDEO_H264_I_PERIOD              (V4L2_CID_MPEG_BASE+358)
+V4L2_CID_MPEG_VIDEO_H264_LEVEL                 (V4L2_CID_MPEG_BASE+359)
+V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA     (V4L2_CID_MPEG_BASE+360)
+V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA      (V4L2_CID_MPEG_BASE+361)
+V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE      (V4L2_CID_MPEG_BASE+362)
+V4L2_CID_MPEG_VIDEO_H264_PROFILE               (V4L2_CID_MPEG_BASE+363)
+V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT    (V4L2_CID_MPEG_BASE+364)
+V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH     (V4L2_CID_MPEG_BASE+365)
+V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_ENABLE                (V4L2_CID_MPEG_BASE+366)
+V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC           (V4L2_CID_MPEG_BASE+367)
+V4L2_CID_MPEG_VIDEO_H264_SEI_FRAME_PACKING             (V4L2_CID_MPEG_BASE+368)
+V4L2_CID_MPEG_VIDEO_H264_SEI_FP_CURRENT_FRAME_0                (V4L2_CID_MPEG_BASE+369)
+V4L2_CID_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE       (V4L2_CID_MPEG_BASE+370)
+V4L2_CID_MPEG_VIDEO_H264_FMO                   (V4L2_CID_MPEG_BASE+371)
+V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE          (V4L2_CID_MPEG_BASE+372)
+V4L2_CID_MPEG_VIDEO_H264_FMO_SLICE_GROUP       (V4L2_CID_MPEG_BASE+373)
+V4L2_CID_MPEG_VIDEO_H264_FMO_CHANGE_DIRECTION  (V4L2_CID_MPEG_BASE+374)
+V4L2_CID_MPEG_VIDEO_H264_FMO_CHANGE_RATE       (V4L2_CID_MPEG_BASE+375)
+V4L2_CID_MPEG_VIDEO_H264_FMO_RUN_LENGTH                (V4L2_CID_MPEG_BASE+376)
+V4L2_CID_MPEG_VIDEO_H264_ASO                   (V4L2_CID_MPEG_BASE+377)
+V4L2_CID_MPEG_VIDEO_H264_ASO_SLICE_ORDER       (V4L2_CID_MPEG_BASE+378)
+V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING           (V4L2_CID_MPEG_BASE+379)
+V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE      (V4L2_CID_MPEG_BASE+380)
+V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER     (V4L2_CID_MPEG_BASE+381)
+V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP  (V4L2_CID_MPEG_BASE+382)
+V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP   (V4L2_CID_MPEG_BASE+400)
+V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP   (V4L2_CID_MPEG_BASE+401)
+V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP   (V4L2_CID_MPEG_BASE+402)
+V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP       (V4L2_CID_MPEG_BASE+403)
+V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP       (V4L2_CID_MPEG_BASE+404)
+V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL                (V4L2_CID_MPEG_BASE+405)
+V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE      (V4L2_CID_MPEG_BASE+406)
+V4L2_CID_MPEG_VIDEO_MPEG4_QPEL         (V4L2_CID_MPEG_BASE+407)
 /*  Control IDs for VP8 streams */
-V4L2_CID_MPEG_VIDEO_VPX_NUM_PARTITIONS
-V4L2_CID_MPEG_VIDEO_VPX_IMD_DISABLE_4X4
-V4L2_CID_MPEG_VIDEO_VPX_NUM_REF_FRAMES
-V4L2_CID_MPEG_VIDEO_VPX_FILTER_LEVEL
-V4L2_CID_MPEG_VIDEO_VPX_FILTER_SHARPNESS
-V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_REF_PERIOD
-V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_SEL
-V4L2_CID_MPEG_VIDEO_VPX_MIN_QP
-V4L2_CID_MPEG_VIDEO_VPX_MAX_QP
-V4L2_CID_MPEG_VIDEO_VPX_I_FRAME_QP
-V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP
-V4L2_CID_MPEG_VIDEO_VPX_PROFILE
+V4L2_CID_MPEG_VIDEO_VPX_NUM_PARTITIONS         (V4L2_CID_MPEG_BASE+500)
+V4L2_CID_MPEG_VIDEO_VPX_IMD_DISABLE_4X4                (V4L2_CID_MPEG_BASE+501)
+V4L2_CID_MPEG_VIDEO_VPX_NUM_REF_FRAMES         (V4L2_CID_MPEG_BASE+502)
+V4L2_CID_MPEG_VIDEO_VPX_FILTER_LEVEL           (V4L2_CID_MPEG_BASE+503)
+V4L2_CID_MPEG_VIDEO_VPX_FILTER_SHARPNESS       (V4L2_CID_MPEG_BASE+504)
+V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_REF_PERIOD        (V4L2_CID_MPEG_BASE+505)
+V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_SEL       (V4L2_CID_MPEG_BASE+506)
+V4L2_CID_MPEG_VIDEO_VPX_MIN_QP                 (V4L2_CID_MPEG_BASE+507)
+V4L2_CID_MPEG_VIDEO_VPX_MAX_QP                 (V4L2_CID_MPEG_BASE+508)
+V4L2_CID_MPEG_VIDEO_VPX_I_FRAME_QP             (V4L2_CID_MPEG_BASE+509)
+V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP             (V4L2_CID_MPEG_BASE+510)
+V4L2_CID_MPEG_VIDEO_VPX_PROFILE                        (V4L2_CID_MPEG_BASE+511)
 /* CIDs for HEVC encoding. */
-V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP
-V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP
-V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP
-V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_QP
-V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_QP
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_TYPE
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_LAYER
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L0_QP
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L1_QP
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L2_QP
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L3_QP
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L4_QP
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_QP
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L6_QP
-V4L2_CID_MPEG_VIDEO_HEVC_PROFILE
-V4L2_CID_MPEG_VIDEO_HEVC_LEVEL
-V4L2_CID_MPEG_VIDEO_HEVC_FRAME_RATE_RESOLUTION
-V4L2_CID_MPEG_VIDEO_HEVC_TIER
-V4L2_CID_MPEG_VIDEO_HEVC_MAX_PARTITION_DEPTH
-V4L2_CID_MPEG_VIDEO_HEVC_LOOP_FILTER_MODE
-V4L2_CID_MPEG_VIDEO_HEVC_LF_BETA_OFFSET_DIV2
-V4L2_CID_MPEG_VIDEO_HEVC_LF_TC_OFFSET_DIV2
-V4L2_CID_MPEG_VIDEO_HEVC_REFRESH_TYPE
-V4L2_CID_MPEG_VIDEO_HEVC_REFRESH_PERIOD
-V4L2_CID_MPEG_VIDEO_HEVC_LOSSLESS_CU
-V4L2_CID_MPEG_VIDEO_HEVC_CONST_INTRA_PRED
-V4L2_CID_MPEG_VIDEO_HEVC_WAVEFRONT
-V4L2_CID_MPEG_VIDEO_HEVC_GENERAL_PB
-V4L2_CID_MPEG_VIDEO_HEVC_TEMPORAL_ID
-V4L2_CID_MPEG_VIDEO_HEVC_STRONG_SMOOTHING
-V4L2_CID_MPEG_VIDEO_HEVC_MAX_NUM_MERGE_MV_MINUS1
-V4L2_CID_MPEG_VIDEO_HEVC_INTRA_PU_SPLIT
-V4L2_CID_MPEG_VIDEO_HEVC_TMV_PREDICTION
-V4L2_CID_MPEG_VIDEO_HEVC_WITHOUT_STARTCODE
-V4L2_CID_MPEG_VIDEO_HEVC_SIZE_OF_LENGTH_FIELD
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L0_BR
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L1_BR
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L2_BR
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L3_BR
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L4_BR
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR
-V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L6_BR
-V4L2_CID_MPEG_VIDEO_REF_NUMBER_FOR_PFRAMES
-V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR
+V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP                        (V4L2_CID_MPEG_BASE + 600)
+V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP                        (V4L2_CID_MPEG_BASE + 601)
+V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP            (V4L2_CID_MPEG_BASE + 602)
+V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_QP            (V4L2_CID_MPEG_BASE + 603)
+V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP            (V4L2_CID_MPEG_BASE + 604)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_QP               (V4L2_CID_MPEG_BASE + 605)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_TYPE      (V4L2_CID_MPEG_BASE + 606)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_LAYER     (V4L2_CID_MPEG_BASE + 607)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L0_QP     (V4L2_CID_MPEG_BASE + 608)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L1_QP     (V4L2_CID_MPEG_BASE + 609)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L2_QP     (V4L2_CID_MPEG_BASE + 610)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L3_QP     (V4L2_CID_MPEG_BASE + 611)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L4_QP     (V4L2_CID_MPEG_BASE + 612)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_QP     (V4L2_CID_MPEG_BASE + 613)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L6_QP     (V4L2_CID_MPEG_BASE + 614)
+V4L2_CID_MPEG_VIDEO_HEVC_PROFILE               (V4L2_CID_MPEG_BASE + 615)
+V4L2_CID_MPEG_VIDEO_HEVC_LEVEL                 (V4L2_CID_MPEG_BASE + 616)
+V4L2_CID_MPEG_VIDEO_HEVC_FRAME_RATE_RESOLUTION (V4L2_CID_MPEG_BASE + 617)
+V4L2_CID_MPEG_VIDEO_HEVC_TIER                  (V4L2_CID_MPEG_BASE + 618)
+V4L2_CID_MPEG_VIDEO_HEVC_MAX_PARTITION_DEPTH   (V4L2_CID_MPEG_BASE + 619)
+V4L2_CID_MPEG_VIDEO_HEVC_LOOP_FILTER_MODE      (V4L2_CID_MPEG_BASE + 620)
+V4L2_CID_MPEG_VIDEO_HEVC_LF_BETA_OFFSET_DIV2   (V4L2_CID_MPEG_BASE + 621)
+V4L2_CID_MPEG_VIDEO_HEVC_LF_TC_OFFSET_DIV2     (V4L2_CID_MPEG_BASE + 622)
+V4L2_CID_MPEG_VIDEO_HEVC_REFRESH_TYPE          (V4L2_CID_MPEG_BASE + 623)
+V4L2_CID_MPEG_VIDEO_HEVC_REFRESH_PERIOD                (V4L2_CID_MPEG_BASE + 624)
+V4L2_CID_MPEG_VIDEO_HEVC_LOSSLESS_CU           (V4L2_CID_MPEG_BASE + 625)
+V4L2_CID_MPEG_VIDEO_HEVC_CONST_INTRA_PRED      (V4L2_CID_MPEG_BASE + 626)
+V4L2_CID_MPEG_VIDEO_HEVC_WAVEFRONT             (V4L2_CID_MPEG_BASE + 627)
+V4L2_CID_MPEG_VIDEO_HEVC_GENERAL_PB            (V4L2_CID_MPEG_BASE + 628)
+V4L2_CID_MPEG_VIDEO_HEVC_TEMPORAL_ID           (V4L2_CID_MPEG_BASE + 629)
+V4L2_CID_MPEG_VIDEO_HEVC_STRONG_SMOOTHING      (V4L2_CID_MPEG_BASE + 630)
+V4L2_CID_MPEG_VIDEO_HEVC_MAX_NUM_MERGE_MV_MINUS1       (V4L2_CID_MPEG_BASE + 631)
+V4L2_CID_MPEG_VIDEO_HEVC_INTRA_PU_SPLIT                (V4L2_CID_MPEG_BASE + 632)
+V4L2_CID_MPEG_VIDEO_HEVC_TMV_PREDICTION                (V4L2_CID_MPEG_BASE + 633)
+V4L2_CID_MPEG_VIDEO_HEVC_WITHOUT_STARTCODE     (V4L2_CID_MPEG_BASE + 634)
+V4L2_CID_MPEG_VIDEO_HEVC_SIZE_OF_LENGTH_FIELD  (V4L2_CID_MPEG_BASE + 635)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L0_BR     (V4L2_CID_MPEG_BASE + 636)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L1_BR     (V4L2_CID_MPEG_BASE + 637)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L2_BR     (V4L2_CID_MPEG_BASE + 638)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L3_BR     (V4L2_CID_MPEG_BASE + 639)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L4_BR     (V4L2_CID_MPEG_BASE + 640)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR     (V4L2_CID_MPEG_BASE + 641)
+V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L6_BR     (V4L2_CID_MPEG_BASE + 642)
+V4L2_CID_MPEG_VIDEO_REF_NUMBER_FOR_PFRAMES     (V4L2_CID_MPEG_BASE + 643)
+V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR      (V4L2_CID_MPEG_BASE + 644)
 /*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
-V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE
-V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER
-V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE
-V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE
-V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE
-V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER
-V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE
-V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM
-V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP
-V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM
-V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP
-V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS
+V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE                (V4L2_CID_MPEG_CX2341X_BASE+0)
+V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER             (V4L2_CID_MPEG_CX2341X_BASE+1)
+V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE   (V4L2_CID_MPEG_CX2341X_BASE+2)
+V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+3)
+V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE       (V4L2_CID_MPEG_CX2341X_BASE+4)
+V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER            (V4L2_CID_MPEG_CX2341X_BASE+5)
+V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE         (V4L2_CID_MPEG_CX2341X_BASE+6)
+V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM  (V4L2_CID_MPEG_CX2341X_BASE+7)
+V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP     (V4L2_CID_MPEG_CX2341X_BASE+8)
+V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM        (V4L2_CID_MPEG_CX2341X_BASE+9)
+V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP   (V4L2_CID_MPEG_CX2341X_BASE+10)
+V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS                (V4L2_CID_MPEG_CX2341X_BASE+11)
 /*  MPEG-class control IDs specific to the Samsung MFC 5.1 driver as defined by V4L2 */
-V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY
-V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE
-V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE
-V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE
-V4L2_CID_MPEG_MFC51_VIDEO_PADDING
-V4L2_CID_MPEG_MFC51_VIDEO_PADDING_YUV
-V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT
-V4L2_CID_MPEG_MFC51_VIDEO_RC_REACTION_COEFF
-V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_ACTIVITY
-V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_DARK
-V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_SMOOTH
-V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_STATIC
-V4L2_CID_MPEG_MFC51_VIDEO_H264_NUM_REF_PIC_FOR_P
+V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY           (V4L2_CID_MPEG_MFC51_BASE+0)
+V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE    (V4L2_CID_MPEG_MFC51_BASE+1)
+V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE                      (V4L2_CID_MPEG_MFC51_BASE+2)
+V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE                     (V4L2_CID_MPEG_MFC51_BASE+3)
+V4L2_CID_MPEG_MFC51_VIDEO_PADDING                              (V4L2_CID_MPEG_MFC51_BASE+4)
+V4L2_CID_MPEG_MFC51_VIDEO_PADDING_YUV                          (V4L2_CID_MPEG_MFC51_BASE+5)
+V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT                  (V4L2_CID_MPEG_MFC51_BASE+6)
+V4L2_CID_MPEG_MFC51_VIDEO_RC_REACTION_COEFF                    (V4L2_CID_MPEG_MFC51_BASE+7)
+V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_ACTIVITY            (V4L2_CID_MPEG_MFC51_BASE+50)
+V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_DARK                        (V4L2_CID_MPEG_MFC51_BASE+51)
+V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_SMOOTH              (V4L2_CID_MPEG_MFC51_BASE+52)
+V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_STATIC              (V4L2_CID_MPEG_MFC51_BASE+53)
+V4L2_CID_MPEG_MFC51_VIDEO_H264_NUM_REF_PIC_FOR_P               (V4L2_CID_MPEG_MFC51_BASE+54)
 /*  Camera class control IDs */
-V4L2_CID_EXPOSURE_AUTO
-V4L2_CID_EXPOSURE_ABSOLUTE
-V4L2_CID_EXPOSURE_AUTO_PRIORITY
-V4L2_CID_PAN_RELATIVE
-V4L2_CID_TILT_RELATIVE
-V4L2_CID_PAN_RESET
-V4L2_CID_TILT_RESET
-V4L2_CID_PAN_ABSOLUTE
-V4L2_CID_TILT_ABSOLUTE
-V4L2_CID_FOCUS_ABSOLUTE
-V4L2_CID_FOCUS_RELATIVE
-V4L2_CID_FOCUS_AUTO
-V4L2_CID_ZOOM_ABSOLUTE
-V4L2_CID_ZOOM_RELATIVE
-V4L2_CID_ZOOM_CONTINUOUS
-V4L2_CID_PRIVACY
-V4L2_CID_IRIS_ABSOLUTE
-V4L2_CID_IRIS_RELATIVE
-V4L2_CID_AUTO_EXPOSURE_BIAS
-V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE
-V4L2_CID_WIDE_DYNAMIC_RANGE
-V4L2_CID_IMAGE_STABILIZATION
-V4L2_CID_ISO_SENSITIVITY
-V4L2_CID_ISO_SENSITIVITY_AUTO
-V4L2_CID_EXPOSURE_METERING
-V4L2_CID_SCENE_MODE
-V4L2_CID_3A_LOCK
-V4L2_CID_AUTO_FOCUS_START
-V4L2_CID_AUTO_FOCUS_STOP
-V4L2_CID_AUTO_FOCUS_STATUS
-V4L2_CID_AUTO_FOCUS_RANGE
-V4L2_CID_PAN_SPEED
-V4L2_CID_TILT_SPEED
+V4L2_CID_EXPOSURE_AUTO                 (V4L2_CID_CAMERA_CLASS_BASE+1)
+V4L2_CID_EXPOSURE_ABSOLUTE             (V4L2_CID_CAMERA_CLASS_BASE+2)
+V4L2_CID_EXPOSURE_AUTO_PRIORITY                (V4L2_CID_CAMERA_CLASS_BASE+3)
+V4L2_CID_PAN_RELATIVE                  (V4L2_CID_CAMERA_CLASS_BASE+4)
+V4L2_CID_TILT_RELATIVE                 (V4L2_CID_CAMERA_CLASS_BASE+5)
+V4L2_CID_PAN_RESET                     (V4L2_CID_CAMERA_CLASS_BASE+6)
+V4L2_CID_TILT_RESET                    (V4L2_CID_CAMERA_CLASS_BASE+7)
+V4L2_CID_PAN_ABSOLUTE                  (V4L2_CID_CAMERA_CLASS_BASE+8)
+V4L2_CID_TILT_ABSOLUTE                 (V4L2_CID_CAMERA_CLASS_BASE+9)
+V4L2_CID_FOCUS_ABSOLUTE                        (V4L2_CID_CAMERA_CLASS_BASE+10)
+V4L2_CID_FOCUS_RELATIVE                        (V4L2_CID_CAMERA_CLASS_BASE+11)
+V4L2_CID_FOCUS_AUTO                    (V4L2_CID_CAMERA_CLASS_BASE+12)
+V4L2_CID_ZOOM_ABSOLUTE                 (V4L2_CID_CAMERA_CLASS_BASE+13)
+V4L2_CID_ZOOM_RELATIVE                 (V4L2_CID_CAMERA_CLASS_BASE+14)
+V4L2_CID_ZOOM_CONTINUOUS               (V4L2_CID_CAMERA_CLASS_BASE+15)
+V4L2_CID_PRIVACY                       (V4L2_CID_CAMERA_CLASS_BASE+16)
+V4L2_CID_IRIS_ABSOLUTE                 (V4L2_CID_CAMERA_CLASS_BASE+17)
+V4L2_CID_IRIS_RELATIVE                 (V4L2_CID_CAMERA_CLASS_BASE+18)
+V4L2_CID_AUTO_EXPOSURE_BIAS            (V4L2_CID_CAMERA_CLASS_BASE+19)
+V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE   (V4L2_CID_CAMERA_CLASS_BASE+20)
+V4L2_CID_WIDE_DYNAMIC_RANGE            (V4L2_CID_CAMERA_CLASS_BASE+21)
+V4L2_CID_IMAGE_STABILIZATION           (V4L2_CID_CAMERA_CLASS_BASE+22)
+V4L2_CID_ISO_SENSITIVITY               (V4L2_CID_CAMERA_CLASS_BASE+23)
+V4L2_CID_ISO_SENSITIVITY_AUTO          (V4L2_CID_CAMERA_CLASS_BASE+24)
+V4L2_CID_EXPOSURE_METERING             (V4L2_CID_CAMERA_CLASS_BASE+25)
+V4L2_CID_SCENE_MODE                    (V4L2_CID_CAMERA_CLASS_BASE+26)
+V4L2_CID_3A_LOCK                       (V4L2_CID_CAMERA_CLASS_BASE+27)
+V4L2_CID_AUTO_FOCUS_START              (V4L2_CID_CAMERA_CLASS_BASE+28)
+V4L2_CID_AUTO_FOCUS_STOP               (V4L2_CID_CAMERA_CLASS_BASE+29)
+V4L2_CID_AUTO_FOCUS_STATUS             (V4L2_CID_CAMERA_CLASS_BASE+30)
+V4L2_CID_AUTO_FOCUS_RANGE              (V4L2_CID_CAMERA_CLASS_BASE+31)
+V4L2_CID_PAN_SPEED                     (V4L2_CID_CAMERA_CLASS_BASE+32)
+V4L2_CID_TILT_SPEED                    (V4L2_CID_CAMERA_CLASS_BASE+33)
 /* FM Modulator class control IDs */
-V4L2_CID_RDS_TX_DEVIATION
-V4L2_CID_RDS_TX_PI
-V4L2_CID_RDS_TX_PTY
-V4L2_CID_RDS_TX_PS_NAME
-V4L2_CID_RDS_TX_RADIO_TEXT
-V4L2_CID_RDS_TX_MONO_STEREO
-V4L2_CID_RDS_TX_ARTIFICIAL_HEAD
-V4L2_CID_RDS_TX_COMPRESSED
-V4L2_CID_RDS_TX_DYNAMIC_PTY
-V4L2_CID_RDS_TX_TRAFFIC_ANNOUNCEMENT
-V4L2_CID_RDS_TX_TRAFFIC_PROGRAM
-V4L2_CID_RDS_TX_MUSIC_SPEECH
-V4L2_CID_RDS_TX_ALT_FREQS_ENABLE
-V4L2_CID_RDS_TX_ALT_FREQS
-V4L2_CID_AUDIO_LIMITER_ENABLED
-V4L2_CID_AUDIO_LIMITER_RELEASE_TIME
-V4L2_CID_AUDIO_LIMITER_DEVIATION
-V4L2_CID_AUDIO_COMPRESSION_ENABLED
-V4L2_CID_AUDIO_COMPRESSION_GAIN
-V4L2_CID_AUDIO_COMPRESSION_THRESHOLD
-V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME
-V4L2_CID_AUDIO_COMPRESSION_RELEASE_TIME
-V4L2_CID_PILOT_TONE_ENABLED
-V4L2_CID_PILOT_TONE_DEVIATION
-V4L2_CID_PILOT_TONE_FREQUENCY
-V4L2_CID_TUNE_PREEMPHASIS
-V4L2_CID_TUNE_POWER_LEVEL
-V4L2_CID_TUNE_ANTENNA_CAPACITOR
+V4L2_CID_RDS_TX_DEVIATION              (V4L2_CID_FM_TX_CLASS_BASE + 1)
+V4L2_CID_RDS_TX_PI                     (V4L2_CID_FM_TX_CLASS_BASE + 2)
+V4L2_CID_RDS_TX_PTY                    (V4L2_CID_FM_TX_CLASS_BASE + 3)
+V4L2_CID_RDS_TX_PS_NAME                        (V4L2_CID_FM_TX_CLASS_BASE + 5)
+V4L2_CID_RDS_TX_RADIO_TEXT             (V4L2_CID_FM_TX_CLASS_BASE + 6)
+V4L2_CID_RDS_TX_MONO_STEREO            (V4L2_CID_FM_TX_CLASS_BASE + 7)
+V4L2_CID_RDS_TX_ARTIFICIAL_HEAD                (V4L2_CID_FM_TX_CLASS_BASE + 8)
+V4L2_CID_RDS_TX_COMPRESSED             (V4L2_CID_FM_TX_CLASS_BASE + 9)
+V4L2_CID_RDS_TX_DYNAMIC_PTY            (V4L2_CID_FM_TX_CLASS_BASE + 10)
+V4L2_CID_RDS_TX_TRAFFIC_ANNOUNCEMENT   (V4L2_CID_FM_TX_CLASS_BASE + 11)
+V4L2_CID_RDS_TX_TRAFFIC_PROGRAM                (V4L2_CID_FM_TX_CLASS_BASE + 12)
+V4L2_CID_RDS_TX_MUSIC_SPEECH           (V4L2_CID_FM_TX_CLASS_BASE + 13)
+V4L2_CID_RDS_TX_ALT_FREQS_ENABLE       (V4L2_CID_FM_TX_CLASS_BASE + 14)
+V4L2_CID_RDS_TX_ALT_FREQS              (V4L2_CID_FM_TX_CLASS_BASE + 15)
+V4L2_CID_AUDIO_LIMITER_ENABLED         (V4L2_CID_FM_TX_CLASS_BASE + 64)
+V4L2_CID_AUDIO_LIMITER_RELEASE_TIME    (V4L2_CID_FM_TX_CLASS_BASE + 65)
+V4L2_CID_AUDIO_LIMITER_DEVIATION       (V4L2_CID_FM_TX_CLASS_BASE + 66)
+V4L2_CID_AUDIO_COMPRESSION_ENABLED     (V4L2_CID_FM_TX_CLASS_BASE + 80)
+V4L2_CID_AUDIO_COMPRESSION_GAIN                (V4L2_CID_FM_TX_CLASS_BASE + 81)
+V4L2_CID_AUDIO_COMPRESSION_THRESHOLD   (V4L2_CID_FM_TX_CLASS_BASE + 82)
+V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME (V4L2_CID_FM_TX_CLASS_BASE + 83)
+V4L2_CID_AUDIO_COMPRESSION_RELEASE_TIME        (V4L2_CID_FM_TX_CLASS_BASE + 84)
+V4L2_CID_PILOT_TONE_ENABLED            (V4L2_CID_FM_TX_CLASS_BASE + 96)
+V4L2_CID_PILOT_TONE_DEVIATION          (V4L2_CID_FM_TX_CLASS_BASE + 97)
+V4L2_CID_PILOT_TONE_FREQUENCY          (V4L2_CID_FM_TX_CLASS_BASE + 98)
+V4L2_CID_TUNE_PREEMPHASIS              (V4L2_CID_FM_TX_CLASS_BASE + 112)
+V4L2_CID_TUNE_POWER_LEVEL              (V4L2_CID_FM_TX_CLASS_BASE + 113)
+V4L2_CID_TUNE_ANTENNA_CAPACITOR                (V4L2_CID_FM_TX_CLASS_BASE + 114)
 /* Flash and privacy (indicator) light controls */
-V4L2_CID_FLASH_LED_MODE
-V4L2_CID_FLASH_STROBE_SOURCE
-V4L2_CID_FLASH_STROBE
-V4L2_CID_FLASH_STROBE_STOP
-V4L2_CID_FLASH_STROBE_STATUS
-V4L2_CID_FLASH_TIMEOUT
-V4L2_CID_FLASH_INTENSITY
-V4L2_CID_FLASH_TORCH_INTENSITY
-V4L2_CID_FLASH_INDICATOR_INTENSITY
-V4L2_CID_FLASH_FAULT
-V4L2_CID_FLASH_CHARGE
-V4L2_CID_FLASH_READY
+V4L2_CID_FLASH_LED_MODE                        (V4L2_CID_FLASH_CLASS_BASE + 1)
+V4L2_CID_FLASH_STROBE_SOURCE           (V4L2_CID_FLASH_CLASS_BASE + 2)
+V4L2_CID_FLASH_STROBE                  (V4L2_CID_FLASH_CLASS_BASE + 3)
+V4L2_CID_FLASH_STROBE_STOP             (V4L2_CID_FLASH_CLASS_BASE + 4)
+V4L2_CID_FLASH_STROBE_STATUS           (V4L2_CID_FLASH_CLASS_BASE + 5)
+V4L2_CID_FLASH_TIMEOUT                 (V4L2_CID_FLASH_CLASS_BASE + 6)
+V4L2_CID_FLASH_INTENSITY               (V4L2_CID_FLASH_CLASS_BASE + 7)
+V4L2_CID_FLASH_TORCH_INTENSITY         (V4L2_CID_FLASH_CLASS_BASE + 8)
+V4L2_CID_FLASH_INDICATOR_INTENSITY     (V4L2_CID_FLASH_CLASS_BASE + 9)
+V4L2_CID_FLASH_FAULT                   (V4L2_CID_FLASH_CLASS_BASE + 10)
+V4L2_CID_FLASH_CHARGE                  (V4L2_CID_FLASH_CLASS_BASE + 11)
+V4L2_CID_FLASH_READY                   (V4L2_CID_FLASH_CLASS_BASE + 12)
 /* Image source controls */
-V4L2_CID_VBLANK
-V4L2_CID_HBLANK
-V4L2_CID_ANALOGUE_GAIN
-V4L2_CID_TEST_PATTERN_RED
-V4L2_CID_TEST_PATTERN_GREENR
-V4L2_CID_TEST_PATTERN_BLUE
-V4L2_CID_TEST_PATTERN_GREENB
+V4L2_CID_VBLANK                                (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 1)
+V4L2_CID_HBLANK                                (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 2)
+V4L2_CID_ANALOGUE_GAIN                 (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 3)
+V4L2_CID_TEST_PATTERN_RED              (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 4)
+V4L2_CID_TEST_PATTERN_GREENR           (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 5)
+V4L2_CID_TEST_PATTERN_BLUE             (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 6)
+V4L2_CID_TEST_PATTERN_GREENB           (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 7)
 /* Image processing controls */
-V4L2_CID_LINK_FREQ
-V4L2_CID_PIXEL_RATE
-V4L2_CID_TEST_PATTERN
-V4L2_CID_DEINTERLACING_MODE
-V4L2_CID_DIGITAL_GAIN
+V4L2_CID_LINK_FREQ                     (V4L2_CID_IMAGE_PROC_CLASS_BASE + 1)
+V4L2_CID_PIXEL_RATE                    (V4L2_CID_IMAGE_PROC_CLASS_BASE + 2)
+V4L2_CID_TEST_PATTERN                  (V4L2_CID_IMAGE_PROC_CLASS_BASE + 3)
+V4L2_CID_DEINTERLACING_MODE            (V4L2_CID_IMAGE_PROC_CLASS_BASE + 4)
+V4L2_CID_DIGITAL_GAIN                  (V4L2_CID_IMAGE_PROC_CLASS_BASE + 5)
 /*  DV-class control IDs defined by V4L2 */
-V4L2_CID_DV_TX_RGB_RANGE
-V4L2_CID_DV_TX_IT_CONTENT_TYPE
-V4L2_CID_DV_RX_RGB_RANGE
-V4L2_CID_DV_RX_IT_CONTENT_TYPE
-V4L2_CID_TUNE_DEEMPHASIS
-V4L2_CID_RDS_RECEPTION
-V4L2_CID_RDS_RX_PTY
-V4L2_CID_RDS_RX_PS_NAME
-V4L2_CID_RDS_RX_RADIO_TEXT
-V4L2_CID_RDS_RX_TRAFFIC_ANNOUNCEMENT
-V4L2_CID_RDS_RX_TRAFFIC_PROGRAM
-V4L2_CID_RDS_RX_MUSIC_SPEECH
-V4L2_CID_RF_TUNER_BANDWIDTH_AUTO
-V4L2_CID_RF_TUNER_BANDWIDTH
-V4L2_CID_RF_TUNER_RF_GAIN
-V4L2_CID_RF_TUNER_LNA_GAIN_AUTO
-V4L2_CID_RF_TUNER_LNA_GAIN
-V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO
-V4L2_CID_RF_TUNER_MIXER_GAIN
-V4L2_CID_RF_TUNER_IF_GAIN_AUTO
-V4L2_CID_RF_TUNER_IF_GAIN
-V4L2_CID_RF_TUNER_PLL_LOCK
+V4L2_CID_DV_TX_RGB_RANGE               (V4L2_CID_DV_CLASS_BASE + 5)
+V4L2_CID_DV_TX_IT_CONTENT_TYPE         (V4L2_CID_DV_CLASS_BASE + 6)
+V4L2_CID_DV_RX_RGB_RANGE               (V4L2_CID_DV_CLASS_BASE + 101)
+V4L2_CID_DV_RX_IT_CONTENT_TYPE         (V4L2_CID_DV_CLASS_BASE + 102)
+V4L2_CID_TUNE_DEEMPHASIS               (V4L2_CID_FM_RX_CLASS_BASE + 1)
+V4L2_CID_RDS_RECEPTION                 (V4L2_CID_FM_RX_CLASS_BASE + 2)
+V4L2_CID_RDS_RX_PTY                    (V4L2_CID_FM_RX_CLASS_BASE + 3)
+V4L2_CID_RDS_RX_PS_NAME                        (V4L2_CID_FM_RX_CLASS_BASE + 4)
+V4L2_CID_RDS_RX_RADIO_TEXT             (V4L2_CID_FM_RX_CLASS_BASE + 5)
+V4L2_CID_RDS_RX_TRAFFIC_ANNOUNCEMENT   (V4L2_CID_FM_RX_CLASS_BASE + 6)
+V4L2_CID_RDS_RX_TRAFFIC_PROGRAM                (V4L2_CID_FM_RX_CLASS_BASE + 7)
+V4L2_CID_RDS_RX_MUSIC_SPEECH           (V4L2_CID_FM_RX_CLASS_BASE + 8)
+V4L2_CID_RF_TUNER_BANDWIDTH_AUTO       (V4L2_CID_RF_TUNER_CLASS_BASE + 11)
+V4L2_CID_RF_TUNER_BANDWIDTH            (V4L2_CID_RF_TUNER_CLASS_BASE + 12)
+V4L2_CID_RF_TUNER_RF_GAIN              (V4L2_CID_RF_TUNER_CLASS_BASE + 32)
+V4L2_CID_RF_TUNER_LNA_GAIN_AUTO                (V4L2_CID_RF_TUNER_CLASS_BASE + 41)
+V4L2_CID_RF_TUNER_LNA_GAIN             (V4L2_CID_RF_TUNER_CLASS_BASE + 42)
+V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO      (V4L2_CID_RF_TUNER_CLASS_BASE + 51)
+V4L2_CID_RF_TUNER_MIXER_GAIN           (V4L2_CID_RF_TUNER_CLASS_BASE + 52)
+V4L2_CID_RF_TUNER_IF_GAIN_AUTO         (V4L2_CID_RF_TUNER_CLASS_BASE + 61)
+V4L2_CID_RF_TUNER_IF_GAIN              (V4L2_CID_RF_TUNER_CLASS_BASE + 62)
+V4L2_CID_RF_TUNER_PLL_LOCK             (V4L2_CID_RF_TUNER_CLASS_BASE + 91)
 /*  Detection-class control IDs defined by V4L2 */
-V4L2_CID_DETECT_MD_MODE
-V4L2_CID_DETECT_MD_GLOBAL_THRESHOLD
-V4L2_CID_DETECT_MD_THRESHOLD_GRID
-V4L2_CID_DETECT_MD_REGION_GRID
+V4L2_CID_DETECT_MD_MODE                        (V4L2_CID_DETECT_CLASS_BASE + 1)
+V4L2_CID_DETECT_MD_GLOBAL_THRESHOLD    (V4L2_CID_DETECT_CLASS_BASE + 2)
+V4L2_CID_DETECT_MD_THRESHOLD_GRID      (V4L2_CID_DETECT_CLASS_BASE + 3)
+V4L2_CID_DETECT_MD_REGION_GRID         (V4L2_CID_DETECT_CLASS_BASE + 4)
Unnamed repository; edit this file 'description' to name the repository.