Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dc8c115 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

media: coda: reuse coda_s_fmt_vid_cap to propagate format in coda_s_fmt_vid_out 



Instead of duplicating the same code, call into coda_s_fmt_vid_out to
propagate the output format to the capture queue.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 0bade8b5

drivers/media/platform/coda/coda-common.c

+1 −13
Original line number Diff line number Diff line
@@ -786,9 +786,7 @@ static int coda_s_fmt_vid_out(struct file *file, void *priv, 
			      struct v4l2_format *f)

{

	struct coda_ctx *ctx = fh_to_ctx(priv);

	struct coda_q_data *q_data_src;

	struct v4l2_format f_cap;

	struct v4l2_rect r;

	int ret;



	ret = coda_try_fmt_vid_out(file, priv, f);
@@ -810,17 +808,7 @@ static int coda_s_fmt_vid_out(struct file *file, void *priv, 
	f_cap.fmt.pix.width = f->fmt.pix.width;

	f_cap.fmt.pix.height = f->fmt.pix.height;



	ret = coda_try_fmt_vid_cap(file, priv, &f_cap);

	if (ret)

		return ret;



	q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);

	r.left = 0;

	r.top = 0;

	r.width = q_data_src->width;

	r.height = q_data_src->height;



	return coda_s_fmt(ctx, &f_cap, &r);

	return coda_s_fmt_vid_cap(file, priv, &f_cap);

}



static int coda_reqbufs(struct file *file, void *priv,