aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2014-07-18 07:22:41 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-21 15:25:19 -0500
commit91b5841e24d1ebefd62f03ff790755ae0f379627 (patch)
tree1092edc2403d7c4709373b9b74829aff37339a66 /drivers
parent[media] coda: delay coda_fill_bitstream() (diff)
downloadlinux-dev-91b5841e24d1ebefd62f03ff790755ae0f379627.tar.xz
linux-dev-91b5841e24d1ebefd62f03ff790755ae0f379627.zip
[media] coda: lock capture frame size to output frame size when streaming
As soon as the output queue is streaming, let try_fmt on the capture side only allow the frame size that was set on the output side. Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/platform/coda.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 898eb3dbb8da..f1cf44a5aa3c 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -719,6 +719,9 @@ static int coda_try_fmt_vid_cap(struct file *file, void *priv,
f->fmt.pix.pixelformat);
if (!codec)
return -EINVAL;
+
+ f->fmt.pix.width = q_data_src->width;
+ f->fmt.pix.height = q_data_src->height;
} else {
/* Otherwise determine codec by encoded format, if possible */
codec = coda_find_codec(ctx->dev, V4L2_PIX_FMT_YUV420,