media: cedrus: Adjust buffer size based on codec

In some cases decoding engine needs extra space in capture buffers. This
is the case for decoding 10-bit HEVC frames into 8-bit capture format.
This commit only adds infrastructure for such cases.

Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h
index 5904294f310893d956aaed7b8e0423968f9dd469..774fe8048ce3335977edad2476e48c1bbbfd20bd 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus.h
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
@@ -162,6 +162,8 @@ struct cedrus_dec_ops {
        int (*start)(struct cedrus_ctx *ctx);
        void (*stop)(struct cedrus_ctx *ctx);
        void (*trigger)(struct cedrus_ctx *ctx);
+       unsigned int (*extra_cap_size)(struct cedrus_ctx *ctx,
+                                      struct v4l2_pix_format *pix_fmt);
 };
 
 struct cedrus_variant {

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
index e6909be282d3dab220bb15d9c7738b1d996609a5..73464c5ec0b5a80119b15f2f4a5de4ee05b14f8d 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
@@ -250,6 +250,10 @@ static int cedrus_try_fmt_vid_cap_p(struct cedrus_ctx *ctx,
        pix_fmt->height = ctx->src_fmt.height;
        cedrus_prepare_format(pix_fmt);
 
+       if (ctx->current_codec->extra_cap_size)
+               pix_fmt->sizeimage +=
+                       ctx->current_codec->extra_cap_size(ctx, pix_fmt);
+
        return 0;
 }