| 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:
<PAXPR04MB825420D7C8A88111F0F8084EE7402@PAXPR04MB8254.eurprd04.prod.outlook.com>
Date: Fri, 18 Oct 2024 08:20:36 +0000
From: Ming Qian <ming.qian@....com>
To: Hans Verkuil <hverkuil-cisco@...all.nl>, "mchehab@...nel.org"
<mchehab@...nel.org>
CC: "yunkec@...gle.com" <yunkec@...gle.com>, "nicolas@...fresne.ca"
<nicolas@...fresne.ca>, "s.hauer@...gutronix.de" <s.hauer@...gutronix.de>,
"kernel@...gutronix.de" <kernel@...gutronix.de>, "festevam@...il.com"
<festevam@...il.com>, dl-linux-imx <linux-imx@....com>, "X.H. Bao"
<xiahong.bao@....com>, Ming Zhou <ming.zhou@....com>, Eagle Zhou
<eagle.zhou@....com>, Tao Jiang <tao.jiang_2@....com>, "Ming Qian (OSS)"
<ming.qian@....nxp.com>, "imx@...ts.linux.dev" <imx@...ts.linux.dev>,
"linux-media@...r.kernel.org" <linux-media@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-arm-kernel@...ts.infradead.org" <linux-arm-kernel@...ts.infradead.org>
Subject: RE: [EXT] Re: [RFC v2 5/6] media: v4l2-ctrls: Add video roi ctrls
Hi Hans,
>-----Original Message-----
>From: Hans Verkuil <hverkuil-cisco@...all.nl>
>Sent: Friday, October 18, 2024 2:28 PM
>To: Ming Qian <ming.qian@....com>; mchehab@...nel.org
>Cc: yunkec@...gle.com; nicolas@...fresne.ca; s.hauer@...gutronix.de;
>kernel@...gutronix.de; festevam@...il.com; dl-linux-imx <linux-
>imx@....com>; X.H. Bao <xiahong.bao@....com>; Ming Zhou
><ming.zhou@....com>; Eagle Zhou <eagle.zhou@....com>; Tao Jiang
><tao.jiang_2@....com>; Ming Qian (OSS) <ming.qian@....nxp.com>;
>imx@...ts.linux.dev; linux-media@...r.kernel.org; linux-
>kernel@...r.kernel.org; linux-arm-kernel@...ts.infradead.org
>Subject: [EXT] Re: [RFC v2 5/6] media: v4l2-ctrls: Add video roi ctrls
>
>Caution: This is an external email. Please take care when clicking links or
>opening attachments. When in doubt, report the message using the 'Report
>this email' button
>
>
>On 18/10/2024 07:44, Ming Qian wrote:
>> Add some ctrls to support the video encoder ROI feature.
>> Support 2 encoder ROI configurations that are rectangular region and
>> QP map
>>
>> Signed-off-by: Ming Qian <ming.qian@....com>
>> Signed-off-by: TaoJiang <tao.jiang_2@....com>
>> ---
>> .../media/v4l/ext-ctrls-codec.rst | 73 +++++++++++++++++++
>> drivers/media/v4l2-core/v4l2-ctrls-defs.c | 29 ++++++++
>> include/uapi/linux/v4l2-controls.h | 11 +++
>> 3 files changed, 113 insertions(+)
>>
>> diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
>> b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
>> index 4a379bd9e3fb..6b972247778c 100644
>> --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
>> +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
>> @@ -1667,6 +1667,79 @@ enum
>v4l2_mpeg_video_h264_hierarchical_coding_type -
>> Codecs need to always use the specified range, rather then a HW custom
>range.
>> Applicable to encoders
>>
>> +``V4L2_CID_MPEG_VIDEO_ROI_MODE``
>> + (enum)
>> +
>> +enum v4l2_mpeg_video_roi_mode -
>> + Video roi mode. Possible values are:
>> +
>> +
>> +
>> +.. flat-table::
>> + :header-rows: 0
>> + :stub-columns: 0
>> +
>> + * - ``V4L2_MPEG_VIDEO_ROI_MODE_NONE``
>> + - No ROI in the MPEG stream
>> + * - ``V4L2_MPEG_VIDEO_ROI_MODE_RECT``
>> + - Rectangle ROI mode
>> + * - ``V4L2_MPEG_VIDEO_ROI_MODE_MAP``
>> + - Map ROI mode
>> +
>> +``V4L2_CID_MPEG_VIDEO_ROI_RECT (struct)``
>> + Select rectangular regions and specify the QP offset. The
>> + struct :c:type:`v4l2_ctrl_video_region_param` provides the
>> + rectangular region and the parameter to describe QP offset.
>> + The maximum number of rectangular regions depends on the
>> + hardware. This control is a dynamically sized array. This
>> + control is applicable when ``V4L2_CID_MPEG_VIDEO_ROI_MODE``
>> + value is ``V4L2_MPEG_VIDEO_ROI_MODE_RECT``. Applicable to
>> + encoders.
>> +
>> +.. c:type:: v4l2_ctrl_video_region_param
>> +
>> +.. raw:: latex
>> +
>> + \small
>> +
>> +.. tabularcolumns:: |p{4.0cm}|p{4.0cm}|p{4.0cm}|
>> +
>> +.. flat-table:: struct v4l2_ctrl_video_region_param
>> + :header-rows: 0
>> + :stub-columns: 0
>> + :widths: 1 1 1
>> +
>> + * - struct :c:type:`v4l2_rect`
>> + - ``rect``
>> + - The rectangular region
>
>What is the unit? I assume pixels. And inside what larger area is this rectangle
>located? It probably needs to refer to one of the SEL_TGT targets as described
>here:
>
>https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fhverkuil.
>home.xs4all.nl%2Fspec%2Fuserspace-api%2Fv4l%2Fv4l2-selection-
>targets.html&data=05%7C02%7Cming.qian%40nxp.com%7Cfe9348ba24504eb
>d98f608dcef3dffcf%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63
>8648296786960098%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAi
>LCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0%7C%7C%7C&sdata
>=cTXaNWLZs4l6IytSu9TWmEb7OyvF4viby9IjpOJXvmE%3D&reserved=0
>
We want to use pixels as the unit, but for some detailed encoder, there
may be alignment constraints, and the rectangular area should be inside
the encoded picture size, for example, we encode a 720P H.264 stream,
the largest area is 1280x720@(0,0). This doesn't involve scaling up or
down. I'm not sure if it's possible to align to crop or compose.
Currently, we want to choose an area and increase or decrease the image
quality. so we want to use a parameter to set the qp offset.
>> + * - __s32
>> + - ``parameter``
>> + -
>
>So what is the parameter? It has no description.
>
I newly add a ctrl type V4L2_CTRL_TYPE_REGION, and this struct is
related to the type, so I thought I need to define a general argument to
meet different needs, then this type can support a series of controls.
For this patch, it's qp offset.
I thought if I name it as qp_offset, the ctrl type can't be used on
other similar controls.
Is it better to rename it or add more description and keep the name?
>> + * - __u32
>> + - ``reserved[2]``
>> + -
>
>Add "Applications and drivers must set this to zero."
>
Yes, I missed it
>> +
>> +.. raw:: latex
>> +
>> + \normalsize
>> +
>> +``V4L2_CID_MPEG_VIDEO_ROI_MAP (integer)``
>> + Specifies the QP offset for each block. This control is a
>> + dynamically sized array. The array size can be calculated
>> + from video resolution and the roi map block size which can
>> + be got from ``V4L2_CID_MPEG_VIDEO_ROI_MAP_BLOCK_SIZE``. This
>> + control is applicable when ``V4L2_CID_MPEG_VIDEO_ROI_MODE``
>> + value is ``V4L2_MPEG_VIDEO_ROI_MODE_MAP``. Applicable to
>> + encoders.
>> +
>> +``V4L2_CID_MPEG_VIDEO_ROI_MAP_BLOCK_SIZE (struct)``
>> + This control returns the roi block size in pixels. The struct
>> + :c:type:`v4l2_area` provides the width and height in separate
>> + fields. This control is applicable when
>> + ``V4L2_CID_MPEG_VIDEO_ROI_MODE`` value is
>> + ``V4L2_MPEG_VIDEO_ROI_MODE_MAP``. This control depends on the
>> + encoding format. Applicable to encoders.
>> +
>> .. raw:: latex
>>
>> \normalsize
>> diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c
>> b/drivers/media/v4l2-core/v4l2-ctrls-defs.c
>> index 1ea52011247a..54219a3b215a 100644
>> --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c
>> +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c
>> @@ -612,6 +612,13 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
>> NULL,
>> };
>>
>> + static const char * const mpeg_video_roi_mode[] = {
>> + "None",
>> + "Rectangle",
>> + "Map",
>> + NULL,
>> + };
>> +
>> switch (id) {
>> case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
>> return mpeg_audio_sampling_freq; @@ -750,6 +757,8 @@
>> const char * const *v4l2_ctrl_get_menu(u32 id)
>> return camera_orientation;
>> case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE:
>> return intra_refresh_period_type;
>> + case V4L2_CID_MPEG_VIDEO_ROI_MODE:
>> + return mpeg_video_roi_mode;
>> default:
>> return NULL;
>> }
>> @@ -971,6 +980,10 @@ const char *v4l2_ctrl_get_name(u32 id)
>> case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX: return "Frame
>LTR Index";
>> case V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES: return "Use LTR
>Frames";
>> case V4L2_CID_MPEG_VIDEO_AVERAGE_QP: return "Average
>QP Value";
>> + case V4L2_CID_MPEG_VIDEO_ROI_MODE: return "Video ROI
>Mode";
>> + case V4L2_CID_MPEG_VIDEO_ROI_RECT: return "Video ROI
>Rectangle";
>> + case V4L2_CID_MPEG_VIDEO_ROI_MAP: return "Video ROI
>Map";
>> + case V4L2_CID_MPEG_VIDEO_ROI_MAP_BLOCK_SIZE: return
>"Video ROI Map Block Size";
>> case V4L2_CID_FWHT_I_FRAME_QP: return "FWHT I-Frame
>QP Value";
>> case V4L2_CID_FWHT_P_FRAME_QP: return "FWHT P-
>Frame QP Value";
>>
>> @@ -1512,6 +1525,22 @@ void v4l2_ctrl_fill(u32 id, const char **name,
>enum v4l2_ctrl_type *type,
>> *type = V4L2_CTRL_TYPE_INTEGER;
>> *flags |= V4L2_CTRL_FLAG_READ_ONLY;
>> break;
>> + case V4L2_CID_MPEG_VIDEO_ROI_MODE:
>> + *type = V4L2_CTRL_TYPE_MENU;
>> + *flags |= V4L2_CTRL_FLAG_UPDATE;
>> + break;
>> + case V4L2_CID_MPEG_VIDEO_ROI_RECT:
>> + *type = V4L2_CTRL_TYPE_REGION;
>> + *flags |= V4L2_CTRL_FLAG_DYNAMIC_ARRAY |
>V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX;
>> + break;
>> + case V4L2_CID_MPEG_VIDEO_ROI_MAP:
>> + *type = V4L2_CTRL_TYPE_INTEGER;
>> + *flags |= V4L2_CTRL_FLAG_DYNAMIC_ARRAY |
>V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX;
>> + break;
>> + case V4L2_CID_MPEG_VIDEO_ROI_MAP_BLOCK_SIZE:
>> + *type = V4L2_CTRL_TYPE_AREA;
>> + *flags |= V4L2_CTRL_FLAG_READ_ONLY;
>> + break;
>> case V4L2_CID_PIXEL_RATE:
>> *type = V4L2_CTRL_TYPE_INTEGER64;
>> *flags |= V4L2_CTRL_FLAG_READ_ONLY; diff --git
>> a/include/uapi/linux/v4l2-controls.h
>> b/include/uapi/linux/v4l2-controls.h
>> index 974fd254e573..169a676fd64c 100644
>> --- a/include/uapi/linux/v4l2-controls.h
>> +++ b/include/uapi/linux/v4l2-controls.h
>> @@ -900,6 +900,17 @@ enum v4l2_mpeg_video_av1_level {
>>
>> #define V4L2_CID_MPEG_VIDEO_AVERAGE_QP (V4L2_CID_CODEC_BASE +
>657)
>>
>> +enum v4l2_mpeg_video_roi_mode {
>> + V4L2_MPEG_VIDEO_ROI_MODE_NONE,
>> + V4L2_MPEG_VIDEO_ROI_MODE_RECT,
>> + V4L2_MPEG_VIDEO_ROI_MODE_MAP
>> +};
>> +
>> +#define V4L2_CID_MPEG_VIDEO_ROI_MODE (V4L2_CID_CODEC_BASE
>+ 658)
>> +#define V4L2_CID_MPEG_VIDEO_ROI_RECT (V4L2_CID_CODEC_BASE +
>659)
>> +#define V4L2_CID_MPEG_VIDEO_ROI_MAP (V4L2_CID_CODEC_BASE +
>660)
>> +#define V4L2_CID_MPEG_VIDEO_ROI_MAP_BLOCK_SIZE
>(V4L2_CID_CODEC_BASE + 661)
>> +
>> /* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2
>*/
>> #define V4L2_CID_CODEC_CX2341X_BASE
>(V4L2_CTRL_CLASS_CODEC | 0x1000)
>> #define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE
>(V4L2_CID_CODEC_CX2341X_BASE+0)
Powered by blists - more mailing lists