| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <9f9d3bcf-6adc-c6c4-663d-0bdabc8adb67@xs4all.nl>
Date: Mon, 14 Mar 2022 11:27:41 +0100
From: Hans Verkuil <hverkuil-cisco@...all.nl>
To: quic_dikshita@...cinc.com, linux-media@...r.kernel.org,
linux-kernel@...r.kernel.org
Cc: linux-arm-msm@...r.kernel.org, ezequiel@...labora.com,
stanimir.varbanov@...aro.org, quic_vgarodia@...cinc.com,
quic_majja@...cinc.com, quic_jdas@...cinc.com
Subject: Re: [PATCH v4 1/2] media: v4l2-ctrls: Add intra-refresh type control
On 3/14/22 11:09, quic_dikshita@...cinc.com wrote:
> From: Dikshita Agarwal <quic_dikshita@...cinc.com>
>
> Add a control to set intra-refresh type.
>
> Signed-off-by: Dikshita Agarwal <quic_dikshita@...cinc.com>
> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@...labora.com>
> ---
> .../userspace-api/media/v4l/ext-ctrls-codec.rst | 22 ++++++++++++++++++++++
> drivers/media/v4l2-core/v4l2-ctrls-defs.c | 9 +++++++++
> include/uapi/linux/v4l2-controls.h | 5 +++++
> 3 files changed, 36 insertions(+)
>
> diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
> index 4cd7c54..1539cd5 100644
> --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
> +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
> @@ -1180,6 +1180,28 @@ enum v4l2_mpeg_video_h264_entropy_mode -
> is set to non zero value.
> Applicable to H264, H263 and MPEG4 encoder.
>
> +``V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE (enum)``
> +
> +enum v4l2_mpeg_video_intra_refresh_period_type -
> + Sets the type of intra refresh. The period to refresh
> + the whole frame is specified by V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD.
> + Note that if this control is not present, then it is undefined what
> + refresh type is used and it is up to the drive to decide.
drive -> driver
> + Applicable to H264 and HEVC encoders. Possible values are:
> +
> +.. tabularcolumns:: |p{9.6cm}|p{7.9cm}|
> +
> +.. flat-table::
> + :header-rows: 0
> + :stub-columns: 0
> +
> + * - ``V4L2_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM``
> + - The whole frame is completely refreshed randomly
> + after the specified period.
> + * - ``V4L2_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC``
> + - The whole frame MBs are completely refreshed in cyclic order
> + after the specified period.
> +
> ``V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD (integer)``
> Intra macroblock refresh period. This sets the period to refresh
> the whole frame. In other words, this defines the number of frames
> diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c
> index 54ca4e6..3089e50 100644
> --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c
> +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c
> @@ -572,6 +572,11 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
> "VBV/CPB Limit",
> NULL,
> };
> + static const char * const intra_refresh_period_type[] = {
> + "Random",
> + "Cyclic",
> + NULL,
> + };
>
> switch (id) {
> case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
> @@ -705,6 +710,8 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
> return hevc_start_code;
> case V4L2_CID_CAMERA_ORIENTATION:
> return camera_orientation;
> + case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE:
> + return intra_refresh_period_type;
> default:
> return NULL;
> }
> @@ -834,6 +841,7 @@ const char *v4l2_ctrl_get_name(u32 id)
> case V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE: return "Decoder Slice Interface";
> case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER: return "MPEG4 Loop Filter Enable";
> case V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB: return "Number of Intra Refresh MBs";
> + case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE: return "Intra Refresh Priod Type";
Priod -> Period
> case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD: return "Intra Refresh Period";
> case V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE: return "Frame Level Rate Control Enable";
> case V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE: return "H264 MB Level Rate Control";
> @@ -1360,6 +1368,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
> case V4L2_CID_STATELESS_H264_DECODE_MODE:
> case V4L2_CID_STATELESS_H264_START_CODE:
> case V4L2_CID_CAMERA_ORIENTATION:
> + case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE:
> *type = V4L2_CTRL_TYPE_MENU;
> break;
> case V4L2_CID_LINK_FREQ:
> diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
> index c8e0f84..e7df4c5 100644
> --- a/include/uapi/linux/v4l2-controls.h
> +++ b/include/uapi/linux/v4l2-controls.h
> @@ -443,6 +443,11 @@ enum v4l2_mpeg_video_multi_slice_mode {
> #define V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES (V4L2_CID_CODEC_BASE+234)
> #define V4L2_CID_MPEG_VIDEO_DEC_CONCEAL_COLOR (V4L2_CID_CODEC_BASE+235)
> #define V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD (V4L2_CID_CODEC_BASE+236)
> +#define V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE (V4L2_CID_CODEC_BASE+237)
> +enum v4l2_mpeg_video_intra_refresh_period_type {
> + V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM = 0,
> + V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC = 1,
> +};
>
> /* CIDs for the MPEG-2 Part 2 (H.262) codec */
> #define V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL (V4L2_CID_CODEC_BASE+270)
After fixing these two typos you can add my:
Acked-by: Hans Verkuil <hverkuil-cisco@...all.nl>
I assume that Stanimir will merge this together with patch 2/2.
Regards,
Hans
Powered by blists - more mailing lists