diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index e2046754e871..85164016ed26 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -327,6 +327,22 @@ minimum value disables backlight compensation.
End of the predefined control IDs (currently
V4L2_CID_ILLUMINATORS_2 + 1).
+
+
+ V4L2_CID_MIN_BUFFERS_FOR_CAPTURE
+ integer
+ This is a read-only control that can be read by the application
+and used as a hint to determine the number of CAPTURE buffers to pass to REQBUFS.
+The value is the minimum number of CAPTURE buffers that is necessary for hardware
+to work.
+
+
+ V4L2_CID_MIN_BUFFERS_FOR_OUTPUT
+ integer
+ This is a read-only control that can be read by the application
+and used as a hint to determine the number of OUTPUT buffers to pass to REQBUFS.
+The value is the minimum number of OUTPUT buffers that is necessary for hardware
+to work.
V4L2_CID_PRIVATE_BASE
@@ -1417,6 +1433,959 @@ of the video. The supplied 32-bit integer is interpreted as follows (bit
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE
+ boolean
+
+ If enabled the decoder expects to receive a single slice per buffer, otherwise
+the decoder expects a single frame in per buffer. Applicable to the decoder, all codecs.
+
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_ENABLE
+ boolean
+
+ Enable writing sample aspect ratio in the Video Usability Information.
+Applicable to the H264 encoder.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC
+ enum v4l2_mpeg_video_h264_vui_sar_idc
+
+ VUI sample aspect ratio indicator for H.264 encoding. The value
+is defined in the table E-1 in the standard. Applicable to the H264 encoder.
+
+
+
+
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED
+ Unspecified
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_1x1
+ 1x1
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_12x11
+ 12x11
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_10x11
+ 10x11
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_16x11
+ 16x11
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_40x33
+ 40x33
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_24x11
+ 24x11
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_20x11
+ 20x11
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_32x11
+ 32x11
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_80x33
+ 80x33
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_18x11
+ 18x11
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_15x11
+ 15x11
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_64x33
+ 64x33
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_160x99
+ 160x99
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_4x3
+ 4x3
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_3x2
+ 3x2
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_2x1
+ 2x1
+
+
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_EXTENDED
+ Extended SAR
+
+
+
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH
+ integer
+
+ Extended sample aspect ratio width for H.264 VUI encoding.
+Applicable to the H264 encoder.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT
+ integer
+
+ Extended sample aspect ratio height for H.264 VUI encoding.
+Applicable to the H264 encoder.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_LEVEL
+ enum v4l2_mpeg_video_h264_level
+
+ The level information for the H264 video elementary stream.
+Applicable to the H264 encoder.
+Possible values are:
+
+
+
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_1_0
+ Level 1.0
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_1B
+ Level 1B
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_1_1
+ Level 1.1
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_1_2
+ Level 1.2
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_1_3
+ Level 1.3
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_2_0
+ Level 2.0
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_2_1
+ Level 2.1
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_2_2
+ Level 2.2
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_3_0
+ Level 3.0
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_3_1
+ Level 3.1
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_3_2
+ Level 3.2
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_4_0
+ Level 4.0
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_4_1
+ Level 4.1
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_4_2
+ Level 4.2
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_5_0
+ Level 5.0
+
+
+ V4L2_MPEG_VIDEO_H264_LEVEL_5_1
+ Level 5.1
+
+
+
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL
+ enum v4l2_mpeg_video_mpeg4_level
+
+ The level information for the MPEG4 elementary stream.
+Applicable to the MPEG4 encoder.
+Possible values are:
+
+
+
+
+
+ V4L2_MPEG_VIDEO_LEVEL_0
+ Level 0
+
+
+ V4L2_MPEG_VIDEO_LEVEL_0B
+ Level 0b
+
+
+ V4L2_MPEG_VIDEO_LEVEL_1
+ Level 1
+
+
+ V4L2_MPEG_VIDEO_LEVEL_2
+ Level 2
+
+
+ V4L2_MPEG_VIDEO_LEVEL_3
+ Level 3
+
+
+ V4L2_MPEG_VIDEO_LEVEL_3B
+ Level 3b
+
+
+ V4L2_MPEG_VIDEO_LEVEL_4
+ Level 4
+
+
+ V4L2_MPEG_VIDEO_LEVEL_5
+ Level 5
+
+
+
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_PROFILE
+ enum v4l2_mpeg_h264_profile
+
+ The profile information for H264.
+Applicable to the H264 encoder.
+Possible values are:
+
+
+
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE
+ Baseline profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE
+ Constrained Baseline profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_MAIN
+ Main profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_EXTENDED
+ Extended profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH
+ High profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_10
+ High 10 profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_422
+ High 422 profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_444_PREDICTIVE
+ High 444 Predictive profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_10_INTRA
+ High 10 Intra profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_422_INTRA
+ High 422 Intra profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_444_INTRA
+ High 444 Intra profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_CAVLC_444_INTRA
+ CAVLC 444 Intra profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_BASELINE
+ Scalable Baseline profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH
+ Scalable High profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH_INTRA
+ Scalable High Intra profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH
+ Stereo High profile
+
+
+ V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH
+ Multiview High profile
+
+
+
+
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE
+ enum v4l2_mpeg_mpeg4_profile
+
+ The profile information for MPEG4.
+Applicable to the MPEG4 encoder.
+Possible values are:
+
+
+
+
+
+ V4L2_MPEG_VIDEO_PROFILE_SIMPLE
+ Simple profile
+
+
+ V4L2_MPEG_VIDEO_PROFILE_ADVANCED_SIMPLE
+ Advanced Simple profile
+
+
+ V4L2_MPEG_VIDEO_PROFILE_CORE
+ Core profile
+
+
+ V4L2_MPEG_VIDEO_PROFILE_SIMPLE_SCALABLE
+ Simple Scalable profile
+
+
+ V4L2_MPEG_VIDEO_PROFILE_ADVANCED_CODING_EFFICIENCY
+
+
+
+
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_MAX_REF_PIC
+ integer
+
+ The maximum number of reference pictures used for encoding.
+Applicable to the encoder.
+
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE
+ enum v4l2_mpeg_multi_slice_mode
+
+ Determines how the encoder should handle division of frame into slices.
+Applicable to the encoder.
+Possible values are:
+
+
+
+
+
+ V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE
+ Single slice per frame.
+
+
+ V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB
+ Multiple slices with set maximum number of macroblocks per slice.
+
+
+ V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES
+ Multiple slice with set maximum size in bytes per slice.
+
+
+
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB
+ integer
+
+ The maximum number of macroblocks in a slice. Used when
+V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE is set to V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB.
+Applicable to the encoder.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES
+ integer
+
+ The maximum size of a slice in bytes. Used when
+V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE is set to V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES.
+Applicable to the encoder.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE
+ enum v4l2_mpeg_h264_loop_filter_mode
+
+ Loop filter mode for H264 encoder.
+Possible values are:
+
+
+
+
+
+ V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED
+ Loop filter is enabled.
+
+
+ V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED
+ Loop filter is disabled.
+
+
+ V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY
+ Loop filter is disabled at the slice boundary.
+
+
+
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA
+ integer
+
+ Loop filter alpha coefficient, defined in the H264 standard.
+Applicable to the H264 encoder.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA
+ integer
+
+ Loop filter beta coefficient, defined in the H264 standard.
+Applicable to the H264 encoder.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE
+ enum v4l2_mpeg_h264_symbol_mode
+
+ Entropy coding mode for H264 - CABAC/CAVALC.
+Applicable to the H264 encoder.
+Possible values are:
+
+
+
+
+
+ V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC
+ Use CAVLC entropy coding.
+
+
+ V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC
+ Use CABAC entropy coding.
+
+
+
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM
+ boolean
+
+ Enable 8X8 transform for H264. Applicable to the H264 encoder.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB
+ integer
+
+ Cyclic intra macroblock refresh. This is the number of continuous macroblocks
+refreshed every frame. Each frame a succesive set of macroblocks is refreshed until the cycle completes and starts from the
+top of the frame. Applicable to H264, H263 and MPEG4 encoder.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE
+ boolean
+
+ Frame level rate control enable.
+If this control is disabled then the quantization parameter for each frame type is constant and set with appropriate controls
+(e.g. V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP).
+If frame rate control is enabled then quantization parameter is adjusted to meet the chosen bitrate. Minimum and maximum value
+for the quantization parameter can be set with appropriate controls (e.g. V4L2_CID_MPEG_VIDEO_H263_MIN_QP).
+Applicable to encoders.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE
+ boolean
+
+ Macroblock level rate control enable.
+Applicable to the MPEG4 and H264 encoders.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_MPEG4_QPEL
+ boolean
+
+ Quarter pixel motion estimation for MPEG4. Applicable to the MPEG4 encoder.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP
+ integer
+
+ Quantization parameter for an I frame for H263. Valid range: from 1 to 31.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H263_MIN_QP
+ integer
+
+ Minimum quantization parameter for H263. Valid range: from 1 to 31.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H263_MAX_QP
+ integer
+
+ Maximum quantization parameter for H263. Valid range: from 1 to 31.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP
+ integer
+
+ Quantization parameter for an P frame for H263. Valid range: from 1 to 31.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP
+ integer
+
+ Quantization parameter for an B frame for H263. Valid range: from 1 to 31.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP
+ integer
+
+ Quantization parameter for an I frame for H264. Valid range: from 0 to 51.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_MIN_QP
+ integer
+
+ Minimum quantization parameter for H264. Valid range: from 0 to 51.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_MAX_QP
+ integer
+
+ Maximum quantization parameter for H264. Valid range: from 0 to 51.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP
+ integer
+
+ Quantization parameter for an P frame for H264. Valid range: from 0 to 51.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP
+ integer
+
+ Quantization parameter for an B frame for H264. Valid range: from 0 to 51.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP
+ integer
+
+ Quantization parameter for an I frame for MPEG4. Valid range: from 1 to 31.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP
+ integer
+
+ Minimum quantization parameter for MPEG4. Valid range: from 1 to 31.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP
+ integer
+
+ Maximum quantization parameter for MPEG4. Valid range: from 1 to 31.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP
+ integer
+
+ Quantization parameter for an P frame for MPEG4. Valid range: from 1 to 31.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP
+ integer
+
+ Quantization parameter for an B frame for MPEG4. Valid range: from 1 to 31.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_VBV_SIZE
+ integer
+
+ The Video Buffer Verifier size in kilobytes, it is used as a limitation of frame skip.
+The VBV is defined in the standard as a mean to verify that the produced stream will be succesfully decoded.
+The standard describes it as "Part of a hypothetical decoder that is conceptually connected to the
+output of the encoder. Its purpose is to provide a constraint on the variability of the data rate that an
+encoder or editing process may produce.".
+Applicable to the MPEG1, MPEG2, MPEG4 encoders.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE
+ integer
+
+ The Coded Picture Buffer size in kilobytes, it is used as a limitation of frame skip.
+The CPB is defined in the H264 standard as a mean to verify that the produced stream will be succesfully decoded.
+Applicable to the H264 encoder.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_H264_I_PERIOD
+ integer
+
+ Period between I-frames in the open GOP for H264. In case of an open GOP
+this is the period between two I-frames. The period between IDR (Instantaneous Decoding Refresh) frames is taken from the GOP_SIZE control.
+An IDR frame, which stands for Instantaneous Decoding Refresh is an I-frame after which no prior frames are
+referenced. This means that a stream can be restarted from an IDR frame without the need to store or decode any
+previous frames. Applicable to the H264 encoder.
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_HEADER_MODE
+ enum v4l2_mpeg_header_mode
+
+ Determines whether the header is returned as the first buffer or is
+it returned together with the first frame. Applicable to encoders.
+Possible values are:
+
+
+
+
+
+ V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE
+ The stream header is returned separately in the first buffer.
+
+
+ V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME
+ The stream header is returned together with the first encoded frame.
+
+
+
+
+
+
+ V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER
+ boolean
+
Enabled the deblocking post processing filter for MPEG4 decoder.
+Applicable to the MPEG4 decoder.
+
+
+
+ V4L2_CID_MPEG_VIDEO_MPEG4_VOP_TIME_RES
+ integer
+
vop_time_increment_resolution value for MPEG4. Applicable to the MPEG4 encoder.
+
+
+
+ V4L2_CID_MPEG_VIDEO_MPEG4_VOP_TIME_INC
+ integer
+
vop_time_increment value for MPEG4. Applicable to the MPEG4 encoder.
+
+
+
+
+
+
+
+
+ MFC 5.1 MPEG Controls
+
+ The following MPEG class controls deal with MPEG
+decoding and encoding settings that are specific to the Multi Format Codec 5.1 device present
+in the S5P family of SoCs by Samsung.
+
+
+
+ MFC 5.1 Control IDs
+
+
+
+
+
+
+
+
+
+ ID
+ Type
+
Description
+
+
+
+
+
+ V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE
+ integer
+
If the display delay is enabled then the decoder has to return a
+CAPTURE buffer after processing a certain number of OUTPUT buffers. If this number is low, then it may result in
+buffers not being dequeued in display order. In addition hardware may still use those buffers as reference, thus
+application should not write to those buffers. This feature can be used for example for generating thumbnails of videos.
+Applicable to the H264 decoder.
+
+
+
+
+ V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY
+ integer
+
Display delay value for H264 decoder.
+The decoder is forced to return a decoded frame after the set 'display delay' number of frames. If this number is
+low it may result in frames returned out of dispaly order, in addition the hardware may still be using the returned buffer
+as a reference picture for subsequent frames.
+
+
+
+
+ V4L2_CID_MPEG_MFC51_VIDEO_H264_NUM_REF_PIC_FOR_P
+ integer
+
The number of reference pictures used for encoding a P picture.
+Applicable to the H264 encoder.
+
+
+
+ V4L2_CID_MPEG_MFC51_VIDEO_PADDING
+ boolean
+
Padding enable in the encoder - use a color instead of repeating border pixels.
+Applicable to encoders.
+
+
+
+ V4L2_CID_MPEG_MFC51_VIDEO_PADDING_YUV
+ integer
+
Padding color in the encoder. Applicable to encoders. The supplied 32-bit integer is interpreted as follows (bit
+0 = least significant bit):
+
+
+
+
+
+ Bit 0:7
+ V chrominance information
+
+
+ Bit 8:15
+ U chrominance information
+
+
+ Bit 16:23
+ Y luminance information
+
+
+ Bit 24:31
+ Must be zero.
+
+
+
+
+
+
+ V4L2_CID_MPEG_MFC51_VIDEO_RC_REACTION_COEFF
+ integer
+
Reaction coefficient for MFC rate control. Applicable to encoders.
+Note 1: Valid only when the frame level RC is enabled.
+Note 2: For tight CBR, this field must be small (ex. 2 ~ 10).
+For VBR, this field must be large (ex. 100 ~ 1000).
+Note 3: It is not recommended to use the greater number than FRAME_RATE * (10^9 / BIT_RATE).
+
+
+
+
+ V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_DARK
+ boolean
+
Adaptive rate control for dark region.
+Valid only when H.264 and macroblock level RC is enabled (V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE).
+Applicable to the H264 encoder.
+
+
+
+ V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_SMOOTH
+ boolean
+
Adaptive rate control for smooth region.
+Valid only when H.264 and macroblock level RC is enabled (V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE).
+Applicable to the H264 encoder.
+
+
+
+ V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_STATIC
+ boolean
+
Adaptive rate control for static region.
+Valid only when H.264 and macroblock level RC is enabled (V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE).
+Applicable to the H264 encoder.
+
+
+
+ V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_ACTIVITY
+ boolean
+
Adaptive rate control for activity region.
+Valid only when H.264 and macroblock level RC is enabled (V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE).
+Applicable to the H264 encoder.
+
+
+
+ V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE
+ enum v4l2_mpeg_mfc51_frame_skip_mode
+
+
+Indicates in what conditions the encoder should skip frames. If encoding a frame would cause the encoded stream to be larger then
+a chosen data limit then the frame will be skipped.
+Possible values are:
+
+
+
+
+
+ V4L2_MPEG_MFC51_FRAME_SKIP_MODE_DISABLED
+ Frame skip mode is disabled.
+
+
+ V4L2_MPEG_MFC51_FRAME_SKIP_MODE_LEVEL_LIMIT
+ Frame skip mode enabled and buffer limit is set by the chosen level and is defined by the standard.
+
+
+ V4L2_MPEG_MFC51_FRAME_SKIP_MODE_BUF_LIMIT
+ Frame skip mode enabled and buffer limit is set by the VBV (MPEG1/2/4) or CPB (H264) buffer size control.
+
+
+
+
+
+
+ V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT
+ integer
+
Enable rate-control with fixed target bit.
+If this setting is enabled, then the rate control logic of the encoder will calculate the average bitrate
+for a GOP and keep it below or equal the set bitrate target. Otherwise the rate control logic calculates the
+overall average bitrate for the stream and keeps it below or equal to the set bitrate. In the first case
+the average bitrate for the whole stream will be smaller then the set bitrate. This is caused because the
+average is calculated for smaller number of frames, on the other hand enabling this setting will ensure that
+the stream will meet tight bandwidth contraints. Applicable to encoders.
+
+
+
+
+ V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE
+ enum v4l2_mpeg_mfc51_force_frame_type
+
+ Force a frame type for the next queued buffer. Applicable to encoders.
+Possible values are:
+
+
+
+
+
+ V4L2_MPEG_MFC51_FORCE_FRAME_TYPE_DISABLED
+ Forcing a specific frame type disabled.
+
+
+ V4L2_MPEG_MFC51_FORCE_FRAME_TYPE_I_FRAME
+ Force an I-frame.
+
+
+ V4L2_MPEG_MFC51_FORCE_FRAME_TYPE_NOT_CODED
+ Force a non-coded frame.
+
+
+
+
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index cb22a2c7a467..fca24cc50436 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1156,8 +1156,13 @@ enum v4l2_colorfx {
#define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+37)
#define V4L2_CID_ILLUMINATORS_2 (V4L2_CID_BASE+38)
+#define V4L2_CID_MIN_BUFFERS_FOR_CAPTURE (V4L2_CID_BASE+39)
+#define V4L2_CID_MIN_BUFFERS_FOR_OUTPUT (V4L2_CID_BASE+40)
+
/* last CID + 1 */
-#define V4L2_CID_LASTP1 (V4L2_CID_BASE+39)
+#define V4L2_CID_LASTP1 (V4L2_CID_BASE+41)
+
+/* Minimum number of buffer neede by the device */
/* MPEG-class control IDs defined by V4L2 */
#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)
@@ -1329,6 +1334,141 @@ enum v4l2_mpeg_video_bitrate_mode {
#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)
+#define V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE (V4L2_CID_MPEG_BASE+212)
+#define V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER (V4L2_CID_MPEG_BASE+213)
+#define V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB (V4L2_CID_MPEG_BASE+214)
+#define V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE (V4L2_CID_MPEG_BASE+215)
+#define V4L2_CID_MPEG_VIDEO_HEADER_MODE (V4L2_CID_MPEG_BASE+216)
+enum v4l2_mpeg_video_header_mode {
+ V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE = 0,
+ V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME = 1,
+
+};
+#define V4L2_CID_MPEG_VIDEO_MAX_REF_PIC (V4L2_CID_MPEG_BASE+217)
+#define V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE (V4L2_CID_MPEG_BASE+218)
+#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES (V4L2_CID_MPEG_BASE+219)
+#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB (V4L2_CID_MPEG_BASE+220)
+#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE (V4L2_CID_MPEG_BASE+221)
+enum v4l2_mpeg_video_multi_slice_mode {
+ V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE = 0,
+ V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB = 1,
+ V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES = 2,
+};
+#define V4L2_CID_MPEG_VIDEO_VBV_SIZE (V4L2_CID_MPEG_BASE+222)
+#define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP (V4L2_CID_MPEG_BASE+300)
+#define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP (V4L2_CID_MPEG_BASE+301)
+#define V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP (V4L2_CID_MPEG_BASE+302)
+#define V4L2_CID_MPEG_VIDEO_H263_MIN_QP (V4L2_CID_MPEG_BASE+303)
+#define V4L2_CID_MPEG_VIDEO_H263_MAX_QP (V4L2_CID_MPEG_BASE+304)
+#define V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP (V4L2_CID_MPEG_BASE+350)
+#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP (V4L2_CID_MPEG_BASE+351)
+#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP (V4L2_CID_MPEG_BASE+352)
+#define V4L2_CID_MPEG_VIDEO_H264_MIN_QP (V4L2_CID_MPEG_BASE+353)
+#define V4L2_CID_MPEG_VIDEO_H264_MAX_QP (V4L2_CID_MPEG_BASE+354)
+#define V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM (V4L2_CID_MPEG_BASE+355)
+#define V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE (V4L2_CID_MPEG_BASE+356)
+#define V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE (V4L2_CID_MPEG_BASE+357)
+enum v4l2_mpeg_video_h264_entropy_mode {
+ V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC = 0,
+ V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC = 1,
+};
+#define V4L2_CID_MPEG_VIDEO_H264_I_PERIOD (V4L2_CID_MPEG_BASE+358)
+#define V4L2_CID_MPEG_VIDEO_H264_LEVEL (V4L2_CID_MPEG_BASE+359)
+enum v4l2_mpeg_video_h264_level {
+ V4L2_MPEG_VIDEO_H264_LEVEL_1_0 = 0,
+ V4L2_MPEG_VIDEO_H264_LEVEL_1B = 1,
+ V4L2_MPEG_VIDEO_H264_LEVEL_1_1 = 2,
+ V4L2_MPEG_VIDEO_H264_LEVEL_1_2 = 3,
+ V4L2_MPEG_VIDEO_H264_LEVEL_1_3 = 4,
+ V4L2_MPEG_VIDEO_H264_LEVEL_2_0 = 5,
+ V4L2_MPEG_VIDEO_H264_LEVEL_2_1 = 6,
+ V4L2_MPEG_VIDEO_H264_LEVEL_2_2 = 7,
+ V4L2_MPEG_VIDEO_H264_LEVEL_3_0 = 8,
+ V4L2_MPEG_VIDEO_H264_LEVEL_3_1 = 9,
+ V4L2_MPEG_VIDEO_H264_LEVEL_3_2 = 10,
+ V4L2_MPEG_VIDEO_H264_LEVEL_4_0 = 11,
+ V4L2_MPEG_VIDEO_H264_LEVEL_4_1 = 12,
+ V4L2_MPEG_VIDEO_H264_LEVEL_4_2 = 13,
+ V4L2_MPEG_VIDEO_H264_LEVEL_5_0 = 14,
+ V4L2_MPEG_VIDEO_H264_LEVEL_5_1 = 15,
+};
+#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA (V4L2_CID_MPEG_BASE+360)
+#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA (V4L2_CID_MPEG_BASE+361)
+#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE (V4L2_CID_MPEG_BASE+362)
+enum v4l2_mpeg_video_h264_loop_filter_mode {
+ V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED = 0,
+ V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED = 1,
+ V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY = 2,
+};
+#define V4L2_CID_MPEG_VIDEO_H264_PROFILE (V4L2_CID_MPEG_BASE+363)
+enum v4l2_mpeg_video_h264_profile {
+ V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE = 0,
+ V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE = 1,
+ V4L2_MPEG_VIDEO_H264_PROFILE_MAIN = 2,
+ V4L2_MPEG_VIDEO_H264_PROFILE_EXTENDED = 3,
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH = 4,
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_10 = 5,
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_422 = 6,
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_444_PREDICTIVE = 7,
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_10_INTRA = 8,
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_422_INTRA = 9,
+ V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_444_INTRA = 10,
+ V4L2_MPEG_VIDEO_H264_PROFILE_CAVLC_444_INTRA = 11,
+ V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_BASELINE = 12,
+ V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH = 13,
+ V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH_INTRA = 14,
+ V4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH = 15,
+ V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH = 16,
+};
+#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT (V4L2_CID_MPEG_BASE+364)
+#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH (V4L2_CID_MPEG_BASE+365)
+#define V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_ENABLE (V4L2_CID_MPEG_BASE+366)
+#define V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC (V4L2_CID_MPEG_BASE+367)
+enum v4l2_mpeg_video_h264_vui_sar_idc {
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED = 0,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_1x1 = 1,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_12x11 = 2,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_10x11 = 3,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_16x11 = 4,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_40x33 = 5,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_24x11 = 6,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_20x11 = 7,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_32x11 = 8,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_80x33 = 9,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_18x11 = 10,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_15x11 = 11,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_64x33 = 12,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_160x99 = 13,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_4x3 = 14,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_3x2 = 15,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_2x1 = 16,
+ V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_EXTENDED = 17,
+};
+#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (V4L2_CID_MPEG_BASE+400)
+#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP (V4L2_CID_MPEG_BASE+401)
+#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP (V4L2_CID_MPEG_BASE+402)
+#define V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP (V4L2_CID_MPEG_BASE+403)
+#define V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP (V4L2_CID_MPEG_BASE+404)
+#define V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL (V4L2_CID_MPEG_BASE+405)
+enum v4l2_mpeg_video_mpeg4_level {
+ V4L2_MPEG_VIDEO_MPEG4_LEVEL_0 = 0,
+ V4L2_MPEG_VIDEO_MPEG4_LEVEL_0B = 1,
+ V4L2_MPEG_VIDEO_MPEG4_LEVEL_1 = 2,
+ V4L2_MPEG_VIDEO_MPEG4_LEVEL_2 = 3,
+ V4L2_MPEG_VIDEO_MPEG4_LEVEL_3 = 4,
+ V4L2_MPEG_VIDEO_MPEG4_LEVEL_3B = 5,
+ V4L2_MPEG_VIDEO_MPEG4_LEVEL_4 = 6,
+ V4L2_MPEG_VIDEO_MPEG4_LEVEL_5 = 7,
+};
+#define V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE (V4L2_CID_MPEG_BASE+406)
+enum v4l2_mpeg_video_mpeg4_profile {
+ V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE = 0,
+ V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE = 1,
+ V4L2_MPEG_VIDEO_MPEG4_PROFILE_CORE = 2,
+ V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE_SCALABLE = 3,
+ V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_CODING_EFFICIENCY = 4,
+};
+#define V4L2_CID_MPEG_VIDEO_MPEG4_QPEL (V4L2_CID_MPEG_BASE+407)
/* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
#define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000)
@@ -1371,6 +1511,33 @@ enum v4l2_mpeg_cx2341x_video_median_filter_type {
#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)
+/* MPEG-class control IDs specific to the Samsung MFC 5.1 driver as defined by V4L2 */
+#define V4L2_CID_MPEG_MFC51_BASE (V4L2_CTRL_CLASS_MPEG | 0x1100)
+
+#define V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY (V4L2_CID_MPEG_MFC51_BASE+0)
+#define V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE (V4L2_CID_MPEG_MFC51_BASE+1)
+#define V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE (V4L2_CID_MPEG_MFC51_BASE+2)
+enum v4l2_mpeg_mfc51_video_frame_skip_mode {
+ V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_DISABLED = 0,
+ V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_LEVEL_LIMIT = 1,
+ V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT = 2,
+};
+#define V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE (V4L2_CID_MPEG_MFC51_BASE+3)
+enum v4l2_mpeg_mfc51_video_force_frame_type {
+ V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_DISABLED = 0,
+ V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_I_FRAME = 1,
+ V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_NOT_CODED = 2,
+};
+#define V4L2_CID_MPEG_MFC51_VIDEO_PADDING (V4L2_CID_MPEG_MFC51_BASE+4)
+#define V4L2_CID_MPEG_MFC51_VIDEO_PADDING_YUV (V4L2_CID_MPEG_MFC51_BASE+5)
+#define V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT (V4L2_CID_MPEG_MFC51_BASE+6)
+#define V4L2_CID_MPEG_MFC51_VIDEO_RC_REACTION_COEFF (V4L2_CID_MPEG_MFC51_BASE+7)
+#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_ACTIVITY (V4L2_CID_MPEG_MFC51_BASE+50)
+#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_DARK (V4L2_CID_MPEG_MFC51_BASE+51)
+#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_SMOOTH (V4L2_CID_MPEG_MFC51_BASE+52)
+#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_STATIC (V4L2_CID_MPEG_MFC51_BASE+53)
+#define V4L2_CID_MPEG_MFC51_VIDEO_H264_NUM_REF_PIC_FOR_P (V4L2_CID_MPEG_MFC51_BASE+54)
+
/* 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)