Commit 57612890 authored by Thibault Saunier's avatar Thibault Saunier Committed by Mauro Carvalho Chehab

[media] exynos-gsc: Use user configured colorspace if provided

Use colorspace provided by the user as we are only doing scaling and
color encoding conversion, we won't be able to transform the colorspace
itself and the colorspace won't mater in that operation.

Also always use output colorspace on the capture side.

If the user does not provide a colorspace do not make it up, we might
later while processing need to figure out the colorspace, which
is possible depending on the frame size but do not ever guess and
leak that guess to the userspace.
Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarThibault Saunier <thibault.saunier@osg.samsung.com>
Reviewed-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 6428f63b
...@@ -454,6 +454,7 @@ int gsc_try_fmt_mplane(struct gsc_ctx *ctx, struct v4l2_format *f) ...@@ -454,6 +454,7 @@ int gsc_try_fmt_mplane(struct gsc_ctx *ctx, struct v4l2_format *f)
} else { } else {
min_w = variant->pix_min->target_rot_dis_w; min_w = variant->pix_min->target_rot_dis_w;
min_h = variant->pix_min->target_rot_dis_h; min_h = variant->pix_min->target_rot_dis_h;
pix_mp->colorspace = ctx->out_colorspace;
} }
pr_debug("mod_x: %d, mod_y: %d, max_w: %d, max_h = %d", pr_debug("mod_x: %d, mod_y: %d, max_w: %d, max_h = %d",
...@@ -472,10 +473,8 @@ int gsc_try_fmt_mplane(struct gsc_ctx *ctx, struct v4l2_format *f) ...@@ -472,10 +473,8 @@ int gsc_try_fmt_mplane(struct gsc_ctx *ctx, struct v4l2_format *f)
pix_mp->num_planes = fmt->num_planes; pix_mp->num_planes = fmt->num_planes;
if (pix_mp->width >= 1280) /* HD */ if (V4L2_TYPE_IS_OUTPUT(f->type))
pix_mp->colorspace = V4L2_COLORSPACE_REC709; ctx->out_colorspace = pix_mp->colorspace;
else /* SD */
pix_mp->colorspace = V4L2_COLORSPACE_SMPTE170M;
for (i = 0; i < pix_mp->num_planes; ++i) { for (i = 0; i < pix_mp->num_planes; ++i) {
struct v4l2_plane_pix_format *plane_fmt = &pix_mp->plane_fmt[i]; struct v4l2_plane_pix_format *plane_fmt = &pix_mp->plane_fmt[i];
...@@ -519,8 +518,8 @@ int gsc_g_fmt_mplane(struct gsc_ctx *ctx, struct v4l2_format *f) ...@@ -519,8 +518,8 @@ int gsc_g_fmt_mplane(struct gsc_ctx *ctx, struct v4l2_format *f)
pix_mp->height = frame->f_height; pix_mp->height = frame->f_height;
pix_mp->field = V4L2_FIELD_NONE; pix_mp->field = V4L2_FIELD_NONE;
pix_mp->pixelformat = frame->fmt->pixelformat; pix_mp->pixelformat = frame->fmt->pixelformat;
pix_mp->colorspace = V4L2_COLORSPACE_REC709;
pix_mp->num_planes = frame->fmt->num_planes; pix_mp->num_planes = frame->fmt->num_planes;
pix_mp->colorspace = ctx->out_colorspace;
for (i = 0; i < pix_mp->num_planes; ++i) { for (i = 0; i < pix_mp->num_planes; ++i) {
pix_mp->plane_fmt[i].bytesperline = (frame->f_width * pix_mp->plane_fmt[i].bytesperline = (frame->f_width *
......
...@@ -376,6 +376,7 @@ struct gsc_ctx { ...@@ -376,6 +376,7 @@ struct gsc_ctx {
struct v4l2_ctrl_handler ctrl_handler; struct v4l2_ctrl_handler ctrl_handler;
struct gsc_ctrls gsc_ctrls; struct gsc_ctrls gsc_ctrls;
bool ctrls_rdy; bool ctrls_rdy;
enum v4l2_colorspace out_colorspace;
}; };
void gsc_set_prefbuf(struct gsc_dev *gsc, struct gsc_frame *frm); void gsc_set_prefbuf(struct gsc_dev *gsc, struct gsc_frame *frm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment