diff options
| author | Ezequiel Garcia <ezequiel@collabora.com> | 2020-08-25 06:52:39 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-09-01 15:13:28 +0300 |
| commit | a52b29e8d21d6c6463ff40e862107da0717a0840 (patch) | |
| tree | 9a7d64805ad4b6fda7f4592a53d88cdb6739b850 | |
| parent | 057c4452894a38e4cc256858425b2c756003a92f (diff) | |
| download | linux-a52b29e8d21d6c6463ff40e862107da0717a0840.tar.xz | |
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: Ezequiel Garcia <ezequiel@collabora.com>
Reviewed-by: Jonas Karlman <jonas@kwiboo.se>
Tested-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| -rw-r--r-- | drivers/staging/media/rkvdec/rkvdec-h264.c | 4 | ||||
| -rw-r--r-- | drivers/staging/media/rkvdec/rkvdec.c | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c index 90f211839be2..c45cd1617b3b 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -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; @@ -1067,9 +1066,6 @@ static void rkvdec_h264_run_preamble(struct rkvdec_ctx *ctx, 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; ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl, diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index c8151328fb70..7c5129593921 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -62,11 +62,6 @@ static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = { { .per_request = true, .mandatory = true, - .cfg.id = V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS, - }, - { - .per_request = true, - .mandatory = true, .cfg.id = V4L2_CID_MPEG_VIDEO_H264_SPS, .cfg.ops = &rkvdec_ctrl_ops, }, |