* [PATCH v2] media: venus: amend buffer size for bitstream plane
@ 2018-11-20 6:53 Malathi Gottam
2018-11-26 8:21 ` Alexandre Courbot
2018-11-26 9:43 ` Stanimir Varbanov
0 siblings, 2 replies; 3+ messages in thread
From: Malathi Gottam @ 2018-11-20 6:53 UTC (permalink / raw)
To: stanimir.varbanov, hverkuil, mchehab
Cc: linux-media, linux-kernel, linux-arm-msm, acourbot, vgarodia, mgottam
Accept the buffer size requested by client and compare it
against driver calculated size and set the maximum to
bitstream plane.
Signed-off-by: Malathi Gottam <mgottam@codeaurora.org>
---
drivers/media/platform/qcom/venus/venc.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index ce85962..ecfdbd6 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -303,6 +303,7 @@ static int venc_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f)
struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp;
struct v4l2_plane_pix_format *pfmt = pixmp->plane_fmt;
const struct venus_format *fmt;
+ __u32 sizeimage;
memset(pfmt[0].reserved, 0, sizeof(pfmt[0].reserved));
memset(pixmp->reserved, 0, sizeof(pixmp->reserved));
@@ -334,9 +335,10 @@ static int venc_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f)
pixmp->num_planes = fmt->num_planes;
pixmp->flags = 0;
- pfmt[0].sizeimage = venus_helper_get_framesz(pixmp->pixelformat,
- pixmp->width,
- pixmp->height);
+ sizeimage = venus_helper_get_framesz(pixmp->pixelformat,
+ pixmp->width,
+ pixmp->height);
+ pfmt[0].sizeimage = max(ALIGN(pfmt[0].sizeimage, SZ_4K), sizeimage);
if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
pfmt[0].bytesperline = ALIGN(pixmp->width, 128);
@@ -408,8 +410,10 @@ static int venc_s_fmt(struct file *file, void *fh, struct v4l2_format *f)
if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
inst->fmt_out = fmt;
- else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
+ else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
inst->fmt_cap = fmt;
+ inst->output_buf_size = pixmp->plane_fmt[0].sizeimage;
+ }
return 0;
}
@@ -908,6 +912,7 @@ static int venc_queue_setup(struct vb2_queue *q,
sizes[0] = venus_helper_get_framesz(inst->fmt_cap->pixfmt,
inst->width,
inst->height);
+ sizes[0] = max(sizes[0], inst->output_buf_size);
inst->output_buf_size = sizes[0];
break;
default:
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] media: venus: amend buffer size for bitstream plane
2018-11-20 6:53 [PATCH v2] media: venus: amend buffer size for bitstream plane Malathi Gottam
@ 2018-11-26 8:21 ` Alexandre Courbot
2018-11-26 9:43 ` Stanimir Varbanov
1 sibling, 0 replies; 3+ messages in thread
From: Alexandre Courbot @ 2018-11-26 8:21 UTC (permalink / raw)
To: mgottam
Cc: Stanimir Varbanov, Hans Verkuil, Mauro Carvalho Chehab,
Linux Media Mailing List, LKML, linux-arm-msm, vgarodia
Hi Malathi,
On Tue, Nov 20, 2018 at 3:53 PM Malathi Gottam <mgottam@codeaurora.org> wrote:
>
> Accept the buffer size requested by client and compare it
> against driver calculated size and set the maximum to
> bitstream plane.
>
> Signed-off-by: Malathi Gottam <mgottam@codeaurora.org>
> ---
> drivers/media/platform/qcom/venus/venc.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
> index ce85962..ecfdbd6 100644
> --- a/drivers/media/platform/qcom/venus/venc.c
> +++ b/drivers/media/platform/qcom/venus/venc.c
> @@ -303,6 +303,7 @@ static int venc_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f)
> struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp;
> struct v4l2_plane_pix_format *pfmt = pixmp->plane_fmt;
> const struct venus_format *fmt;
> + __u32 sizeimage;
>
> memset(pfmt[0].reserved, 0, sizeof(pfmt[0].reserved));
> memset(pixmp->reserved, 0, sizeof(pixmp->reserved));
> @@ -334,9 +335,10 @@ static int venc_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f)
> pixmp->num_planes = fmt->num_planes;
> pixmp->flags = 0;
>
> - pfmt[0].sizeimage = venus_helper_get_framesz(pixmp->pixelformat,
> - pixmp->width,
> - pixmp->height);
> + sizeimage = venus_helper_get_framesz(pixmp->pixelformat,
> + pixmp->width,
> + pixmp->height);
> + pfmt[0].sizeimage = max(ALIGN(pfmt[0].sizeimage, SZ_4K), sizeimage);
>
> if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
> pfmt[0].bytesperline = ALIGN(pixmp->width, 128);
> @@ -408,8 +410,10 @@ static int venc_s_fmt(struct file *file, void *fh, struct v4l2_format *f)
>
> if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
> inst->fmt_out = fmt;
> - else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
> + else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
> inst->fmt_cap = fmt;
> + inst->output_buf_size = pixmp->plane_fmt[0].sizeimage;
> + }
>
> return 0;
> }
> @@ -908,6 +912,7 @@ static int venc_queue_setup(struct vb2_queue *q,
> sizes[0] = venus_helper_get_framesz(inst->fmt_cap->pixfmt,
> inst->width,
> inst->height);
> + sizes[0] = max(sizes[0], inst->output_buf_size);
> inst->output_buf_size = sizes[0];
> break;
> default:
I think this should work, but don't we also need to do the same thing
for the decoder's OUTPUT queue?
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] media: venus: amend buffer size for bitstream plane
2018-11-20 6:53 [PATCH v2] media: venus: amend buffer size for bitstream plane Malathi Gottam
2018-11-26 8:21 ` Alexandre Courbot
@ 2018-11-26 9:43 ` Stanimir Varbanov
1 sibling, 0 replies; 3+ messages in thread
From: Stanimir Varbanov @ 2018-11-26 9:43 UTC (permalink / raw)
To: Malathi Gottam, hverkuil, mchehab
Cc: linux-media, linux-kernel, linux-arm-msm, acourbot, vgarodia
Hi Malathi,
thanks for the patch!
On 11/20/18 8:53 AM, Malathi Gottam wrote:
> Accept the buffer size requested by client and compare it
> against driver calculated size and set the maximum to
> bitstream plane.
>
> Signed-off-by: Malathi Gottam <mgottam@codeaurora.org>
> ---
> drivers/media/platform/qcom/venus/venc.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
> index ce85962..ecfdbd6 100644
> --- a/drivers/media/platform/qcom/venus/venc.c
> +++ b/drivers/media/platform/qcom/venus/venc.c
> @@ -303,6 +303,7 @@ static int venc_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f)
> struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp;
> struct v4l2_plane_pix_format *pfmt = pixmp->plane_fmt;
> const struct venus_format *fmt;
> + __u32 sizeimage;
please use u32 for kernel internal variables.
Otherwise looks good to me:
Acked-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
>
> memset(pfmt[0].reserved, 0, sizeof(pfmt[0].reserved));
> memset(pixmp->reserved, 0, sizeof(pixmp->reserved));
> @@ -334,9 +335,10 @@ static int venc_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f)
> pixmp->num_planes = fmt->num_planes;
> pixmp->flags = 0;
>
> - pfmt[0].sizeimage = venus_helper_get_framesz(pixmp->pixelformat,
> - pixmp->width,
> - pixmp->height);
> + sizeimage = venus_helper_get_framesz(pixmp->pixelformat,
> + pixmp->width,
> + pixmp->height);
> + pfmt[0].sizeimage = max(ALIGN(pfmt[0].sizeimage, SZ_4K), sizeimage);
>
> if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
> pfmt[0].bytesperline = ALIGN(pixmp->width, 128);
> @@ -408,8 +410,10 @@ static int venc_s_fmt(struct file *file, void *fh, struct v4l2_format *f)
>
> if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
> inst->fmt_out = fmt;
> - else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
> + else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
> inst->fmt_cap = fmt;
> + inst->output_buf_size = pixmp->plane_fmt[0].sizeimage;
> + }
>
> return 0;
> }
> @@ -908,6 +912,7 @@ static int venc_queue_setup(struct vb2_queue *q,
> sizes[0] = venus_helper_get_framesz(inst->fmt_cap->pixfmt,
> inst->width,
> inst->height);
> + sizes[0] = max(sizes[0], inst->output_buf_size);
> inst->output_buf_size = sizes[0];
> break;
> default:
>
--
regards,
Stan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-11-26 9:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-20 6:53 [PATCH v2] media: venus: amend buffer size for bitstream plane Malathi Gottam
2018-11-26 8:21 ` Alexandre Courbot
2018-11-26 9:43 ` Stanimir Varbanov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).