Commit 298d8e8f authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Mauro Carvalho Chehab
Browse files

media: rkvdec: Do not override sizeimage for output format 



The rkvdec H.264 decoder currently overrides sizeimage for the output
format. This causes issues when userspace requires and requests a larger
buffer, but ends up with one of insufficient size.

Instead, only provide a default size if none was requested. This fixes
the video_decode_accelerator_tests from Chromium failing on the first
frame due to insufficient buffer space. It also aligns the behavior
of the rkvdec driver with the Hantro and Cedrus drivers.

Fixes: cd33c830 ("media: rkvdec: Add the rkvdec driver")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Reviewed-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 4c2e5156

drivers/staging/media/rkvdec/rkvdec-h264.c

+3 −2
Original line number Diff line number Diff line
@@ -1015,6 +1015,7 @@ static int rkvdec_h264_adjust_fmt(struct rkvdec_ctx *ctx, 
	struct v4l2_pix_format_mplane *fmt = &f->fmt.pix_mp;



	fmt->num_planes = 1;

	if (!fmt->plane_fmt[0].sizeimage)

		fmt->plane_fmt[0].sizeimage = fmt->width * fmt->height *

					      RKVDEC_H264_MAX_DEPTH_IN_BYTES;

	return 0;