Re: [PATCH v8 5/5] media: imx: Try colorimetry at both sink and source pads

From: Steve Longerbeam
Date: Mon Oct 21 2019 - 23:55:34 EST



On 10/21/19 8:26 PM, Steve Longerbeam wrote:
Hi Laurent,

On 10/21/19 6:44 PM, Laurent Pinchart wrote:
Hi Steve,

On Tue, May 21, 2019 at 06:03:17PM -0700, Steve Longerbeam wrote:
Retask imx_media_fill_default_mbus_fields() to try colorimetry parameters,
renaming it to to imx_media_try_colorimetry(), and call it at both sink and
source pad try_fmt's. The unrelated check for uninitialized field value is
moved out to appropriate places in each subdev try_fmt.

The IC now supports Rec.709 and BT.601 Y'CbCr encoding, and both limited
and full range quantization for both YUV and RGB space, so allow those
for pipelines that route through the IC.

Signed-off-by: Steve Longerbeam <slongerbeam@xxxxxxxxx>
---
Changes in v7:
- squashed with "media: imx: Allow Rec.709 encoding for IC routes".
- remove the RGB full-range quantization restriction for IC routes.
---
 drivers/staging/media/imx/imx-ic-prp.c | 6 +-
 drivers/staging/media/imx/imx-ic-prpencvf.c | 8 +--
 drivers/staging/media/imx/imx-media-csi.c | 19 +++---
 drivers/staging/media/imx/imx-media-utils.c | 73 ++++++++++-----------
 drivers/staging/media/imx/imx-media-vdic.c | 5 +-
 drivers/staging/media/imx/imx-media.h | 5 +-
 drivers/staging/media/imx/imx7-media-csi.c | 8 +--
 7 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/drivers/staging/media/imx/imx-ic-prp.c b/drivers/staging/media/imx/imx-ic-prp.c
index 10ffe00f1a54..f87fe0203720 100644
--- a/drivers/staging/media/imx/imx-ic-prp.c
+++ b/drivers/staging/media/imx/imx-ic-prp.c
@@ -193,8 +193,8 @@ static int prp_set_fmt(struct v4l2_subdev *sd,
ÂÂÂÂÂÂÂÂÂÂÂÂÂ sdformat->format.code = cc->codes[0];
ÂÂÂÂÂÂÂÂÂ }
 - imx_media_fill_default_mbus_fields(&sdformat->format, infmt,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ true);
+ÂÂÂÂÂÂÂ if (sdformat->format.field == V4L2_FIELD_ANY)
+ÂÂÂÂÂÂÂÂÂÂÂ sdformat->format.field = V4L2_FIELD_NONE;
ÂÂÂÂÂÂÂÂÂ break;
ÂÂÂÂÂ case PRP_SRC_PAD_PRPENC:
ÂÂÂÂÂ case PRP_SRC_PAD_PRPVF:
@@ -203,6 +203,8 @@ static int prp_set_fmt(struct v4l2_subdev *sd,
ÂÂÂÂÂÂÂÂÂ break;
ÂÂÂÂÂ }
 + imx_media_try_colorimetry(&sdformat->format, true);
+
ÂÂÂÂÂ fmt = __prp_get_fmt(priv, cfg, sdformat->pad, sdformat->which);
ÂÂÂÂÂ *fmt = sdformat->format;
 out:
diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c
index e8b36a181ccc..f2fe3c11c70e 100644
--- a/drivers/staging/media/imx/imx-ic-prpencvf.c
+++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
@@ -907,8 +907,6 @@ static void prp_try_fmt(struct prp_priv *priv,
ÂÂÂÂÂÂÂÂÂ /* propagate colorimetry from sink */
ÂÂÂÂÂÂÂÂÂ sdformat->format.colorspace = infmt->colorspace;
ÂÂÂÂÂÂÂÂÂ sdformat->format.xfer_func = infmt->xfer_func;
-ÂÂÂÂÂÂÂ sdformat->format.quantization = infmt->quantization;
-ÂÂÂÂÂÂÂ sdformat->format.ycbcr_enc = infmt->ycbcr_enc;
ÂÂÂÂÂ } else {
v4l_bound_align_image(&sdformat->format.width,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ MIN_W_SINK, MAX_W_SINK, W_ALIGN_SINK,
@@ -916,9 +914,11 @@ static void prp_try_fmt(struct prp_priv *priv,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ MIN_H_SINK, MAX_H_SINK, H_ALIGN_SINK,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ S_ALIGN);
 - imx_media_fill_default_mbus_fields(&sdformat->format, infmt,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ true);
+ÂÂÂÂÂÂÂ if (sdformat->format.field == V4L2_FIELD_ANY)
+ÂÂÂÂÂÂÂÂÂÂÂ sdformat->format.field = V4L2_FIELD_NONE;
ÂÂÂÂÂ }
+
+ÂÂÂ imx_media_try_colorimetry(&sdformat->format, true);
 }
  static int prp_set_fmt(struct v4l2_subdev *sd,
diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index 1d248aca40a9..dce4addadff4 100644
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -1375,9 +1375,15 @@ static void csi_try_field(struct csi_priv *priv,
ÂÂÂÂÂ struct v4l2_mbus_framefmt *infmt =
ÂÂÂÂÂÂÂÂÂ __csi_get_fmt(priv, cfg, CSI_SINK_PAD, sdformat->which);
 - /* no restrictions on sink pad field type */
-ÂÂÂ if (sdformat->pad == CSI_SINK_PAD)
+ÂÂÂ /*
+ÂÂÂÂ * no restrictions on sink pad field type except must
+ÂÂÂÂ * be initialized.
+ÂÂÂÂ */
+ÂÂÂ if (sdformat->pad == CSI_SINK_PAD) {
+ÂÂÂÂÂÂÂ if (sdformat->format.field == V4L2_FIELD_ANY)
+ÂÂÂÂÂÂÂÂÂÂÂ sdformat->format.field = V4L2_FIELD_NONE;
ÂÂÂÂÂÂÂÂÂ return;
+ÂÂÂ }
 Â switch (infmt->field) {
ÂÂÂÂÂ case V4L2_FIELD_SEQ_TB:
@@ -1455,8 +1461,6 @@ static void csi_try_fmt(struct csi_priv *priv,
ÂÂÂÂÂÂÂÂÂ /* propagate colorimetry from sink */
ÂÂÂÂÂÂÂÂÂ sdformat->format.colorspace = infmt->colorspace;
ÂÂÂÂÂÂÂÂÂ sdformat->format.xfer_func = infmt->xfer_func;
-ÂÂÂÂÂÂÂ sdformat->format.quantization = infmt->quantization;
-ÂÂÂÂÂÂÂ sdformat->format.ycbcr_enc = infmt->ycbcr_enc;
 Â break;
ÂÂÂÂÂ case CSI_SINK_PAD:
@@ -1476,10 +1480,6 @@ static void csi_try_fmt(struct csi_priv *priv,
 Â csi_try_field(priv, cfg, sdformat);
 - imx_media_fill_default_mbus_fields(
-ÂÂÂÂÂÂÂÂÂÂÂ &sdformat->format, infmt,
-ÂÂÂÂÂÂÂÂÂÂÂ priv->active_output_pad == CSI_SRC_PAD_DIRECT);
-
ÂÂÂÂÂÂÂÂÂ /* Reset crop and compose rectangles */
ÂÂÂÂÂÂÂÂÂ crop->left = 0;
ÂÂÂÂÂÂÂÂÂ crop->top = 0;
@@ -1495,6 +1495,9 @@ static void csi_try_fmt(struct csi_priv *priv,
 Â break;
ÂÂÂÂÂ }
+
+ÂÂÂ imx_media_try_colorimetry(&sdformat->format,
+ÂÂÂÂÂÂÂÂÂÂÂ priv->active_output_pad == CSI_SRC_PAD_DIRECT);
 }
  static int csi_set_fmt(struct v4l2_subdev *sd,
diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c
index b41842dba5ec..05b63395084e 100644
--- a/drivers/staging/media/imx/imx-media-utils.c
+++ b/drivers/staging/media/imx/imx-media-utils.c
@@ -511,21 +511,18 @@ int imx_media_init_cfg(struct v4l2_subdev *sd,
 EXPORT_SYMBOL_GPL(imx_media_init_cfg);
  /*
- * Check whether the field and colorimetry parameters in tryfmt are
- * uninitialized, and if so fill them with the values from fmt,
- * or if tryfmt->colorspace has been initialized, all the default
- * colorimetry params can be derived from tryfmt->colorspace.
+ * Default the colorspace in tryfmt to SRGB if set to an unsupported
+ * colorspace or not initialized. Then set the remaining colorimetry
+ * parameters based on the colorspace if they are uninitialized.
ÂÂ *
ÂÂ * tryfmt->code must be set on entry.
ÂÂ *
ÂÂ * If this format is destined to be routed through the Image Converter,
- * quantization and Y`CbCr encoding must be fixed. The IC expects and
- * produces fixed quantization and Y`CbCr encoding at its input and output
- * (full range for RGB, limited range for YUV, and V4L2_YCBCR_ENC_601).
+ * Y`CbCr encoding must be fixed. The IC supports only BT.601 Y`CbCr
+ * or Rec.709 Y`CbCr encoding.
ÂÂ */
-void imx_media_fill_default_mbus_fields(struct v4l2_mbus_framefmt *tryfmt,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ struct v4l2_mbus_framefmt *fmt,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ bool ic_route)
+void imx_media_try_colorimetry(struct v4l2_mbus_framefmt *tryfmt,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ bool ic_route)
 {
ÂÂÂÂÂ const struct imx_media_pixfmt *cc;
ÂÂÂÂÂ bool is_rgb = false;
@@ -533,44 +530,46 @@ void imx_media_fill_default_mbus_fields(struct v4l2_mbus_framefmt *tryfmt,
ÂÂÂÂÂ cc = imx_media_find_mbus_format(tryfmt->code, CS_SEL_ANY, true);
ÂÂÂÂÂ if (!cc)
ÂÂÂÂÂÂÂÂÂ cc = imx_media_find_ipu_format(tryfmt->code, CS_SEL_ANY);
-ÂÂÂ if (cc && cc->cs != IPUV3_COLORSPACE_YUV)
+ÂÂÂ if (cc && cc->cs == IPUV3_COLORSPACE_RGB)
ÂÂÂÂÂÂÂÂÂ is_rgb = true;
 - /* fill field if necessary */
-ÂÂÂ if (tryfmt->field == V4L2_FIELD_ANY)
-ÂÂÂÂÂÂÂ tryfmt->field = fmt->field;
Have you tested this patch on i.MX7 ?

Nope.

 It breaks pipeline validation as
the field field isn't handled anymore in imx7_csi_try_fmt(), due to the
removal if this code.

Yep, patches crossed paths.

Hmm, actually after closer review it looks like this was missed in this patch. So in the IMX7_CSI_PAD_SINK case in imx7_csi_try_fmt(), need to add:

if (sdformat->format.field == V4L2_FIELD_ANY)
ÂÂÂÂÂÂÂ sdformat->format.field = V4L2_FIELD_NONE;

Steve




+ÂÂÂ switch (tryfmt->colorspace) {
+ÂÂÂ case V4L2_COLORSPACE_SMPTE170M:
+ÂÂÂ case V4L2_COLORSPACE_REC709:
+ÂÂÂ case V4L2_COLORSPACE_JPEG:
+ÂÂÂ case V4L2_COLORSPACE_SRGB:
+ÂÂÂ case V4L2_COLORSPACE_BT2020:
+ÂÂÂ case V4L2_COLORSPACE_OPRGB:
+ÂÂÂ case V4L2_COLORSPACE_DCI_P3:
+ÂÂÂ case V4L2_COLORSPACE_RAW:
+ÂÂÂÂÂÂÂ break;
+ÂÂÂ default:
+ÂÂÂÂÂÂÂ tryfmt->colorspace = V4L2_COLORSPACE_SRGB;
+ÂÂÂÂÂÂÂ break;
+ÂÂÂ }
+
+ÂÂÂ if (tryfmt->xfer_func == V4L2_XFER_FUNC_DEFAULT)
+ÂÂÂÂÂÂÂ tryfmt->xfer_func =
+ V4L2_MAP_XFER_FUNC_DEFAULT(tryfmt->colorspace);
 - /* fill colorimetry if necessary */
-ÂÂÂ if (tryfmt->colorspace == V4L2_COLORSPACE_DEFAULT) {
-ÂÂÂÂÂÂÂ tryfmt->colorspace = fmt->colorspace;
-ÂÂÂÂÂÂÂ tryfmt->xfer_func = fmt->xfer_func;
-ÂÂÂÂÂÂÂ tryfmt->ycbcr_enc = fmt->ycbcr_enc;
-ÂÂÂÂÂÂÂ tryfmt->quantization = fmt->quantization;
+ÂÂÂ if (ic_route) {
+ÂÂÂÂÂÂÂ if (tryfmt->ycbcr_enc != V4L2_YCBCR_ENC_601 &&
+ÂÂÂÂÂÂÂÂÂÂÂ tryfmt->ycbcr_enc != V4L2_YCBCR_ENC_709)
+ÂÂÂÂÂÂÂÂÂÂÂ tryfmt->ycbcr_enc = V4L2_YCBCR_ENC_601;
ÂÂÂÂÂ } else {
-ÂÂÂÂÂÂÂ if (tryfmt->xfer_func == V4L2_XFER_FUNC_DEFAULT) {
-ÂÂÂÂÂÂÂÂÂÂÂ tryfmt->xfer_func =
- V4L2_MAP_XFER_FUNC_DEFAULT(tryfmt->colorspace);
-ÂÂÂÂÂÂÂ }
ÂÂÂÂÂÂÂÂÂ if (tryfmt->ycbcr_enc == V4L2_YCBCR_ENC_DEFAULT) {
ÂÂÂÂÂÂÂÂÂÂÂÂÂ tryfmt->ycbcr_enc =
V4L2_MAP_YCBCR_ENC_DEFAULT(tryfmt->colorspace);
ÂÂÂÂÂÂÂÂÂ }
-ÂÂÂÂÂÂÂ if (tryfmt->quantization == V4L2_QUANTIZATION_DEFAULT) {
-ÂÂÂÂÂÂÂÂÂÂÂ tryfmt->quantization =
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ V4L2_MAP_QUANTIZATION_DEFAULT(
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ is_rgb, tryfmt->colorspace,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ tryfmt->ycbcr_enc);
-ÂÂÂÂÂÂÂ }
ÂÂÂÂÂ }
 - if (ic_route) {
-ÂÂÂÂÂÂÂ tryfmt->quantization = is_rgb ?
-ÂÂÂÂÂÂÂÂÂÂÂ V4L2_QUANTIZATION_FULL_RANGE :
-ÂÂÂÂÂÂÂÂÂÂÂ V4L2_QUANTIZATION_LIM_RANGE;
-ÂÂÂÂÂÂÂ tryfmt->ycbcr_enc = V4L2_YCBCR_ENC_601;
-ÂÂÂ }
+ÂÂÂ if (tryfmt->quantization == V4L2_QUANTIZATION_DEFAULT)
+ÂÂÂÂÂÂÂ tryfmt->quantization =
+ÂÂÂÂÂÂÂÂÂÂÂ V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ tryfmt->colorspace,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ tryfmt->ycbcr_enc);
 }
-EXPORT_SYMBOL_GPL(imx_media_fill_default_mbus_fields);
+EXPORT_SYMBOL_GPL(imx_media_try_colorimetry);
  int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ struct v4l2_rect *compose,
diff --git a/drivers/staging/media/imx/imx-media-vdic.c b/drivers/staging/media/imx/imx-media-vdic.c
index 4487374c9435..fbafd7fb7aeb 100644
--- a/drivers/staging/media/imx/imx-media-vdic.c
+++ b/drivers/staging/media/imx/imx-media-vdic.c
@@ -617,14 +617,13 @@ static void vdic_try_fmt(struct vdic_priv *priv,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ &sdformat->format.height,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ MIN_H, MAX_H_VDIC, H_ALIGN, S_ALIGN);
 - imx_media_fill_default_mbus_fields(&sdformat->format, infmt,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ true);
-
ÂÂÂÂÂÂÂÂÂ /* input must be interlaced! Choose SEQ_TB if not */
ÂÂÂÂÂÂÂÂÂ if (!V4L2_FIELD_HAS_BOTH(sdformat->format.field))
ÂÂÂÂÂÂÂÂÂÂÂÂÂ sdformat->format.field = V4L2_FIELD_SEQ_TB;
ÂÂÂÂÂÂÂÂÂ break;
ÂÂÂÂÂ }
+
+ÂÂÂ imx_media_try_colorimetry(&sdformat->format, true);
 }
  static int vdic_set_fmt(struct v4l2_subdev *sd,
diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h
index 6587aa49e005..23024c9bc887 100644
--- a/drivers/staging/media/imx/imx-media.h
+++ b/drivers/staging/media/imx/imx-media.h
@@ -172,9 +172,8 @@ int imx_media_init_mbus_fmt(struct v4l2_mbus_framefmt *mbus,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ const struct imx_media_pixfmt **cc);
 int imx_media_init_cfg(struct v4l2_subdev *sd,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ struct v4l2_subdev_pad_config *cfg);
-void imx_media_fill_default_mbus_fields(struct v4l2_mbus_framefmt *tryfmt,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ struct v4l2_mbus_framefmt *fmt,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ bool ic_route);
+void imx_media_try_colorimetry(struct v4l2_mbus_framefmt *tryfmt,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ bool ic_route);
 int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ struct v4l2_rect *compose,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ const struct v4l2_mbus_framefmt *mbus,
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index a708a0340eb1..6e2f4c3eb24f 100644
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -1003,8 +1003,6 @@ static int imx7_csi_try_fmt(struct imx7_csi *csi,
 Â sdformat->format.colorspace = in_fmt->colorspace;
ÂÂÂÂÂÂÂÂÂ sdformat->format.xfer_func = in_fmt->xfer_func;
-ÂÂÂÂÂÂÂ sdformat->format.quantization = in_fmt->quantization;
-ÂÂÂÂÂÂÂ sdformat->format.ycbcr_enc = in_fmt->ycbcr_enc;
ÂÂÂÂÂÂÂÂÂ break;
ÂÂÂÂÂ case IMX7_CSI_PAD_SINK:
ÂÂÂÂÂÂÂÂÂ *cc = imx_media_find_mbus_format(sdformat->format.code,
@@ -1015,14 +1013,14 @@ static int imx7_csi_try_fmt(struct imx7_csi *csi,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ false);
ÂÂÂÂÂÂÂÂÂÂÂÂÂ sdformat->format.code = (*cc)->codes[0];
ÂÂÂÂÂÂÂÂÂ }
-
- imx_media_fill_default_mbus_fields(&sdformat->format, in_fmt,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ false);
ÂÂÂÂÂÂÂÂÂ break;
ÂÂÂÂÂ default:
ÂÂÂÂÂÂÂÂÂ return -EINVAL;
ÂÂÂÂÂÂÂÂÂ break;
ÂÂÂÂÂ }
+
+ÂÂÂ imx_media_try_colorimetry(&sdformat->format, false);
+
ÂÂÂÂÂ return 0;
 }
 --
2.17.1