Commit 1925665e authored by Ming Qian's avatar Ming Qian Committed by Mauro Carvalho Chehab
Browse files

media: amphion: remove redundant check of colorspace in venc_s_fmt 



record the colorspace set by user.
if it's not supported by h264 vui, then zero will be written to vui,
but don't modify the user setting.

Fixes: 0401e659 ("media: amphion: add v4l2 m2m vpu encoder stateful driver")
Signed-off-by: default avatarMing Qian <ming.qian@nxp.com>
Acked-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@kernel.org>
parent 7206fcc5

drivers/media/platform/amphion/venc.c

+4 −14
Original line number Diff line number Diff line
@@ -250,18 +250,9 @@ static int venc_s_fmt(struct file *file, void *fh, struct v4l2_format *f) 
	}



	if (V4L2_TYPE_IS_OUTPUT(f->type)) {

		if (!vpu_color_check_primaries(pix_mp->colorspace)) {

		venc->params.color.primaries = pix_mp->colorspace;

			vpu_color_get_default(venc->params.color.primaries,

					      &venc->params.color.transfer,

					      &venc->params.color.matrix,

					      &venc->params.color.full_range);

		}

		if (!vpu_color_check_transfers(pix_mp->xfer_func))

		venc->params.color.transfer = pix_mp->xfer_func;

		if (!vpu_color_check_matrix(pix_mp->ycbcr_enc))

		venc->params.color.matrix = pix_mp->ycbcr_enc;

		if (!vpu_color_check_full_range(pix_mp->quantization))

		venc->params.color.full_range = pix_mp->quantization;

	}
@@ -1281,7 +1272,6 @@ static void venc_init(struct file *file) 
	f.fmt.pix_mp.width = 1280;

	f.fmt.pix_mp.height = 720;

	f.fmt.pix_mp.field = V4L2_FIELD_NONE;

	f.fmt.pix_mp.colorspace = V4L2_COLORSPACE_REC709;

	venc_s_fmt(file, &inst->fh, &f);



	memset(&f, 0, sizeof(f));