Commit a52b29e8 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

media: rkvdec: Don't require unneeded H264_SLICE_PARAMS 



Now that slice invariant parameters have been moved,
the driver no longer needs this control, so drop it.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Reviewed-by: default avatarJonas Karlman <jonas@kwiboo.se>
Tested-by: default avatarJonas Karlman <jonas@kwiboo.se>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 057c4452

drivers/staging/media/rkvdec/rkvdec-h264.c

+0 −4
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ struct rkvdec_h264_reflists { 
struct rkvdec_h264_run {

	struct rkvdec_run base;

	const struct v4l2_ctrl_h264_decode_params *decode_params;

	const struct v4l2_ctrl_h264_slice_params *slices_params;

	const struct v4l2_ctrl_h264_sps *sps;

	const struct v4l2_ctrl_h264_pps *pps;

	const struct v4l2_ctrl_h264_scaling_matrix *scaling_matrix;
@@ -1066,9 +1065,6 @@ static void rkvdec_h264_run_preamble(struct rkvdec_ctx *ctx, 
	ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,

			      V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS);

	run->decode_params = ctrl ? ctrl->p_cur.p : NULL;

	ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,

			      V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS);

	run->slices_params = ctrl ? ctrl->p_cur.p : NULL;

	ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,

			      V4L2_CID_MPEG_VIDEO_H264_SPS);

	run->sps = ctrl ? ctrl->p_cur.p : NULL;

drivers/staging/media/rkvdec/rkvdec.c

+0 −5
Original line number Diff line number Diff line
@@ -59,11 +59,6 @@ static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = { 
		.mandatory = true,

		.cfg.id = V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS,

	},

	{

		.per_request = true,

		.mandatory = true,

		.cfg.id = V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS,

	},

	{

		.per_request = true,

		.mandatory = true,

CRA Git | Maintained and supported by SUSTech CRA and CCSE