Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3470705imu; Sun, 11 Nov 2018 15:51:39 -0800 (PST) X-Google-Smtp-Source: AJdET5cdoAoRMRf3baT4FDBqUtoiu7ScUW7/v6h9EXtY5LnHszUFmAhcO0h0r4MWTvx7ulE/g4fS X-Received: by 2002:a63:2c8a:: with SMTP id s132-v6mr15067488pgs.73.1541980298945; Sun, 11 Nov 2018 15:51:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541980298; cv=none; d=google.com; s=arc-20160816; b=r05hRJVFWwDWSOmv5pXQQK2ocpZ2nIfGhzqXqRk2X2zXAQ2pqEqEaVSB3dAFwnpJ/R GplkCWFLiKMikSPebMAjQDKaeGnrOAGNdIaS2GsFtKZN2yK9eM6Qc4k5vh27RaRyLIvQ j3xMpOhylR/yuZm4C3bn9dHYprUc9+EZAYE24vVmxxlIudA7qrRRSuQsIhyNh4SqJrcj waLca+hgfWTH8QLJMEXuCmlTUKUe1Kvuweot2HWoM2LVaU/Vcg3J8XqNtajdScQ4BAmR 0pgNVUHO/oEPy4q2oL5LJOaB/inyNpwyLZVkUL4yfkbf6Jye1kZTaE2Mz27uBbw+YI9A 49uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nzryCHNAquq+BXry43/qCMo2RpsectwwHsQpT2dy5RY=; b=BNJnaKVQsUdqWb1FWglV9Q4IWR5JLbx7ajGYGJ40H5ZeRM8wOo2OzBTW1qZ2WoQPso IIBeKyu+WdHFi5Esd8faiTIRfNwI7FQ+5jccLP3slzuuwz6INO3wBWR1mt7JO3KuS7uW qeGjAGhmu9aJxn/iUadQiJ5FdkbotpjIJBVunAwQYXXEGAkV0xAiOsEn4x3mT22PZpWt 6R/NK5S2rQd/gJd6R8nRpqzWAT7KEdh9skki9HzCnRBKngJftfBqdue/Amu7mpWVjspW xl3sjqGzfnAVk7FYJsbUus82kOVybwkmqHpeeXmWF+Idwv723/ewX0tZN8hPtOjF9yGR jUtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cvtX3tO2; 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 p12si2227200pli.239.2018.11.11.15.51.24; Sun, 11 Nov 2018 15:51:38 -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=@kernel.org header.s=default header.b=cvtX3tO2; 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 S1733073AbeKLJkr (ORCPT + 99 others); Mon, 12 Nov 2018 04:40:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:38154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732930AbeKLISf (ORCPT ); Mon, 12 Nov 2018 03:18:35 -0500 Received: from localhost (unknown [206.108.79.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7002B22443; Sun, 11 Nov 2018 22:28:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541975319; bh=Fqx8tpDjUTnA2aIhqe06gYAcQYhS19848h5GqHhzgvA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cvtX3tO2Lcaz+/3PeUxFfEf5bARY6amxOkzq6hdBSaqZ22w8aAo/YZRH2KWF+4otC 1FK04gieiHLbzOSIA0jY39+DTm/p0pC9hm8YNKavfLq9wqn4igO0EyqJqOcj2y2GQ9 WvcdMDNzgkBtfTOQNiw1SVYtFvYDweN+bgFYHQbo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans Verkuil , Daniel Vetter , Mauro Carvalho Chehab Subject: [PATCH 4.19 313/361] media: media colorspaces*.rst: rename AdobeRGB to opRGB Date: Sun, 11 Nov 2018 14:21:00 -0800 Message-Id: <20181111221658.444009595@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111221619.915519183@linuxfoundation.org> References: <20181111221619.915519183@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans Verkuil commit a58c37978cf02f6d35d05ee4e9288cb8455f1401 upstream. Drop all Adobe references and use the official opRGB standard instead. Signed-off-by: Hans Verkuil Cc: stable@vger.kernel.org Acked-by: Daniel Vetter Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- Documentation/media/uapi/v4l/biblio.rst | 10 ---------- Documentation/media/uapi/v4l/colorspaces-defs.rst | 8 ++++---- Documentation/media/uapi/v4l/colorspaces-details.rst | 13 ++++++------- 3 files changed, 10 insertions(+), 21 deletions(-) --- a/Documentation/media/uapi/v4l/biblio.rst +++ b/Documentation/media/uapi/v4l/biblio.rst @@ -226,16 +226,6 @@ xvYCC :author: International Electrotechnical Commission (http://www.iec.ch) -.. _adobergb: - -AdobeRGB -======== - - -:title: Adobe© RGB (1998) Color Image Encoding Version 2005-05 - -:author: Adobe Systems Incorporated (http://www.adobe.com) - .. _oprgb: opRGB --- a/Documentation/media/uapi/v4l/colorspaces-defs.rst +++ b/Documentation/media/uapi/v4l/colorspaces-defs.rst @@ -51,8 +51,8 @@ whole range, 0-255, dividing the angular - See :ref:`col-rec709`. * - ``V4L2_COLORSPACE_SRGB`` - See :ref:`col-srgb`. - * - ``V4L2_COLORSPACE_ADOBERGB`` - - See :ref:`col-adobergb`. + * - ``V4L2_COLORSPACE_OPRGB`` + - See :ref:`col-oprgb`. * - ``V4L2_COLORSPACE_BT2020`` - See :ref:`col-bt2020`. * - ``V4L2_COLORSPACE_DCI_P3`` @@ -90,8 +90,8 @@ whole range, 0-255, dividing the angular - Use the Rec. 709 transfer function. * - ``V4L2_XFER_FUNC_SRGB`` - Use the sRGB transfer function. - * - ``V4L2_XFER_FUNC_ADOBERGB`` - - Use the AdobeRGB transfer function. + * - ``V4L2_XFER_FUNC_OPRGB`` + - Use the opRGB transfer function. * - ``V4L2_XFER_FUNC_SMPTE240M`` - Use the SMPTE 240M transfer function. * - ``V4L2_XFER_FUNC_NONE`` --- a/Documentation/media/uapi/v4l/colorspaces-details.rst +++ b/Documentation/media/uapi/v4l/colorspaces-details.rst @@ -290,15 +290,14 @@ Y' is clamped to the range [0…1] and C 170M/BT.601. The Y'CbCr quantization is limited range. -.. _col-adobergb: +.. _col-oprgb: -Colorspace Adobe RGB (V4L2_COLORSPACE_ADOBERGB) +Colorspace opRGB (V4L2_COLORSPACE_OPRGB) =============================================== -The :ref:`adobergb` standard defines the colorspace used by computer -graphics that use the AdobeRGB colorspace. This is also known as the -:ref:`oprgb` standard. The default transfer function is -``V4L2_XFER_FUNC_ADOBERGB``. The default Y'CbCr encoding is +The :ref:`oprgb` standard defines the colorspace used by computer +graphics that use the opRGB colorspace. The default transfer function is +``V4L2_XFER_FUNC_OPRGB``. The default Y'CbCr encoding is ``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is limited range. @@ -312,7 +311,7 @@ The chromaticities of the primary colors .. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}| -.. flat-table:: Adobe RGB Chromaticities +.. flat-table:: opRGB Chromaticities :header-rows: 1 :stub-columns: 0 :widths: 1 1 2