| Message ID | 20200715202233.185680-11-ezequiel@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: Clean H264 stateless uAPI | expand |
Hi, On 2020-07-15 22:22, Ezequiel Garcia wrote: > 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> > --- > drivers/staging/media/rkvdec/rkvdec-h264.c | 4 ---- > drivers/staging/media/rkvdec/rkvdec.c | 5 ----- > 2 files changed, 9 deletions(-) > > diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c > index 57c084910b3b..f6e1fa19d625 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, > 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); V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS line should be removed not SPS :-) With that fixed, Reviewed-by: Jonas Karlman <jonas@kwiboo.se> Best regards, Jonas > run->sps = ctrl ? ctrl->p_cur.p : NULL; > ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl, > V4L2_CID_MPEG_VIDEO_H264_PPS); > diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c > index accb4a902fdd..8ebc9dfc83be 100644 > --- a/drivers/staging/media/rkvdec/rkvdec.c > +++ b/drivers/staging/media/rkvdec/rkvdec.c > @@ -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, >
diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c index 57c084910b3b..f6e1fa19d625 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, 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, V4L2_CID_MPEG_VIDEO_H264_PPS); diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index accb4a902fdd..8ebc9dfc83be 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -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,
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> --- drivers/staging/media/rkvdec/rkvdec-h264.c | 4 ---- drivers/staging/media/rkvdec/rkvdec.c | 5 ----- 2 files changed, 9 deletions(-)