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 00FD6C433EF for ; Tue, 19 Oct 2021 08:44:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E1DA060EB9 for ; Tue, 19 Oct 2021 08:44:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234817AbhJSIqd (ORCPT ); Tue, 19 Oct 2021 04:46:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234857AbhJSIqZ (ORCPT ); Tue, 19 Oct 2021 04:46:25 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AB5EC06176F; Tue, 19 Oct 2021 01:44:09 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id t21so5148357plr.6; Tue, 19 Oct 2021 01:44:09 -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=1VqU4XTjCpirHS39n6Ik6WoFuzFscoD7Gz6T1rIL72A=; b=fPX8rWmpzjzpH/OQxS77IoGJc3xbaB8bKw+m7+Tm3IR/qeFSLZ+qfSlnSTIlLhNPUO PCOBf0TTrgZhPw7lrwp6QT6rIqSJcO7C5zaP9UftBVgxmevAzxSdqGtdmsfQgqc5SRb3 iiZf163blJRtfXNSk1bHC4H/GNa3tiFLtQUiLpLMe75nAkWPNrm/LaNuUFyccDavlJKB g8tYXh8hH80mZiNF9gkb65qVfIJPIkd8vMpeDyAmKPT8Xv6BXSFOLBrVJbv7SbZ9kIT0 jHe32FPmK19AWygbE4lmFEmUSWGQpMpZhfuT1XmgaT5L8uBDQWMW/yPHDMru+EmAubFg X/Bw== 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=1VqU4XTjCpirHS39n6Ik6WoFuzFscoD7Gz6T1rIL72A=; b=QooJ/sdjZymE+KqG0YIPiTDBeatP/I5QnoEj1QSAj2IUq0uUxJrJc6lCscUuI1Q6a0 UDzG5qPOMkj1tp7nYZGtn6ZSS6unAN+bbDdBHv8eUqU9XWTcH3WNUGR/hiqntTi4fhVJ F/Nb30oBhfK2flmbkSc49+DwxrS7Bm50G4FniSFAB2HDcCeRmLCMnOTF5jGCZAyMt/ds nYeirX0oE5i9ZnuAxu8zB3D2X1ObTeLg1KNFlQAzMBw2oi3YxEkw5et2wfuDhZfQXQAR EfVV6j2cUZxKkL9wLUB/kSl5YLnWBbyFnFPnVUiG4uqppl+w59KuaYTxUre6pwr/IBk5 TOaQ== X-Gm-Message-State: AOAM530/Y+FR4gCM9VsZ/6047dN6EKddUX2E4LoGmqp++Aj+k/eF2lhW qCk5M8K1Bxq79zjQUCSQoCI= X-Google-Smtp-Source: ABdhPJyfW1mP1njhIKYVaL1M/HtxJBdQwz1eAcuC+TRtsUJLSXNJ8Z/JXZVOFK3MR3N6IyLcR1HsSA== X-Received: by 2002:a17:902:e746:b0:13f:398e:a0e2 with SMTP id p6-20020a170902e74600b0013f398ea0e2mr31807286plf.48.1634633049003; Tue, 19 Oct 2021 01:44:09 -0700 (PDT) Received: from fmin-OptiPlex-7060.nreal.work ([137.59.103.165]) by smtp.gmail.com with ESMTPSA id c11sm1824716pji.38.2021.10.19.01.44.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Oct 2021 01:44:08 -0700 (PDT) From: Dillon Min 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 Subject: [PATCH v6 08/10] media: v4l2-ctrls: Add RGB color effects control Date: Tue, 19 Oct 2021 16:43:21 +0800 Message-Id: <1634633003-18132-9-git-send-email-dillon.minfei@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1634633003-18132-1-git-send-email-dillon.minfei@gmail.com> References: <1634633003-18132-1-git-send-email-dillon.minfei@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Add V4L2_COLORFX_SET_RGB color effects control, V4L2_CID_COLORFX_RGB for RGB color setting. with two mirror changes: - change 0xFFFFFF to 0xffffff - fix comments 2^24 to 2^24 - 1 Signed-off-by: Dillon Min --- v6: add space in '(V4L2_CID_BASE+43)' to avoid checkpatch warrnings. Documentation/userspace-api/media/v4l/control.rst | 9 +++++++++ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 6 ++++-- include/uapi/linux/v4l2-controls.h | 4 +++- 3 files changed, 16 insertions(+), 3 deletions(-) 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 0cb6c0f18b39..431f7ec17557 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 @@ -1394,11 +1395,12 @@ 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; - /* Max is calculated as RGB888 that is 2^24 */ - *max = 0xFFFFFF; + /* Max is calculated as RGB888 that is 2^24 - 1 */ + *max = 0xffffff; break; case V4L2_CID_COLORFX_CBCR: *type = V4L2_CTRL_TYPE_INTEGER; diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 133e20444939..1406df0cc107 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 D0474C433EF for ; Tue, 19 Oct 2021 08:47:11 +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 9B13060EFF for ; Tue, 19 Oct 2021 08:47:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9B13060EFF 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=gXN68fqlSFBColNZxvk0Hn/o+CQolJMs91I+JXZ/g50=; b=ViRNOncOlL2N6D fhH0HMfZ9al4Uq7vDSswvVNedSz4B8Oqf944NIVJWfwGTosgv2Ms3zrXie5oJqGMVppHPTLb7jkKG sLOhPbNG4MuTAr3xzHU/gM3QLStSbRRqVEvgPLwrWmrJyH1YKOqhYHnUoWpYttZlktym000AhEB0b Tx8vVRhps6607AsknL7iZson3A9mIYjDdCkHte5AsbUBS0JkC1VlMa2G4L0c4LzLFFxsaTZ1V2qBU KgeYhebvECiTD5l+Jjow6u1Dz07+JFlXBJzXajryTmOiqnanhvAlItGsuEmae7uEP1vybBRaUYGfV fl3Rc57uIuzoTEYhmj2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mckkj-000YV0-EV; Tue, 19 Oct 2021 08:45:46 +0000 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mckjC-000Xp4-4p for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 08:44:15 +0000 Received: by mail-pl1-x62b.google.com with SMTP id b14so3410272plg.2 for ; Tue, 19 Oct 2021 01:44:09 -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=1VqU4XTjCpirHS39n6Ik6WoFuzFscoD7Gz6T1rIL72A=; b=fPX8rWmpzjzpH/OQxS77IoGJc3xbaB8bKw+m7+Tm3IR/qeFSLZ+qfSlnSTIlLhNPUO PCOBf0TTrgZhPw7lrwp6QT6rIqSJcO7C5zaP9UftBVgxmevAzxSdqGtdmsfQgqc5SRb3 iiZf163blJRtfXNSk1bHC4H/GNa3tiFLtQUiLpLMe75nAkWPNrm/LaNuUFyccDavlJKB g8tYXh8hH80mZiNF9gkb65qVfIJPIkd8vMpeDyAmKPT8Xv6BXSFOLBrVJbv7SbZ9kIT0 jHe32FPmK19AWygbE4lmFEmUSWGQpMpZhfuT1XmgaT5L8uBDQWMW/yPHDMru+EmAubFg X/Bw== 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=1VqU4XTjCpirHS39n6Ik6WoFuzFscoD7Gz6T1rIL72A=; b=Thrt+ctDKOxCw5U6edH9rS+SH0ElI7jfSpdEiFb1JNsdERgVZXdX7Pq3yMcsXXuuK0 pXumDjREQBRK5lX0uH9W7cX3ANHAiVgMU83BkByzFSFIY+Q70nW7Ce5mF3giZpf1JV6l dg/vw51IBA0cdm+NFv024YwGSMUNc/xd6LbFv1+qeOtcb1rDyDV6C0T7bHZE+GJPSgE3 fF4Syv6ITiX7J0yYaFq9aJHu8+kWzyLas7Mde2AhhmCW6xraZD9tgEg2+ArHbQGDYOnR KebFr0/5zbepZovbTVJY+bbSdC++HuH2TrhAs4vMsYJIpMLzEueu6fVyKZfHfwSE137s 1GIQ== X-Gm-Message-State: AOAM532B5nfqBPWNOARoxGL9NI+RG5GneDqz2zAiKTuHoPRai4U3Yge/ tMI8luVVbkudAQlI8VShTu0riCOwlDA88XV2 X-Google-Smtp-Source: ABdhPJyfW1mP1njhIKYVaL1M/HtxJBdQwz1eAcuC+TRtsUJLSXNJ8Z/JXZVOFK3MR3N6IyLcR1HsSA== X-Received: by 2002:a17:902:e746:b0:13f:398e:a0e2 with SMTP id p6-20020a170902e74600b0013f398ea0e2mr31807286plf.48.1634633049003; Tue, 19 Oct 2021 01:44:09 -0700 (PDT) Received: from fmin-OptiPlex-7060.nreal.work ([137.59.103.165]) by smtp.gmail.com with ESMTPSA id c11sm1824716pji.38.2021.10.19.01.44.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Oct 2021 01:44:08 -0700 (PDT) From: Dillon Min 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 Subject: [PATCH v6 08/10] media: v4l2-ctrls: Add RGB color effects control Date: Tue, 19 Oct 2021 16:43:21 +0800 Message-Id: <1634633003-18132-9-git-send-email-dillon.minfei@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1634633003-18132-1-git-send-email-dillon.minfei@gmail.com> References: <1634633003-18132-1-git-send-email-dillon.minfei@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_014410_260208_41ED1ACA X-CRM114-Status: GOOD ( 15.35 ) 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 Add V4L2_COLORFX_SET_RGB color effects control, V4L2_CID_COLORFX_RGB for RGB color setting. with two mirror changes: - change 0xFFFFFF to 0xffffff - fix comments 2^24 to 2^24 - 1 Signed-off-by: Dillon Min --- v6: add space in '(V4L2_CID_BASE+43)' to avoid checkpatch warrnings. Documentation/userspace-api/media/v4l/control.rst | 9 +++++++++ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 6 ++++-- include/uapi/linux/v4l2-controls.h | 4 +++- 3 files changed, 16 insertions(+), 3 deletions(-) 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 0cb6c0f18b39..431f7ec17557 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 @@ -1394,11 +1395,12 @@ 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; - /* Max is calculated as RGB888 that is 2^24 */ - *max = 0xFFFFFF; + /* Max is calculated as RGB888 that is 2^24 - 1 */ + *max = 0xffffff; break; case V4L2_CID_COLORFX_CBCR: *type = V4L2_CTRL_TYPE_INTEGER; diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 133e20444939..1406df0cc107 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