From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A73E6C433F5 for ; Thu, 14 Oct 2021 10:25:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 96600610E8 for ; Thu, 14 Oct 2021 10:25:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230255AbhJNK1s (ORCPT ); Thu, 14 Oct 2021 06:27:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230206AbhJNK1r (ORCPT ); Thu, 14 Oct 2021 06:27:47 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E079AC061760; Thu, 14 Oct 2021 03:25:42 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id lk8-20020a17090b33c800b001a0a284fcc2so6582690pjb.2; Thu, 14 Oct 2021 03:25:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r8HJ6DgODtj2X2cqd5mOjTvpDOOECTMV1Qw563xhwTM=; b=mpc74U8iXqWqKswUPZ5p5H8afkLFsxDUpV8Js49OSjvOQA0/Uadbd5LN71Qnghk3CJ V4tYCVOuDfBSP8iIiynxP6lA1Pi7Mk4X86AEKCYzbVa1vzpiQ4OcY+XU8Wq5Cvlx5uQX hr7hTu7jMfPRb+2VrL48gHi8bLPqv10v/QwA6JvCIqSPNP5bKRP02Z77AhqajsIuLu07 lsghDHcSKkCLprlJjdmeSL1Fq2VUom+g6YkWrlOk2hYFBHwGydAytdy4d8XeTfhpqust K/JMpgvVhyiDAjeJJcigzAstg5OgzVeMH0wPjCEoVKQU5TyrzBikeSWV8W1Iybq4p9ka rfRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=r8HJ6DgODtj2X2cqd5mOjTvpDOOECTMV1Qw563xhwTM=; b=Wpp+OOpvClDcaX3ky7v+EElQefHHC0ely+JN+z20rLGMN7/dlJHyhTuS65bCcPEu6b nsAAEEWlSvtmVFTcExvmNMFQMvGvuqj1fBJLRPSqWSFPSmHHaN3sWD7P12Hx/G7aMuUu cpS0bDhFQsLhRkxBEC0ECVv01pkDklIVSvp69X57hpFtLS3kZsRmLdid5ciDBzLlRqEm pEXPO2vrjaZ++JYJ6Ngw3p21+g+x654Y/uHeoP/l2qMMGoeudwqW0y82MKUqghS3cvSG 59fsMBlZHRCzS9i0CB0GZtRFM9O9MtvrBhmNtaF7HOGkV79B5b1svCihvmQnMgnbGRTv pikQ== X-Gm-Message-State: AOAM5337aOWYt+HDWJV+H2jcUERBHLs0BFNREPFo6zNz6aP7Gdi15P2Z jiANy2RlTLAtBu58WcBACR4= X-Google-Smtp-Source: ABdhPJzKxYnF0aGU+TyU3PMufbcyBKd0EQJgQ/9fRF15N0SJKrKkNhhFj2gzhLmQcxZMPFOZwxQzeg== X-Received: by 2002:a17:90b:4d86:: with SMTP id oj6mr11020697pjb.46.1634207142519; Thu, 14 Oct 2021 03:25:42 -0700 (PDT) Received: from fmin-OptiPlex-7060.nreal.work ([137.59.103.165]) by smtp.gmail.com with ESMTPSA id ip10sm2105939pjb.40.2021.10.14.03.25.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Oct 2021 03:25:42 -0700 (PDT) From: dillon.minfei@gmail.com To: mchehab@kernel.org, mchehab+huawei@kernel.org, hverkuil-cisco@xs4all.nl, ezequiel@collabora.com, gnurou@gmail.com, pihsun@chromium.org, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, mturquette@baylibre.com, sboyd@kernel.org, robh+dt@kernel.org, gabriel.fernandez@st.com, gabriel.fernandez@foss.st.com Cc: patrice.chotard@foss.st.com, hugues.fruchet@foss.st.com, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, Dillon Min Subject: [PATCH v4 6/8] media: v4l2-ctrls: Add RGB color effects control Date: Thu, 14 Oct 2021 18:25:04 +0800 Message-Id: <1634207106-7632-7-git-send-email-dillon.minfei@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1634207106-7632-1-git-send-email-dillon.minfei@gmail.com> References: <1634207106-7632-1-git-send-email-dillon.minfei@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Dillon Min Add V4L2_COLORFX_SET_RGB color effects control, V4L2_CID_COLORFX_RGB for RGB color setting. Signed-off-by: Dillon Min --- v4: - replace V4L2_COLORFX_SET_ARGB, V4L2_CID_COLORFX_ARGB to V4L2_COLORFX_SET_RGB, V4L2_CID_COLORFX_RGB since Alpha paramter not used in current. thanks Hans. Documentation/userspace-api/media/v4l/control.rst | 9 +++++++++ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 2 ++ include/uapi/linux/v4l2-controls.h | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Documentation/userspace-api/media/v4l/control.rst b/Documentation/userspace-api/media/v4l/control.rst index f8d0b923da20..3eec65174260 100644 --- a/Documentation/userspace-api/media/v4l/control.rst +++ b/Documentation/userspace-api/media/v4l/control.rst @@ -242,8 +242,17 @@ Control IDs * - ``V4L2_COLORFX_SET_CBCR`` - The Cb and Cr chroma components are replaced by fixed coefficients determined by ``V4L2_CID_COLORFX_CBCR`` control. + * - ``V4L2_COLORFX_SET_RGB`` + - The RGB components are replaced by the fixed RGB components determined + by ``V4L2_CID_COLORFX_RGB`` control. +``V4L2_CID_COLORFX_RGB`` ``(integer)`` + Determines the Red, Green, and Blue coefficients for + ``V4L2_COLORFX_SET_RGB`` color effect. + Bits [7:0] of the supplied 32 bit value are interpreted as Blue component, + bits [15:8] as Green component, bits [23:16] as Red component, and + bits [31:24] must be zero. ``V4L2_CID_COLORFX_CBCR`` ``(integer)`` Determines the Cb and Cr coefficients for ``V4L2_COLORFX_SET_CBCR`` diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c index 421300e13a41..f4bd90170105 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c @@ -785,6 +785,7 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_MIN_BUFFERS_FOR_OUTPUT: return "Min Number of Output Buffers"; case V4L2_CID_ALPHA_COMPONENT: return "Alpha Component"; case V4L2_CID_COLORFX_CBCR: return "Color Effects, CbCr"; + case V4L2_CID_COLORFX_RGB: return "Color Effects, RGB"; /* * Codec controls @@ -1392,6 +1393,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, *min = *max = *step = *def = 0; break; case V4L2_CID_BG_COLOR: + case V4L2_CID_COLORFX_RGB: *type = V4L2_CTRL_TYPE_INTEGER; *step = 1; *min = 0; diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 5532b5f68493..9aa3fd368383 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -128,6 +128,7 @@ enum v4l2_colorfx { V4L2_COLORFX_SOLARIZATION = 13, V4L2_COLORFX_ANTIQUE = 14, V4L2_COLORFX_SET_CBCR = 15, + V4L2_COLORFX_SET_RGB = 16, }; #define V4L2_CID_AUTOBRIGHTNESS (V4L2_CID_BASE+32) #define V4L2_CID_BAND_STOP_FILTER (V4L2_CID_BASE+33) @@ -145,9 +146,10 @@ enum v4l2_colorfx { #define V4L2_CID_ALPHA_COMPONENT (V4L2_CID_BASE+41) #define V4L2_CID_COLORFX_CBCR (V4L2_CID_BASE+42) +#define V4L2_CID_COLORFX_RGB (V4L2_CID_BASE+43) /* last CID + 1 */ -#define V4L2_CID_LASTP1 (V4L2_CID_BASE+43) +#define V4L2_CID_LASTP1 (V4L2_CID_BASE+44) /* USER-class private control IDs */ -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41336C433F5 for ; Thu, 14 Oct 2021 10:29:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 14443610D0 for ; Thu, 14 Oct 2021 10:29:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 14443610D0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VDHNSJDjCHqgGH9ctwbhJcYdZkYpCecI/KlEY3w2u68=; b=n3zFPXpKF/c6oh Y+HFnhr0uzItzRHwEQTwC6v284ma2xiOTvzezrl9+0zaSzyphnsG0jquPI1h0w51ORECGTQnctL40 jCOOS0NQtoeb77FrgeVw7OxyeL5JY/9Y0CwxAS9dlPCRVRAdgI5rFi67jLzLLr8TEAQrblrNzTaUv wTIGP34357jyaOH2Of5yGo3u786exdBOHCWeIKHt8Y6z5T6Jpg2e0br+f86KoTSJ+OU33ASiZY4Lj jmz7d1W8FwB8O6n8M1paV+ggS/V3QI5zrntH3ZN3hi1fPFYDFa4ow+a8RyvnWrqeE4+DltrI21ZU6 UhdTT4aHM5yArYW+eM0A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1maxwv-002Ygm-7M; Thu, 14 Oct 2021 10:26:57 +0000 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1maxvj-002YG8-Ks for linux-arm-kernel@lists.infradead.org; Thu, 14 Oct 2021 10:25:47 +0000 Received: by mail-pl1-x634.google.com with SMTP id n11so3863299plf.4 for ; Thu, 14 Oct 2021 03:25:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r8HJ6DgODtj2X2cqd5mOjTvpDOOECTMV1Qw563xhwTM=; b=mpc74U8iXqWqKswUPZ5p5H8afkLFsxDUpV8Js49OSjvOQA0/Uadbd5LN71Qnghk3CJ V4tYCVOuDfBSP8iIiynxP6lA1Pi7Mk4X86AEKCYzbVa1vzpiQ4OcY+XU8Wq5Cvlx5uQX hr7hTu7jMfPRb+2VrL48gHi8bLPqv10v/QwA6JvCIqSPNP5bKRP02Z77AhqajsIuLu07 lsghDHcSKkCLprlJjdmeSL1Fq2VUom+g6YkWrlOk2hYFBHwGydAytdy4d8XeTfhpqust K/JMpgvVhyiDAjeJJcigzAstg5OgzVeMH0wPjCEoVKQU5TyrzBikeSWV8W1Iybq4p9ka rfRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=r8HJ6DgODtj2X2cqd5mOjTvpDOOECTMV1Qw563xhwTM=; b=R2Ywbp2lF9zlZqo6BpdsujqL0trvzSDjChbh4B9fb3V+oiK3dWQJM/qkMqpVBu5Ein c88z7HIzim4QzK3LIXU+CDo9TMJvP8E5Hcsienvu6DBk0rLmsLvAReYFlmu8fI7gR+vK vJ0wlnd4XRFgo4GlmyTBtGrWowZIXRW0ksdQmQTmECElAQIEhUoyNSfvaswqM6gBWc6o i7rHRHm+DgWKpEAeFr/iPYH1KgVpBdu9pxbe1bOwgmWfZBLnCA7RElrSYtkF4gxy4wEL 4FB1HfFr3eXXxkyS+fFv5H7t0jLdWLVEYRLnSRmiCGcEiaeByKOfaF1tH+Y6nAvlC+EZ 0pRw== X-Gm-Message-State: AOAM531jemhdgjduQ6uQSZ2TtHtrynthEy2gzqAAoz1Y98SjG0pBOyuW Bb1wcLsl9by50fwZEeq020k= X-Google-Smtp-Source: ABdhPJzKxYnF0aGU+TyU3PMufbcyBKd0EQJgQ/9fRF15N0SJKrKkNhhFj2gzhLmQcxZMPFOZwxQzeg== X-Received: by 2002:a17:90b:4d86:: with SMTP id oj6mr11020697pjb.46.1634207142519; Thu, 14 Oct 2021 03:25:42 -0700 (PDT) Received: from fmin-OptiPlex-7060.nreal.work ([137.59.103.165]) by smtp.gmail.com with ESMTPSA id ip10sm2105939pjb.40.2021.10.14.03.25.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Oct 2021 03:25:42 -0700 (PDT) From: dillon.minfei@gmail.com To: mchehab@kernel.org, mchehab+huawei@kernel.org, hverkuil-cisco@xs4all.nl, ezequiel@collabora.com, gnurou@gmail.com, pihsun@chromium.org, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, mturquette@baylibre.com, sboyd@kernel.org, robh+dt@kernel.org, gabriel.fernandez@st.com, gabriel.fernandez@foss.st.com Cc: patrice.chotard@foss.st.com, hugues.fruchet@foss.st.com, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, Dillon Min Subject: [PATCH v4 6/8] media: v4l2-ctrls: Add RGB color effects control Date: Thu, 14 Oct 2021 18:25:04 +0800 Message-Id: <1634207106-7632-7-git-send-email-dillon.minfei@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1634207106-7632-1-git-send-email-dillon.minfei@gmail.com> References: <1634207106-7632-1-git-send-email-dillon.minfei@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211014_032543_707227_E4482D95 X-CRM114-Status: GOOD ( 14.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Dillon Min Add V4L2_COLORFX_SET_RGB color effects control, V4L2_CID_COLORFX_RGB for RGB color setting. Signed-off-by: Dillon Min --- v4: - replace V4L2_COLORFX_SET_ARGB, V4L2_CID_COLORFX_ARGB to V4L2_COLORFX_SET_RGB, V4L2_CID_COLORFX_RGB since Alpha paramter not used in current. thanks Hans. Documentation/userspace-api/media/v4l/control.rst | 9 +++++++++ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 2 ++ include/uapi/linux/v4l2-controls.h | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Documentation/userspace-api/media/v4l/control.rst b/Documentation/userspace-api/media/v4l/control.rst index f8d0b923da20..3eec65174260 100644 --- a/Documentation/userspace-api/media/v4l/control.rst +++ b/Documentation/userspace-api/media/v4l/control.rst @@ -242,8 +242,17 @@ Control IDs * - ``V4L2_COLORFX_SET_CBCR`` - The Cb and Cr chroma components are replaced by fixed coefficients determined by ``V4L2_CID_COLORFX_CBCR`` control. + * - ``V4L2_COLORFX_SET_RGB`` + - The RGB components are replaced by the fixed RGB components determined + by ``V4L2_CID_COLORFX_RGB`` control. +``V4L2_CID_COLORFX_RGB`` ``(integer)`` + Determines the Red, Green, and Blue coefficients for + ``V4L2_COLORFX_SET_RGB`` color effect. + Bits [7:0] of the supplied 32 bit value are interpreted as Blue component, + bits [15:8] as Green component, bits [23:16] as Red component, and + bits [31:24] must be zero. ``V4L2_CID_COLORFX_CBCR`` ``(integer)`` Determines the Cb and Cr coefficients for ``V4L2_COLORFX_SET_CBCR`` diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c index 421300e13a41..f4bd90170105 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c @@ -785,6 +785,7 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_MIN_BUFFERS_FOR_OUTPUT: return "Min Number of Output Buffers"; case V4L2_CID_ALPHA_COMPONENT: return "Alpha Component"; case V4L2_CID_COLORFX_CBCR: return "Color Effects, CbCr"; + case V4L2_CID_COLORFX_RGB: return "Color Effects, RGB"; /* * Codec controls @@ -1392,6 +1393,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, *min = *max = *step = *def = 0; break; case V4L2_CID_BG_COLOR: + case V4L2_CID_COLORFX_RGB: *type = V4L2_CTRL_TYPE_INTEGER; *step = 1; *min = 0; diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 5532b5f68493..9aa3fd368383 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -128,6 +128,7 @@ enum v4l2_colorfx { V4L2_COLORFX_SOLARIZATION = 13, V4L2_COLORFX_ANTIQUE = 14, V4L2_COLORFX_SET_CBCR = 15, + V4L2_COLORFX_SET_RGB = 16, }; #define V4L2_CID_AUTOBRIGHTNESS (V4L2_CID_BASE+32) #define V4L2_CID_BAND_STOP_FILTER (V4L2_CID_BASE+33) @@ -145,9 +146,10 @@ enum v4l2_colorfx { #define V4L2_CID_ALPHA_COMPONENT (V4L2_CID_BASE+41) #define V4L2_CID_COLORFX_CBCR (V4L2_CID_BASE+42) +#define V4L2_CID_COLORFX_RGB (V4L2_CID_BASE+43) /* last CID + 1 */ -#define V4L2_CID_LASTP1 (V4L2_CID_BASE+43) +#define V4L2_CID_LASTP1 (V4L2_CID_BASE+44) /* USER-class private control IDs */ -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel