From dcce8fdda0dfabdde89fd2a804c3e062b2dc4262 Mon Sep 17 00:00:00 2001 From: Shijie Qin Date: Wed, 21 Apr 2021 18:39:50 +0800 Subject: [PATCH] MLK-25457 [[8QM_MEK/8QXP_MEK] mxc: vpu_windsor: ignore VUI operation in try_fmt Encoder support all valid VUI formats. In gstreamer, the range/matrix/transfer of following try_fmt() all the same as firt time. So donot change VUI in try_fmt(), otherwise, gstreamer get supported VUI list is incorrect. Signed-off-by: Shijie Qin Reviewed-by: ming_qian (cherry picked from commit aea600d6f7f47e8cfa5491a2f7378afc5d24816b) --- drivers/mxc/vpu_windsor/vpu_encoder_b0.c | 25 ++---------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/drivers/mxc/vpu_windsor/vpu_encoder_b0.c b/drivers/mxc/vpu_windsor/vpu_encoder_b0.c index 3ba1d6cdc840..8c34ed71bba3 100644 --- a/drivers/mxc/vpu_windsor/vpu_encoder_b0.c +++ b/drivers/mxc/vpu_windsor/vpu_encoder_b0.c @@ -1508,32 +1508,11 @@ static int vpu_enc_v4l2_ioctl_try_fmt(struct file *file, return -EINVAL; vpu_dbg(LVL_FUNC, "%s(), %s\n", __func__, q_data->desc); - if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { - pix_mp->field = V4L2_FIELD_NONE; - pix_mp->colorspace = V4L2_COLORSPACE_REC709; - if (!vpu_enc_check_colorspace(pix_mp->colorspace)) { - pix_mp->colorspace = ctx->colorspace; - pix_mp->xfer_func = ctx->xfer_func; - pix_mp->ycbcr_enc = ctx->ycbcr_enc; - pix_mp->quantization = ctx->quantization; - } else { - if (!vpu_enc_check_xfer_func(pix_mp->xfer_func)) - pix_mp->xfer_func = ctx->xfer_func; - if (!vpu_enc_check_ycbcr_enc(pix_mp->ycbcr_enc)) - pix_mp->ycbcr_enc = ctx->ycbcr_enc; - if (!vpu_enc_check_quantization(pix_mp->quantization)) - pix_mp->quantization = ctx->quantization; - } - } else { - pix_mp->colorspace = ctx->colorspace; - pix_mp->xfer_func = ctx->xfer_func; - pix_mp->ycbcr_enc = ctx->ycbcr_enc; - pix_mp->quantization = ctx->quantization; - } - if (!format_is_support(q_data->supported_fmts, q_data->fmt_count, f)) return -EINVAL; + pix_mp->field = V4L2_FIELD_NONE; + return 0; } -- 2.17.1