iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: venus: venc: amend buffer size for bitstream plane

Browse Source 
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>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Malathi Gottam
2018-11-26 08:12:53 -02:00
committed by Mauro Carvalho Chehab
parent d3dd552da3
commit d162aea8f6
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/platform/qcom/venus/venc.c
View File

@ -294,6 +294,7 @@ venc_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f)
struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp; struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp;
struct v4l2_plane_pix_format *pfmt = pixmp->plane_fmt; struct v4l2_plane_pix_format *pfmt = pixmp->plane_fmt;
const struct venus_format *fmt; const struct venus_format *fmt;
u32 sizeimage;
memset(pfmt[0].reserved, 0, sizeof(pfmt[0].reserved)); memset(pfmt[0].reserved, 0, sizeof(pfmt[0].reserved));
memset(pixmp->reserved, 0, sizeof(pixmp->reserved)); memset(pixmp->reserved, 0, sizeof(pixmp->reserved));
@ -325,9 +326,10 @@ venc_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f)
pixmp->num_planes = fmt->num_planes; pixmp->num_planes = fmt->num_planes;
pixmp->flags = 0; pixmp->flags = 0;
pfmt[0].sizeimage = venus_helper_get_framesz(pixmp->pixelformat, sizeimage = venus_helper_get_framesz(pixmp->pixelformat,
pixmp->width, pixmp->width,
pixmp->height); pixmp->height);
pfmt[0].sizeimage = max(ALIGN(pfmt[0].sizeimage, SZ_4K), sizeimage);
if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
pfmt[0].bytesperline = ALIGN(pixmp->width, 128); pfmt[0].bytesperline = ALIGN(pixmp->width, 128);
@ -399,8 +401,10 @@ static int venc_s_fmt(struct file *file, void *fh, struct v4l2_format *f)
if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
inst->fmt_out = fmt; 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->fmt_cap = fmt;
inst->output_buf_size = pixmp->plane_fmt[0].sizeimage;
}
return 0; return 0;
} }
@ -918,6 +922,7 @@ static int venc_queue_setup(struct vb2_queue *q,
sizes[0] = venus_helper_get_framesz(inst->fmt_cap->pixfmt, sizes[0] = venus_helper_get_framesz(inst->fmt_cap->pixfmt,
inst->width, inst->width,
inst->height); inst->height);
sizes[0] = max(sizes[0], inst->output_buf_size);
inst->output_buf_size = sizes[0]; inst->output_buf_size = sizes[0];
break; break;
default: default: