diff options
| author | Jacek Anaszewski | 2013-11-21 17:33:41 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-12-18 14:49:34 +0100 |
| commit | fdf9e2bcbb7e53759fde6a3f5dd9f63cc0268f40 (patch) | |
| tree | b1ce00d1c7524907a115401a3895a75f165a7857 /drivers/media/platform/s5p-jpeg/jpeg-core.c | |
| parent | [media] s5p-jpeg: Ensure correct capture format for Exynos4x12 (diff) | |
| download | kernel-qcow2-linux-fdf9e2bcbb7e53759fde6a3f5dd9f63cc0268f40.tar.gz kernel-qcow2-linux-fdf9e2bcbb7e53759fde6a3f5dd9f63cc0268f40.tar.xz kernel-qcow2-linux-fdf9e2bcbb7e53759fde6a3f5dd9f63cc0268f40.zip | |
[media] s5p-jpeg: Allow for wider JPEG subsampling scope for Exynos4x12 encoder
Exynos4x12 supports wider scope of subsampling modes than
S5PC210. Adjust corresponding mask accordingly.
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/s5p-jpeg/jpeg-core.c')
| -rw-r--r-- | drivers/media/platform/s5p-jpeg/jpeg-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index ba8e4fcb8f33..3d5d99446d78 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -1249,7 +1249,8 @@ static int s5p_jpeg_controls_create(struct s5p_jpeg_ctx *ctx) v4l2_ctrl_new_std(&ctx->ctrl_handler, &s5p_jpeg_ctrl_ops, V4L2_CID_JPEG_RESTART_INTERVAL, 0, 3, 0xffff, 0); - mask = ~0x06; /* 422, 420 */ + if (ctx->jpeg->variant->version == SJPEG_S5P) + mask = ~0x06; /* 422, 420 */ } ctrl = v4l2_ctrl_new_std_menu(&ctx->ctrl_handler, &s5p_jpeg_ctrl_ops, |