From patchwork Wed Feb 20 00:05:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 10820911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2C8246CB for ; Wed, 20 Feb 2019 00:05:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16BC32D247 for ; Wed, 20 Feb 2019 00:05:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B0142D278; Wed, 20 Feb 2019 00:05:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_RP_RNBL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9F4B2D247 for ; Wed, 20 Feb 2019 00:05:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730167AbfBTAFo (ORCPT ); Tue, 19 Feb 2019 19:05:44 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:40988 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730151AbfBTAFo (ORCPT ); Tue, 19 Feb 2019 19:05:44 -0500 Received: by mail-pl1-f193.google.com with SMTP id y5so5656148plk.8; Tue, 19 Feb 2019 16:05:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=P8PzRIifprMXFLbQqXKcG+mi2gnEr+W/CIJ2rU/DvCo=; b=Upt2BiL1PvcfCiCG7UGwgUAwn+0/gHLWJHGAIlvsiSlaa2+jyGY1V2taOV+6y+h/eW eK1W12cwujjoz81KJhC/hFLSuoPD55DEdzywB4B6dJITl8n1OiXeatJ/r8b+b/4s550X TrAky23eYf1J7yDKHkTjg5GiOcoYFyBpFVpJXFrTjfx3nwsor6//GeoR8bXonp3YPqdP ennKrPlKVUkeqSVvk2i1NiKhP14rH63CiEu7tQHQb9WMbuNbthcZQav3yN7eAfIxqJHS /zYvfWenhmlA1gOhrLuleeKfPGjXyFY7uMjJVLa1Y9XoceulC5NiHZx643AUCFs3oPEW CyZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=P8PzRIifprMXFLbQqXKcG+mi2gnEr+W/CIJ2rU/DvCo=; b=CnFEoHThYsllxyii3k0otyVuFnfdEq7kcglrksB9/W59CBUQ7EAoz6DNg+RaErC5+d N+JP0BY1K+0ZFOq/QnmWEoEOchXfqJrUvj4Oxzw0xrlXU6O8sJSgVPqMETh1CyzJGGX6 XDjOXpI6J9e5o3rN4+NKSv8mCmXBSRiM29qO9Y+TE8YBeSRz8CiyFdxAU1R1NCcrmSuJ nR7PiGR0RCQzc1VJ2R6y2nfJrLq8R0+Q6Qua4sVQBzJ6S/1RhKcXarAj7GraVuNZwu6l SBw6SBbZijSpaQJydoxjpn+nPmDNtt6z4bvMTcr3fvE2wCHw9T2eimpArWe6ck0mei7i kmKQ== X-Gm-Message-State: AHQUAubiXaQM/lsiQK8zJiVGaKPyz2swtg6v6zn2gnPCDcPBVQ03fYFK y0bewtKvdA4dtfe5+Lwo29U0dQ85 X-Google-Smtp-Source: AHgI3IblQ7cwR7BHCD+aTEO7Kh2+LS7B09WpvXzkx28JJcwkc11kxx1xAyvcK+tl8LAbGmLv58aX0g== X-Received: by 2002:a17:902:28e9:: with SMTP id f96mr33736202plb.169.1550621142980; Tue, 19 Feb 2019 16:05:42 -0800 (PST) Received: from majic.sklembedded.com (c-73-202-231-77.hsd1.ca.comcast.net. [73.202.231.77]) by smtp.googlemail.com with ESMTPSA id f14sm19159083pgv.23.2019.02.19.16.05.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Feb 2019 16:05:42 -0800 (PST) From: Steve Longerbeam To: linux-media@vger.kernel.org Cc: Tim Harvey , Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman , devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 7/7] media: imx: Allow BT.709 encoding for IC routes Date: Tue, 19 Feb 2019 16:05:21 -0800 Message-Id: <20190220000521.31130-8-slongerbeam@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190220000521.31130-1-slongerbeam@gmail.com> References: <20190220000521.31130-1-slongerbeam@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The IC now supports BT.709 Y'CbCr encoding, in addition to existing BT.601 encoding, so allow both, for pipelines that route through the IC. Reported-by: Tim Harvey Signed-off-by: Steve Longerbeam --- Changes in v5: - rebased this patch on top of repurposing the function to imx_media_try_colorimetry(). Changes in v2: - move ic_route check above default colorimetry checks, and fill default colorimetry for ic_route, otherwise it's not possible to set BT.709 encoding for ic routes. --- drivers/staging/media/imx/imx-media-utils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c index aa7d4be77a7e..12967d6d7e1a 100644 --- a/drivers/staging/media/imx/imx-media-utils.c +++ b/drivers/staging/media/imx/imx-media-utils.c @@ -524,7 +524,7 @@ EXPORT_SYMBOL_GPL(imx_media_init_cfg); * If this format is destined to be routed through the Image Converter, * quantization and Y`CbCr encoding must be fixed. The IC supports only * full-range quantization for RGB at its input and output, and only - * BT.601 Y`CbCr encoding. + * BT.601 or Rec.709 Y`CbCr encoding. */ void imx_media_try_colorimetry(struct v4l2_mbus_framefmt *tryfmt, bool ic_route) @@ -563,7 +563,9 @@ void imx_media_try_colorimetry(struct v4l2_mbus_framefmt *tryfmt, tryfmt->quantization == V4L2_QUANTIZATION_DEFAULT) tryfmt->quantization = V4L2_QUANTIZATION_FULL_RANGE; - tryfmt->ycbcr_enc = V4L2_YCBCR_ENC_601; + 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->ycbcr_enc == V4L2_YCBCR_ENC_DEFAULT) { tryfmt->ycbcr_enc =