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

Commit fac4d961 authored by Jacek Anaszewski's avatar Jacek Anaszewski Committed by Mauro Carvalho Chehab
Browse files

[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.

Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent e9e7dfe5

drivers/media/platform/s5p-jpeg/jpeg-core.c

+7 −5
Original line number Original line Diff line number Diff line
@@ -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:

	case V4L2_SEL_TGT_CROP_BOUNDS:

	case V4L2_SEL_TGT_CROP_BOUNDS:

	case V4L2_SEL_TGT_CROP_DEFAULT:

	case V4L2_SEL_TGT_CROP_DEFAULT:

	case V4L2_SEL_TGT_COMPOSE:

	case V4L2_SEL_TGT_COMPOSE_DEFAULT:

	case V4L2_SEL_TGT_COMPOSE_DEFAULT:

		s->r.width = ctx->out_q.w;

		s->r.width = ctx->out_q.w;

		s->r.height = ctx->out_q.h;

		s->r.height = ctx->out_q.h;

		s->r.left = 0;

		s->r.top = 0;

		break;

		break;

	case V4L2_SEL_TGT_COMPOSE:

	case V4L2_SEL_TGT_COMPOSE_BOUNDS:

	case V4L2_SEL_TGT_COMPOSE_BOUNDS:

	case V4L2_SEL_TGT_COMPOSE_PADDED:

	case V4L2_SEL_TGT_COMPOSE_PADDED:

		s->r.width = ctx->cap_q.w;

		s->r.width = ctx->crop_rect.width;

		s->r.height = ctx->cap_q.h;

		s->r.height =  ctx->crop_rect.height;

		s->r.left = ctx->crop_rect.left;

		s->r.top = ctx->crop_rect.top;

		break;

		break;

	default:

	default:

		return -EINVAL;

		return -EINVAL;

	}

	}

	s->r.left = 0;

	s->r.top = 0;

	return 0;

	return 0;

}

}