aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorAndrzej Hajda <a.hajda@samsung.com>2012-06-12 08:46:26 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-06-18 18:48:14 -0400
commit0749ae350133204c2562c69f4265842141cacf12 (patch)
tree6ced0788cb6d280100aaee2463faf91d8c45e5ec /drivers/media
parentafd14f48a732758d6fbbc3a5fc5b211742102c4b (diff)
[media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT
Image size for MFC encoder should have size between 8x4 and 1920x1080 with even width and height. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/s5p-mfc/s5p_mfc_enc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
index 9c19aa8038dd..03d83340e7fb 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
@@ -901,6 +901,8 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
901 mfc_err("failed to try output format\n"); 901 mfc_err("failed to try output format\n");
902 return -EINVAL; 902 return -EINVAL;
903 } 903 }
904 v4l_bound_align_image(&pix_fmt_mp->width, 8, 1920, 1,
905 &pix_fmt_mp->height, 4, 1080, 1, 0);
904 } else { 906 } else {
905 mfc_err("invalid buf type\n"); 907 mfc_err("invalid buf type\n");
906 return -EINVAL; 908 return -EINVAL;