leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: rkvdec: Move H264 SPS validation in rkvdec-h264

Browse Source 
No functional change, this moves H264 specific validation into the H264
specific code. This is in preparation of improving this validation and
reusing it when VIDIOC_STREAMON is called.

Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Nicolas Dufresne
2022-05-13 22:29:13 +02:00
committed by Mauro Carvalho Chehab
parent a074aa4760
commit cf76bb4d5e
3 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/media/rkvdec/rkvdec-h264.c
View File

@@ -1137,9 +1137,32 @@ static int rkvdec_h264_run(struct rkvdec_ctx *ctx)
return 0; return 0;
} }
static int rkvdec_h264_try_ctrl(struct rkvdec_ctx *ctx, struct v4l2_ctrl *ctrl)
{
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,
* but it's currently broken in the driver.
* Reject them for now, until it's fixed.
*/
if (sps->chroma_format_idc > 1)
/* Only 4:0:0 and 4:2:0 are supported */
return -EINVAL;
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;
}
return 0;
}
const struct rkvdec_coded_fmt_ops rkvdec_h264_fmt_ops = { const struct rkvdec_coded_fmt_ops rkvdec_h264_fmt_ops = {
.adjust_fmt = rkvdec_h264_adjust_fmt, .adjust_fmt = rkvdec_h264_adjust_fmt,
.start = rkvdec_h264_start, .start = rkvdec_h264_start,
.stop = rkvdec_h264_stop, .stop = rkvdec_h264_stop,
.run = rkvdec_h264_run, .run = rkvdec_h264_run,
.try_ctrl = rkvdec_h264_try_ctrl,
}; };

23
drivers/staging/media/rkvdec/rkvdec.c
View File

@@ -29,23 +29,12 @@
static int rkvdec_try_ctrl(struct v4l2_ctrl *ctrl) static int rkvdec_try_ctrl(struct v4l2_ctrl *ctrl)
{ {
if (ctrl->id == V4L2_CID_STATELESS_H264_SPS) { struct rkvdec_ctx *ctx = container_of(ctrl->handler, struct rkvdec_ctx, ctrl_hdl);
const struct v4l2_ctrl_h264_sps *sps = ctrl->p_new.p_h264_sps; const struct rkvdec_coded_fmt_desc *desc = ctx->coded_fmt_desc;
/*
* TODO: The hardware supports 10-bit and 4:2:2 profiles, if (desc->ops->try_ctrl)
* but it's currently broken in the driver. return desc->ops->try_ctrl(ctx, ctrl);
* Reject them for now, until it's fixed.
*/
if (sps->chroma_format_idc > 1)
/* Only 4:0:0 and 4:2:0 are supported */
return -EINVAL;
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;
}
return 0; return 0;
} }

1
drivers/staging/media/rkvdec/rkvdec.h
View File

@@ -72,6 +72,7 @@ struct rkvdec_coded_fmt_ops {
void (*done)(struct rkvdec_ctx *ctx, struct vb2_v4l2_buffer *src_buf, void (*done)(struct rkvdec_ctx *ctx, struct vb2_v4l2_buffer *src_buf,
struct vb2_v4l2_buffer *dst_buf, struct vb2_v4l2_buffer *dst_buf,
enum vb2_buffer_state result); enum vb2_buffer_state result);
int (*try_ctrl)(struct rkvdec_ctx *ctx, struct v4l2_ctrl *ctrl);
}; };
struct rkvdec_coded_fmt_desc { struct rkvdec_coded_fmt_desc {