Stateless H.264 de-staging
Subsystems (5)
v5 cover Stateless H.264 de-staging
Another iteration, hoping we nailed it this time!
The git-diff difference between v4 and v5: http://ix.io/2Fwj.
v5:
* Pick class g-ext-ctrls.rst patch from Hans.
* Document V4L2_CTRL_CLASS_CODEC_STATELESS and H264 stateless fields in vidioc-g-ext-ctrls.rst.
* Add videodev2 replace symbol for V4L2_CTRL_TYPE_H264_PRED_WEIGHTS.
* Drop profile-idc macros and add a comment for it.
* Fix old mpeg_video names in the new documentation.
v4:
* Minor documentation fixes.
* Remove media/h264-ctrls.h, which was missing before.
* Thanks to feedback from Jernej, std_validation_compound
is now more complete, initializing non-present syntax elements.
v3:
* Dropped level control from Cedrus, as agreed.
* Add support for H264 stateless controls in std_log and std_validate_compound.
* Added a ctrl debug error message, to help debug validation issues.
* Style minor fixes as requested by Hans.
v2:
* Split destage changes in several patches so it's easier to review.
* Added missing changes to drivers/media/v4l2-core/v4l2-ctrls.c.
* Renamed V4L2_CID_CODEC_CX2341X_ and V4L2_CID_MPEG_MFC51_
* Moved the compatibility macros for MPEG to the end of the header.
Ezequiel Garcia (12):
media: controls: Add validate failure debug message
media: cedrus: h264: Support profile controls
media: Rename stateful codec control macros
media: Clean stateless control includes
media: controls: Validate H264 stateless controls
media: controls: Add the stateless codec control class
media: uapi: Move parsed H264 pixel format out of staging
media: doc: Replace symbol for V4L2_CTRL_TYPE_H264_PRED_WEIGHTS
media: uapi: Move the H264 stateless control types out of staging
media: controls: Log H264 stateless controls in .std_log
media: uapi: move H264 stateless controls out of staging
media: docs: Move the H264 stateless codec uAPI
Hans Verkuil (1):
media: vidioc-g-ext-ctrls.rst: document V4L2_CTRL_CLASS_DETECT
Jonas Karlman (1):
media: rkvdec: h264: Support profile and level controls
.../userspace-api/media/v4l/common.rst | 1 + .../userspace-api/media/v4l/dev-mem2mem.rst | 2 +- .../media/v4l/ext-ctrls-codec-stateless.rst | 674 +++++++++++++++ .../media/v4l/ext-ctrls-codec.rst | 696 +-------------- .../media/v4l/extended-controls.rst | 8 +- .../media/v4l/pixfmt-compressed.rst | 25 +- .../media/v4l/vidioc-g-ext-ctrls.rst | 38 +- .../media/videodev2.h.rst.exceptions | 1 + drivers/media/common/cx2341x.c | 4 +- drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 2 +- drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 2 +- drivers/media/v4l2-core/v4l2-ctrls.c | 204 ++++- drivers/staging/media/hantro/hantro_drv.c | 26 +- drivers/staging/media/hantro/hantro_h264.c | 8 +- drivers/staging/media/hantro/hantro_hw.h | 4 +- drivers/staging/media/rkvdec/rkvdec-h264.c | 8 +- drivers/staging/media/rkvdec/rkvdec.c | 39 +- drivers/staging/media/sunxi/cedrus/cedrus.c | 43 +- .../staging/media/sunxi/cedrus/cedrus_dec.c | 12 +- include/media/fwht-ctrls.h | 2 +- include/media/h264-ctrls.h | 406 --------- include/media/hevc-ctrls.h | 10 +- include/media/mpeg2-ctrls.h | 4 +- include/media/v4l2-ctrls.h | 1 - include/media/v4l2-h264.h | 2 +- include/media/vp8-ctrls.h | 2 +- include/uapi/linux/v4l2-controls.h | 797 +++++++++++++----- include/uapi/linux/videodev2.h | 14 + 28 files changed, 1621 insertions(+), 1414 deletions(-) create mode 100644 Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst delete mode 100644 include/media/h264-ctrls.h
Signature · 1 line
2.27.0
PATCH v5 1/14 media: vidioc-g-ext-ctrls.rst: document V4L2_CTRL_CLASS_DETECT
From: Hans Verkuil <[email protected]>
V4L2_CTRL_CLASS_DETECT was never documented here, add it.
--- Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst +4 -0
@@ -358,6 +358,10 @@ still cause this situation. - 0xa20000 - The class containing RF tuner controls. These controls are described in :ref:`rf-tuner-controls`. + * - ``V4L2_CTRL_CLASS_DETECT`` + - 0xa30000 + - The class containing motion or object detection controls. These controls + are described in :ref:`detect-controls`. Return Value ============
Signature · 1 line
2.27.0
PATCH v5 2/14 media: controls: Add validate failure debug message
In reply to Ezequiel GarciaAdd a debug message for control validation (validate_new) failures. This is useful to debug issues with ioctls such as VIDIOC_TRY_EXT_CTRLS and VIDIOC_S_EXT_CTRLS.
--- drivers/media/v4l2-core/v4l2-ctrls.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-ctrls.c +6 -1
@@ -4112,8 +4112,13 @@ static int try_set_ext_ctrls_common(struct v4l2_fh *fh,struct v4l2_ctrl *ctrl = helpers[idx].ref->ctrl; ret =user_to_new (cs->controls + idx, ctrl); -if (!ret && ctrl->is_ptr) +if (!ret && ctrl->is_ptr) { ret =validate_new (ctrl, ctrl->p_new); +if (ret) +dprintk (vdev, +"failed to validate control %s (%d)\n" , +v4l2_ctrl_get_name (ctrl->id), ret); + } idx = helpers[idx].next; }while (!ret && idx);
Signature · 1 line
2.27.0
PATCH v5 3/14 media: rkvdec: h264: Support profile and level controls
In reply to Ezequiel GarciaFrom: Jonas Karlman <[email protected]>
The Rockchip Video Decoder used in RK3399 supports H.264 profiles from Baseline to High 4:2:2 up to Level 5.1, except for the Extended profile.
Expose the V4L2_CID_MPEG_VIDEO_H264_PROFILE and the V4L2_CID_MPEG_VIDEO_H264_LEVEL control, so that userspace can query the driver for the list of supported profiles and level.
For now, we don't expose 4:2:2 since the driver doesn't implement the required support.
--- drivers/staging/media/rkvdec/rkvdec.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/staging/media/rkvdec/rkvdec.c +13 -0
@@ -82,6 +82,19 @@ static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = { .cfg.def = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B, .cfg.max = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B, }, + { + .cfg.id = V4L2_CID_MPEG_VIDEO_H264_PROFILE, + .cfg.min = V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, + .cfg.max = V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, + .cfg.menu_skip_mask = + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_EXTENDED), + .cfg.def = V4L2_MPEG_VIDEO_H264_PROFILE_MAIN, + }, + { + .cfg.id = V4L2_CID_MPEG_VIDEO_H264_LEVEL, + .cfg.min = V4L2_MPEG_VIDEO_H264_LEVEL_1_0, + .cfg.max = V4L2_MPEG_VIDEO_H264_LEVEL_5_1, + }, }; static const struct rkvdec_ctrls rkvdec_h264_ctrls = {
Signature · 1 line
2.27.0
PATCH v5 4/14 media: cedrus: h264: Support profile controls
In reply to Ezequiel GarciaCedrus supports H.264 profiles from Baseline to High, except for the Extended profile
Expose the V4L2_CID_MPEG_VIDEO_H264_PROFILE so that userspace can query the driver for the supported profiles and levels.
--- drivers/staging/media/sunxi/cedrus/cedrus.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/staging/media/sunxi/cedrus/cedrus.c +19 -0
@@ -103,6 +103,25 @@ static const struct cedrus_control cedrus_controls[] = { .codec = CEDRUS_CODEC_H264, .required = false, }, +/* +* We only expose supported profiles information, +* and not levels as it's not clear what is supported +* for each hardware/core version. +* In any case, TRY/S_FMT will clamp the format resolution +* to the maximum supported. +*/ + { + .cfg = { + .id = V4L2_CID_MPEG_VIDEO_H264_PROFILE, + .min = V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, + .def = V4L2_MPEG_VIDEO_H264_PROFILE_MAIN, + .max = V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, + .menu_skip_mask = + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_EXTENDED), + }, + .codec = CEDRUS_CODEC_H264, + .required = false, + }, { .cfg = { .id = V4L2_CID_MPEG_VIDEO_HEVC_SPS,
Signature · 1 line
2.27.0
PATCH v5 5/14 media: Rename stateful codec control macros
In reply to Ezequiel GarciaFor historical reasons, stateful codec controls are named as {}_MPEG_{}. While we can't at this point sanely
change all control IDs (such as V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER), we can least change the more meaningful macros such as classes macros.
--- .../userspace-api/media/v4l/dev-mem2mem.rst | 2 +- .../media/v4l/ext-ctrls-codec.rst | 4 +- .../media/v4l/extended-controls.rst | 8 +- .../media/v4l/vidioc-g-ext-ctrls.rst | 6 +- drivers/media/common/cx2341x.c | 4 +- drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 2 +- drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 2 +- drivers/media/v4l2-core/v4l2-ctrls.c | 4 +- include/media/fwht-ctrls.h | 2 +- include/media/h264-ctrls.h | 16 +- include/media/hevc-ctrls.h | 10 +- include/media/mpeg2-ctrls.h | 4 +- include/media/vp8-ctrls.h | 2 +- include/uapi/linux/v4l2-controls.h | 409 +++++++++--------- 14 files changed, 242 insertions(+), 233 deletions(-)
Documentation/userspace-api/media/v4l/dev-mem2mem.rst +1 -1
@@ -32,7 +32,7 @@ file handle is visible through another file handle). One of the most common memory-to-memory device is the codec. Codecs are more complicated than most and require additional setup for their codec parameters. This is done through codec controls. -See :ref:`mpeg-controls`. More details on how to use codec memory-to-memory +See :ref:`codec-controls`. More details on how to use codec memory-to-memory devices are given in the following sections. .. toctree::
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +2 -2
@@ -1,6 +1,6 @@ .. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. _mpeg-controls: +.. _codec-controls: *********************** Codec Control Reference
@@ -26,7 +26,7 @@ Generic Codec Controls Codec Control IDs ----------------- -``V4L2_CID_MPEG_CLASS (class)`` +``V4L2_CID_CODEC_CLASS (class)`` The Codec class descriptor. Calling :ref:`VIDIOC_QUERYCTRL` for this control will return a description of this control class. This description can be
Documentation/userspace-api/media/v4l/extended-controls.rst +4 -4
@@ -55,8 +55,8 @@ controls in that array and a control class. Control classes are used to group similar controls into a single class. For example, control class ``V4L2_CTRL_CLASS_USER`` contains all user controls (i. e. all controls that can also be set using the old :ref:`VIDIOC_S_CTRL <VIDIOC_G_CTRL>` -ioctl). Control class ``V4L2_CTRL_CLASS_MPEG`` contains all controls -relating to MPEG encoding, etc. +ioctl). Control class ``V4L2_CTRL_CLASS_CODEC`` contains controls +relating to codecs. All controls in the control array must belong to the specified control class. An error is returned if this is not the case.
@@ -130,9 +130,9 @@ control class is found: .. code-block:: c - qctrl.id = V4L2_CTRL_CLASS_MPEG | V4L2_CTRL_FLAG_NEXT_CTRL; + qctrl.id = V4L2_CTRL_CLASS_CODEC | V4L2_CTRL_FLAG_NEXT_CTRL; while (0 == ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) { - if (V4L2_CTRL_ID2CLASS(qctrl.id) != V4L2_CTRL_CLASS_MPEG) + if (V4L2_CTRL_ID2CLASS(qctrl.id) != V4L2_CTRL_CLASS_CODEC) break; /* ... */ qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst +3 -3
@@ -322,10 +322,10 @@ still cause this situation. :ref:`VIDIOC_S_CTRL <VIDIOC_G_CTRL>` and :ref:`VIDIOC_G_CTRL <VIDIOC_G_CTRL>` ioctl belong to this class. - * - ``V4L2_CTRL_CLASS_MPEG`` + * - ``V4L2_CTRL_CLASS_CODEC`` - 0x990000 - - The class containing MPEG compression controls. These controls are - described in :ref:`mpeg-controls`. + - The class containing stateful codec controls. These controls are + described in :ref:`codec-controls`. * - ``V4L2_CTRL_CLASS_CAMERA`` - 0x9a0000 - The class containing camera controls. These controls are described
drivers/media/common/cx2341x.c +2 -2
@@ -166,7 +166,7 @@ static void cx2341x_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *ty/* Must be sorted from low to high control ID! */ const u32 cx2341x_mpeg_ctrls[] = { -V4L2_CID_MPEG_CLASS , +V4L2_CID_CODEC_CLASS ,V4L2_CID_MPEG_STREAM_TYPE ,V4L2_CID_MPEG_STREAM_VBI_FMT ,V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ ,
@@ -574,7 +574,7 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params,int err;switch (qctrl->id) { -case V4L2_CID_MPEG_CLASS : +case V4L2_CID_CODEC_CLASS :return v4l2_ctrl_query_fill (qctrl,0 ,0 ,0 ,0 );case V4L2_CID_MPEG_STREAM_TYPE : return v4l2_ctrl_query_fill(qctrl,
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +1 -1
@@ -1109,7 +1109,7 @@ const struct v4l2_ioctl_ops *get_dec_v4l2_ioctl_ops(void)return &s5p_mfc_dec_ioctl_ops; } -#define IS_MFC51_PRIV (x) ((V4L2_CTRL_ID2WHICH(x) == V4L2_CTRL_CLASS_MPEG) \ +#define IS_MFC51_PRIV (x) ((V4L2_CTRL_ID2WHICH(x) == V4L2_CTRL_CLASS_CODEC) \ && V4L2_CTRL_DRIVER_PRIV(x))int s5p_mfc_dec_ctrls_setup (struct s5p_mfc_ctx *ctx)
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +1 -1
@@ -2614,7 +2614,7 @@ const struct v4l2_ioctl_ops *get_enc_v4l2_ioctl_ops(void)return &s5p_mfc_enc_ioctl_ops; } -#define IS_MFC51_PRIV (x) ((V4L2_CTRL_ID2WHICH(x) == V4L2_CTRL_CLASS_MPEG) \ +#define IS_MFC51_PRIV (x) ((V4L2_CTRL_ID2WHICH(x) == V4L2_CTRL_CLASS_CODEC) \ && V4L2_CTRL_DRIVER_PRIV(x))int s5p_mfc_enc_ctrls_setup (struct s5p_mfc_ctx *ctx)
drivers/media/v4l2-core/v4l2-ctrls.c +2 -2
@@ -830,7 +830,7 @@ const char *v4l2_ctrl_get_name(u32 id)/* The MPEG controls are applicable to all codec controls * and the 'MPEG' part of the define is historical */ /* Keep the order of the 'case's the same as in videodev2.h! */ -case V4L2_CID_MPEG_CLASS :return "Codec Controls" ; +case V4L2_CID_CODEC_CLASS :return "Codec Controls" ;case V4L2_CID_MPEG_STREAM_TYPE :return "Stream Type" ;case V4L2_CID_MPEG_STREAM_PID_PMT :return "Stream PMT Program ID" ;case V4L2_CID_MPEG_STREAM_PID_AUDIO :return "Stream Audio Program ID" ;
@@ -1358,7 +1358,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,break ;case V4L2_CID_USER_CLASS :case V4L2_CID_CAMERA_CLASS : -case V4L2_CID_MPEG_CLASS : +case V4L2_CID_CODEC_CLASS :case V4L2_CID_FM_TX_CLASS :case V4L2_CID_FLASH_CLASS :case V4L2_CID_JPEG_CLASS :
include/media/fwht-ctrls.h +1 -1
@@ -13,7 +13,7 @@#define V4L2_CTRL_TYPE_FWHT_PARAMS 0x0105 -#define V4L2_CID_MPEG_VIDEO_FWHT_PARAMS (V4L2_CID_MPEG_BASE + 292) +#define V4L2_CID_MPEG_VIDEO_FWHT_PARAMS (V4L2_CID_CODEC_BASE + 292)struct v4l2_ctrl_fwht_params {__u64 backward_ref_ts;
include/media/h264-ctrls.h +8 -8
@@ -29,14 +29,14 @@* would be added during the phase where those controls are not * stable. It should be fixed eventually. */ -#define V4L2_CID_MPEG_VIDEO_H264_SPS (V4L2_CID_MPEG_BASE+1000) -#define V4L2_CID_MPEG_VIDEO_H264_PPS (V4L2_CID_MPEG_BASE+1001) -#define V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX (V4L2_CID_MPEG_BASE+1002) -#define V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS (V4L2_CID_MPEG_BASE+1003) -#define V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS (V4L2_CID_MPEG_BASE+1004) -#define V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE (V4L2_CID_MPEG_BASE+1005) -#define V4L2_CID_MPEG_VIDEO_H264_START_CODE (V4L2_CID_MPEG_BASE+1006) -#define V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS (V4L2_CID_MPEG_BASE+1007) +#define V4L2_CID_MPEG_VIDEO_H264_SPS (V4L2_CID_CODEC_BASE+1000) +#define V4L2_CID_MPEG_VIDEO_H264_PPS (V4L2_CID_CODEC_BASE+1001) +#define V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX (V4L2_CID_CODEC_BASE+1002) +#define V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS (V4L2_CID_CODEC_BASE+1003) +#define V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS (V4L2_CID_CODEC_BASE+1004) +#define V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE (V4L2_CID_CODEC_BASE+1005) +#define V4L2_CID_MPEG_VIDEO_H264_START_CODE (V4L2_CID_CODEC_BASE+1006) +#define V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS (V4L2_CID_CODEC_BASE+1007)/* enum v4l2_ctrl_type type values */ #define V4L2_CTRL_TYPE_H264_SPS 0x0110
include/media/hevc-ctrls.h +5 -5
@@ -16,11 +16,11 @@/* The pixel format isn't stable at the moment and will likely be renamed. */ #define V4L2_PIX_FMT_HEVC_SLICE v4l2_fourcc('S', '2', '6', '5')/* HEVC parsed slices */ -#define V4L2_CID_MPEG_VIDEO_HEVC_SPS (V4L2_CID_MPEG_BASE + 1008) -#define V4L2_CID_MPEG_VIDEO_HEVC_PPS (V4L2_CID_MPEG_BASE + 1009) -#define V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS (V4L2_CID_MPEG_BASE + 1010) -#define V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE (V4L2_CID_MPEG_BASE + 1015) -#define V4L2_CID_MPEG_VIDEO_HEVC_START_CODE (V4L2_CID_MPEG_BASE + 1016) +#define V4L2_CID_MPEG_VIDEO_HEVC_SPS (V4L2_CID_CODEC_BASE + 1008) +#define V4L2_CID_MPEG_VIDEO_HEVC_PPS (V4L2_CID_CODEC_BASE + 1009) +#define V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS (V4L2_CID_CODEC_BASE + 1010) +#define V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE (V4L2_CID_CODEC_BASE + 1015) +#define V4L2_CID_MPEG_VIDEO_HEVC_START_CODE (V4L2_CID_CODEC_BASE + 1016)/* enum v4l2_ctrl_type type values */ #define V4L2_CTRL_TYPE_HEVC_SPS 0x0120
include/media/mpeg2-ctrls.h +2 -2
@@ -11,8 +11,8 @@#ifndef _MPEG2_CTRLS_H_#define _MPEG2_CTRLS_H_ -#define V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS (V4L2_CID_MPEG_BASE+250) -#define V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION (V4L2_CID_MPEG_BASE+251) +#define V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS (V4L2_CID_CODEC_BASE+250) +#define V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION (V4L2_CID_CODEC_BASE+251)/* enum v4l2_ctrl_type type values */ #define V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS 0x0103
include/media/vp8-ctrls.h +1 -1
@@ -15,7 +15,7 @@#define V4L2_PIX_FMT_VP8_FRAME v4l2_fourcc('V', 'P', '8', 'F') -#define V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER (V4L2_CID_MPEG_BASE + 2000) +#define V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER (V4L2_CID_CODEC_BASE + 2000)#define V4L2_CTRL_TYPE_VP8_FRAME_HEADER 0x301#define V4L2_VP8_SEGMENT_HEADER_FLAG_ENABLED 0x01
include/uapi/linux/v4l2-controls.h +209 -200
720 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH v5 6/14 media: Clean stateless control includes
In reply to Ezequiel GarciaAvoid including h264-ctrls.h, vp8-ctrls.h, etc, and instead just include v4l2-ctrls.h which does the right thing.
This is in preparation for moving the stateless controls out of staging, which will mean removing some of these headers.
--- drivers/staging/media/hantro/hantro_hw.h | 4 +--- include/media/v4l2-h264.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/staging/media/hantro/hantro_hw.h +1 -3
@@ -11,9 +11,7 @@#include <linux/interrupt.h> #include <linux/v4l2-controls.h> -#include <media/h264-ctrls.h> -#include <media/mpeg2-ctrls.h> -#include <media/vp8-ctrls.h> +#include <media/v4l2-ctrls.h> #include <media/videobuf2-core.h> #define DEC_8190_ALIGN_MASK 0x07U
include/media/v4l2-h264.h +1 -1
@@ -10,7 +10,7 @@#ifndef _MEDIA_V4L2_H264_H#define _MEDIA_V4L2_H264_H -#include <media/h264-ctrls.h> +#include <media/v4l2-ctrls.h> /** * struct v4l2_h264_reflist_builder - Reference list builder object
Signature · 1 line
2.27.0
PATCH v5 7/14 media: controls: Validate H264 stateless controls
In reply to Ezequiel GarciaCheck that all the fields that correspond or are related to a H264 specification syntax element have legal values.
--- drivers/media/v4l2-core/v4l2-ctrls.c | 134 +++++++++++++++++++++++++++ include/media/h264-ctrls.h | 9 ++ 2 files changed, 143 insertions(+)
drivers/media/v4l2-core/v4l2-ctrls.c +134 -0
@@ -1775,6 +1775,9 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, {struct v4l2_ctrl_mpeg2_slice_params *p_mpeg2_slice_params;struct v4l2_ctrl_vp8_frame_header *p_vp8_frame_header; +struct v4l2_ctrl_h264_sps *p_h264_sps; +struct v4l2_ctrl_h264_pps *p_h264_pps; +struct v4l2_ctrl_h264_pred_weights *p_h264_pred_weights;struct v4l2_ctrl_h264_slice_params *p_h264_slice_params;struct v4l2_ctrl_h264_decode_params *p_h264_dec_params;struct v4l2_ctrl_hevc_sps *p_hevc_sps;
@@ -1834,20 +1837,151 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx,break ;case V4L2_CTRL_TYPE_H264_SPS : + p_h264_sps = p; + +/* Some syntax elements are only conditionally valid */ +if (p_h264_sps->pic_order_cnt_type !=0 ) { + p_h264_sps->log2_max_pic_order_cnt_lsb_minus4 =0 ; + }else if (p_h264_sps->pic_order_cnt_type !=1 ) { + p_h264_sps->num_ref_frames_in_pic_order_cnt_cycle =0 ; + p_h264_sps->offset_for_non_ref_pic =0 ; + p_h264_sps->offset_for_top_to_bottom_field =0 ; +memset (&p_h264_sps->offset_for_ref_frame,0 , +sizeof (p_h264_sps->offset_for_ref_frame)); + } + +if (!V4L2_H264_SPS_HAS_CHROMA_FORMAT (p_h264_sps)) { + p_h264_sps->chroma_format_idc =1 ; + p_h264_sps->bit_depth_luma_minus8 =0 ; + p_h264_sps->bit_depth_chroma_minus8 =0 ; + + p_h264_sps->flags &= + ~V4L2_H264_SPS_FLAG_QPPRIME_Y_ZERO_TRANSFORM_BYPASS ; + +if (p_h264_sps->chroma_format_idc <3 ) + p_h264_sps->flags &= + ~V4L2_H264_SPS_FLAG_SEPARATE_COLOUR_PLANE ; + } + +if (p_h264_sps->flags &V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY ) + p_h264_sps->flags &= + ~V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD ; + +/* +* Chroma 4:2:2 format require at least High 4:2:2 profile. +* +* The H264 specification and well-known parser implementations +* use profile-idc values directly, as that is clearer and +* less ambiguous. We do the same here. +*/ +if (p_h264_sps->profile_idc <122 && + p_h264_sps->chroma_format_idc >1 ) +return -EINVAL ; +/* Chroma 4:4:4 format require at least High 4:2:2 profile */ +if (p_h264_sps->profile_idc <244 && + p_h264_sps->chroma_format_idc >2 ) +return -EINVAL ; +if (p_h264_sps->chroma_format_idc >3 ) +return -EINVAL ; + +if (p_h264_sps->bit_depth_luma_minus8 >6 ) +return -EINVAL ; +if (p_h264_sps->bit_depth_chroma_minus8 >6 ) +return -EINVAL ; +if (p_h264_sps->log2_max_frame_num_minus4 >12 ) +return -EINVAL ; +if (p_h264_sps->pic_order_cnt_type >2 ) +return -EINVAL ; +if (p_h264_sps->log2_max_pic_order_cnt_lsb_minus4 >12 ) +return -EINVAL ; +if (p_h264_sps->max_num_ref_frames >V4L2_H264_REF_LIST_LEN ) +return -EINVAL ; +break ; +case V4L2_CTRL_TYPE_H264_PPS : + p_h264_pps = p; + +if (p_h264_pps->num_slice_groups_minus1 >7 ) +return -EINVAL ; +if (p_h264_pps->num_ref_idx_l0_default_active_minus1 > + (V4L2_H264_REF_LIST_LEN -1 )) +return -EINVAL ; +if (p_h264_pps->num_ref_idx_l1_default_active_minus1 > + (V4L2_H264_REF_LIST_LEN -1 )) +return -EINVAL ; +if (p_h264_pps->weighted_bipred_idc >2 ) +return -EINVAL ; +/* +* pic_init_qp_minus26 shall be in the range of +* -(26 + QpBdOffset_y) to +25, inclusive, +* where QpBdOffset_y is 6 * bit_depth_luma_minus8 +*/ +if (p_h264_pps->pic_init_qp_minus26 <-62 || + p_h264_pps->pic_init_qp_minus26 >25 ) +return -EINVAL ; +if (p_h264_pps->pic_init_qs_minus26 <-26 || + p_h264_pps->pic_init_qs_minus26 >25 ) +return -EINVAL ; +if (p_h264_pps->chroma_qp_index_offset <-12 || + p_h264_pps->chroma_qp_index_offset >12 ) +return -EINVAL ; +if (p_h264_pps->second_chroma_qp_index_offset <-12 || + p_h264_pps->second_chroma_qp_index_offset >12 ) +return -EINVAL ; +break ; +case V4L2_CTRL_TYPE_H264_SCALING_MATRIX : +break ; +case V4L2_CTRL_TYPE_H264_PRED_WEIGHTS : + p_h264_pred_weights = p; + +if (p_h264_pred_weights->luma_log2_weight_denom >7 ) +return -EINVAL ; +if (p_h264_pred_weights->chroma_log2_weight_denom >7 ) +return -EINVAL ;break ;case V4L2_CTRL_TYPE_H264_SLICE_PARAMS : p_h264_slice_params = p; +if (p_h264_slice_params->slice_type !=V4L2_H264_SLICE_TYPE_B ) + p_h264_slice_params->flags &= + ~V4L2_H264_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED ; + +if (p_h264_slice_params->colour_plane_id >2 ) +return -EINVAL ; +if (p_h264_slice_params->cabac_init_idc >2 ) +return -EINVAL ; +if (p_h264_slice_params->disable_deblocking_filter_idc >2 ) +return -EINVAL ; +if (p_h264_slice_params->slice_alpha_c0_offset_div2 <-6 || + p_h264_slice_params->slice_alpha_c0_offset_div2 >6 ) +return -EINVAL ; +if (p_h264_slice_params->slice_beta_offset_div2 <-6 || + p_h264_slice_params->slice_beta_offset_div2 >6 ) +return -EINVAL ; + +if (p_h264_slice_params->slice_type ==V4L2_H264_SLICE_TYPE_I || + p_h264_slice_params->slice_type ==V4L2_H264_SLICE_TYPE_SI ) + p_h264_slice_params->num_ref_idx_l0_active_minus1 =0 ; +if (p_h264_slice_params->slice_type !=V4L2_H264_SLICE_TYPE_B ) + p_h264_slice_params->num_ref_idx_l1_active_minus1 =0 ; + +if (p_h264_slice_params->num_ref_idx_l0_active_minus1 > + (V4L2_H264_REF_LIST_LEN -1 )) +return -EINVAL ; +if (p_h264_slice_params->num_ref_idx_l1_active_minus1 > + (V4L2_H264_REF_LIST_LEN -1 )) +return -EINVAL ;zero_reserved (*p_h264_slice_params);break ;case V4L2_CTRL_TYPE_H264_DECODE_PARAMS : p_h264_dec_params = p; +if (p_h264_dec_params->nal_ref_idc >3 ) +return -EINVAL ;for (i =0 ; i <V4L2_H264_NUM_DPB_ENTRIES ; i++) {struct v4l2_h264_dpb_entry *dpb_entry = &p_h264_dec_params->dpb[i];
include/media/h264-ctrls.h +9 -0
@@ -98,6 +98,15 @@ enum v4l2_mpeg_video_h264_start_code {#define V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD 0x20#define V4L2_H264_SPS_FLAG_DIRECT_8X8_INFERENCE 0x40 +#define V4L2_H264_SPS_HAS_CHROMA_FORMAT (sps) \ + ((sps)->profile_idc == 100 || (sps)->profile_idc == 110 || \ + (sps)->profile_idc == 122 || (sps)->profile_idc == 244 || \ + (sps)->profile_idc == 44 || (sps)->profile_idc == 83 || \ + (sps)->profile_idc == 86 || (sps)->profile_idc == 118 || \ + (sps)->profile_idc == 128 || (sps)->profile_idc == 138 || \ + (sps)->profile_idc == 139 || (sps)->profile_idc == 134 || \ + (sps)->profile_idc == 135) +/** * struct v4l2_ctrl_h264_sps - H264 sequence parameter set *
Signature · 1 line
2.27.0
PATCH v5 8/14 media: controls: Add the stateless codec control class
In reply to Ezequiel GarciaAdd a new control class to hold the stateless codecs controls that are ready to be moved out of staging.
--- .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 4 ++++ drivers/media/v4l2-core/v4l2-ctrls.c | 5 +++++ include/uapi/linux/v4l2-controls.h | 7 +++++++ 3 files changed, 16 insertions(+)
Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst +4 -0
@@ -362,6 +362,10 @@ still cause this situation. - 0xa30000 - The class containing motion or object detection controls. These controls are described in :ref:`detect-controls`. + * - ``V4L2_CTRL_CLASS_CODEC_STATELESS`` + - 0xa40000 + - The class containing stateless codec controls. These controls are + described in :ref:`codec-stateless-controls`. Return Value ============
drivers/media/v4l2-core/v4l2-ctrls.c +5 -0
@@ -1181,6 +1181,10 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_DETECT_MD_GLOBAL_THRESHOLD :return "MD Global Threshold" ;case V4L2_CID_DETECT_MD_THRESHOLD_GRID :return "MD Threshold Grid" ;case V4L2_CID_DETECT_MD_REGION_GRID :return "MD Region Grid" ; + +/* Stateless Codec controls */ +/* Keep the order of the 'case's the same as in v4l2-controls.h! */ +case V4L2_CID_CODEC_STATELESS_CLASS :return "Stateless Codec Controls" ;default :return NULL ; }
@@ -1368,6 +1372,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_FM_RX_CLASS :case V4L2_CID_RF_TUNER_CLASS :case V4L2_CID_DETECT_CLASS : +case V4L2_CID_CODEC_STATELESS_CLASS : *type =V4L2_CTRL_TYPE_CTRL_CLASS ;/* You can neither read not write these */ *flags |=V4L2_CTRL_FLAG_READ_ONLY |V4L2_CTRL_FLAG_WRITE_ONLY ;
include/uapi/linux/v4l2-controls.h +7 -0
@@ -65,6 +65,7 @@#define V4L2_CTRL_CLASS_FM_RX 0x00a10000/* FM Receiver controls */ #define V4L2_CTRL_CLASS_RF_TUNER 0x00a20000/* RF tuner controls */ #define V4L2_CTRL_CLASS_DETECT 0x00a30000/* Detection controls */ +#define V4L2_CTRL_CLASS_CODEC_STATELESS 0x00a40000/* Stateless codecs controls */ /* User-class control IDs */
@@ -1177,6 +1178,12 @@ enum v4l2_detect_md_mode {#define V4L2_CID_DETECT_MD_THRESHOLD_GRID (V4L2_CID_DETECT_CLASS_BASE + 3)#define V4L2_CID_DETECT_MD_REGION_GRID (V4L2_CID_DETECT_CLASS_BASE + 4) + +/* Stateless CODECs controls */ +#define V4L2_CID_CODEC_STATELESS_BASE (V4L2_CTRL_CLASS_CODEC_STATELESS | 0x900) +#define V4L2_CID_CODEC_STATELESS_CLASS (V4L2_CTRL_CLASS_CODEC_STATELESS | 1) + +/* MPEG-compression definitions kept for backwards compatibility */ #ifndef __KERNEL__#define V4L2_CTRL_CLASS_MPEG V4L2_CTRL_CLASS_CODEC
Signature · 1 line
2.27.0
PATCH v5 9/14 media: uapi: Move parsed H264 pixel format out of staging
In reply to Ezequiel GarciaSince we are ready to stabilize the H264 stateless API, start by first moving the parsed H264 pixel format.
--- include/media/h264-ctrls.h | 3 --- include/uapi/linux/videodev2.h | 1 + 2 files changed, 1 insertion(+), 3 deletions(-)
include/media/h264-ctrls.h +0 -3
@@ -21,9 +21,6 @@#define V4L2_H264_REF_LIST_LEN (2 * V4L2_H264_NUM_DPB_ENTRIES) -/* Our pixel format isn't stable at the moment */ -#define V4L2_PIX_FMT_H264_SLICE v4l2_fourcc('S', '2', '6', '4')/* H264 parsed slices */ -/* * This is put insanely high to avoid conflicting with controls that * would be added during the phase where those controls are not
include/uapi/linux/videodev2.h +1 -0
@@ -703,6 +703,7 @@ struct v4l2_pix_format {#define V4L2_PIX_FMT_HEVC v4l2_fourcc('H', 'E', 'V', 'C')/* HEVC aka H.265 */ #define V4L2_PIX_FMT_FWHT v4l2_fourcc('F', 'W', 'H', 'T')/* Fast Walsh Hadamard Transform (vicodec) */ #define V4L2_PIX_FMT_FWHT_STATELESS v4l2_fourcc('S', 'F', 'W', 'H')/* Stateless FWHT (vicodec) */ +#define V4L2_PIX_FMT_H264_SLICE v4l2_fourcc('S', '2', '6', '4')/* H264 parsed slices */ /* Vendor-specific formats */ #define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A')/* cpia1 YUV */
Signature · 1 line
2.27.0
PATCH v5 10/14 media: doc: Replace symbol for V4L2_CTRL_TYPE_H264_PRED_WEIGHTS
In reply to Ezequiel GarciaWhen V4L2_CTRL_TYPE_H264_PRED_WEIGHTS was added, adding a replace symbol directive in videodev2.h.rst.exceptions was missed.
Now that the control type is destaged, it's important to fix this.
--- Documentation/userspace-api/media/videodev2.h.rst.exceptions | 1 + 1 file changed, 1 insertion(+)
Documentation/userspace-api/media/videodev2.h.rst.exceptions +1 -0
@@ -139,6 +139,7 @@ replace symbol V4L2_CTRL_TYPE_MPEG2_QUANTIZATION :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_H264_SPS :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_H264_PPS :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_H264_SCALING_MATRIX :c:type:`v4l2_ctrl_type` +replace symbol V4L2_CTRL_TYPE_H264_PRED_WEIGHTS :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_H264_SLICE_PARAMS :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_H264_DECODE_PARAMS :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_HEVC_SPS :c:type:`v4l2_ctrl_type`
Signature · 1 line
2.27.0
PATCH v5 11/14 media: uapi: Move the H264 stateless control types out of staging
In reply to Ezequiel GarciaMove the H264 stateless control types out of staging, and re-number them to avoid any confusion.
--- include/media/h264-ctrls.h | 8 -------- include/uapi/linux/videodev2.h | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-)
include/media/h264-ctrls.h +0 -8
@@ -35,14 +35,6 @@#define V4L2_CID_MPEG_VIDEO_H264_START_CODE (V4L2_CID_CODEC_BASE+1006)#define V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS (V4L2_CID_CODEC_BASE+1007) -/* enum v4l2_ctrl_type type values */ -#define V4L2_CTRL_TYPE_H264_SPS 0x0110 -#define V4L2_CTRL_TYPE_H264_PPS 0x0111 -#define V4L2_CTRL_TYPE_H264_SCALING_MATRIX 0x0112 -#define V4L2_CTRL_TYPE_H264_SLICE_PARAMS 0x0113 -#define V4L2_CTRL_TYPE_H264_DECODE_PARAMS 0x0114 -#define V4L2_CTRL_TYPE_H264_PRED_WEIGHTS 0x0115 -/** * enum v4l2_mpeg_video_h264_decode_mode - Decoding mode *
include/uapi/linux/videodev2.h +7 -0
@@ -1780,6 +1780,13 @@ enum v4l2_ctrl_type {V4L2_CTRL_TYPE_U16 =0x0101 ,V4L2_CTRL_TYPE_U32 =0x0102 ,V4L2_CTRL_TYPE_AREA =0x0106 , + +V4L2_CTRL_TYPE_H264_SPS =0x0200 , +V4L2_CTRL_TYPE_H264_PPS =0x0201 , +V4L2_CTRL_TYPE_H264_SCALING_MATRIX =0x0202 , +V4L2_CTRL_TYPE_H264_SLICE_PARAMS =0x0203 , +V4L2_CTRL_TYPE_H264_DECODE_PARAMS =0x0204 , + V4L2_CTRL_TYPE_H264_PRED_WEIGHTS = 0x0205, };/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
Signature · 1 line
2.27.0
PATCH v5 12/14 media: controls: Log H264 stateless controls in .std_log
In reply to Ezequiel GarciaFor now, only print the type of the control. In the future, we might want to be able to print the values of all
the stateless codec controls currently set in the control handler, which should be useful for debugging reasons.
--- drivers/media/v4l2-core/v4l2-ctrls.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/media/v4l2-core/v4l2-ctrls.c +18 -0
@@ -1737,6 +1737,24 @@ static void std_log(const struct v4l2_ctrl *ctrl)case V4L2_CTRL_TYPE_U32 :pr_cont ("%u" , (unsigned )*ptr.p_u32);break ; +case V4L2_CTRL_TYPE_H264_SPS : +pr_cont ("H264_SPS" ); +break ; +case V4L2_CTRL_TYPE_H264_PPS : +pr_cont ("H264_PPS" ); +break ; +case V4L2_CTRL_TYPE_H264_SCALING_MATRIX : +pr_cont ("H264_SCALING_MATRIX" ); +break ; +case V4L2_CTRL_TYPE_H264_SLICE_PARAMS : +pr_cont ("H264_SLICE_PARAMS" ); +break ; +case V4L2_CTRL_TYPE_H264_DECODE_PARAMS : +pr_cont ("H264_DECODE_PARAMS" ); +break ; +case V4L2_CTRL_TYPE_H264_PRED_WEIGHTS : +pr_cont ("H264_PRED_WEIGHTS" ); +break ;default :pr_cont ("unknown type %d" , ctrl->type);break ;
Signature · 1 line
2.27.0
PATCH v5 13/14 media: uapi: move H264 stateless controls out of staging
In reply to Ezequiel GarciaThe H264 stateless controls is ready to be part
of the stable uAPI.
Re-number the control IDs, move them to the newly
created stateless control class, and updates all
the drivers accordingly.
--- drivers/media/v4l2-core/v4l2-ctrls.c | 36 +- drivers/staging/media/hantro/hantro_drv.c | 26 +- drivers/staging/media/hantro/hantro_h264.c | 8 +- drivers/staging/media/rkvdec/rkvdec-h264.c | 8 +- drivers/staging/media/rkvdec/rkvdec.c | 26 +- drivers/staging/media/sunxi/cedrus/cedrus.c | 24 +- .../staging/media/sunxi/cedrus/cedrus_dec.c | 12 +- include/media/h264-ctrls.h | 404 ------------------ include/media/v4l2-ctrls.h | 1 - include/uapi/linux/v4l2-controls.h | 381 +++++++++++++++++ include/uapi/linux/videodev2.h | 6 + 11 files changed, 457 insertions(+), 475 deletions(-) delete mode 100644 include/media/h264-ctrls.h
drivers/media/v4l2-core/v4l2-ctrls.c +18 -18
@@ -693,9 +693,9 @@ const char * const *v4l2_ctrl_get_menu(u32 id)return h264_fp_arrangement_type;case V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE :return h264_fmo_map_type; -case V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE : +case V4L2_CID_STATELESS_H264_DECODE_MODE :return h264_decode_mode; -case V4L2_CID_MPEG_VIDEO_H264_START_CODE : +case V4L2_CID_STATELESS_H264_START_CODE :return h264_start_code;case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL :return mpeg_mpeg2_level;
@@ -920,14 +920,6 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP :return "H264 I-Frame Maximum QP Value" ;case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP :return "H264 P-Frame Minimum QP Value" ;case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP :return "H264 P-Frame Maximum QP Value" ; -case V4L2_CID_MPEG_VIDEO_H264_SPS :return "H264 Sequence Parameter Set" ; -case V4L2_CID_MPEG_VIDEO_H264_PPS :return "H264 Picture Parameter Set" ; -case V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX :return "H264 Scaling Matrix" ; -case V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS :return "H264 Slice Parameters" ; -case V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS :return "H264 Decode Parameters" ; -case V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE :return "H264 Decode Mode" ; -case V4L2_CID_MPEG_VIDEO_H264_START_CODE :return "H264 Start Code" ; -case V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS :return "H264 Prediction Weight Table" ;case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL :return "MPEG2 Level" ;case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE :return "MPEG2 Profile" ;case V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP :return "MPEG4 I-Frame QP Value" ;
@@ -1185,6 +1177,14 @@ const char *v4l2_ctrl_get_name(u32 id)/* Stateless Codec controls */ /* Keep the order of the 'case's the same as in v4l2-controls.h! */ case V4L2_CID_CODEC_STATELESS_CLASS :return "Stateless Codec Controls" ; +case V4L2_CID_STATELESS_H264_DECODE_MODE :return "H264 Decode Mode" ; +case V4L2_CID_STATELESS_H264_START_CODE :return "H264 Start Code" ; +case V4L2_CID_STATELESS_H264_SPS :return "H264 Sequence Parameter Set" ; +case V4L2_CID_STATELESS_H264_PPS :return "H264 Picture Parameter Set" ; +case V4L2_CID_STATELESS_H264_SCALING_MATRIX :return "H264 Scaling Matrix" ; +case V4L2_CID_STATELESS_H264_PRED_WEIGHTS :return "H264 Prediction Weight Table" ; +case V4L2_CID_STATELESS_H264_SLICE_PARAMS :return "H264 Slice Parameters" ; +case V4L2_CID_STATELESS_H264_DECODE_PARAMS :return "H264 Decode Parameters" ;default :return NULL ; }
@@ -1310,8 +1310,6 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC :case V4L2_CID_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE :case V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE : -case V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE : -case V4L2_CID_MPEG_VIDEO_H264_START_CODE :case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL :case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE :case V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL :
@@ -1342,6 +1340,8 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_MPEG_VIDEO_HEVC_LOOP_FILTER_MODE :case V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE :case V4L2_CID_MPEG_VIDEO_HEVC_START_CODE : +case V4L2_CID_STATELESS_H264_DECODE_MODE : +case V4L2_CID_STATELESS_H264_START_CODE :case V4L2_CID_CAMERA_ORIENTATION : *type =V4L2_CTRL_TYPE_MENU ;break ;
@@ -1436,22 +1436,22 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS : *type =V4L2_CTRL_TYPE_FWHT_PARAMS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_SPS : +case V4L2_CID_STATELESS_H264_SPS : *type =V4L2_CTRL_TYPE_H264_SPS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_PPS : +case V4L2_CID_STATELESS_H264_PPS : *type =V4L2_CTRL_TYPE_H264_PPS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX : +case V4L2_CID_STATELESS_H264_SCALING_MATRIX : *type =V4L2_CTRL_TYPE_H264_SCALING_MATRIX ;break ; -case V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS : +case V4L2_CID_STATELESS_H264_SLICE_PARAMS : *type =V4L2_CTRL_TYPE_H264_SLICE_PARAMS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS : +case V4L2_CID_STATELESS_H264_DECODE_PARAMS : *type =V4L2_CTRL_TYPE_H264_DECODE_PARAMS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS : +case V4L2_CID_STATELESS_H264_PRED_WEIGHTS : *type =V4L2_CTRL_TYPE_H264_PRED_WEIGHTS ;break ;case V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER :
drivers/staging/media/hantro/hantro_drv.c +13 -13
@@ -231,7 +231,7 @@ queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)static int hantro_try_ctrl (struct v4l2_ctrl *ctrl) { -if (ctrl->id ==V4L2_CID_MPEG_VIDEO_H264_SPS ) { +if (ctrl->id ==V4L2_CID_STATELESS_H264_SPS ) {const struct v4l2_ctrl_h264_sps *sps = ctrl->p_new.p_h264_sps;if (sps->chroma_format_idc >1 )
@@ -304,39 +304,39 @@ static const struct hantro_ctrl controls[] = { }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS, + .id = V4L2_CID_STATELESS_H264_DECODE_PARAMS, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SPS, + .id = V4L2_CID_STATELESS_H264_SPS, .ops = &hantro_ctrl_ops, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_PPS, + .id = V4L2_CID_STATELESS_H264_PPS, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX, + .id = V4L2_CID_STATELESS_H264_SCALING_MATRIX, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE, - .min = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED, - .def = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED, - .max = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED, + .id = V4L2_CID_STATELESS_H264_DECODE_MODE, + .min = V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED, + .def = V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED, + .max = V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_START_CODE, - .min = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B, - .def = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B, - .max = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B, + .id = V4L2_CID_STATELESS_H264_START_CODE, + .min = V4L2_STATELESS_H264_START_CODE_ANNEX_B, + .def = V4L2_STATELESS_H264_START_CODE_ANNEX_B, + .max = V4L2_STATELESS_H264_START_CODE_ANNEX_B, }, }, { .codec = HANTRO_H264_DECODER,
drivers/staging/media/hantro/hantro_h264.c +4 -4
@@ -344,22 +344,22 @@ int hantro_h264_dec_prepare_run(struct hantro_ctx *ctx)hantro_start_prepare_run (ctx); ctrls->scaling = -hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX ); +hantro_get_ctrl (ctx,V4L2_CID_STATELESS_H264_SCALING_MATRIX );if (WARN_ON (!ctrls->scaling))return -EINVAL ; ctrls->decode = -hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS ); +hantro_get_ctrl (ctx,V4L2_CID_STATELESS_H264_DECODE_PARAMS );if (WARN_ON (!ctrls->decode))return -EINVAL ; ctrls->sps = -hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_H264_SPS ); +hantro_get_ctrl (ctx,V4L2_CID_STATELESS_H264_SPS );if (WARN_ON (!ctrls->sps))return -EINVAL ; ctrls->pps = -hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_H264_PPS ); +hantro_get_ctrl (ctx,V4L2_CID_STATELESS_H264_PPS );if (WARN_ON (!ctrls->pps))return -EINVAL ;
drivers/staging/media/rkvdec/rkvdec-h264.c +4 -4
@@ -1067,16 +1067,16 @@ static void rkvdec_h264_run_preamble(struct rkvdec_ctx *ctx,struct v4l2_ctrl *ctrl; ctrl =v4l2_ctrl_find (&ctx->ctrl_hdl, -V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS ); +V4L2_CID_STATELESS_H264_DECODE_PARAMS ); run->decode_params = ctrl ? ctrl->p_cur.p :NULL ; ctrl =v4l2_ctrl_find (&ctx->ctrl_hdl, -V4L2_CID_MPEG_VIDEO_H264_SPS ); +V4L2_CID_STATELESS_H264_SPS ); run->sps = ctrl ? ctrl->p_cur.p :NULL ; ctrl =v4l2_ctrl_find (&ctx->ctrl_hdl, -V4L2_CID_MPEG_VIDEO_H264_PPS ); +V4L2_CID_STATELESS_H264_PPS ); run->pps = ctrl ? ctrl->p_cur.p :NULL ; ctrl =v4l2_ctrl_find (&ctx->ctrl_hdl, -V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX ); +V4L2_CID_STATELESS_H264_SCALING_MATRIX ); run->scaling_matrix = ctrl ? ctrl->p_cur.p :NULL ;rkvdec_run_preamble (ctx, &run->base);
drivers/staging/media/rkvdec/rkvdec.c +13 -13
@@ -29,7 +29,7 @@static int rkvdec_try_ctrl (struct v4l2_ctrl *ctrl) { -if (ctrl->id ==V4L2_CID_MPEG_VIDEO_H264_SPS ) { +if (ctrl->id ==V4L2_CID_STATELESS_H264_SPS ) {const struct v4l2_ctrl_h264_sps *sps = ctrl->p_new.p_h264_sps;/* * TODO: The hardware supports 10-bit and 4:2:2 profiles,
@@ -56,31 +56,31 @@ static const struct v4l2_ctrl_ops rkvdec_ctrl_ops = {static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = { { .mandatory = true, - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS , + .cfg.id =V4L2_CID_STATELESS_H264_DECODE_PARAMS , }, { .mandatory = true, - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_SPS , + .cfg.id =V4L2_CID_STATELESS_H264_SPS , .cfg.ops = &rkvdec_ctrl_ops, }, { .mandatory = true, - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_PPS , + .cfg.id =V4L2_CID_STATELESS_H264_PPS , }, { - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX , + .cfg.id =V4L2_CID_STATELESS_H264_SCALING_MATRIX , }, { - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE , - .cfg.min =V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED , - .cfg.max =V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED , - .cfg.def =V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED , + .cfg.id =V4L2_CID_STATELESS_H264_DECODE_MODE , + .cfg.min =V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED , + .cfg.max =V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED , + .cfg.def =V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED , }, { - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_START_CODE , - .cfg.min =V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B , - .cfg.def =V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B , - .cfg.max =V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B , + .cfg.id =V4L2_CID_STATELESS_H264_START_CODE , + .cfg.min =V4L2_STATELESS_H264_START_CODE_ANNEX_B , + .cfg.def =V4L2_STATELESS_H264_START_CODE_ANNEX_B , + .cfg.max =V4L2_STATELESS_H264_START_CODE_ANNEX_B , }, { .cfg.id =V4L2_CID_MPEG_VIDEO_H264_PROFILE ,
drivers/staging/media/sunxi/cedrus/cedrus.c +12 -12
@@ -45,60 +45,60 @@ static const struct cedrus_control cedrus_controls[] = { }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS, + .id = V4L2_CID_STATELESS_H264_DECODE_PARAMS, }, .codec = CEDRUS_CODEC_H264, .required = true, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS, + .id = V4L2_CID_STATELESS_H264_SLICE_PARAMS, }, .codec = CEDRUS_CODEC_H264, .required = true, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SPS, + .id = V4L2_CID_STATELESS_H264_SPS, }, .codec = CEDRUS_CODEC_H264, .required = true, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_PPS, + .id = V4L2_CID_STATELESS_H264_PPS, }, .codec = CEDRUS_CODEC_H264, .required = true, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX, + .id = V4L2_CID_STATELESS_H264_SCALING_MATRIX, }, .codec = CEDRUS_CODEC_H264, .required = false, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS, + .id = V4L2_CID_STATELESS_H264_PRED_WEIGHTS, }, .codec = CEDRUS_CODEC_H264, .required = false, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE, - .max = V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED, - .def = V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED, + .id = V4L2_CID_STATELESS_H264_DECODE_MODE, + .max = V4L2_STATELESS_H264_DECODE_MODE_SLICE_BASED, + .def = V4L2_STATELESS_H264_DECODE_MODE_SLICE_BASED, }, .codec = CEDRUS_CODEC_H264, .required = false, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_START_CODE, - .max = V4L2_MPEG_VIDEO_H264_START_CODE_NONE, - .def = V4L2_MPEG_VIDEO_H264_START_CODE_NONE, + .id = V4L2_CID_STATELESS_H264_START_CODE, + .max = V4L2_STATELESS_H264_START_CODE_NONE, + .def = V4L2_STATELESS_H264_START_CODE_NONE, }, .codec = CEDRUS_CODEC_H264, .required = false,
drivers/staging/media/sunxi/cedrus/cedrus_dec.c +6 -6
@@ -48,17 +48,17 @@ void cedrus_device_run(void *priv)case V4L2_PIX_FMT_H264_SLICE : run.h264.decode_params =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS ); +V4L2_CID_STATELESS_H264_DECODE_PARAMS ); run.h264.pps =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_PPS ); +V4L2_CID_STATELESS_H264_PPS ); run.h264.scaling_matrix =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX ); +V4L2_CID_STATELESS_H264_SCALING_MATRIX ); run.h264.slice_params =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS ); +V4L2_CID_STATELESS_H264_SLICE_PARAMS ); run.h264.sps =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_SPS ); +V4L2_CID_STATELESS_H264_SPS ); run.h264.pred_weights =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS ); +V4L2_CID_STATELESS_H264_PRED_WEIGHTS );break ;case V4L2_PIX_FMT_HEVC_SLICE :
include/media/h264-ctrls.h deleted +0 -404
404 lines not on this page · raw message
include/media/v4l2-ctrls.h +0 -1
@@ -19,7 +19,6 @@*/ #include <media/mpeg2-ctrls.h> #include <media/fwht-ctrls.h> -#include <media/h264-ctrls.h> #include <media/vp8-ctrls.h> #include <media/hevc-ctrls.h>
include/uapi/linux/v4l2-controls.h +381 -0
387 lines not on this page · raw message
include/uapi/linux/videodev2.h +6 -0
@@ -1734,6 +1734,12 @@ struct v4l2_ext_control {__u16 __user *p_u16;__u32 __user *p_u32;struct v4l2_area __user *p_area; +struct v4l2_ctrl_h264_sps __user *p_h264_sps; +struct v4l2_ctrl_h264_pps *p_h264_pps; +struct v4l2_ctrl_h264_scaling_matrix __user *p_h264_scaling_matrix; +struct v4l2_ctrl_h264_pred_weights __user *p_h264_pred_weights; +struct v4l2_ctrl_h264_slice_params __user *p_h264_slice_params; +struct v4l2_ctrl_h264_decode_params __user *p_h264_decode_params;void __user *ptr; }; } __attribute__ ((packed));
Signature · 1 line
2.27.0
Re: [PATCH v5 13/14] media: uapi: move H264 stateless controls out of staging
Em Thu, 26 Nov 2020 06:36:17 -0300 Ezequiel Garcia <[email protected]> escreveu:
Quoted 6 lines
The H264 stateless controls is ready to be part
of the stable uAPI.Re-number the control IDs, move them to the newly
created stateless control class, and updates all
the drivers accordingly.
Hmm... renumber and rename will break uAPI!
Nack.
If this is really needed, a backward-compatible logic should be provided.
Regards,
Mauro
Quoted 1,215 lines
Signed-off-by Ezequiel Garcia <[email protected]>Tested-by Jernej Skrabec <[email protected]>--- drivers/media/v4l2-core/v4l2-ctrls.c | 36 +- drivers/staging/media/hantro/hantro_drv.c | 26 +- drivers/staging/media/hantro/hantro_h264.c | 8 +- drivers/staging/media/rkvdec/rkvdec-h264.c | 8 +- drivers/staging/media/rkvdec/rkvdec.c | 26 +- drivers/staging/media/sunxi/cedrus/cedrus.c | 24 +- .../staging/media/sunxi/cedrus/cedrus_dec.c | 12 +- include/media/h264-ctrls.h | 404 ------------------ include/media/v4l2-ctrls.h | 1 - include/uapi/linux/v4l2-controls.h | 381 +++++++++++++++++ include/uapi/linux/videodev2.h | 6 + 11 files changed, 457 insertions(+), 475 deletions(-) delete mode 100644 include/media/h264-ctrls.hdrivers/media/v4l2-core/v4l2-ctrls.c +18
-18@@ -693,9 +693,9 @@ const char * const *v4l2_ctrl_get_menu(u32 id)return h264_fp_arrangement_type;case V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE :return h264_fmo_map_type; -case V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE : +case V4L2_CID_STATELESS_H264_DECODE_MODE :return h264_decode_mode; -case V4L2_CID_MPEG_VIDEO_H264_START_CODE : +case V4L2_CID_STATELESS_H264_START_CODE :return h264_start_code;case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL :return mpeg_mpeg2_level;@@ -920,14 +920,6 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP :return "H264 I-Frame Maximum QP Value" ;case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP :return "H264 P-Frame Minimum QP Value" ;case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP :return "H264 P-Frame Maximum QP Value" ; -case V4L2_CID_MPEG_VIDEO_H264_SPS :return "H264 Sequence Parameter Set" ; -case V4L2_CID_MPEG_VIDEO_H264_PPS :return "H264 Picture Parameter Set" ; -case V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX :return "H264 Scaling Matrix" ; -case V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS :return "H264 Slice Parameters" ; -case V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS :return "H264 Decode Parameters" ; -case V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE :return "H264 Decode Mode" ; -case V4L2_CID_MPEG_VIDEO_H264_START_CODE :return "H264 Start Code" ; -case V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS :return "H264 Prediction Weight Table" ;case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL :return "MPEG2 Level" ;case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE :return "MPEG2 Profile" ;case V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP :return "MPEG4 I-Frame QP Value" ;@@ -1185,6 +1177,14 @@ const char *v4l2_ctrl_get_name(u32 id)/* Stateless Codec controls */ /* Keep the order of the 'case's the same as in v4l2-controls.h! */ case V4L2_CID_CODEC_STATELESS_CLASS :return "Stateless Codec Controls" ; +case V4L2_CID_STATELESS_H264_DECODE_MODE :return "H264 Decode Mode" ; +case V4L2_CID_STATELESS_H264_START_CODE :return "H264 Start Code" ; +case V4L2_CID_STATELESS_H264_SPS :return "H264 Sequence Parameter Set" ; +case V4L2_CID_STATELESS_H264_PPS :return "H264 Picture Parameter Set" ; +case V4L2_CID_STATELESS_H264_SCALING_MATRIX :return "H264 Scaling Matrix" ; +case V4L2_CID_STATELESS_H264_PRED_WEIGHTS :return "H264 Prediction Weight Table" ; +case V4L2_CID_STATELESS_H264_SLICE_PARAMS :return "H264 Slice Parameters" ; +case V4L2_CID_STATELESS_H264_DECODE_PARAMS :return "H264 Decode Parameters" ;default :return NULL ; }@@ -1310,8 +1310,6 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC :case V4L2_CID_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE :case V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE : -case V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE : -case V4L2_CID_MPEG_VIDEO_H264_START_CODE :case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL :case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE :case V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL :@@ -1342,6 +1340,8 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_MPEG_VIDEO_HEVC_LOOP_FILTER_MODE :case V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE :case V4L2_CID_MPEG_VIDEO_HEVC_START_CODE : +case V4L2_CID_STATELESS_H264_DECODE_MODE : +case V4L2_CID_STATELESS_H264_START_CODE :case V4L2_CID_CAMERA_ORIENTATION : *type =V4L2_CTRL_TYPE_MENU ;break ;@@ -1436,22 +1436,22 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS : *type =V4L2_CTRL_TYPE_FWHT_PARAMS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_SPS : +case V4L2_CID_STATELESS_H264_SPS : *type =V4L2_CTRL_TYPE_H264_SPS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_PPS : +case V4L2_CID_STATELESS_H264_PPS : *type =V4L2_CTRL_TYPE_H264_PPS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX : +case V4L2_CID_STATELESS_H264_SCALING_MATRIX : *type =V4L2_CTRL_TYPE_H264_SCALING_MATRIX ;break ; -case V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS : +case V4L2_CID_STATELESS_H264_SLICE_PARAMS : *type =V4L2_CTRL_TYPE_H264_SLICE_PARAMS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS : +case V4L2_CID_STATELESS_H264_DECODE_PARAMS : *type =V4L2_CTRL_TYPE_H264_DECODE_PARAMS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS : +case V4L2_CID_STATELESS_H264_PRED_WEIGHTS : *type =V4L2_CTRL_TYPE_H264_PRED_WEIGHTS ;break ;case V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER :drivers/staging/media/hantro/hantro_drv.c +13
-13@@ -231,7 +231,7 @@ queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)static int hantro_try_ctrl (struct v4l2_ctrl *ctrl) { -if (ctrl->id ==V4L2_CID_MPEG_VIDEO_H264_SPS ) { +if (ctrl->id ==V4L2_CID_STATELESS_H264_SPS ) {const struct v4l2_ctrl_h264_sps *sps = ctrl->p_new.p_h264_sps;if (sps->chroma_format_idc >1 )@@ -304,39 +304,39 @@ static const struct hantro_ctrl controls[] = { }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS, + .id = V4L2_CID_STATELESS_H264_DECODE_PARAMS, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SPS, + .id = V4L2_CID_STATELESS_H264_SPS, .ops = &hantro_ctrl_ops, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_PPS, + .id = V4L2_CID_STATELESS_H264_PPS, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX, + .id = V4L2_CID_STATELESS_H264_SCALING_MATRIX, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE, - .min = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED, - .def = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED, - .max = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED, + .id = V4L2_CID_STATELESS_H264_DECODE_MODE, + .min = V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED, + .def = V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED, + .max = V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_START_CODE, - .min = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B, - .def = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B, - .max = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B, + .id = V4L2_CID_STATELESS_H264_START_CODE, + .min = V4L2_STATELESS_H264_START_CODE_ANNEX_B, + .def = V4L2_STATELESS_H264_START_CODE_ANNEX_B, + .max = V4L2_STATELESS_H264_START_CODE_ANNEX_B, }, }, { .codec = HANTRO_H264_DECODER,drivers/staging/media/hantro/hantro_h264.c +4
-4@@ -344,22 +344,22 @@ int hantro_h264_dec_prepare_run(struct hantro_ctx *ctx)hantro_start_prepare_run (ctx); ctrls->scaling = -hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX ); +hantro_get_ctrl (ctx,V4L2_CID_STATELESS_H264_SCALING_MATRIX );if (WARN_ON (!ctrls->scaling))return -EINVAL ; ctrls->decode = -hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS ); +hantro_get_ctrl (ctx,V4L2_CID_STATELESS_H264_DECODE_PARAMS );if (WARN_ON (!ctrls->decode))return -EINVAL ; ctrls->sps = -hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_H264_SPS ); +hantro_get_ctrl (ctx,V4L2_CID_STATELESS_H264_SPS );if (WARN_ON (!ctrls->sps))return -EINVAL ; ctrls->pps = -hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_H264_PPS ); +hantro_get_ctrl (ctx,V4L2_CID_STATELESS_H264_PPS );if (WARN_ON (!ctrls->pps))return -EINVAL ;drivers/staging/media/rkvdec/rkvdec-h264.c +4
-4@@ -1067,16 +1067,16 @@ static void rkvdec_h264_run_preamble(struct rkvdec_ctx *ctx,struct v4l2_ctrl *ctrl; ctrl =v4l2_ctrl_find (&ctx->ctrl_hdl, -V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS ); +V4L2_CID_STATELESS_H264_DECODE_PARAMS ); run->decode_params = ctrl ? ctrl->p_cur.p :NULL ; ctrl =v4l2_ctrl_find (&ctx->ctrl_hdl, -V4L2_CID_MPEG_VIDEO_H264_SPS ); +V4L2_CID_STATELESS_H264_SPS ); run->sps = ctrl ? ctrl->p_cur.p :NULL ; ctrl =v4l2_ctrl_find (&ctx->ctrl_hdl, -V4L2_CID_MPEG_VIDEO_H264_PPS ); +V4L2_CID_STATELESS_H264_PPS ); run->pps = ctrl ? ctrl->p_cur.p :NULL ; ctrl =v4l2_ctrl_find (&ctx->ctrl_hdl, -V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX ); +V4L2_CID_STATELESS_H264_SCALING_MATRIX ); run->scaling_matrix = ctrl ? ctrl->p_cur.p :NULL ;rkvdec_run_preamble (ctx, &run->base);drivers/staging/media/rkvdec/rkvdec.c +13
-13@@ -29,7 +29,7 @@static int rkvdec_try_ctrl (struct v4l2_ctrl *ctrl) { -if (ctrl->id ==V4L2_CID_MPEG_VIDEO_H264_SPS ) { +if (ctrl->id ==V4L2_CID_STATELESS_H264_SPS ) {const struct v4l2_ctrl_h264_sps *sps = ctrl->p_new.p_h264_sps;/* * TODO: The hardware supports 10-bit and 4:2:2 profiles, @@ -56,31 +56,31 @@ static const struct v4l2_ctrl_ops rkvdec_ctrl_ops = {static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = { { .mandatory = true, - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS , + .cfg.id =V4L2_CID_STATELESS_H264_DECODE_PARAMS , }, { .mandatory = true, - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_SPS , + .cfg.id =V4L2_CID_STATELESS_H264_SPS , .cfg.ops = &rkvdec_ctrl_ops, }, { .mandatory = true, - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_PPS , + .cfg.id =V4L2_CID_STATELESS_H264_PPS , }, { - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX , + .cfg.id =V4L2_CID_STATELESS_H264_SCALING_MATRIX , }, { - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE , - .cfg.min =V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED , - .cfg.max =V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED , - .cfg.def =V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED , + .cfg.id =V4L2_CID_STATELESS_H264_DECODE_MODE , + .cfg.min =V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED , + .cfg.max =V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED , + .cfg.def =V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED , }, { - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_START_CODE , - .cfg.min =V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B , - .cfg.def =V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B , - .cfg.max =V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B , + .cfg.id =V4L2_CID_STATELESS_H264_START_CODE , + .cfg.min =V4L2_STATELESS_H264_START_CODE_ANNEX_B , + .cfg.def =V4L2_STATELESS_H264_START_CODE_ANNEX_B , + .cfg.max =V4L2_STATELESS_H264_START_CODE_ANNEX_B , }, { .cfg.id =V4L2_CID_MPEG_VIDEO_H264_PROFILE ,drivers/staging/media/sunxi/cedrus/cedrus.c +12
-12@@ -45,60 +45,60 @@ static const struct cedrus_control cedrus_controls[] = { }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS, + .id = V4L2_CID_STATELESS_H264_DECODE_PARAMS, }, .codec = CEDRUS_CODEC_H264, .required = true, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS, + .id = V4L2_CID_STATELESS_H264_SLICE_PARAMS, }, .codec = CEDRUS_CODEC_H264, .required = true, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SPS, + .id = V4L2_CID_STATELESS_H264_SPS, }, .codec = CEDRUS_CODEC_H264, .required = true, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_PPS, + .id = V4L2_CID_STATELESS_H264_PPS, }, .codec = CEDRUS_CODEC_H264, .required = true, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX, + .id = V4L2_CID_STATELESS_H264_SCALING_MATRIX, }, .codec = CEDRUS_CODEC_H264, .required = false, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS, + .id = V4L2_CID_STATELESS_H264_PRED_WEIGHTS, }, .codec = CEDRUS_CODEC_H264, .required = false, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE, - .max = V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED, - .def = V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED, + .id = V4L2_CID_STATELESS_H264_DECODE_MODE, + .max = V4L2_STATELESS_H264_DECODE_MODE_SLICE_BASED, + .def = V4L2_STATELESS_H264_DECODE_MODE_SLICE_BASED, }, .codec = CEDRUS_CODEC_H264, .required = false, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_START_CODE, - .max = V4L2_MPEG_VIDEO_H264_START_CODE_NONE, - .def = V4L2_MPEG_VIDEO_H264_START_CODE_NONE, + .id = V4L2_CID_STATELESS_H264_START_CODE, + .max = V4L2_STATELESS_H264_START_CODE_NONE, + .def = V4L2_STATELESS_H264_START_CODE_NONE, }, .codec = CEDRUS_CODEC_H264, .required = false,drivers/staging/media/sunxi/cedrus/cedrus_dec.c +6
-6@@ -48,17 +48,17 @@ void cedrus_device_run(void *priv)case V4L2_PIX_FMT_H264_SLICE : run.h264.decode_params =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS ); +V4L2_CID_STATELESS_H264_DECODE_PARAMS ); run.h264.pps =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_PPS ); +V4L2_CID_STATELESS_H264_PPS ); run.h264.scaling_matrix =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX ); +V4L2_CID_STATELESS_H264_SCALING_MATRIX ); run.h264.slice_params =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS ); +V4L2_CID_STATELESS_H264_SLICE_PARAMS ); run.h264.sps =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_SPS ); +V4L2_CID_STATELESS_H264_SPS ); run.h264.pred_weights =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS ); +V4L2_CID_STATELESS_H264_PRED_WEIGHTS );break ;case V4L2_PIX_FMT_HEVC_SLICE :include/media/h264-ctrls.h deleted +0
-404@@ -1,404 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* These are the H.264 state controls for use with stateless H.264 -* codec drivers. -* -* It turns out that these structs are not stable yet and will undergo -* more changes. So keep them private until they are stable and ready to -* become part of the official public API. -*/ - -#ifndef _H264_CTRLS_H_ -#define _H264_CTRLS_H_ - -#include <linux/videodev2.h> - -/* -* Maximum DPB size, as specified by section 'A.3.1 Level limits -* common to the Baseline, Main, and Extended profiles'. -*/ -#define V4L2_H264_NUM_DPB_ENTRIES 16 - -#define V4L2_H264_REF_LIST_LEN (2 * V4L2_H264_NUM_DPB_ENTRIES) - -/* -* This is put insanely high to avoid conflicting with controls that -* would be added during the phase where those controls are not -* stable. It should be fixed eventually. -*/ -#define V4L2_CID_MPEG_VIDEO_H264_SPS (V4L2_CID_CODEC_BASE+1000) -#define V4L2_CID_MPEG_VIDEO_H264_PPS (V4L2_CID_CODEC_BASE+1001) -#define V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX (V4L2_CID_CODEC_BASE+1002) -#define V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS (V4L2_CID_CODEC_BASE+1003) -#define V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS (V4L2_CID_CODEC_BASE+1004) -#define V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE (V4L2_CID_CODEC_BASE+1005) -#define V4L2_CID_MPEG_VIDEO_H264_START_CODE (V4L2_CID_CODEC_BASE+1006) -#define V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS (V4L2_CID_CODEC_BASE+1007) - -/** -* enum v4l2_mpeg_video_h264_decode_mode - Decoding mode -* -* @V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED: indicates that decoding -* is performed one slice at a time. In this mode, -* V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS must contain the parsed slice -* parameters and the OUTPUT buffer must contain a single slice. -* V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF feature is used -* in order to support multislice frames. -* @V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED: indicates that -* decoding is performed per frame. The OUTPUT buffer must contain -* all slices and also both fields. This mode is typically supported -* by device drivers that are able to parse the slice(s) header(s) -* in hardware. When this mode is selected, -* V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS is not used. -*/ -enum v4l2_mpeg_video_h264_decode_mode { -V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED , -V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED , -}; - -/** -* enum v4l2_mpeg_video_h264_start_code - Start code -* -* @V4L2_MPEG_VIDEO_H264_START_CODE_NONE: slices are passed -* to the driver without any start code. -* @V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B: slices are passed -* to the driver with an Annex B start code prefix -* (legal start codes can be 3-bytes 0x000001 or 4-bytes 0x00000001). -* This mode is typically supported by device drivers that parse -* the start code in hardware. -*/ -enum v4l2_mpeg_video_h264_start_code { -V4L2_MPEG_VIDEO_H264_START_CODE_NONE , -V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B , -}; - -#define V4L2_H264_SPS_CONSTRAINT_SET0_FLAG 0x01 -#define V4L2_H264_SPS_CONSTRAINT_SET1_FLAG 0x02 -#define V4L2_H264_SPS_CONSTRAINT_SET2_FLAG 0x04 -#define V4L2_H264_SPS_CONSTRAINT_SET3_FLAG 0x08 -#define V4L2_H264_SPS_CONSTRAINT_SET4_FLAG 0x10 -#define V4L2_H264_SPS_CONSTRAINT_SET5_FLAG 0x20 - -#define V4L2_H264_SPS_FLAG_SEPARATE_COLOUR_PLANE 0x01 -#define V4L2_H264_SPS_FLAG_QPPRIME_Y_ZERO_TRANSFORM_BYPASS 0x02 -#define V4L2_H264_SPS_FLAG_DELTA_PIC_ORDER_ALWAYS_ZERO 0x04 -#define V4L2_H264_SPS_FLAG_GAPS_IN_FRAME_NUM_VALUE_ALLOWED 0x08 -#define V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY 0x10 -#define V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD 0x20 -#define V4L2_H264_SPS_FLAG_DIRECT_8X8_INFERENCE 0x40 - -#define V4L2_H264_SPS_HAS_CHROMA_FORMAT (sps) \ - ((sps)->profile_idc == 100 || (sps)->profile_idc == 110 || \ - (sps)->profile_idc == 122 || (sps)->profile_idc == 244 || \ - (sps)->profile_idc == 44 || (sps)->profile_idc == 83 || \ - (sps)->profile_idc == 86 || (sps)->profile_idc == 118 || \ - (sps)->profile_idc == 128 || (sps)->profile_idc == 138 || \ - (sps)->profile_idc == 139 || (sps)->profile_idc == 134 || \ - (sps)->profile_idc == 135) - -/** -* struct v4l2_ctrl_h264_sps - H264 sequence parameter set -* -* All the members on this sequence parameter set structure match the -* sequence parameter set syntax as specified by the H264 specification. -* -* @profile_idc: see H264 specification. -* @constraint_set_flags: see H264 specification. -* @level_idc: see H264 specification. -* @seq_parameter_set_id: see H264 specification. -* @chroma_format_idc: see H264 specification. -* @bit_depth_luma_minus8: see H264 specification. -* @bit_depth_chroma_minus8: see H264 specification. -* @log2_max_frame_num_minus4: see H264 specification. -* @pic_order_cnt_type: see H264 specification. -* @log2_max_pic_order_cnt_lsb_minus4: see H264 specification. -* @max_num_ref_frames: see H264 specification. -* @num_ref_frames_in_pic_order_cnt_cycle: see H264 specification. -* @offset_for_ref_frame: see H264 specification. -* @offset_for_non_ref_pic: see H264 specification. -* @offset_for_top_to_bottom_field: see H264 specification. -* @pic_width_in_mbs_minus1: see H264 specification. -* @pic_height_in_map_units_minus1: see H264 specification. -* @flags: see V4L2_H264_SPS_FLAG_{}. -*/ -struct v4l2_ctrl_h264_sps { -__u8 profile_idc; -__u8 constraint_set_flags; -__u8 level_idc; -__u8 seq_parameter_set_id; -__u8 chroma_format_idc; -__u8 bit_depth_luma_minus8; -__u8 bit_depth_chroma_minus8; -__u8 log2_max_frame_num_minus4; -__u8 pic_order_cnt_type; -__u8 log2_max_pic_order_cnt_lsb_minus4; -__u8 max_num_ref_frames; -__u8 num_ref_frames_in_pic_order_cnt_cycle; -__s32 offset_for_ref_frame[255 ]; -__s32 offset_for_non_ref_pic; -__s32 offset_for_top_to_bottom_field; -__u16 pic_width_in_mbs_minus1; -__u16 pic_height_in_map_units_minus1; -__u32 flags; -}; - -#define V4L2_H264_PPS_FLAG_ENTROPY_CODING_MODE 0x0001 -#define V4L2_H264_PPS_FLAG_BOTTOM_FIELD_PIC_ORDER_IN_FRAME_PRESENT 0x0002 -#define V4L2_H264_PPS_FLAG_WEIGHTED_PRED 0x0004 -#define V4L2_H264_PPS_FLAG_DEBLOCKING_FILTER_CONTROL_PRESENT 0x0008 -#define V4L2_H264_PPS_FLAG_CONSTRAINED_INTRA_PRED 0x0010 -#define V4L2_H264_PPS_FLAG_REDUNDANT_PIC_CNT_PRESENT 0x0020 -#define V4L2_H264_PPS_FLAG_TRANSFORM_8X8_MODE 0x0040 -#define V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT 0x0080 - -/** -* struct v4l2_ctrl_h264_pps - H264 picture parameter set -* -* Except where noted, all the members on this picture parameter set -* structure match the sequence parameter set syntax as specified -* by the H264 specification. -* -* In particular, V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT flag -* has a specific meaning. This flag should be set if a non-flat -* scaling matrix applies to the picture. In this case, applications -* are expected to use V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX, -* to pass the values of the non-flat matrices. -* -* @pic_parameter_set_id: see H264 specification. -* @seq_parameter_set_id: see H264 specification. -* @num_slice_groups_minus1: see H264 specification. -* @num_ref_idx_l0_default_active_minus1: see H264 specification. -* @num_ref_idx_l1_default_active_minus1: see H264 specification. -* @weighted_bipred_idc: see H264 specification. -* @pic_init_qp_minus26: see H264 specification. -* @pic_init_qs_minus26: see H264 specification. -* @chroma_qp_index_offset: see H264 specification. -* @second_chroma_qp_index_offset: see H264 specification. -* @flags: see V4L2_H264_PPS_FLAG_{}. -*/ -struct v4l2_ctrl_h264_pps { -__u8 pic_parameter_set_id; -__u8 seq_parameter_set_id; -__u8 num_slice_groups_minus1; -__u8 num_ref_idx_l0_default_active_minus1; -__u8 num_ref_idx_l1_default_active_minus1; -__u8 weighted_bipred_idc; -__s8 pic_init_qp_minus26; -__s8 pic_init_qs_minus26; -__s8 chroma_qp_index_offset; -__s8 second_chroma_qp_index_offset; -__u16 flags; -}; - -/** -* struct v4l2_ctrl_h264_scaling_matrix - H264 scaling matrices -* -* @scaling_list_4x4: scaling matrix after applying the inverse -* scanning process. Expected list order is Intra Y, Intra Cb, -* Intra Cr, Inter Y, Inter Cb, Inter Cr. The values on each -* scaling list are expected in raster scan order. -* @scaling_list_8x8: scaling matrix after applying the inverse -* scanning process. Expected list order is Intra Y, Inter Y, -* Intra Cb, Inter Cb, Intra Cr, Inter Cr. The values on each -* scaling list are expected in raster scan order. -* -* Note that the list order is different for the 4x4 and 8x8 -* matrices as per the H264 specification, see table 7-2 "Assignment -* of mnemonic names to scaling list indices and specification of -* fall-back rule". -*/ -struct v4l2_ctrl_h264_scaling_matrix { -__u8 scaling_list_4x4[6 ][16 ]; -__u8 scaling_list_8x8[6 ][64 ]; -}; - -struct v4l2_h264_weight_factors { -__s16 luma_weight[32 ]; -__s16 luma_offset[32 ]; -__s16 chroma_weight[32 ][2 ]; -__s16 chroma_offset[32 ][2 ]; -}; - -#define V4L2_H264_CTRL_PRED_WEIGHTS_REQUIRED (pps, slice) \ - ((((pps)->flags & V4L2_H264_PPS_FLAG_WEIGHTED_PRED) && \ - ((slice)->slice_type == V4L2_H264_SLICE_TYPE_P || \ - (slice)->slice_type == V4L2_H264_SLICE_TYPE_SP)) || \ - ((pps)->weighted_bipred_idc == 1 && \ - (slice)->slice_type == V4L2_H264_SLICE_TYPE_B)) - -/** -* struct v4l2_ctrl_h264_pred_weights - Prediction weight table -* -* Prediction weight table, which matches the syntax specified -* by the H264 specification. -* -* @luma_log2_weight_denom: see H264 specification. -* @chroma_log2_weight_denom: see H264 specification. -* @weight_factors: luma and chroma weight factors. -*/ -struct v4l2_ctrl_h264_pred_weights { -__u16 luma_log2_weight_denom; -__u16 chroma_log2_weight_denom; -struct v4l2_h264_weight_factors weight_factors[2 ]; -}; - -#define V4L2_H264_SLICE_TYPE_P 0 -#define V4L2_H264_SLICE_TYPE_B 1 -#define V4L2_H264_SLICE_TYPE_I 2 -#define V4L2_H264_SLICE_TYPE_SP 3 -#define V4L2_H264_SLICE_TYPE_SI 4 - -#define V4L2_H264_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED 0x01 -#define V4L2_H264_SLICE_FLAG_SP_FOR_SWITCH 0x02 - -#define V4L2_H264_TOP_FIELD_REF 0x1 -#define V4L2_H264_BOTTOM_FIELD_REF 0x2 -#define V4L2_H264_FRAME_REF 0x3 - -/** -* struct v4l2_h264_reference - H264 picture reference -* -* @fields: indicates how the picture is referenced. -* Valid values are V4L2_H264_{}_REF. -* @index: index into v4l2_ctrl_h264_decode_params.dpb[]. -*/ -struct v4l2_h264_reference { -__u8 fields; -__u8 index; -}; - -/** -* struct v4l2_ctrl_h264_slice_params - H264 slice parameters -* -* This structure holds the H264 syntax elements that are specified -* as non-invariant for the slices in a given frame. -* -* Slice invariant syntax elements are contained in struct -* v4l2_ctrl_h264_decode_params. This is done to reduce the API surface -* on frame-based decoders, where slice header parsing is done by the -* hardware. -* -* Slice invariant syntax elements are specified in specification section -* "7.4.3 Slice header semantics". -* -* Except where noted, the members on this struct match the slice header syntax. -* -* @header_bit_size: offset in bits to slice_data() from the beginning of this slice. -* @first_mb_in_slice: see H264 specification. -* @slice_type: see H264 specification. -* @colour_plane_id: see H264 specification. -* @redundant_pic_cnt: see H264 specification. -* @cabac_init_idc: see H264 specification. -* @slice_qp_delta: see H264 specification. -* @slice_qs_delta: see H264 specification. -* @disable_deblocking_filter_idc: see H264 specification. -* @slice_alpha_c0_offset_div2: see H264 specification. -* @slice_beta_offset_div2: see H264 specification. -* @num_ref_idx_l0_active_minus1: see H264 specification. -* @num_ref_idx_l1_active_minus1: see H264 specification. -* @reserved: padding field. Should be zeroed by applications. -* @ref_pic_list0: reference picture list 0 after applying the per-slice modifications. -* @ref_pic_list1: reference picture list 1 after applying the per-slice modifications. -* @flags: see V4L2_H264_SLICE_FLAG_{}. -*/ -struct v4l2_ctrl_h264_slice_params { -__u32 header_bit_size; -__u32 first_mb_in_slice; -__u8 slice_type; -__u8 colour_plane_id; -__u8 redundant_pic_cnt; -__u8 cabac_init_idc; -__s8 slice_qp_delta; -__s8 slice_qs_delta; -__u8 disable_deblocking_filter_idc; -__s8 slice_alpha_c0_offset_div2; -__s8 slice_beta_offset_div2; -__u8 num_ref_idx_l0_active_minus1; -__u8 num_ref_idx_l1_active_minus1; - -__u8 reserved; - -struct v4l2_h264_reference ref_pic_list0[V4L2_H264_REF_LIST_LEN ]; -struct v4l2_h264_reference ref_pic_list1[V4L2_H264_REF_LIST_LEN ]; - -__u32 flags; -}; - -#define V4L2_H264_DPB_ENTRY_FLAG_VALID 0x01 -#define V4L2_H264_DPB_ENTRY_FLAG_ACTIVE 0x02 -#define V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM 0x04 -#define V4L2_H264_DPB_ENTRY_FLAG_FIELD 0x08 - -/** -* struct v4l2_h264_dpb_entry - H264 decoded picture buffer entry -* -* @reference_ts: timestamp of the V4L2 capture buffer to use as reference. -* The timestamp refers to the timestamp field in struct v4l2_buffer. -* Use v4l2_timeval_to_ns() to convert the struct timeval to a __u64. -* @pic_num: matches PicNum variable assigned during the reference -* picture lists construction process. -* @frame_num: frame identifier which matches frame_num syntax element. -* @fields: indicates how the DPB entry is referenced. Valid values are -* V4L2_H264_{}_REF. -* @reserved: padding field. Should be zeroed by applications. -* @top_field_order_cnt: matches TopFieldOrderCnt picture value. -* @bottom_field_order_cnt: matches BottomFieldOrderCnt picture value. -* Note that picture field is indicated by v4l2_buffer.field. -* @flags: see V4L2_H264_DPB_ENTRY_FLAG_{}. -*/ -struct v4l2_h264_dpb_entry { -__u64 reference_ts; -__u32 pic_num; -__u16 frame_num; -__u8 fields; -__u8 reserved[5 ]; -__s32 top_field_order_cnt; -__s32 bottom_field_order_cnt; -__u32 flags; -}; - -#define V4L2_H264_DECODE_PARAM_FLAG_IDR_PIC 0x01 -#define V4L2_H264_DECODE_PARAM_FLAG_FIELD_PIC 0x02 -#define V4L2_H264_DECODE_PARAM_FLAG_BOTTOM_FIELD 0x04 - -/** -* struct v4l2_ctrl_h264_decode_params - H264 decoding parameters -* -* @dpb: decoded picture buffer. -* @nal_ref_idc: slice header syntax element. -* @frame_num: slice header syntax element. -* @top_field_order_cnt: matches TopFieldOrderCnt picture value. -* @bottom_field_order_cnt: matches BottomFieldOrderCnt picture value. -* Note that picture field is indicated by v4l2_buffer.field. -* @idr_pic_id: slice header syntax element. -* @pic_order_cnt_lsb: slice header syntax element. -* @delta_pic_order_cnt_bottom: slice header syntax element. -* @delta_pic_order_cnt0: slice header syntax element. -* @delta_pic_order_cnt1: slice header syntax element. -* @dec_ref_pic_marking_bit_size: size in bits of dec_ref_pic_marking() -* syntax element. -* @pic_order_cnt_bit_size: size in bits of pic order count syntax. -* @slice_group_change_cycle: slice header syntax element. -* @reserved: padding field. Should be zeroed by applications. -* @flags: see V4L2_H264_DECODE_PARAM_FLAG_{}. -*/ -struct v4l2_ctrl_h264_decode_params { -struct v4l2_h264_dpb_entry dpb[V4L2_H264_NUM_DPB_ENTRIES ]; -__u16 nal_ref_idc; -__u16 frame_num; -__s32 top_field_order_cnt; -__s32 bottom_field_order_cnt; -__u16 idr_pic_id; -__u16 pic_order_cnt_lsb; -__s32 delta_pic_order_cnt_bottom; -__s32 delta_pic_order_cnt0; -__s32 delta_pic_order_cnt1; -__u32 dec_ref_pic_marking_bit_size; -__u32 pic_order_cnt_bit_size; -__u32 slice_group_change_cycle; - -__u32 reserved; -__u32 flags; -}; - -#endif include/media/v4l2-ctrls.h +0
-1@@ -19,7 +19,6 @@*/ #include <media/mpeg2-ctrls.h> #include <media/fwht-ctrls.h> -#include <media/h264-ctrls.h> #include <media/vp8-ctrls.h> #include <media/hevc-ctrls.h> include/uapi/linux/v4l2-controls.h +381
-0@@ -1183,6 +1183,387 @@ enum v4l2_detect_md_mode {#define V4L2_CID_CODEC_STATELESS_BASE (V4L2_CTRL_CLASS_CODEC_STATELESS | 0x900)#define V4L2_CID_CODEC_STATELESS_CLASS (V4L2_CTRL_CLASS_CODEC_STATELESS | 1) +#define V4L2_CID_STATELESS_H264_DECODE_MODE (V4L2_CID_CODEC_STATELESS_BASE + 0) +/** +* enum v4l2_stateless_h264_decode_mode - Decoding mode +* +* @V4L2_STATELESS_H264_DECODE_MODE_SLICE_BASED: indicates that decoding +* is performed one slice at a time. In this mode, +* V4L2_CID_STATELESS_H264_SLICE_PARAMS must contain the parsed slice +* parameters and the OUTPUT buffer must contain a single slice. +* V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF feature is used +* in order to support multislice frames. +* @V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED: indicates that +* decoding is performed per frame. The OUTPUT buffer must contain +* all slices and also both fields. This mode is typically supported +* by device drivers that are able to parse the slice(s) header(s) +* in hardware. When this mode is selected, +* V4L2_CID_STATELESS_H264_SLICE_PARAMS is not used. +*/ +enum v4l2_stateless_h264_decode_mode { +V4L2_STATELESS_H264_DECODE_MODE_SLICE_BASED , +V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED , +}; + +#define V4L2_CID_STATELESS_H264_START_CODE (V4L2_CID_CODEC_STATELESS_BASE + 1) +/** +* enum v4l2_stateless_h264_start_code - Start code +* +* @V4L2_STATELESS_H264_START_CODE_NONE: slices are passed +* to the driver without any start code. +* @V4L2_STATELESS_H264_START_CODE_ANNEX_B: slices are passed +* to the driver with an Annex B start code prefix +* (legal start codes can be 3-bytes 0x000001 or 4-bytes 0x00000001). +* This mode is typically supported by device drivers that parse +* the start code in hardware. +*/ +enum v4l2_stateless_h264_start_code { +V4L2_STATELESS_H264_START_CODE_NONE , +V4L2_STATELESS_H264_START_CODE_ANNEX_B , +}; + +#define V4L2_H264_SPS_CONSTRAINT_SET0_FLAG 0x01 +#define V4L2_H264_SPS_CONSTRAINT_SET1_FLAG 0x02 +#define V4L2_H264_SPS_CONSTRAINT_SET2_FLAG 0x04 +#define V4L2_H264_SPS_CONSTRAINT_SET3_FLAG 0x08 +#define V4L2_H264_SPS_CONSTRAINT_SET4_FLAG 0x10 +#define V4L2_H264_SPS_CONSTRAINT_SET5_FLAG 0x20 + +#define V4L2_H264_SPS_FLAG_SEPARATE_COLOUR_PLANE 0x01 +#define V4L2_H264_SPS_FLAG_QPPRIME_Y_ZERO_TRANSFORM_BYPASS 0x02 +#define V4L2_H264_SPS_FLAG_DELTA_PIC_ORDER_ALWAYS_ZERO 0x04 +#define V4L2_H264_SPS_FLAG_GAPS_IN_FRAME_NUM_VALUE_ALLOWED 0x08 +#define V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY 0x10 +#define V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD 0x20 +#define V4L2_H264_SPS_FLAG_DIRECT_8X8_INFERENCE 0x40 + +#define V4L2_H264_SPS_HAS_CHROMA_FORMAT (sps) \ + ((sps)->profile_idc == 100 || (sps)->profile_idc == 110 || \ + (sps)->profile_idc == 122 || (sps)->profile_idc == 244 || \ + (sps)->profile_idc == 44 || (sps)->profile_idc == 83 || \ + (sps)->profile_idc == 86 || (sps)->profile_idc == 118 || \ + (sps)->profile_idc == 128 || (sps)->profile_idc == 138 || \ + (sps)->profile_idc == 139 || (sps)->profile_idc == 134 || \ + (sps)->profile_idc == 135) + +#define V4L2_CID_STATELESS_H264_SPS (V4L2_CID_CODEC_STATELESS_BASE + 2) +/** +* struct v4l2_ctrl_h264_sps - H264 sequence parameter set +* +* All the members on this sequence parameter set structure match the +* sequence parameter set syntax as specified by the H264 specification. +* +* @profile_idc: see H264 specification. +* @constraint_set_flags: see H264 specification. +* @level_idc: see H264 specification. +* @seq_parameter_set_id: see H264 specification. +* @chroma_format_idc: see H264 specification. +* @bit_depth_luma_minus8: see H264 specification. +* @bit_depth_chroma_minus8: see H264 specification. +* @log2_max_frame_num_minus4: see H264 specification. +* @pic_order_cnt_type: see H264 specification. +* @log2_max_pic_order_cnt_lsb_minus4: see H264 specification. +* @max_num_ref_frames: see H264 specification. +* @num_ref_frames_in_pic_order_cnt_cycle: see H264 specification. +* @offset_for_ref_frame: see H264 specification. +* @offset_for_non_ref_pic: see H264 specification. +* @offset_for_top_to_bottom_field: see H264 specification. +* @pic_width_in_mbs_minus1: see H264 specification. +* @pic_height_in_map_units_minus1: see H264 specification. +* @flags: see V4L2_H264_SPS_FLAG_{}. +*/ +struct v4l2_ctrl_h264_sps { +__u8 profile_idc; +__u8 constraint_set_flags; +__u8 level_idc; +__u8 seq_parameter_set_id; +__u8 chroma_format_idc; +__u8 bit_depth_luma_minus8; +__u8 bit_depth_chroma_minus8; +__u8 log2_max_frame_num_minus4; +__u8 pic_order_cnt_type; +__u8 log2_max_pic_order_cnt_lsb_minus4; +__u8 max_num_ref_frames; +__u8 num_ref_frames_in_pic_order_cnt_cycle; +__s32 offset_for_ref_frame[255 ]; +__s32 offset_for_non_ref_pic; +__s32 offset_for_top_to_bottom_field; +__u16 pic_width_in_mbs_minus1; +__u16 pic_height_in_map_units_minus1; +__u32 flags; +}; + +#define V4L2_H264_PPS_FLAG_ENTROPY_CODING_MODE 0x0001 +#define V4L2_H264_PPS_FLAG_BOTTOM_FIELD_PIC_ORDER_IN_FRAME_PRESENT 0x0002 +#define V4L2_H264_PPS_FLAG_WEIGHTED_PRED 0x0004 +#define V4L2_H264_PPS_FLAG_DEBLOCKING_FILTER_CONTROL_PRESENT 0x0008 +#define V4L2_H264_PPS_FLAG_CONSTRAINED_INTRA_PRED 0x0010 +#define V4L2_H264_PPS_FLAG_REDUNDANT_PIC_CNT_PRESENT 0x0020 +#define V4L2_H264_PPS_FLAG_TRANSFORM_8X8_MODE 0x0040 +#define V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT 0x0080 + +#define V4L2_CID_STATELESS_H264_PPS (V4L2_CID_CODEC_STATELESS_BASE + 3) +/** +* struct v4l2_ctrl_h264_pps - H264 picture parameter set +* +* Except where noted, all the members on this picture parameter set +* structure match the sequence parameter set syntax as specified +* by the H264 specification. +* +* In particular, V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT flag +* has a specific meaning. This flag should be set if a non-flat +* scaling matrix applies to the picture. In this case, applications +* are expected to use V4L2_CID_STATELESS_H264_SCALING_MATRIX, +* to pass the values of the non-flat matrices. +* +* @pic_parameter_set_id: see H264 specification. +* @seq_parameter_set_id: see H264 specification. +* @num_slice_groups_minus1: see H264 specification. +* @num_ref_idx_l0_default_active_minus1: see H264 specification. +* @num_ref_idx_l1_default_active_minus1: see H264 specification. +* @weighted_bipred_idc: see H264 specification. +* @pic_init_qp_minus26: see H264 specification. +* @pic_init_qs_minus26: see H264 specification. +* @chroma_qp_index_offset: see H264 specification. +* @second_chroma_qp_index_offset: see H264 specification. +* @flags: see V4L2_H264_PPS_FLAG_{}. +*/ +struct v4l2_ctrl_h264_pps { +__u8 pic_parameter_set_id; +__u8 seq_parameter_set_id; +__u8 num_slice_groups_minus1; +__u8 num_ref_idx_l0_default_active_minus1; +__u8 num_ref_idx_l1_default_active_minus1; +__u8 weighted_bipred_idc; +__s8 pic_init_qp_minus26; +__s8 pic_init_qs_minus26; +__s8 chroma_qp_index_offset; +__s8 second_chroma_qp_index_offset; +__u16 flags; +}; + +#define V4L2_CID_STATELESS_H264_SCALING_MATRIX (V4L2_CID_CODEC_STATELESS_BASE + 4) +/** +* struct v4l2_ctrl_h264_scaling_matrix - H264 scaling matrices +* +* @scaling_list_4x4: scaling matrix after applying the inverse +* scanning process. Expected list order is Intra Y, Intra Cb, +* Intra Cr, Inter Y, Inter Cb, Inter Cr. The values on each +* scaling list are expected in raster scan order. +* @scaling_list_8x8: scaling matrix after applying the inverse +* scanning process. Expected list order is Intra Y, Inter Y, +* Intra Cb, Inter Cb, Intra Cr, Inter Cr. The values on each +* scaling list are expected in raster scan order. +* +* Note that the list order is different for the 4x4 and 8x8 +* matrices as per the H264 specification, see table 7-2 "Assignment +* of mnemonic names to scaling list indices and specification of +* fall-back rule". +*/ +struct v4l2_ctrl_h264_scaling_matrix { +__u8 scaling_list_4x4[6 ][16 ]; +__u8 scaling_list_8x8[6 ][64 ]; +}; + +struct v4l2_h264_weight_factors { +__s16 luma_weight[32 ]; +__s16 luma_offset[32 ]; +__s16 chroma_weight[32 ][2 ]; +__s16 chroma_offset[32 ][2 ]; +}; + +#define V4L2_H264_CTRL_PRED_WEIGHTS_REQUIRED (pps, slice) \ + ((((pps)->flags & V4L2_H264_PPS_FLAG_WEIGHTED_PRED) && \ + ((slice)->slice_type == V4L2_H264_SLICE_TYPE_P || \ + (slice)->slice_type == V4L2_H264_SLICE_TYPE_SP)) || \ + ((pps)->weighted_bipred_idc == 1 && \ + (slice)->slice_type == V4L2_H264_SLICE_TYPE_B)) + +#define V4L2_CID_STATELESS_H264_PRED_WEIGHTS (V4L2_CID_CODEC_STATELESS_BASE + 5) +/** +* struct v4l2_ctrl_h264_pred_weights - Prediction weight table +* +* Prediction weight table, which matches the syntax specified +* by the H264 specification. +* +* @luma_log2_weight_denom: see H264 specification. +* @chroma_log2_weight_denom: see H264 specification. +* @weight_factors: luma and chroma weight factors. +*/ +struct v4l2_ctrl_h264_pred_weights { +__u16 luma_log2_weight_denom; +__u16 chroma_log2_weight_denom; +struct v4l2_h264_weight_factors weight_factors[2 ]; +}; + +#define V4L2_H264_SLICE_TYPE_P 0 +#define V4L2_H264_SLICE_TYPE_B 1 +#define V4L2_H264_SLICE_TYPE_I 2 +#define V4L2_H264_SLICE_TYPE_SP 3 +#define V4L2_H264_SLICE_TYPE_SI 4 + +#define V4L2_H264_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED 0x01 +#define V4L2_H264_SLICE_FLAG_SP_FOR_SWITCH 0x02 + +#define V4L2_H264_TOP_FIELD_REF 0x1 +#define V4L2_H264_BOTTOM_FIELD_REF 0x2 +#define V4L2_H264_FRAME_REF 0x3 + +/** +* struct v4l2_h264_reference - H264 picture reference +* +* @fields: indicates how the picture is referenced. +* Valid values are V4L2_H264_{}_REF. +* @index: index into v4l2_ctrl_h264_decode_params.dpb[]. +*/ +struct v4l2_h264_reference { +__u8 fields; +__u8 index; +}; + +/* +* Maximum DPB size, as specified by section 'A.3.1 Level limits +* common to the Baseline, Main, and Extended profiles'. +*/ +#define V4L2_H264_NUM_DPB_ENTRIES 16 +#define V4L2_H264_REF_LIST_LEN (2 * V4L2_H264_NUM_DPB_ENTRIES) + +#define V4L2_CID_STATELESS_H264_SLICE_PARAMS (V4L2_CID_CODEC_STATELESS_BASE + 6) +/** +* struct v4l2_ctrl_h264_slice_params - H264 slice parameters +* +* This structure holds the H264 syntax elements that are specified +* as non-invariant for the slices in a given frame. +* +* Slice invariant syntax elements are contained in struct +* v4l2_ctrl_h264_decode_params. This is done to reduce the API surface +* on frame-based decoders, where slice header parsing is done by the +* hardware. +* +* Slice invariant syntax elements are specified in specification section +* "7.4.3 Slice header semantics". +* +* Except where noted, the members on this struct match the slice header syntax. +* +* @header_bit_size: offset in bits to slice_data() from the beginning of this slice. +* @first_mb_in_slice: see H264 specification. +* @slice_type: see H264 specification. +* @colour_plane_id: see H264 specification. +* @redundant_pic_cnt: see H264 specification. +* @cabac_init_idc: see H264 specification. +* @slice_qp_delta: see H264 specification. +* @slice_qs_delta: see H264 specification. +* @disable_deblocking_filter_idc: see H264 specification. +* @slice_alpha_c0_offset_div2: see H264 specification. +* @slice_beta_offset_div2: see H264 specification. +* @num_ref_idx_l0_active_minus1: see H264 specification. +* @num_ref_idx_l1_active_minus1: see H264 specification. +* @reserved: padding field. Should be zeroed by applications. +* @ref_pic_list0: reference picture list 0 after applying the per-slice modifications. +* @ref_pic_list1: reference picture list 1 after applying the per-slice modifications. +* @flags: see V4L2_H264_SLICE_FLAG_{}. +*/ +struct v4l2_ctrl_h264_slice_params { +__u32 header_bit_size; +__u32 first_mb_in_slice; +__u8 slice_type; +__u8 colour_plane_id; +__u8 redundant_pic_cnt; +__u8 cabac_init_idc; +__s8 slice_qp_delta; +__s8 slice_qs_delta; +__u8 disable_deblocking_filter_idc; +__s8 slice_alpha_c0_offset_div2; +__s8 slice_beta_offset_div2; +__u8 num_ref_idx_l0_active_minus1; +__u8 num_ref_idx_l1_active_minus1; + +__u8 reserved; + +struct v4l2_h264_reference ref_pic_list0[V4L2_H264_REF_LIST_LEN ]; +struct v4l2_h264_reference ref_pic_list1[V4L2_H264_REF_LIST_LEN ]; + +__u32 flags; +}; + +#define V4L2_H264_DPB_ENTRY_FLAG_VALID 0x01 +#define V4L2_H264_DPB_ENTRY_FLAG_ACTIVE 0x02 +#define V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM 0x04 +#define V4L2_H264_DPB_ENTRY_FLAG_FIELD 0x08 + +/** +* struct v4l2_h264_dpb_entry - H264 decoded picture buffer entry +* +* @reference_ts: timestamp of the V4L2 capture buffer to use as reference. +* The timestamp refers to the timestamp field in struct v4l2_buffer. +* Use v4l2_timeval_to_ns() to convert the struct timeval to a __u64. +* @pic_num: matches PicNum variable assigned during the reference +* picture lists construction process. +* @frame_num: frame identifier which matches frame_num syntax element. +* @fields: indicates how the DPB entry is referenced. Valid values are +* V4L2_H264_{}_REF. +* @reserved: padding field. Should be zeroed by applications. +* @top_field_order_cnt: matches TopFieldOrderCnt picture value. +* @bottom_field_order_cnt: matches BottomFieldOrderCnt picture value. +* Note that picture field is indicated by v4l2_buffer.field. +* @flags: see V4L2_H264_DPB_ENTRY_FLAG_{}. +*/ +struct v4l2_h264_dpb_entry { +__u64 reference_ts; +__u32 pic_num; +__u16 frame_num; +__u8 fields; +__u8 reserved[5 ]; +__s32 top_field_order_cnt; +__s32 bottom_field_order_cnt; +__u32 flags; +}; + +#define V4L2_H264_DECODE_PARAM_FLAG_IDR_PIC 0x01 +#define V4L2_H264_DECODE_PARAM_FLAG_FIELD_PIC 0x02 +#define V4L2_H264_DECODE_PARAM_FLAG_BOTTOM_FIELD 0x04 + +#define V4L2_CID_STATELESS_H264_DECODE_PARAMS (V4L2_CID_CODEC_STATELESS_BASE + 7) +/** +* struct v4l2_ctrl_h264_decode_params - H264 decoding parameters +* +* @dpb: decoded picture buffer. +* @nal_ref_idc: slice header syntax element. +* @frame_num: slice header syntax element. +* @top_field_order_cnt: matches TopFieldOrderCnt picture value. +* @bottom_field_order_cnt: matches BottomFieldOrderCnt picture value. +* Note that picture field is indicated by v4l2_buffer.field. +* @idr_pic_id: slice header syntax element. +* @pic_order_cnt_lsb: slice header syntax element. +* @delta_pic_order_cnt_bottom: slice header syntax element. +* @delta_pic_order_cnt0: slice header syntax element. +* @delta_pic_order_cnt1: slice header syntax element. +* @dec_ref_pic_marking_bit_size: size in bits of dec_ref_pic_marking() +* syntax element. +* @pic_order_cnt_bit_size: size in bits of pic order count syntax. +* @slice_group_change_cycle: slice header syntax element. +* @reserved: padding field. Should be zeroed by applications. +* @flags: see V4L2_H264_DECODE_PARAM_FLAG_{}. +*/ +struct v4l2_ctrl_h264_decode_params { +struct v4l2_h264_dpb_entry dpb[V4L2_H264_NUM_DPB_ENTRIES ]; +__u16 nal_ref_idc; +__u16 frame_num; +__s32 top_field_order_cnt; +__s32 bottom_field_order_cnt; +__u16 idr_pic_id; +__u16 pic_order_cnt_lsb; +__s32 delta_pic_order_cnt_bottom; +__s32 delta_pic_order_cnt0; +__s32 delta_pic_order_cnt1; +__u32 dec_ref_pic_marking_bit_size; +__u32 pic_order_cnt_bit_size; +__u32 slice_group_change_cycle; + +__u32 reserved; +__u32 flags; +}; +/* MPEG-compression definitions kept for backwards compatibility */ #ifndef __KERNEL__include/uapi/linux/videodev2.h +0
-0@@ -1734,6 +1734,12 @@ struct v4l2_ext_control {__u16 __user *p_u16;__u32 __user *p_u32;
include/uapi/linux/videodev2.h struct v4l2_ext_control { · line 1745
Quoted 10 lines
include/uapi/linux/videodev2.h +6
-0struct v4l2_area __user *p_area; +struct v4l2_ctrl_h264_sps __user *p_h264_sps; +struct v4l2_ctrl_h264_pps *p_h264_pps; +struct v4l2_ctrl_h264_scaling_matrix __user *p_h264_scaling_matrix; +struct v4l2_ctrl_h264_pred_weights __user *p_h264_pred_weights; +struct v4l2_ctrl_h264_slice_params __user *p_h264_slice_params; +struct v4l2_ctrl_h264_decode_params __user *p_h264_decode_params;void __user *ptr; }; } __attribute__ ((packed));
Thanks,
Mauro
Re: [PATCH v5 13/14] media: uapi: move H264 stateless controls out of staging
Quoted 11 lines · Mauro Carvalho Chehab
Em Thu, 26 Nov 2020 06:36:17 -0300 Ezequiel Garcia <[email protected]> escreveu:
Quoted 6 lines
The H264 stateless controls is ready to be part
of the stable uAPI.Re-number the control IDs, move them to the newly
created stateless control class, and updates all
the drivers accordingly.
Quoted 6 lines
Hmm... renumber and rename will break uAPI!
Nack.
If this is really needed, a backward-compatible logic should be provided.
The H.264 stateless 'uAPI' was staging and marked explicitly in the V4L2 specification that it will change and is unstable. And it has in fact changed several times.
By renumbering these control IDs it in fact avoids any possible confusion if someone based their work on the unstable uAPI.
Note that these control IDs were *never* exported as a public API, they were only defined in kernel-local headers (h264-ctrls.h). So applications that wanted to use this staging API had to manually copy that header.
In other words, there never was a public API for this since the H.264 header was never exported.
Regards,
Hans
Quoted 1,235 lines
Regards,
MauroQuoted 1,215 lines
Signed-off-by Ezequiel Garcia <[email protected]>Tested-by Jernej Skrabec <[email protected]>--- drivers/media/v4l2-core/v4l2-ctrls.c | 36 +- drivers/staging/media/hantro/hantro_drv.c | 26 +- drivers/staging/media/hantro/hantro_h264.c | 8 +- drivers/staging/media/rkvdec/rkvdec-h264.c | 8 +- drivers/staging/media/rkvdec/rkvdec.c | 26 +- drivers/staging/media/sunxi/cedrus/cedrus.c | 24 +- .../staging/media/sunxi/cedrus/cedrus_dec.c | 12 +- include/media/h264-ctrls.h | 404 ------------------ include/media/v4l2-ctrls.h | 1 - include/uapi/linux/v4l2-controls.h | 381 +++++++++++++++++ include/uapi/linux/videodev2.h | 6 + 11 files changed, 457 insertions(+), 475 deletions(-) delete mode 100644 include/media/h264-ctrls.hdrivers/media/v4l2-core/v4l2-ctrls.c +18
-18@@ -693,9 +693,9 @@ const char * const *v4l2_ctrl_get_menu(u32 id)return h264_fp_arrangement_type;case V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE :return h264_fmo_map_type; -case V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE : +case V4L2_CID_STATELESS_H264_DECODE_MODE :return h264_decode_mode; -case V4L2_CID_MPEG_VIDEO_H264_START_CODE : +case V4L2_CID_STATELESS_H264_START_CODE :return h264_start_code;case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL :return mpeg_mpeg2_level;@@ -920,14 +920,6 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP :return "H264 I-Frame Maximum QP Value" ;case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP :return "H264 P-Frame Minimum QP Value" ;case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP :return "H264 P-Frame Maximum QP Value" ; -case V4L2_CID_MPEG_VIDEO_H264_SPS :return "H264 Sequence Parameter Set" ; -case V4L2_CID_MPEG_VIDEO_H264_PPS :return "H264 Picture Parameter Set" ; -case V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX :return "H264 Scaling Matrix" ; -case V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS :return "H264 Slice Parameters" ; -case V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS :return "H264 Decode Parameters" ; -case V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE :return "H264 Decode Mode" ; -case V4L2_CID_MPEG_VIDEO_H264_START_CODE :return "H264 Start Code" ; -case V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS :return "H264 Prediction Weight Table" ;case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL :return "MPEG2 Level" ;case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE :return "MPEG2 Profile" ;case V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP :return "MPEG4 I-Frame QP Value" ;@@ -1185,6 +1177,14 @@ const char *v4l2_ctrl_get_name(u32 id)/* Stateless Codec controls */ /* Keep the order of the 'case's the same as in v4l2-controls.h! */ case V4L2_CID_CODEC_STATELESS_CLASS :return "Stateless Codec Controls" ; +case V4L2_CID_STATELESS_H264_DECODE_MODE :return "H264 Decode Mode" ; +case V4L2_CID_STATELESS_H264_START_CODE :return "H264 Start Code" ; +case V4L2_CID_STATELESS_H264_SPS :return "H264 Sequence Parameter Set" ; +case V4L2_CID_STATELESS_H264_PPS :return "H264 Picture Parameter Set" ; +case V4L2_CID_STATELESS_H264_SCALING_MATRIX :return "H264 Scaling Matrix" ; +case V4L2_CID_STATELESS_H264_PRED_WEIGHTS :return "H264 Prediction Weight Table" ; +case V4L2_CID_STATELESS_H264_SLICE_PARAMS :return "H264 Slice Parameters" ; +case V4L2_CID_STATELESS_H264_DECODE_PARAMS :return "H264 Decode Parameters" ;default :return NULL ; }@@ -1310,8 +1310,6 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC :case V4L2_CID_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE :case V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE : -case V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE : -case V4L2_CID_MPEG_VIDEO_H264_START_CODE :case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL :case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE :case V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL :@@ -1342,6 +1340,8 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_MPEG_VIDEO_HEVC_LOOP_FILTER_MODE :case V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE :case V4L2_CID_MPEG_VIDEO_HEVC_START_CODE : +case V4L2_CID_STATELESS_H264_DECODE_MODE : +case V4L2_CID_STATELESS_H264_START_CODE :case V4L2_CID_CAMERA_ORIENTATION : *type =V4L2_CTRL_TYPE_MENU ;break ;@@ -1436,22 +1436,22 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS : *type =V4L2_CTRL_TYPE_FWHT_PARAMS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_SPS : +case V4L2_CID_STATELESS_H264_SPS : *type =V4L2_CTRL_TYPE_H264_SPS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_PPS : +case V4L2_CID_STATELESS_H264_PPS : *type =V4L2_CTRL_TYPE_H264_PPS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX : +case V4L2_CID_STATELESS_H264_SCALING_MATRIX : *type =V4L2_CTRL_TYPE_H264_SCALING_MATRIX ;break ; -case V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS : +case V4L2_CID_STATELESS_H264_SLICE_PARAMS : *type =V4L2_CTRL_TYPE_H264_SLICE_PARAMS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS : +case V4L2_CID_STATELESS_H264_DECODE_PARAMS : *type =V4L2_CTRL_TYPE_H264_DECODE_PARAMS ;break ; -case V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS : +case V4L2_CID_STATELESS_H264_PRED_WEIGHTS : *type =V4L2_CTRL_TYPE_H264_PRED_WEIGHTS ;break ;case V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER :drivers/staging/media/hantro/hantro_drv.c +13
-13@@ -231,7 +231,7 @@ queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)static int hantro_try_ctrl (struct v4l2_ctrl *ctrl) { -if (ctrl->id ==V4L2_CID_MPEG_VIDEO_H264_SPS ) { +if (ctrl->id ==V4L2_CID_STATELESS_H264_SPS ) {const struct v4l2_ctrl_h264_sps *sps = ctrl->p_new.p_h264_sps;if (sps->chroma_format_idc >1 )@@ -304,39 +304,39 @@ static const struct hantro_ctrl controls[] = { }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS, + .id = V4L2_CID_STATELESS_H264_DECODE_PARAMS, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SPS, + .id = V4L2_CID_STATELESS_H264_SPS, .ops = &hantro_ctrl_ops, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_PPS, + .id = V4L2_CID_STATELESS_H264_PPS, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX, + .id = V4L2_CID_STATELESS_H264_SCALING_MATRIX, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE, - .min = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED, - .def = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED, - .max = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED, + .id = V4L2_CID_STATELESS_H264_DECODE_MODE, + .min = V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED, + .def = V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED, + .max = V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED, }, }, { .codec = HANTRO_H264_DECODER, .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_START_CODE, - .min = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B, - .def = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B, - .max = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B, + .id = V4L2_CID_STATELESS_H264_START_CODE, + .min = V4L2_STATELESS_H264_START_CODE_ANNEX_B, + .def = V4L2_STATELESS_H264_START_CODE_ANNEX_B, + .max = V4L2_STATELESS_H264_START_CODE_ANNEX_B, }, }, { .codec = HANTRO_H264_DECODER,drivers/staging/media/hantro/hantro_h264.c +4
-4@@ -344,22 +344,22 @@ int hantro_h264_dec_prepare_run(struct hantro_ctx *ctx)hantro_start_prepare_run (ctx); ctrls->scaling = -hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX ); +hantro_get_ctrl (ctx,V4L2_CID_STATELESS_H264_SCALING_MATRIX );if (WARN_ON (!ctrls->scaling))return -EINVAL ; ctrls->decode = -hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS ); +hantro_get_ctrl (ctx,V4L2_CID_STATELESS_H264_DECODE_PARAMS );if (WARN_ON (!ctrls->decode))return -EINVAL ; ctrls->sps = -hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_H264_SPS ); +hantro_get_ctrl (ctx,V4L2_CID_STATELESS_H264_SPS );if (WARN_ON (!ctrls->sps))return -EINVAL ; ctrls->pps = -hantro_get_ctrl (ctx,V4L2_CID_MPEG_VIDEO_H264_PPS ); +hantro_get_ctrl (ctx,V4L2_CID_STATELESS_H264_PPS );if (WARN_ON (!ctrls->pps))return -EINVAL ;drivers/staging/media/rkvdec/rkvdec-h264.c +4
-4@@ -1067,16 +1067,16 @@ static void rkvdec_h264_run_preamble(struct rkvdec_ctx *ctx,struct v4l2_ctrl *ctrl; ctrl =v4l2_ctrl_find (&ctx->ctrl_hdl, -V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS ); +V4L2_CID_STATELESS_H264_DECODE_PARAMS ); run->decode_params = ctrl ? ctrl->p_cur.p :NULL ; ctrl =v4l2_ctrl_find (&ctx->ctrl_hdl, -V4L2_CID_MPEG_VIDEO_H264_SPS ); +V4L2_CID_STATELESS_H264_SPS ); run->sps = ctrl ? ctrl->p_cur.p :NULL ; ctrl =v4l2_ctrl_find (&ctx->ctrl_hdl, -V4L2_CID_MPEG_VIDEO_H264_PPS ); +V4L2_CID_STATELESS_H264_PPS ); run->pps = ctrl ? ctrl->p_cur.p :NULL ; ctrl =v4l2_ctrl_find (&ctx->ctrl_hdl, -V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX ); +V4L2_CID_STATELESS_H264_SCALING_MATRIX ); run->scaling_matrix = ctrl ? ctrl->p_cur.p :NULL ;rkvdec_run_preamble (ctx, &run->base);drivers/staging/media/rkvdec/rkvdec.c +13
-13@@ -29,7 +29,7 @@static int rkvdec_try_ctrl (struct v4l2_ctrl *ctrl) { -if (ctrl->id ==V4L2_CID_MPEG_VIDEO_H264_SPS ) { +if (ctrl->id ==V4L2_CID_STATELESS_H264_SPS ) {const struct v4l2_ctrl_h264_sps *sps = ctrl->p_new.p_h264_sps;/* * TODO: The hardware supports 10-bit and 4:2:2 profiles, @@ -56,31 +56,31 @@ static const struct v4l2_ctrl_ops rkvdec_ctrl_ops = {static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = { { .mandatory = true, - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS , + .cfg.id =V4L2_CID_STATELESS_H264_DECODE_PARAMS , }, { .mandatory = true, - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_SPS , + .cfg.id =V4L2_CID_STATELESS_H264_SPS , .cfg.ops = &rkvdec_ctrl_ops, }, { .mandatory = true, - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_PPS , + .cfg.id =V4L2_CID_STATELESS_H264_PPS , }, { - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX , + .cfg.id =V4L2_CID_STATELESS_H264_SCALING_MATRIX , }, { - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE , - .cfg.min =V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED , - .cfg.max =V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED , - .cfg.def =V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED , + .cfg.id =V4L2_CID_STATELESS_H264_DECODE_MODE , + .cfg.min =V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED , + .cfg.max =V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED , + .cfg.def =V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED , }, { - .cfg.id =V4L2_CID_MPEG_VIDEO_H264_START_CODE , - .cfg.min =V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B , - .cfg.def =V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B , - .cfg.max =V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B , + .cfg.id =V4L2_CID_STATELESS_H264_START_CODE , + .cfg.min =V4L2_STATELESS_H264_START_CODE_ANNEX_B , + .cfg.def =V4L2_STATELESS_H264_START_CODE_ANNEX_B , + .cfg.max =V4L2_STATELESS_H264_START_CODE_ANNEX_B , }, { .cfg.id =V4L2_CID_MPEG_VIDEO_H264_PROFILE ,drivers/staging/media/sunxi/cedrus/cedrus.c +12
-12@@ -45,60 +45,60 @@ static const struct cedrus_control cedrus_controls[] = { }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS, + .id = V4L2_CID_STATELESS_H264_DECODE_PARAMS, }, .codec = CEDRUS_CODEC_H264, .required = true, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS, + .id = V4L2_CID_STATELESS_H264_SLICE_PARAMS, }, .codec = CEDRUS_CODEC_H264, .required = true, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SPS, + .id = V4L2_CID_STATELESS_H264_SPS, }, .codec = CEDRUS_CODEC_H264, .required = true, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_PPS, + .id = V4L2_CID_STATELESS_H264_PPS, }, .codec = CEDRUS_CODEC_H264, .required = true, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX, + .id = V4L2_CID_STATELESS_H264_SCALING_MATRIX, }, .codec = CEDRUS_CODEC_H264, .required = false, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS, + .id = V4L2_CID_STATELESS_H264_PRED_WEIGHTS, }, .codec = CEDRUS_CODEC_H264, .required = false, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE, - .max = V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED, - .def = V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED, + .id = V4L2_CID_STATELESS_H264_DECODE_MODE, + .max = V4L2_STATELESS_H264_DECODE_MODE_SLICE_BASED, + .def = V4L2_STATELESS_H264_DECODE_MODE_SLICE_BASED, }, .codec = CEDRUS_CODEC_H264, .required = false, }, { .cfg = { - .id = V4L2_CID_MPEG_VIDEO_H264_START_CODE, - .max = V4L2_MPEG_VIDEO_H264_START_CODE_NONE, - .def = V4L2_MPEG_VIDEO_H264_START_CODE_NONE, + .id = V4L2_CID_STATELESS_H264_START_CODE, + .max = V4L2_STATELESS_H264_START_CODE_NONE, + .def = V4L2_STATELESS_H264_START_CODE_NONE, }, .codec = CEDRUS_CODEC_H264, .required = false,drivers/staging/media/sunxi/cedrus/cedrus_dec.c +6
-6@@ -48,17 +48,17 @@ void cedrus_device_run(void *priv)case V4L2_PIX_FMT_H264_SLICE : run.h264.decode_params =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS ); +V4L2_CID_STATELESS_H264_DECODE_PARAMS ); run.h264.pps =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_PPS ); +V4L2_CID_STATELESS_H264_PPS ); run.h264.scaling_matrix =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX ); +V4L2_CID_STATELESS_H264_SCALING_MATRIX ); run.h264.slice_params =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS ); +V4L2_CID_STATELESS_H264_SLICE_PARAMS ); run.h264.sps =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_SPS ); +V4L2_CID_STATELESS_H264_SPS ); run.h264.pred_weights =cedrus_find_control_data (ctx, -V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS ); +V4L2_CID_STATELESS_H264_PRED_WEIGHTS );break ;case V4L2_PIX_FMT_HEVC_SLICE :include/media/h264-ctrls.h deleted +0
-404@@ -1,404 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* These are the H.264 state controls for use with stateless H.264 -* codec drivers. -* -* It turns out that these structs are not stable yet and will undergo -* more changes. So keep them private until they are stable and ready to -* become part of the official public API. -*/ - -#ifndef _H264_CTRLS_H_ -#define _H264_CTRLS_H_ - -#include <linux/videodev2.h> - -/* -* Maximum DPB size, as specified by section 'A.3.1 Level limits -* common to the Baseline, Main, and Extended profiles'. -*/ -#define V4L2_H264_NUM_DPB_ENTRIES 16 - -#define V4L2_H264_REF_LIST_LEN (2 * V4L2_H264_NUM_DPB_ENTRIES) - -/* -* This is put insanely high to avoid conflicting with controls that -* would be added during the phase where those controls are not -* stable. It should be fixed eventually. -*/ -#define V4L2_CID_MPEG_VIDEO_H264_SPS (V4L2_CID_CODEC_BASE+1000) -#define V4L2_CID_MPEG_VIDEO_H264_PPS (V4L2_CID_CODEC_BASE+1001) -#define V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX (V4L2_CID_CODEC_BASE+1002) -#define V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS (V4L2_CID_CODEC_BASE+1003) -#define V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS (V4L2_CID_CODEC_BASE+1004) -#define V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE (V4L2_CID_CODEC_BASE+1005) -#define V4L2_CID_MPEG_VIDEO_H264_START_CODE (V4L2_CID_CODEC_BASE+1006) -#define V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS (V4L2_CID_CODEC_BASE+1007) - -/** -* enum v4l2_mpeg_video_h264_decode_mode - Decoding mode -* -* @V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED: indicates that decoding -* is performed one slice at a time. In this mode, -* V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS must contain the parsed slice -* parameters and the OUTPUT buffer must contain a single slice. -* V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF feature is used -* in order to support multislice frames. -* @V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED: indicates that -* decoding is performed per frame. The OUTPUT buffer must contain -* all slices and also both fields. This mode is typically supported -* by device drivers that are able to parse the slice(s) header(s) -* in hardware. When this mode is selected, -* V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS is not used. -*/ -enum v4l2_mpeg_video_h264_decode_mode { -V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED , -V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED , -}; - -/** -* enum v4l2_mpeg_video_h264_start_code - Start code -* -* @V4L2_MPEG_VIDEO_H264_START_CODE_NONE: slices are passed -* to the driver without any start code. -* @V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B: slices are passed -* to the driver with an Annex B start code prefix -* (legal start codes can be 3-bytes 0x000001 or 4-bytes 0x00000001). -* This mode is typically supported by device drivers that parse -* the start code in hardware. -*/ -enum v4l2_mpeg_video_h264_start_code { -V4L2_MPEG_VIDEO_H264_START_CODE_NONE , -V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B , -}; - -#define V4L2_H264_SPS_CONSTRAINT_SET0_FLAG 0x01 -#define V4L2_H264_SPS_CONSTRAINT_SET1_FLAG 0x02 -#define V4L2_H264_SPS_CONSTRAINT_SET2_FLAG 0x04 -#define V4L2_H264_SPS_CONSTRAINT_SET3_FLAG 0x08 -#define V4L2_H264_SPS_CONSTRAINT_SET4_FLAG 0x10 -#define V4L2_H264_SPS_CONSTRAINT_SET5_FLAG 0x20 - -#define V4L2_H264_SPS_FLAG_SEPARATE_COLOUR_PLANE 0x01 -#define V4L2_H264_SPS_FLAG_QPPRIME_Y_ZERO_TRANSFORM_BYPASS 0x02 -#define V4L2_H264_SPS_FLAG_DELTA_PIC_ORDER_ALWAYS_ZERO 0x04 -#define V4L2_H264_SPS_FLAG_GAPS_IN_FRAME_NUM_VALUE_ALLOWED 0x08 -#define V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY 0x10 -#define V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD 0x20 -#define V4L2_H264_SPS_FLAG_DIRECT_8X8_INFERENCE 0x40 - -#define V4L2_H264_SPS_HAS_CHROMA_FORMAT (sps) \ - ((sps)->profile_idc == 100 || (sps)->profile_idc == 110 || \ - (sps)->profile_idc == 122 || (sps)->profile_idc == 244 || \ - (sps)->profile_idc == 44 || (sps)->profile_idc == 83 || \ - (sps)->profile_idc == 86 || (sps)->profile_idc == 118 || \ - (sps)->profile_idc == 128 || (sps)->profile_idc == 138 || \ - (sps)->profile_idc == 139 || (sps)->profile_idc == 134 || \ - (sps)->profile_idc == 135) - -/** -* struct v4l2_ctrl_h264_sps - H264 sequence parameter set -* -* All the members on this sequence parameter set structure match the -* sequence parameter set syntax as specified by the H264 specification. -* -* @profile_idc: see H264 specification. -* @constraint_set_flags: see H264 specification. -* @level_idc: see H264 specification. -* @seq_parameter_set_id: see H264 specification. -* @chroma_format_idc: see H264 specification. -* @bit_depth_luma_minus8: see H264 specification. -* @bit_depth_chroma_minus8: see H264 specification. -* @log2_max_frame_num_minus4: see H264 specification. -* @pic_order_cnt_type: see H264 specification. -* @log2_max_pic_order_cnt_lsb_minus4: see H264 specification. -* @max_num_ref_frames: see H264 specification. -* @num_ref_frames_in_pic_order_cnt_cycle: see H264 specification. -* @offset_for_ref_frame: see H264 specification. -* @offset_for_non_ref_pic: see H264 specification. -* @offset_for_top_to_bottom_field: see H264 specification. -* @pic_width_in_mbs_minus1: see H264 specification. -* @pic_height_in_map_units_minus1: see H264 specification. -* @flags: see V4L2_H264_SPS_FLAG_{}. -*/ -struct v4l2_ctrl_h264_sps { -__u8 profile_idc; -__u8 constraint_set_flags; -__u8 level_idc; -__u8 seq_parameter_set_id; -__u8 chroma_format_idc; -__u8 bit_depth_luma_minus8; -__u8 bit_depth_chroma_minus8; -__u8 log2_max_frame_num_minus4; -__u8 pic_order_cnt_type; -__u8 log2_max_pic_order_cnt_lsb_minus4; -__u8 max_num_ref_frames; -__u8 num_ref_frames_in_pic_order_cnt_cycle; -__s32 offset_for_ref_frame[255 ]; -__s32 offset_for_non_ref_pic; -__s32 offset_for_top_to_bottom_field; -__u16 pic_width_in_mbs_minus1; -__u16 pic_height_in_map_units_minus1; -__u32 flags; -}; - -#define V4L2_H264_PPS_FLAG_ENTROPY_CODING_MODE 0x0001 -#define V4L2_H264_PPS_FLAG_BOTTOM_FIELD_PIC_ORDER_IN_FRAME_PRESENT 0x0002 -#define V4L2_H264_PPS_FLAG_WEIGHTED_PRED 0x0004 -#define V4L2_H264_PPS_FLAG_DEBLOCKING_FILTER_CONTROL_PRESENT 0x0008 -#define V4L2_H264_PPS_FLAG_CONSTRAINED_INTRA_PRED 0x0010 -#define V4L2_H264_PPS_FLAG_REDUNDANT_PIC_CNT_PRESENT 0x0020 -#define V4L2_H264_PPS_FLAG_TRANSFORM_8X8_MODE 0x0040 -#define V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT 0x0080 - -/** -* struct v4l2_ctrl_h264_pps - H264 picture parameter set -* -* Except where noted, all the members on this picture parameter set -* structure match the sequence parameter set syntax as specified -* by the H264 specification. -* -* In particular, V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT flag -* has a specific meaning. This flag should be set if a non-flat -* scaling matrix applies to the picture. In this case, applications -* are expected to use V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX, -* to pass the values of the non-flat matrices. -* -* @pic_parameter_set_id: see H264 specification. -* @seq_parameter_set_id: see H264 specification. -* @num_slice_groups_minus1: see H264 specification. -* @num_ref_idx_l0_default_active_minus1: see H264 specification. -* @num_ref_idx_l1_default_active_minus1: see H264 specification. -* @weighted_bipred_idc: see H264 specification. -* @pic_init_qp_minus26: see H264 specification. -* @pic_init_qs_minus26: see H264 specification. -* @chroma_qp_index_offset: see H264 specification. -* @second_chroma_qp_index_offset: see H264 specification. -* @flags: see V4L2_H264_PPS_FLAG_{}. -*/ -struct v4l2_ctrl_h264_pps { -__u8 pic_parameter_set_id; -__u8 seq_parameter_set_id; -__u8 num_slice_groups_minus1; -__u8 num_ref_idx_l0_default_active_minus1; -__u8 num_ref_idx_l1_default_active_minus1; -__u8 weighted_bipred_idc; -__s8 pic_init_qp_minus26; -__s8 pic_init_qs_minus26; -__s8 chroma_qp_index_offset; -__s8 second_chroma_qp_index_offset; -__u16 flags; -}; - -/** -* struct v4l2_ctrl_h264_scaling_matrix - H264 scaling matrices -* -* @scaling_list_4x4: scaling matrix after applying the inverse -* scanning process. Expected list order is Intra Y, Intra Cb, -* Intra Cr, Inter Y, Inter Cb, Inter Cr. The values on each -* scaling list are expected in raster scan order. -* @scaling_list_8x8: scaling matrix after applying the inverse -* scanning process. Expected list order is Intra Y, Inter Y, -* Intra Cb, Inter Cb, Intra Cr, Inter Cr. The values on each -* scaling list are expected in raster scan order. -* -* Note that the list order is different for the 4x4 and 8x8 -* matrices as per the H264 specification, see table 7-2 "Assignment -* of mnemonic names to scaling list indices and specification of -* fall-back rule". -*/ -struct v4l2_ctrl_h264_scaling_matrix { -__u8 scaling_list_4x4[6 ][16 ]; -__u8 scaling_list_8x8[6 ][64 ]; -}; - -struct v4l2_h264_weight_factors { -__s16 luma_weight[32 ]; -__s16 luma_offset[32 ]; -__s16 chroma_weight[32 ][2 ]; -__s16 chroma_offset[32 ][2 ]; -}; - -#define V4L2_H264_CTRL_PRED_WEIGHTS_REQUIRED (pps, slice) \ - ((((pps)->flags & V4L2_H264_PPS_FLAG_WEIGHTED_PRED) && \ - ((slice)->slice_type == V4L2_H264_SLICE_TYPE_P || \ - (slice)->slice_type == V4L2_H264_SLICE_TYPE_SP)) || \ - ((pps)->weighted_bipred_idc == 1 && \ - (slice)->slice_type == V4L2_H264_SLICE_TYPE_B)) - -/** -* struct v4l2_ctrl_h264_pred_weights - Prediction weight table -* -* Prediction weight table, which matches the syntax specified -* by the H264 specification. -* -* @luma_log2_weight_denom: see H264 specification. -* @chroma_log2_weight_denom: see H264 specification. -* @weight_factors: luma and chroma weight factors. -*/ -struct v4l2_ctrl_h264_pred_weights { -__u16 luma_log2_weight_denom; -__u16 chroma_log2_weight_denom; -struct v4l2_h264_weight_factors weight_factors[2 ]; -}; - -#define V4L2_H264_SLICE_TYPE_P 0 -#define V4L2_H264_SLICE_TYPE_B 1 -#define V4L2_H264_SLICE_TYPE_I 2 -#define V4L2_H264_SLICE_TYPE_SP 3 -#define V4L2_H264_SLICE_TYPE_SI 4 - -#define V4L2_H264_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED 0x01 -#define V4L2_H264_SLICE_FLAG_SP_FOR_SWITCH 0x02 - -#define V4L2_H264_TOP_FIELD_REF 0x1 -#define V4L2_H264_BOTTOM_FIELD_REF 0x2 -#define V4L2_H264_FRAME_REF 0x3 - -/** -* struct v4l2_h264_reference - H264 picture reference -* -* @fields: indicates how the picture is referenced. -* Valid values are V4L2_H264_{}_REF. -* @index: index into v4l2_ctrl_h264_decode_params.dpb[]. -*/ -struct v4l2_h264_reference { -__u8 fields; -__u8 index; -}; - -/** -* struct v4l2_ctrl_h264_slice_params - H264 slice parameters -* -* This structure holds the H264 syntax elements that are specified -* as non-invariant for the slices in a given frame. -* -* Slice invariant syntax elements are contained in struct -* v4l2_ctrl_h264_decode_params. This is done to reduce the API surface -* on frame-based decoders, where slice header parsing is done by the -* hardware. -* -* Slice invariant syntax elements are specified in specification section -* "7.4.3 Slice header semantics". -* -* Except where noted, the members on this struct match the slice header syntax. -* -* @header_bit_size: offset in bits to slice_data() from the beginning of this slice. -* @first_mb_in_slice: see H264 specification. -* @slice_type: see H264 specification. -* @colour_plane_id: see H264 specification. -* @redundant_pic_cnt: see H264 specification. -* @cabac_init_idc: see H264 specification. -* @slice_qp_delta: see H264 specification. -* @slice_qs_delta: see H264 specification. -* @disable_deblocking_filter_idc: see H264 specification. -* @slice_alpha_c0_offset_div2: see H264 specification. -* @slice_beta_offset_div2: see H264 specification. -* @num_ref_idx_l0_active_minus1: see H264 specification. -* @num_ref_idx_l1_active_minus1: see H264 specification. -* @reserved: padding field. Should be zeroed by applications. -* @ref_pic_list0: reference picture list 0 after applying the per-slice modifications. -* @ref_pic_list1: reference picture list 1 after applying the per-slice modifications. -* @flags: see V4L2_H264_SLICE_FLAG_{}. -*/ -struct v4l2_ctrl_h264_slice_params { -__u32 header_bit_size; -__u32 first_mb_in_slice; -__u8 slice_type; -__u8 colour_plane_id; -__u8 redundant_pic_cnt; -__u8 cabac_init_idc; -__s8 slice_qp_delta; -__s8 slice_qs_delta; -__u8 disable_deblocking_filter_idc; -__s8 slice_alpha_c0_offset_div2; -__s8 slice_beta_offset_div2; -__u8 num_ref_idx_l0_active_minus1; -__u8 num_ref_idx_l1_active_minus1; - -__u8 reserved; - -struct v4l2_h264_reference ref_pic_list0[V4L2_H264_REF_LIST_LEN ]; -struct v4l2_h264_reference ref_pic_list1[V4L2_H264_REF_LIST_LEN ]; - -__u32 flags; -}; - -#define V4L2_H264_DPB_ENTRY_FLAG_VALID 0x01 -#define V4L2_H264_DPB_ENTRY_FLAG_ACTIVE 0x02 -#define V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM 0x04 -#define V4L2_H264_DPB_ENTRY_FLAG_FIELD 0x08 - -/** -* struct v4l2_h264_dpb_entry - H264 decoded picture buffer entry -* -* @reference_ts: timestamp of the V4L2 capture buffer to use as reference. -* The timestamp refers to the timestamp field in struct v4l2_buffer. -* Use v4l2_timeval_to_ns() to convert the struct timeval to a __u64. -* @pic_num: matches PicNum variable assigned during the reference -* picture lists construction process. -* @frame_num: frame identifier which matches frame_num syntax element. -* @fields: indicates how the DPB entry is referenced. Valid values are -* V4L2_H264_{}_REF. -* @reserved: padding field. Should be zeroed by applications. -* @top_field_order_cnt: matches TopFieldOrderCnt picture value. -* @bottom_field_order_cnt: matches BottomFieldOrderCnt picture value. -* Note that picture field is indicated by v4l2_buffer.field. -* @flags: see V4L2_H264_DPB_ENTRY_FLAG_{}. -*/ -struct v4l2_h264_dpb_entry { -__u64 reference_ts; -__u32 pic_num; -__u16 frame_num; -__u8 fields; -__u8 reserved[5 ]; -__s32 top_field_order_cnt; -__s32 bottom_field_order_cnt; -__u32 flags; -}; - -#define V4L2_H264_DECODE_PARAM_FLAG_IDR_PIC 0x01 -#define V4L2_H264_DECODE_PARAM_FLAG_FIELD_PIC 0x02 -#define V4L2_H264_DECODE_PARAM_FLAG_BOTTOM_FIELD 0x04 - -/** -* struct v4l2_ctrl_h264_decode_params - H264 decoding parameters -* -* @dpb: decoded picture buffer. -* @nal_ref_idc: slice header syntax element. -* @frame_num: slice header syntax element. -* @top_field_order_cnt: matches TopFieldOrderCnt picture value. -* @bottom_field_order_cnt: matches BottomFieldOrderCnt picture value. -* Note that picture field is indicated by v4l2_buffer.field. -* @idr_pic_id: slice header syntax element. -* @pic_order_cnt_lsb: slice header syntax element. -* @delta_pic_order_cnt_bottom: slice header syntax element. -* @delta_pic_order_cnt0: slice header syntax element. -* @delta_pic_order_cnt1: slice header syntax element. -* @dec_ref_pic_marking_bit_size: size in bits of dec_ref_pic_marking() -* syntax element. -* @pic_order_cnt_bit_size: size in bits of pic order count syntax. -* @slice_group_change_cycle: slice header syntax element. -* @reserved: padding field. Should be zeroed by applications. -* @flags: see V4L2_H264_DECODE_PARAM_FLAG_{}. -*/ -struct v4l2_ctrl_h264_decode_params { -struct v4l2_h264_dpb_entry dpb[V4L2_H264_NUM_DPB_ENTRIES ]; -__u16 nal_ref_idc; -__u16 frame_num; -__s32 top_field_order_cnt; -__s32 bottom_field_order_cnt; -__u16 idr_pic_id; -__u16 pic_order_cnt_lsb; -__s32 delta_pic_order_cnt_bottom; -__s32 delta_pic_order_cnt0; -__s32 delta_pic_order_cnt1; -__u32 dec_ref_pic_marking_bit_size; -__u32 pic_order_cnt_bit_size; -__u32 slice_group_change_cycle; - -__u32 reserved; -__u32 flags; -}; - -#endif include/media/v4l2-ctrls.h +0
-1@@ -19,7 +19,6 @@*/ #include <media/mpeg2-ctrls.h> #include <media/fwht-ctrls.h> -#include <media/h264-ctrls.h> #include <media/vp8-ctrls.h> #include <media/hevc-ctrls.h> include/uapi/linux/v4l2-controls.h +381
-0@@ -1183,6 +1183,387 @@ enum v4l2_detect_md_mode {#define V4L2_CID_CODEC_STATELESS_BASE (V4L2_CTRL_CLASS_CODEC_STATELESS | 0x900)#define V4L2_CID_CODEC_STATELESS_CLASS (V4L2_CTRL_CLASS_CODEC_STATELESS | 1) +#define V4L2_CID_STATELESS_H264_DECODE_MODE (V4L2_CID_CODEC_STATELESS_BASE + 0) +/** +* enum v4l2_stateless_h264_decode_mode - Decoding mode +* +* @V4L2_STATELESS_H264_DECODE_MODE_SLICE_BASED: indicates that decoding +* is performed one slice at a time. In this mode, +* V4L2_CID_STATELESS_H264_SLICE_PARAMS must contain the parsed slice +* parameters and the OUTPUT buffer must contain a single slice. +* V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF feature is used +* in order to support multislice frames. +* @V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED: indicates that +* decoding is performed per frame. The OUTPUT buffer must contain +* all slices and also both fields. This mode is typically supported +* by device drivers that are able to parse the slice(s) header(s) +* in hardware. When this mode is selected, +* V4L2_CID_STATELESS_H264_SLICE_PARAMS is not used. +*/ +enum v4l2_stateless_h264_decode_mode { +V4L2_STATELESS_H264_DECODE_MODE_SLICE_BASED , +V4L2_STATELESS_H264_DECODE_MODE_FRAME_BASED , +}; + +#define V4L2_CID_STATELESS_H264_START_CODE (V4L2_CID_CODEC_STATELESS_BASE + 1) +/** +* enum v4l2_stateless_h264_start_code - Start code +* +* @V4L2_STATELESS_H264_START_CODE_NONE: slices are passed +* to the driver without any start code. +* @V4L2_STATELESS_H264_START_CODE_ANNEX_B: slices are passed +* to the driver with an Annex B start code prefix +* (legal start codes can be 3-bytes 0x000001 or 4-bytes 0x00000001). +* This mode is typically supported by device drivers that parse +* the start code in hardware. +*/ +enum v4l2_stateless_h264_start_code { +V4L2_STATELESS_H264_START_CODE_NONE , +V4L2_STATELESS_H264_START_CODE_ANNEX_B , +}; + +#define V4L2_H264_SPS_CONSTRAINT_SET0_FLAG 0x01 +#define V4L2_H264_SPS_CONSTRAINT_SET1_FLAG 0x02 +#define V4L2_H264_SPS_CONSTRAINT_SET2_FLAG 0x04 +#define V4L2_H264_SPS_CONSTRAINT_SET3_FLAG 0x08 +#define V4L2_H264_SPS_CONSTRAINT_SET4_FLAG 0x10 +#define V4L2_H264_SPS_CONSTRAINT_SET5_FLAG 0x20 + +#define V4L2_H264_SPS_FLAG_SEPARATE_COLOUR_PLANE 0x01 +#define V4L2_H264_SPS_FLAG_QPPRIME_Y_ZERO_TRANSFORM_BYPASS 0x02 +#define V4L2_H264_SPS_FLAG_DELTA_PIC_ORDER_ALWAYS_ZERO 0x04 +#define V4L2_H264_SPS_FLAG_GAPS_IN_FRAME_NUM_VALUE_ALLOWED 0x08 +#define V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY 0x10 +#define V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD 0x20 +#define V4L2_H264_SPS_FLAG_DIRECT_8X8_INFERENCE 0x40 + +#define V4L2_H264_SPS_HAS_CHROMA_FORMAT (sps) \ + ((sps)->profile_idc == 100 || (sps)->profile_idc == 110 || \ + (sps)->profile_idc == 122 || (sps)->profile_idc == 244 || \ + (sps)->profile_idc == 44 || (sps)->profile_idc == 83 || \ + (sps)->profile_idc == 86 || (sps)->profile_idc == 118 || \ + (sps)->profile_idc == 128 || (sps)->profile_idc == 138 || \ + (sps)->profile_idc == 139 || (sps)->profile_idc == 134 || \ + (sps)->profile_idc == 135) + +#define V4L2_CID_STATELESS_H264_SPS (V4L2_CID_CODEC_STATELESS_BASE + 2) +/** +* struct v4l2_ctrl_h264_sps - H264 sequence parameter set +* +* All the members on this sequence parameter set structure match the +* sequence parameter set syntax as specified by the H264 specification. +* +* @profile_idc: see H264 specification. +* @constraint_set_flags: see H264 specification. +* @level_idc: see H264 specification. +* @seq_parameter_set_id: see H264 specification. +* @chroma_format_idc: see H264 specification. +* @bit_depth_luma_minus8: see H264 specification. +* @bit_depth_chroma_minus8: see H264 specification. +* @log2_max_frame_num_minus4: see H264 specification. +* @pic_order_cnt_type: see H264 specification. +* @log2_max_pic_order_cnt_lsb_minus4: see H264 specification. +* @max_num_ref_frames: see H264 specification. +* @num_ref_frames_in_pic_order_cnt_cycle: see H264 specification. +* @offset_for_ref_frame: see H264 specification. +* @offset_for_non_ref_pic: see H264 specification. +* @offset_for_top_to_bottom_field: see H264 specification. +* @pic_width_in_mbs_minus1: see H264 specification. +* @pic_height_in_map_units_minus1: see H264 specification. +* @flags: see V4L2_H264_SPS_FLAG_{}. +*/ +struct v4l2_ctrl_h264_sps { +__u8 profile_idc; +__u8 constraint_set_flags; +__u8 level_idc; +__u8 seq_parameter_set_id; +__u8 chroma_format_idc; +__u8 bit_depth_luma_minus8; +__u8 bit_depth_chroma_minus8; +__u8 log2_max_frame_num_minus4; +__u8 pic_order_cnt_type; +__u8 log2_max_pic_order_cnt_lsb_minus4; +__u8 max_num_ref_frames; +__u8 num_ref_frames_in_pic_order_cnt_cycle; +__s32 offset_for_ref_frame[255 ]; +__s32 offset_for_non_ref_pic; +__s32 offset_for_top_to_bottom_field; +__u16 pic_width_in_mbs_minus1; +__u16 pic_height_in_map_units_minus1; +__u32 flags; +}; + +#define V4L2_H264_PPS_FLAG_ENTROPY_CODING_MODE 0x0001 +#define V4L2_H264_PPS_FLAG_BOTTOM_FIELD_PIC_ORDER_IN_FRAME_PRESENT 0x0002 +#define V4L2_H264_PPS_FLAG_WEIGHTED_PRED 0x0004 +#define V4L2_H264_PPS_FLAG_DEBLOCKING_FILTER_CONTROL_PRESENT 0x0008 +#define V4L2_H264_PPS_FLAG_CONSTRAINED_INTRA_PRED 0x0010 +#define V4L2_H264_PPS_FLAG_REDUNDANT_PIC_CNT_PRESENT 0x0020 +#define V4L2_H264_PPS_FLAG_TRANSFORM_8X8_MODE 0x0040 +#define V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT 0x0080 + +#define V4L2_CID_STATELESS_H264_PPS (V4L2_CID_CODEC_STATELESS_BASE + 3) +/** +* struct v4l2_ctrl_h264_pps - H264 picture parameter set +* +* Except where noted, all the members on this picture parameter set +* structure match the sequence parameter set syntax as specified +* by the H264 specification. +* +* In particular, V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT flag +* has a specific meaning. This flag should be set if a non-flat +* scaling matrix applies to the picture. In this case, applications +* are expected to use V4L2_CID_STATELESS_H264_SCALING_MATRIX, +* to pass the values of the non-flat matrices. +* +* @pic_parameter_set_id: see H264 specification. +* @seq_parameter_set_id: see H264 specification. +* @num_slice_groups_minus1: see H264 specification. +* @num_ref_idx_l0_default_active_minus1: see H264 specification. +* @num_ref_idx_l1_default_active_minus1: see H264 specification. +* @weighted_bipred_idc: see H264 specification. +* @pic_init_qp_minus26: see H264 specification. +* @pic_init_qs_minus26: see H264 specification. +* @chroma_qp_index_offset: see H264 specification. +* @second_chroma_qp_index_offset: see H264 specification. +* @flags: see V4L2_H264_PPS_FLAG_{}. +*/ +struct v4l2_ctrl_h264_pps { +__u8 pic_parameter_set_id; +__u8 seq_parameter_set_id; +__u8 num_slice_groups_minus1; +__u8 num_ref_idx_l0_default_active_minus1; +__u8 num_ref_idx_l1_default_active_minus1; +__u8 weighted_bipred_idc; +__s8 pic_init_qp_minus26; +__s8 pic_init_qs_minus26; +__s8 chroma_qp_index_offset; +__s8 second_chroma_qp_index_offset; +__u16 flags; +}; + +#define V4L2_CID_STATELESS_H264_SCALING_MATRIX (V4L2_CID_CODEC_STATELESS_BASE + 4) +/** +* struct v4l2_ctrl_h264_scaling_matrix - H264 scaling matrices +* +* @scaling_list_4x4: scaling matrix after applying the inverse +* scanning process. Expected list order is Intra Y, Intra Cb, +* Intra Cr, Inter Y, Inter Cb, Inter Cr. The values on each +* scaling list are expected in raster scan order. +* @scaling_list_8x8: scaling matrix after applying the inverse +* scanning process. Expected list order is Intra Y, Inter Y, +* Intra Cb, Inter Cb, Intra Cr, Inter Cr. The values on each +* scaling list are expected in raster scan order. +* +* Note that the list order is different for the 4x4 and 8x8 +* matrices as per the H264 specification, see table 7-2 "Assignment +* of mnemonic names to scaling list indices and specification of +* fall-back rule". +*/ +struct v4l2_ctrl_h264_scaling_matrix { +__u8 scaling_list_4x4[6 ][16 ]; +__u8 scaling_list_8x8[6 ][64 ]; +}; + +struct v4l2_h264_weight_factors { +__s16 luma_weight[32 ]; +__s16 luma_offset[32 ]; +__s16 chroma_weight[32 ][2 ]; +__s16 chroma_offset[32 ][2 ]; +}; + +#define V4L2_H264_CTRL_PRED_WEIGHTS_REQUIRED (pps, slice) \ + ((((pps)->flags & V4L2_H264_PPS_FLAG_WEIGHTED_PRED) && \ + ((slice)->slice_type == V4L2_H264_SLICE_TYPE_P || \ + (slice)->slice_type == V4L2_H264_SLICE_TYPE_SP)) || \ + ((pps)->weighted_bipred_idc == 1 && \ + (slice)->slice_type == V4L2_H264_SLICE_TYPE_B)) + +#define V4L2_CID_STATELESS_H264_PRED_WEIGHTS (V4L2_CID_CODEC_STATELESS_BASE + 5) +/** +* struct v4l2_ctrl_h264_pred_weights - Prediction weight table +* +* Prediction weight table, which matches the syntax specified +* by the H264 specification. +* +* @luma_log2_weight_denom: see H264 specification. +* @chroma_log2_weight_denom: see H264 specification. +* @weight_factors: luma and chroma weight factors. +*/ +struct v4l2_ctrl_h264_pred_weights { +__u16 luma_log2_weight_denom; +__u16 chroma_log2_weight_denom; +struct v4l2_h264_weight_factors weight_factors[2 ]; +}; + +#define V4L2_H264_SLICE_TYPE_P 0 +#define V4L2_H264_SLICE_TYPE_B 1 +#define V4L2_H264_SLICE_TYPE_I 2 +#define V4L2_H264_SLICE_TYPE_SP 3 +#define V4L2_H264_SLICE_TYPE_SI 4 + +#define V4L2_H264_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED 0x01 +#define V4L2_H264_SLICE_FLAG_SP_FOR_SWITCH 0x02 + +#define V4L2_H264_TOP_FIELD_REF 0x1 +#define V4L2_H264_BOTTOM_FIELD_REF 0x2 +#define V4L2_H264_FRAME_REF 0x3 + +/** +* struct v4l2_h264_reference - H264 picture reference +* +* @fields: indicates how the picture is referenced. +* Valid values are V4L2_H264_{}_REF. +* @index: index into v4l2_ctrl_h264_decode_params.dpb[]. +*/ +struct v4l2_h264_reference { +__u8 fields; +__u8 index; +}; + +/* +* Maximum DPB size, as specified by section 'A.3.1 Level limits +* common to the Baseline, Main, and Extended profiles'. +*/ +#define V4L2_H264_NUM_DPB_ENTRIES 16 +#define V4L2_H264_REF_LIST_LEN (2 * V4L2_H264_NUM_DPB_ENTRIES) + +#define V4L2_CID_STATELESS_H264_SLICE_PARAMS (V4L2_CID_CODEC_STATELESS_BASE + 6) +/** +* struct v4l2_ctrl_h264_slice_params - H264 slice parameters +* +* This structure holds the H264 syntax elements that are specified +* as non-invariant for the slices in a given frame. +* +* Slice invariant syntax elements are contained in struct +* v4l2_ctrl_h264_decode_params. This is done to reduce the API surface +* on frame-based decoders, where slice header parsing is done by the +* hardware. +* +* Slice invariant syntax elements are specified in specification section +* "7.4.3 Slice header semantics". +* +* Except where noted, the members on this struct match the slice header syntax. +* +* @header_bit_size: offset in bits to slice_data() from the beginning of this slice. +* @first_mb_in_slice: see H264 specification. +* @slice_type: see H264 specification. +* @colour_plane_id: see H264 specification. +* @redundant_pic_cnt: see H264 specification. +* @cabac_init_idc: see H264 specification. +* @slice_qp_delta: see H264 specification. +* @slice_qs_delta: see H264 specification. +* @disable_deblocking_filter_idc: see H264 specification. +* @slice_alpha_c0_offset_div2: see H264 specification. +* @slice_beta_offset_div2: see H264 specification. +* @num_ref_idx_l0_active_minus1: see H264 specification. +* @num_ref_idx_l1_active_minus1: see H264 specification. +* @reserved: padding field. Should be zeroed by applications. +* @ref_pic_list0: reference picture list 0 after applying the per-slice modifications. +* @ref_pic_list1: reference picture list 1 after applying the per-slice modifications. +* @flags: see V4L2_H264_SLICE_FLAG_{}. +*/ +struct v4l2_ctrl_h264_slice_params { +__u32 header_bit_size; +__u32 first_mb_in_slice; +__u8 slice_type; +__u8 colour_plane_id; +__u8 redundant_pic_cnt; +__u8 cabac_init_idc; +__s8 slice_qp_delta; +__s8 slice_qs_delta; +__u8 disable_deblocking_filter_idc; +__s8 slice_alpha_c0_offset_div2; +__s8 slice_beta_offset_div2; +__u8 num_ref_idx_l0_active_minus1; +__u8 num_ref_idx_l1_active_minus1; + +__u8 reserved; + +struct v4l2_h264_reference ref_pic_list0[V4L2_H264_REF_LIST_LEN ]; +struct v4l2_h264_reference ref_pic_list1[V4L2_H264_REF_LIST_LEN ]; + +__u32 flags; +}; + +#define V4L2_H264_DPB_ENTRY_FLAG_VALID 0x01 +#define V4L2_H264_DPB_ENTRY_FLAG_ACTIVE 0x02 +#define V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM 0x04 +#define V4L2_H264_DPB_ENTRY_FLAG_FIELD 0x08 + +/** +* struct v4l2_h264_dpb_entry - H264 decoded picture buffer entry +* +* @reference_ts: timestamp of the V4L2 capture buffer to use as reference. +* The timestamp refers to the timestamp field in struct v4l2_buffer. +* Use v4l2_timeval_to_ns() to convert the struct timeval to a __u64. +* @pic_num: matches PicNum variable assigned during the reference +* picture lists construction process. +* @frame_num: frame identifier which matches frame_num syntax element. +* @fields: indicates how the DPB entry is referenced. Valid values are +* V4L2_H264_{}_REF. +* @reserved: padding field. Should be zeroed by applications. +* @top_field_order_cnt: matches TopFieldOrderCnt picture value. +* @bottom_field_order_cnt: matches BottomFieldOrderCnt picture value. +* Note that picture field is indicated by v4l2_buffer.field. +* @flags: see V4L2_H264_DPB_ENTRY_FLAG_{}. +*/ +struct v4l2_h264_dpb_entry { +__u64 reference_ts; +__u32 pic_num; +__u16 frame_num; +__u8 fields; +__u8 reserved[5 ]; +__s32 top_field_order_cnt; +__s32 bottom_field_order_cnt; +__u32 flags; +}; + +#define V4L2_H264_DECODE_PARAM_FLAG_IDR_PIC 0x01 +#define V4L2_H264_DECODE_PARAM_FLAG_FIELD_PIC 0x02 +#define V4L2_H264_DECODE_PARAM_FLAG_BOTTOM_FIELD 0x04 + +#define V4L2_CID_STATELESS_H264_DECODE_PARAMS (V4L2_CID_CODEC_STATELESS_BASE + 7) +/** +* struct v4l2_ctrl_h264_decode_params - H264 decoding parameters +* +* @dpb: decoded picture buffer. +* @nal_ref_idc: slice header syntax element. +* @frame_num: slice header syntax element. +* @top_field_order_cnt: matches TopFieldOrderCnt picture value. +* @bottom_field_order_cnt: matches BottomFieldOrderCnt picture value. +* Note that picture field is indicated by v4l2_buffer.field. +* @idr_pic_id: slice header syntax element. +* @pic_order_cnt_lsb: slice header syntax element. +* @delta_pic_order_cnt_bottom: slice header syntax element. +* @delta_pic_order_cnt0: slice header syntax element. +* @delta_pic_order_cnt1: slice header syntax element. +* @dec_ref_pic_marking_bit_size: size in bits of dec_ref_pic_marking() +* syntax element. +* @pic_order_cnt_bit_size: size in bits of pic order count syntax. +* @slice_group_change_cycle: slice header syntax element. +* @reserved: padding field. Should be zeroed by applications. +* @flags: see V4L2_H264_DECODE_PARAM_FLAG_{}. +*/ +struct v4l2_ctrl_h264_decode_params { +struct v4l2_h264_dpb_entry dpb[V4L2_H264_NUM_DPB_ENTRIES ]; +__u16 nal_ref_idc; +__u16 frame_num; +__s32 top_field_order_cnt; +__s32 bottom_field_order_cnt; +__u16 idr_pic_id; +__u16 pic_order_cnt_lsb; +__s32 delta_pic_order_cnt_bottom; +__s32 delta_pic_order_cnt0; +__s32 delta_pic_order_cnt1; +__u32 dec_ref_pic_marking_bit_size; +__u32 pic_order_cnt_bit_size; +__u32 slice_group_change_cycle; + +__u32 reserved; +__u32 flags; +}; +/* MPEG-compression definitions kept for backwards compatibility */ #ifndef __KERNEL__include/uapi/linux/videodev2.h +0
-0@@ -1734,6 +1734,12 @@ struct v4l2_ext_control {__u16 __user *p_u16;__u32 __user *p_u32;include/uapi/linux/videodev2.h struct v4l2_ext_control { · line 1745
Quoted 10 lines
include/uapi/linux/videodev2.h +6
-0struct v4l2_area __user *p_area; +struct v4l2_ctrl_h264_sps __user *p_h264_sps; +struct v4l2_ctrl_h264_pps *p_h264_pps; +struct v4l2_ctrl_h264_scaling_matrix __user *p_h264_scaling_matrix; +struct v4l2_ctrl_h264_pred_weights __user *p_h264_pred_weights; +struct v4l2_ctrl_h264_slice_params __user *p_h264_slice_params; +struct v4l2_ctrl_h264_decode_params __user *p_h264_decode_params;void __user *ptr; }; } __attribute__ ((packed));Thanks,
Mauro
PATCH v5 14/14 media: docs: Move the H264 stateless codec uAPI
In reply to Ezequiel GarciaNow that we've destaged the H264 stateless codec controls, and with all the pieces in place, update the documentation and move it to its own section.
--- .../userspace-api/media/v4l/common.rst | 1 + .../media/v4l/ext-ctrls-codec-stateless.rst | 674 +++++++++++++++++ .../media/v4l/ext-ctrls-codec.rst | 692 ------------------ .../media/v4l/pixfmt-compressed.rst | 25 +- .../media/v4l/vidioc-g-ext-ctrls.rst | 24 + 5 files changed, 709 insertions(+), 707 deletions(-) create mode 100644 Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst
Documentation/userspace-api/media/v4l/common.rst +1 -0
@@ -44,6 +44,7 @@ applicable to all devices. ext-ctrls-image-source ext-ctrls-image-process ext-ctrls-codec + ext-ctrls-codec-stateless ext-ctrls-jpeg ext-ctrls-dv ext-ctrls-rf-tuner
Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst new file +674 -0
674 lines not on this page · raw message
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +0 -692
698 lines not on this page · raw message
Documentation/userspace-api/media/v4l/pixfmt-compressed.rst +10 -15
@@ -57,18 +57,18 @@ Compressed Formats - H264 parsed slice data, including slice headers, either with or without the start code, as extracted from the H264 bitstream. This format is adapted for stateless video decoders that implement an - H264 pipeline (using the :ref:`mem2mem` and :ref:`media-request-api`). + H264 pipeline with the :ref:`stateless_decoder`. This pixelformat has two modifiers that must be set at least once - through the ``V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE`` - and ``V4L2_CID_MPEG_VIDEO_H264_START_CODE`` controls. + through the ``V4L2_CID_STATELESS_H264_DECODE_MODE`` + and ``V4L2_CID_STATELESS_H264_START_CODE`` controls. In addition, metadata associated with the frame to decode are - required to be passed through the ``V4L2_CID_MPEG_VIDEO_H264_SPS``, - ``V4L2_CID_MPEG_VIDEO_H264_PPS``, - ``V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX``, - ``V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS`` and - ``V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS`` controls. See the - :ref:`associated Codec Control IDs <v4l2-mpeg-h264>`. Exactly - one output and one capture buffer must be provided for use + required to be passed through the ``V4L2_CID_STATELESS_H264_SPS``, + ``V4L2_CID_STATELESS_H264_PPS``, + ``V4L2_CID_STATELESS_H264_SCALING_MATRIX``, + ``V4L2_CID_STATELESS_H264_SLICE_PARAMS`` and + ``V4L2_CID_STATELESS_H264_DECODE_PARAMS`` controls. See the + :ref:`associated Codec Control IDs <v4l2-codec-stateless-h264>`. + Exactly one output and one capture buffer must be provided for use with this pixel format. The output buffer must contain the appropriate number of macroblocks to decode a full corresponding frame to the matching capture buffer.
@@ -77,11 +77,6 @@ Compressed Formats 7.3.2.8 "Slice layer without partitioning RBSP syntax" and the following sections. - .. note:: - - This format is not yet part of the public kernel API and it - is expected to change. - * .. _V4L2-PIX-FMT-H263: - ``V4L2_PIX_FMT_H263``
Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst +24 -0
@@ -184,6 +184,30 @@ still cause this situation. - ``p_area`` - A pointer to a struct :c:type:`v4l2_area`. Valid if this control is of type ``V4L2_CTRL_TYPE_AREA``. + * - :c:type:`v4l2_ctrl_h264_sps` * + - ``p_h264_sps`` + - A pointer to a struct :c:type:`v4l2_ctrl_h264_sps`. Valid if this control is + of type ``V4L2_CTRL_TYPE_H264_SPS``. + * - :c:type:`v4l2_ctrl_h264_pps` * + - ``p_h264_pps`` + - A pointer to a struct :c:type:`v4l2_ctrl_h264_pps`. Valid if this control is + of type ``V4L2_CTRL_TYPE_H264_PPS``. + * - :c:type:`v4l2_ctrl_h264_scaling_matrix` * + - ``p_h264_scaling_matrix`` + - A pointer to a struct :c:type:`v4l2_ctrl_h264_scaling_matrix`. Valid if this control is + of type ``V4L2_CTRL_TYPE_H264_SCALING_MATRIX``. + * - :c:type:`v4l2_ctrl_h264_pred_weights` * + - ``p_h264_pred_weights`` + - A pointer to a struct :c:type:`v4l2_ctrl_h264_pred_weights`. Valid if this control is + of type ``V4L2_CTRL_TYPE_H264_PRED_WEIGHTS``. + * - :c:type:`v4l2_ctrl_h264_slice_params` * + - ``p_h264_slice_params`` + - A pointer to a struct :c:type:`v4l2_ctrl_h264_slice_params`. Valid if this control is + of type ``V4L2_CTRL_TYPE_H264_SLICE_PARAMS``. + * - :c:type:`v4l2_ctrl_h264_decode_params` * + - ``p_h264_decode_params`` + - A pointer to a struct :c:type:`v4l2_ctrl_h264_decode_params`. Valid if this control is + of type ``V4L2_CTRL_TYPE_H264_DECODE_PARAMS``. * - void * - ``ptr`` - A pointer to a compound type which can be an N-dimensional array
Signature · 1 line
2.27.0