On 2018-11-12 18:04, Stanimir Varbanov wrote:
Hi Tomasz,
On 10/23/2018 05:50 AM, Tomasz Figa wrote:
Hi Malathi,
On Tue, Oct 9, 2018 at 4:58 PM Malathi Gottam <mgottam@xxxxxxxxxxxxxx>
wrote:
For lower resolutions, incase of encoder, the compressed
frame size is more than half of the corresponding input
YUV. Keep the size as same as YUV considering worst case.
Signed-off-by: Malathi Gottam <mgottam@xxxxxxxxxxxxxx>
---
drivers/media/platform/qcom/venus/helpers.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/qcom/venus/helpers.c
b/drivers/media/platform/qcom/venus/helpers.c
index 2679adb..05c5423 100644
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c
@@ -649,7 +649,7 @@ u32 venus_helper_get_framesz(u32 v4l2_fmt, u32
width, u32 height)
}
if (compressed) {
- sz = ALIGN(height, 32) * ALIGN(width, 32) * 3 / 2 /
2;
+ sz = ALIGN(height, 32) * ALIGN(width, 32) * 3 / 2;
return ALIGN(sz, SZ_4K);
}
Note that the driver should not enforce one particular buffer size for
bitstream buffers unless it's a workaround for broken firmware or
hardware. The userspace should be able to select the desired size.
Good point! Yes, we have to extend set_fmt to allow bigger sizeimage
for
the compressed buffers (not only for encoder).
So Stan you meant to say that we should allow s_fmt to accept client
specified size?
If so should we set the inst->input_buf_size here in venc_s_fmt?
@@ -333,10 +333,10 @@static const struct venus_format *
venc_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f)
pixmp->num_planes = fmt->num_planes;
pixmp->flags = 0;
-
- pfmt[0].sizeimage = venus_helper_get_framesz(pixmp->pixelformat,
- pixmp->width,
- pixmp->height);
+ if (!pfmt[0].sizeimage)
+ pfmt[0].sizeimage =
venus_helper_get_framesz(pixmp->pixelformat,
+
pixmp->width,
+
pixmp->height);
if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
pfmt[0].bytesperline = ALIGN(pixmp->width, 128);
@@ -387,6 +387,7 @@ static int venc_s_fmt(struct file *file, void *fh,
struct v4l2_format *f)
venc_try_fmt_common(inst, &format);
if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
+ inst->input_buf_size = pixmp->plane_fmt[0].sizeimage;
inst->out_width = format.fmt.pix_mp.width;
inst->out_height = format.fmt.pix_mp.height;
Similar implementation is already handled in case of decoder.
Then in queue setup, we can compare this against calculated size to
obtain final buffer size
@@ -899,7 +900,8 @@ static int venc_queue_setup(struct vb2_queue *q,
sizes[0] =
venus_helper_get_framesz(inst->fmt_out->pixfmt,
inst->width,
inst->height);
- inst->input_buf_size = sizes[0];
+ if(inst->input_buf_size < sizes[0])
+ inst->input_buf_size = sizes[0];
break;
I hope this meets are requirements.
