Received: by 10.223.185.116 with SMTP id b49csp2248652wrg; Thu, 15 Feb 2018 08:43:54 -0800 (PST) X-Google-Smtp-Source: AH8x226UM2Z3E3uDUZXNUUaIwfeyFIbaniW6DjnI+DhJPzrNAhO6iX59AUE9HV5jjAdWj+vYfSEz X-Received: by 2002:a17:902:6843:: with SMTP id f3-v6mr3052757pln.182.1518713034103; Thu, 15 Feb 2018 08:43:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518713034; cv=none; d=google.com; s=arc-20160816; b=t81zHcG+IZLHx4kdGpI6CDR3BmoDPOKohvySHaFvS/BJsEWvV7EKrnyOntm7FaRlw6 Ath1j4oTrpxnXCaAvP/qPCOuypICONvJL138iV1rbIOlnsubZ2JK94pYY5JGDEDsBYzB 3qjpa/5Qw4eatE6Mba4sz7WLF5F86O4CCtY5E8Shh4AC6Ox6QP1ETaG6j09ALf1JQlez WNN0KyTtI+tpbEHwioMyWZyYxXASksfFvlhsCJgdbzCfDPlwerrja3Nd/uqIBZ7Ypt8B 9eHBPxBlbqEu41jEk79BN7MYsR0BzIg9JPTWB7Eh0UAPhkTx/NYAlh0XBFjoREhXrnGj irVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=fp4Gd555MpbInfEntEVFUpAzVpyKDgcQkoms1by9/WA=; b=YJOsgCKaruSrFVISlQIyyV0213fOE189j81BT6yQItvjRilN/7NBuBY82np+PT0j0q fi0f8HGVPdbNHFNSQOQzqwxUU9AmDCVDePoDrrx9iLxoRtqaSSFLPLt7Cb0DUuocge09 36DvtvGfEg38R+kGJCOCY9Cz+ayIFy+Lx9bHjXOwvqoWd0pHh6hJtPCWRbN0PgXrf5RO m8ILVkRxhXzymS44RZCBnRdf3ELqKQ2iC1xqPtrKFJ0qnn/sA27fvClMZUtRwsDVEHIc g8jCK2KS+cL2Y42BDpFv8UKO306b4LVD57KDB79WRH/OL78cbGp13lkFif3BExTpQhx7 hqdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gateworks-com.20150623.gappssmtp.com header.s=20150623 header.b=XfS3JnIe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v34-v6si1581498plg.803.2018.02.15.08.43.39; Thu, 15 Feb 2018 08:43:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gateworks-com.20150623.gappssmtp.com header.s=20150623 header.b=XfS3JnIe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1426332AbeBOQmh (ORCPT + 99 others); Thu, 15 Feb 2018 11:42:37 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33215 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1426185AbeBOQjr (ORCPT ); Thu, 15 Feb 2018 11:39:47 -0500 Received: by mail-pg0-f66.google.com with SMTP id g12so183846pgs.0 for ; Thu, 15 Feb 2018 08:39:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gateworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fp4Gd555MpbInfEntEVFUpAzVpyKDgcQkoms1by9/WA=; b=XfS3JnIePUr94HBzivNTB7FrPTwvo9UVEDxZ5E/Ea7lygNT1fujYrjBvQ6HTJrCgFw LMoUET+PJThVrrXf6npikoNwO9uBTG8By66OlG6PjWhNxH2QDKwS51Ch/Qg0QWSZMRQt GJIvlGUNUrQVwaQzgJ1EWJ4m3FbXk/PnRn4yyPivMH52RJVpO2hH15ixMZPHmLfqNdmz zf807hU8sgp1e4e3cIxRr5bVTr/hWfS+S65yH3Pwocwqs3pokgrIdxkWZ0XEyrIg7Lt5 Drpv45MVxnyBQ5OaIhmA0X6+YvGqqAQDCtlepW6gSbGxiCpMCHAOzqZgqYV10Xi0uFM7 oRMA== 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=fp4Gd555MpbInfEntEVFUpAzVpyKDgcQkoms1by9/WA=; b=ZKJDVziMwb6B4/pUV8fvYLdue+NlNybHx5hR2c9bDzJM+vCIZTHvpoEXIs/GRPdo2o seaWIzyJGqV+cn83yHqpHRVLb5uJyNuCWTUuvTri0UvlJ3c3ChaCtHU8ZMiJi05imOAe FIcmAUlL7DUPPlwwmV6OfM26QZEujpBH2vI229mC9S4teS0EvpljNUZMItEjnwtL/wFW 0xBkdeCAiqb8IDW2PwAFrZ+RJe23aNtG+hE4y8HfhUjHkmvKjt2GUcgvF6QkIXBRKmOJ LgF9IYADSvugDWlwfxOaNEAfqD2W6TFtZjDVmOd6R9v35IGO3mLYf6VlyX0pxQNtvdi4 mmjQ== X-Gm-Message-State: APf1xPCMt+2y9D37CmjMfmPd6Y1G9G7+7ACItcaEQjRLx3Vuq5+/XcQi LboKaa472gKx5N3UJL7+3ui2KA== X-Received: by 10.101.88.205 with SMTP id e13mr2732203pgu.121.1518712787148; Thu, 15 Feb 2018 08:39:47 -0800 (PST) Received: from tharvey.pdc.gateworks.com (68-189-91-139.static.snlo.ca.charter.com. [68.189.91.139]) by smtp.gmail.com with ESMTPSA id x4sm8085838pgv.84.2018.02.15.08.39.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Feb 2018 08:39:46 -0800 (PST) From: Tim Harvey To: linux-media@vger.kernel.org, alsa-devel@alsa-project.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, shawnguo@kernel.org, Steve Longerbeam , Philipp Zabel , Hans Verkuil , Mauro Carvalho Chehab , Hans Verkuil , Randy Dunlap , Hans Verkuil Subject: [PATCH v12 1/8] v4l2-dv-timings: add v4l2_hdmi_colorimetry() Date: Thu, 15 Feb 2018 08:39:20 -0800 Message-Id: <1518712767-21928-2-git-send-email-tharvey@gateworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518712767-21928-1-git-send-email-tharvey@gateworks.com> References: <1518712767-21928-1-git-send-email-tharvey@gateworks.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans Verkuil Add the v4l2_hdmi_colorimetry() function so we have a single function that determines the colorspace, YCbCr encoding, quantization range and transfer function from the InfoFrame data. Cc: Randy Dunlap Signed-off-by: Hans Verkuil --- v9: - fix kernel-doc format (Randy) drivers/media/v4l2-core/v4l2-dv-timings.c | 141 ++++++++++++++++++++++++++++++ include/media/v4l2-dv-timings.h | 21 +++++ 2 files changed, 162 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c index 930f9c5..5663d86 100644 --- a/drivers/media/v4l2-core/v4l2-dv-timings.c +++ b/drivers/media/v4l2-core/v4l2-dv-timings.c @@ -27,6 +27,7 @@ #include #include #include +#include MODULE_AUTHOR("Hans Verkuil"); MODULE_DESCRIPTION("V4L2 DV Timings Helper Functions"); @@ -814,3 +815,143 @@ struct v4l2_fract v4l2_calc_aspect_ratio(u8 hor_landscape, u8 vert_portrait) return aspect; } EXPORT_SYMBOL_GPL(v4l2_calc_aspect_ratio); + +/** v4l2_hdmi_rx_colorimetry - determine HDMI colorimetry information + * based on various InfoFrames. + * @avi: the AVI InfoFrame + * @hdmi: the HDMI Vendor InfoFrame, may be NULL + * @height: the frame height + * + * Determines the HDMI colorimetry information, i.e. how the HDMI + * pixel color data should be interpreted. + * + * Note that some of the newer features (DCI-P3, HDR) are not yet + * implemented: the hdmi.h header needs to be updated to the HDMI 2.0 + * and CTA-861-G standards. + */ +struct v4l2_hdmi_colorimetry +v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi, + const struct hdmi_vendor_infoframe *hdmi, + unsigned int height) +{ + struct v4l2_hdmi_colorimetry c = { + V4L2_COLORSPACE_SRGB, + V4L2_YCBCR_ENC_DEFAULT, + V4L2_QUANTIZATION_FULL_RANGE, + V4L2_XFER_FUNC_SRGB + }; + bool is_ce = avi->video_code || (hdmi && hdmi->vic); + bool is_sdtv = height <= 576; + bool default_is_lim_range_rgb = avi->video_code > 1; + + switch (avi->colorspace) { + case HDMI_COLORSPACE_RGB: + /* RGB pixel encoding */ + switch (avi->colorimetry) { + case HDMI_COLORIMETRY_EXTENDED: + switch (avi->extended_colorimetry) { + case HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB: + c.colorspace = V4L2_COLORSPACE_ADOBERGB; + c.xfer_func = V4L2_XFER_FUNC_ADOBERGB; + break; + case HDMI_EXTENDED_COLORIMETRY_BT2020: + c.colorspace = V4L2_COLORSPACE_BT2020; + c.xfer_func = V4L2_XFER_FUNC_709; + break; + default: + break; + } + break; + default: + break; + } + switch (avi->quantization_range) { + case HDMI_QUANTIZATION_RANGE_LIMITED: + c.quantization = V4L2_QUANTIZATION_LIM_RANGE; + break; + case HDMI_QUANTIZATION_RANGE_FULL: + break; + default: + if (default_is_lim_range_rgb) + c.quantization = V4L2_QUANTIZATION_LIM_RANGE; + break; + } + break; + + default: + /* YCbCr pixel encoding */ + c.quantization = V4L2_QUANTIZATION_LIM_RANGE; + switch (avi->colorimetry) { + case HDMI_COLORIMETRY_NONE: + if (!is_ce) + break; + if (is_sdtv) { + c.colorspace = V4L2_COLORSPACE_SMPTE170M; + c.ycbcr_enc = V4L2_YCBCR_ENC_601; + } else { + c.colorspace = V4L2_COLORSPACE_REC709; + c.ycbcr_enc = V4L2_YCBCR_ENC_709; + } + c.xfer_func = V4L2_XFER_FUNC_709; + break; + case HDMI_COLORIMETRY_ITU_601: + c.colorspace = V4L2_COLORSPACE_SMPTE170M; + c.ycbcr_enc = V4L2_YCBCR_ENC_601; + c.xfer_func = V4L2_XFER_FUNC_709; + break; + case HDMI_COLORIMETRY_ITU_709: + c.colorspace = V4L2_COLORSPACE_REC709; + c.ycbcr_enc = V4L2_YCBCR_ENC_709; + c.xfer_func = V4L2_XFER_FUNC_709; + break; + case HDMI_COLORIMETRY_EXTENDED: + switch (avi->extended_colorimetry) { + case HDMI_EXTENDED_COLORIMETRY_XV_YCC_601: + c.colorspace = V4L2_COLORSPACE_REC709; + c.ycbcr_enc = V4L2_YCBCR_ENC_XV709; + c.xfer_func = V4L2_XFER_FUNC_709; + break; + case HDMI_EXTENDED_COLORIMETRY_XV_YCC_709: + c.colorspace = V4L2_COLORSPACE_REC709; + c.ycbcr_enc = V4L2_YCBCR_ENC_XV601; + c.xfer_func = V4L2_XFER_FUNC_709; + break; + case HDMI_EXTENDED_COLORIMETRY_S_YCC_601: + c.colorspace = V4L2_COLORSPACE_SRGB; + c.ycbcr_enc = V4L2_YCBCR_ENC_601; + c.xfer_func = V4L2_XFER_FUNC_SRGB; + break; + case HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601: + c.colorspace = V4L2_COLORSPACE_ADOBERGB; + c.ycbcr_enc = V4L2_YCBCR_ENC_601; + c.xfer_func = V4L2_XFER_FUNC_ADOBERGB; + break; + case HDMI_EXTENDED_COLORIMETRY_BT2020: + c.colorspace = V4L2_COLORSPACE_BT2020; + c.ycbcr_enc = V4L2_YCBCR_ENC_BT2020; + c.xfer_func = V4L2_XFER_FUNC_709; + break; + case HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM: + c.colorspace = V4L2_COLORSPACE_BT2020; + c.ycbcr_enc = V4L2_YCBCR_ENC_BT2020_CONST_LUM; + c.xfer_func = V4L2_XFER_FUNC_709; + break; + default: /* fall back to ITU_709 */ + c.colorspace = V4L2_COLORSPACE_REC709; + c.ycbcr_enc = V4L2_YCBCR_ENC_709; + c.xfer_func = V4L2_XFER_FUNC_709; + break; + } + break; + default: + break; + } + /* + * YCC Quantization Range signaling is more-or-less broken, + * let's just ignore this. + */ + break; + } + return c; +} +EXPORT_SYMBOL_GPL(v4l2_hdmi_rx_colorimetry); diff --git a/include/media/v4l2-dv-timings.h b/include/media/v4l2-dv-timings.h index 61a1889..835aef7 100644 --- a/include/media/v4l2-dv-timings.h +++ b/include/media/v4l2-dv-timings.h @@ -223,5 +223,26 @@ static inline bool can_reduce_fps(struct v4l2_bt_timings *bt) return false; } +/** + * struct v4l2_hdmi_rx_colorimetry - describes the HDMI colorimetry information + * @colorspace: enum v4l2_colorspace, the colorspace + * @ycbcr_enc: enum v4l2_ycbcr_encoding, Y'CbCr encoding + * @quantization: enum v4l2_quantization, colorspace quantization + * @xfer_func: enum v4l2_xfer_func, colorspace transfer function + */ +struct v4l2_hdmi_colorimetry { + enum v4l2_colorspace colorspace; + enum v4l2_ycbcr_encoding ycbcr_enc; + enum v4l2_quantization quantization; + enum v4l2_xfer_func xfer_func; +}; + +struct hdmi_avi_infoframe; +struct hdmi_vendor_infoframe; + +struct v4l2_hdmi_colorimetry +v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi, + const struct hdmi_vendor_infoframe *hdmi, + unsigned int height); #endif -- 2.7.4