| Message ID | 20200127145602.21863-1-p.zabel@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: hantro: fix extra MV/MC sync space calculation | expand |
Hi Philipp, Thanks for the patch. On Mon, 2020-01-27 at 15:56 +0100, Philipp Zabel wrote: > Add space for MVs and MC sync data to the capture buffers depending on > whether the post processor will be enabled for the new capture format > passed to TRY_FMT, not the currently set capture format. > Fixes: 158e92003ba27 ("media: hantro: Support color conversion via post-processing") Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > --- > drivers/staging/media/hantro/hantro_v4l2.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c > index 0198bcda26b7..f4ae2cee0f18 100644 > --- a/drivers/staging/media/hantro/hantro_v4l2.c > +++ b/drivers/staging/media/hantro/hantro_v4l2.c > @@ -295,7 +295,7 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f, > * +---------------------------+ > */ > if (ctx->vpu_src_fmt->fourcc == V4L2_PIX_FMT_H264_SLICE && > - !hantro_needs_postproc(ctx, ctx->vpu_dst_fmt)) > + !hantro_needs_postproc(ctx, fmt)) And we also need to fix hantro_needs_postproc, as it should only be used for decoders. I can send a patch for it. Thanks, Ezequiel > pix_mp->plane_fmt[0].sizeimage += > 64 * MB_WIDTH(pix_mp->width) * > MB_WIDTH(pix_mp->height) + 32;
diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c index 0198bcda26b7..f4ae2cee0f18 100644 --- a/drivers/staging/media/hantro/hantro_v4l2.c +++ b/drivers/staging/media/hantro/hantro_v4l2.c @@ -295,7 +295,7 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f, * +---------------------------+ */ if (ctx->vpu_src_fmt->fourcc == V4L2_PIX_FMT_H264_SLICE && - !hantro_needs_postproc(ctx, ctx->vpu_dst_fmt)) + !hantro_needs_postproc(ctx, fmt)) pix_mp->plane_fmt[0].sizeimage += 64 * MB_WIDTH(pix_mp->width) * MB_WIDTH(pix_mp->height) + 32;
Add space for MVs and MC sync data to the capture buffers depending on whether the post processor will be enabled for the new capture format passed to TRY_FMT, not the currently set capture format. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- drivers/staging/media/hantro/hantro_v4l2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)