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

media: hantro: 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>
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 54889c51

drivers/staging/media/hantro/hantro_drv.c

+0 −5
Original line number Diff line number Diff line
@@ -306,11 +306,6 @@ static const struct hantro_ctrl controls[] = { 
		.cfg = {

			.id = V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS,

		},

	}, {

		.codec = HANTRO_H264_DECODER,

		.cfg = {

			.id = V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS,

		},

	}, {

		.codec = HANTRO_H264_DECODER,

		.cfg = {

drivers/staging/media/hantro/hantro_h264.c

+0 −5
Original line number Diff line number Diff line
@@ -349,11 +349,6 @@ int hantro_h264_dec_prepare_run(struct hantro_ctx *ctx) 
	if (WARN_ON(!ctrls->decode))

		return -EINVAL;



	ctrls->slices =

		hantro_get_ctrl(ctx, V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS);

	if (WARN_ON(!ctrls->slices))

		return -EINVAL;



	ctrls->sps =

		hantro_get_ctrl(ctx, V4L2_CID_MPEG_VIDEO_H264_SPS);

	if (WARN_ON(!ctrls->sps))

drivers/staging/media/hantro/hantro_hw.h

+0 −2
Original line number Diff line number Diff line
@@ -56,14 +56,12 @@ struct hantro_jpeg_enc_hw_ctx { 
 * struct hantro_h264_dec_ctrls

 * @decode:	Decode params

 * @scaling:	Scaling info

 * @slice:	Slice params

 * @sps:	SPS info

 * @pps:	PPS info

 */

struct hantro_h264_dec_ctrls {

	const struct v4l2_ctrl_h264_decode_params *decode;

	const struct v4l2_ctrl_h264_scaling_matrix *scaling;

	const struct v4l2_ctrl_h264_slice_params *slices;

	const struct v4l2_ctrl_h264_sps *sps;

	const struct v4l2_ctrl_h264_pps *pps;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE