| Message ID | 20231105165521.3592037-7-jonas@kwiboo.se (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: rkvdec: Add H.264 High 10 and 4:2:2 profile support | expand |
Le dimanche 05 novembre 2023 à 16:55 +0000, Jonas Karlman a écrit : > Extract call to v4l2_fill_pixfmt_mp() and ajusting of sizeimage into a > helper. Replace current code with a call to the new helper. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> > --- > v4: > - Do not reset pix_mp->field in rkvdec_fill_decoded_pixfmt() > > v3: > - No changes > > drivers/staging/media/rkvdec/rkvdec.c | 27 ++++++++++++++------------- > 1 file changed, 14 insertions(+), 13 deletions(-) > > diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c > index 84a41792cb4b..0570c790ad08 100644 > --- a/drivers/staging/media/rkvdec/rkvdec.c > +++ b/drivers/staging/media/rkvdec/rkvdec.c > @@ -27,6 +27,16 @@ > #include "rkvdec.h" > #include "rkvdec-regs.h" > > +static void rkvdec_fill_decoded_pixfmt(struct rkvdec_ctx *ctx, > + struct v4l2_pix_format_mplane *pix_mp) > +{ > + v4l2_fill_pixfmt_mp(pix_mp, pix_mp->pixelformat, > + pix_mp->width, pix_mp->height); > + pix_mp->plane_fmt[0].sizeimage += 128 * > + DIV_ROUND_UP(pix_mp->width, 16) * > + DIV_ROUND_UP(pix_mp->height, 16); > +} > + > static int rkvdec_try_ctrl(struct v4l2_ctrl *ctrl) > { > struct rkvdec_ctx *ctx = container_of(ctrl->handler, struct rkvdec_ctx, ctrl_hdl); > @@ -192,13 +202,9 @@ static void rkvdec_reset_decoded_fmt(struct rkvdec_ctx *ctx) > > rkvdec_reset_fmt(ctx, f, ctx->coded_fmt_desc->decoded_fmts[0]); > f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; > - v4l2_fill_pixfmt_mp(&f->fmt.pix_mp, > - ctx->coded_fmt_desc->decoded_fmts[0], > - ctx->coded_fmt.fmt.pix_mp.width, > - ctx->coded_fmt.fmt.pix_mp.height); > - f->fmt.pix_mp.plane_fmt[0].sizeimage += 128 * > - DIV_ROUND_UP(f->fmt.pix_mp.width, 16) * > - DIV_ROUND_UP(f->fmt.pix_mp.height, 16); > + f->fmt.pix_mp.width = ctx->coded_fmt.fmt.pix_mp.width; > + f->fmt.pix_mp.height = ctx->coded_fmt.fmt.pix_mp.height; > + rkvdec_fill_decoded_pixfmt(ctx, &f->fmt.pix_mp); > } > > static int rkvdec_enum_framesizes(struct file *file, void *priv, > @@ -264,12 +270,7 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, > &pix_mp->height, > &coded_desc->frmsize); > > - v4l2_fill_pixfmt_mp(pix_mp, pix_mp->pixelformat, > - pix_mp->width, pix_mp->height); > - pix_mp->plane_fmt[0].sizeimage += > - 128 * > - DIV_ROUND_UP(pix_mp->width, 16) * > - DIV_ROUND_UP(pix_mp->height, 16); > + rkvdec_fill_decoded_pixfmt(ctx, pix_mp); > pix_mp->field = V4L2_FIELD_NONE; > > return 0;
diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index 84a41792cb4b..0570c790ad08 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,6 +27,16 @@ #include "rkvdec.h" #include "rkvdec-regs.h" +static void rkvdec_fill_decoded_pixfmt(struct rkvdec_ctx *ctx, + struct v4l2_pix_format_mplane *pix_mp) +{ + v4l2_fill_pixfmt_mp(pix_mp, pix_mp->pixelformat, + pix_mp->width, pix_mp->height); + pix_mp->plane_fmt[0].sizeimage += 128 * + DIV_ROUND_UP(pix_mp->width, 16) * + DIV_ROUND_UP(pix_mp->height, 16); +} + static int rkvdec_try_ctrl(struct v4l2_ctrl *ctrl) { struct rkvdec_ctx *ctx = container_of(ctrl->handler, struct rkvdec_ctx, ctrl_hdl); @@ -192,13 +202,9 @@ static void rkvdec_reset_decoded_fmt(struct rkvdec_ctx *ctx) rkvdec_reset_fmt(ctx, f, ctx->coded_fmt_desc->decoded_fmts[0]); f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; - v4l2_fill_pixfmt_mp(&f->fmt.pix_mp, - ctx->coded_fmt_desc->decoded_fmts[0], - ctx->coded_fmt.fmt.pix_mp.width, - ctx->coded_fmt.fmt.pix_mp.height); - f->fmt.pix_mp.plane_fmt[0].sizeimage += 128 * - DIV_ROUND_UP(f->fmt.pix_mp.width, 16) * - DIV_ROUND_UP(f->fmt.pix_mp.height, 16); + f->fmt.pix_mp.width = ctx->coded_fmt.fmt.pix_mp.width; + f->fmt.pix_mp.height = ctx->coded_fmt.fmt.pix_mp.height; + rkvdec_fill_decoded_pixfmt(ctx, &f->fmt.pix_mp); } static int rkvdec_enum_framesizes(struct file *file, void *priv, @@ -264,12 +270,7 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, &pix_mp->height, &coded_desc->frmsize); - v4l2_fill_pixfmt_mp(pix_mp, pix_mp->pixelformat, - pix_mp->width, pix_mp->height); - pix_mp->plane_fmt[0].sizeimage += - 128 * - DIV_ROUND_UP(pix_mp->width, 16) * - DIV_ROUND_UP(pix_mp->height, 16); + rkvdec_fill_decoded_pixfmt(ctx, pix_mp); pix_mp->field = V4L2_FIELD_NONE; return 0;
Extract call to v4l2_fill_pixfmt_mp() and ajusting of sizeimage into a helper. Replace current code with a call to the new helper. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- v4: - Do not reset pix_mp->field in rkvdec_fill_decoded_pixfmt() v3: - No changes drivers/staging/media/rkvdec/rkvdec.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)