diff options
author | Jacek Anaszewski <j.anaszewski@samsung.com> | 2014-07-11 12:19:45 -0300 |
---|---|---|
committer | Jacek Anaszewski <j.anaszewski@samsung.com> | 2014-11-05 16:05:28 +0100 |
commit | 7a0ce363759ce9a1040724c2c1908593dcd6ff0f (patch) | |
tree | 46e61106acea63d9e90801f237e7b35b9863be25 | |
parent | 75039fc777fa8a9e64725a155038dc1a3ca67d6f (diff) | |
download | linux-3.10-7a0ce363759ce9a1040724c2c1908593dcd6ff0f.tar.gz linux-3.10-7a0ce363759ce9a1040724c2c1908593dcd6ff0f.tar.bz2 linux-3.10-7a0ce363759ce9a1040724c2c1908593dcd6ff0f.zip |
[media] s5p-jpeg: fix g_selection op
V4L2_SEL_TGT_COMPOSE_DEFAULT switch case should select whole
available area of the image and V4L2_SEL_TGT_COMPOSE
should apply user settings.
Change-Id: I32ea7a72f86a52b001a251782f821d0772f42e54
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/media/platform/s5p-jpeg/jpeg-core.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index 5ef7f5b1e82..d11357f5fc4 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -1505,21 +1505,23 @@ static int s5p_jpeg_g_selection(struct file *file, void *priv, case V4L2_SEL_TGT_CROP: case V4L2_SEL_TGT_CROP_BOUNDS: case V4L2_SEL_TGT_CROP_DEFAULT: - case V4L2_SEL_TGT_COMPOSE: case V4L2_SEL_TGT_COMPOSE_DEFAULT: s->r.width = ctx->out_q.w; s->r.height = ctx->out_q.h; + s->r.left = 0; + s->r.top = 0; break; + case V4L2_SEL_TGT_COMPOSE: case V4L2_SEL_TGT_COMPOSE_BOUNDS: case V4L2_SEL_TGT_COMPOSE_PADDED: - s->r.width = ctx->cap_q.w; - s->r.height = ctx->cap_q.h; + s->r.width = ctx->crop_rect.width; + s->r.height = ctx->crop_rect.height; + s->r.left = ctx->crop_rect.left; + s->r.top = ctx->crop_rect.top; break; default: return -EINVAL; } - s->r.left = 0; - s->r.top = 0; return 0; } |