| 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: <807fbefd25e2e91e6d3dd47acfd9a596def9e7ea.camel@collabora.com>
Date: Wed, 24 Feb 2021 17:39:37 -0300
From: Ezequiel Garcia <ezequiel@...labora.com>
To: Benjamin Gaignard <benjamin.gaignard@...labora.com>,
p.zabel@...gutronix.de, mchehab@...nel.org, robh+dt@...nel.org,
shawnguo@...nel.org, s.hauer@...gutronix.de, kernel@...gutronix.de,
festevam@...il.com, linux-imx@....com, gregkh@...uxfoundation.org,
mripard@...nel.org, paul.kocialkowski@...tlin.com, wens@...e.org,
jernej.skrabec@...l.net, peng.fan@....com,
hverkuil-cisco@...all.nl, dan.carpenter@...cle.com
Cc: linux-media@...r.kernel.org, linux-rockchip@...ts.infradead.org,
devicetree@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org, kernel@...labora.com
Subject: Re: [PATCH v3 2/9] media: hantro: Define HEVC codec profiles and
supported features
On Mon, 2021-02-22 at 13:23 +0100, Benjamin Gaignard wrote:
> Define which HEVC profiles (up to level 5.1) and features
> (no scaling, no 10 bits) are supported by the driver.
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@...labora.com>
> ---
> drivers/staging/media/hantro/hantro.h | 2 +
> drivers/staging/media/hantro/hantro_drv.c | 58 +++++++++++++++++++++++
> 2 files changed, 60 insertions(+)
>
> diff --git a/drivers/staging/media/hantro/hantro.h b/drivers/staging/media/hantro/hantro.h
> index 65f9f7ea7dcf..bde65231f22f 100644
> --- a/drivers/staging/media/hantro/hantro.h
> +++ b/drivers/staging/media/hantro/hantro.h
> @@ -99,6 +99,7 @@ struct hantro_variant {
> * @HANTRO_MODE_H264_DEC: H264 decoder.
> * @HANTRO_MODE_MPEG2_DEC: MPEG-2 decoder.
> * @HANTRO_MODE_VP8_DEC: VP8 decoder.
> + * @HANTRO_MODE_HEVC_DEC: HEVC decoder.
> */
> enum hantro_codec_mode {
> HANTRO_MODE_NONE = -1,
> @@ -106,6 +107,7 @@ enum hantro_codec_mode {
> HANTRO_MODE_H264_DEC,
> HANTRO_MODE_MPEG2_DEC,
> HANTRO_MODE_VP8_DEC,
> + HANTRO_MODE_HEVC_DEC,
> };
>
> /*
> diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
> index e5f200e64993..d86e322a5980 100644
> --- a/drivers/staging/media/hantro/hantro_drv.c
> +++ b/drivers/staging/media/hantro/hantro_drv.c
> @@ -243,6 +243,18 @@ static int hantro_try_ctrl(struct v4l2_ctrl *ctrl)
> if (sps->bit_depth_luma_minus8 != 0)
> /* Only 8-bit is supported */
> return -EINVAL;
> + } else if (ctrl->id == V4L2_CID_MPEG_VIDEO_HEVC_SPS) {
> + const struct v4l2_ctrl_hevc_sps *sps = ctrl->p_new.p_hevc_sps;
> +
> + if (sps->bit_depth_luma_minus8 != sps->bit_depth_chroma_minus8)
> + /* Luma and chroma bit depth mismatch */
> + return -EINVAL;
> + if (sps->bit_depth_luma_minus8 != 0)
> + /* Only 8-bit is supported */
> + return -EINVAL;
> + if (sps->flags & V4L2_HEVC_SPS_FLAG_SCALING_LIST_ENABLED)
> + /* No scaling support */
> + return -EINVAL;
> }
> return 0;
> }
> @@ -349,6 +361,52 @@ static const struct hantro_ctrl controls[] = {
> .def = V4L2_MPEG_VIDEO_H264_PROFILE_MAIN,
> }
> }, {
> + .codec = HANTRO_HEVC_DECODER,
Silly nitpick. Looks like this is not defined yet?
I'm getting:
drivers/staging/media/hantro/hantro_drv.c:364:12: error: ‘HANTRO_HEVC_DECODER’ undeclared here (not in a function); did you mean
‘HANTRO_H264_DECODER’?
364 | .codec = HANTRO_HEVC_DECODER,
| ^~~~~~~~~~~~~~~~~~~
| HANTRO_H264_DECODER
I'll review the G2 driver soon :-)
Thanks,
Ezequiel
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE,
> + .min = V4L2_MPEG_VIDEO_HEVC_DECODE_MODE_FRAME_BASED,
> + .max = V4L2_MPEG_VIDEO_HEVC_DECODE_MODE_FRAME_BASED,
> + .def = V4L2_MPEG_VIDEO_HEVC_DECODE_MODE_FRAME_BASED,
> + },
> + }, {
> + .codec = HANTRO_HEVC_DECODER,
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_START_CODE,
> + .min = V4L2_MPEG_VIDEO_HEVC_START_CODE_ANNEX_B,
> + .max = V4L2_MPEG_VIDEO_HEVC_START_CODE_ANNEX_B,
> + .def = V4L2_MPEG_VIDEO_HEVC_START_CODE_ANNEX_B,
> + },
> + }, {
> + .codec = HANTRO_HEVC_DECODER,
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_PROFILE,
> + .min = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN,
> + .max = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10,
> + .def = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN,
> + },
> + }, {
> + .codec = HANTRO_HEVC_DECODER,
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_LEVEL,
> + .min = V4L2_MPEG_VIDEO_HEVC_LEVEL_1,
> + .max = V4L2_MPEG_VIDEO_HEVC_LEVEL_5_1,
> + },
> + }, {
> + .codec = HANTRO_HEVC_DECODER,
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_SPS,
> + .ops = &hantro_ctrl_ops,
> + },
> + }, {
> + .codec = HANTRO_HEVC_DECODER,
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_PPS,
> + },
> + }, {
> + .codec = HANTRO_HEVC_DECODER,
> + .cfg = {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_DECODE_PARAMS,
> + },
> },
> };
>
Powered by blists - more mailing lists