From patchwork Wed Aug 2 03:19:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Chen X-Patchwork-Id: 9875871 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 668566038F for ; Wed, 2 Aug 2017 03:22:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 614A828763 for ; Wed, 2 Aug 2017 03:22:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5626D2876B; Wed, 2 Aug 2017 03:22:09 +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.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable 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 C71AA28763 for ; Wed, 2 Aug 2017 03:22:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751968AbdHBDUO (ORCPT ); Tue, 1 Aug 2017 23:20:14 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:37089 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751562AbdHBDUL (ORCPT ); Tue, 1 Aug 2017 23:20:11 -0400 Received: by mail-pg0-f67.google.com with SMTP id 83so4983072pgb.4; Tue, 01 Aug 2017 20:20:11 -0700 (PDT) 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=ydXocRNlTGaqFThwingnv0YmqEOXyc0EYkvjeH6PPh0=; b=enFOphArivZyAo03zX9n2oML+TlQwbeYqkagwSQJX9xNpzCZ5NGrzbS2SUvzcSTpV4 VFti3upRifeJA7G13OocjtKhPWqRohOYBjgYqkT+fkO6fHlydBxCWBvXX1XdzJafFb+4 jMTTYjBdiedSUTHcygjrKz3eipyGYTeJoGfiQyPKrL5mwYd1mFqb4d4/UEcc0lCtdqCO D9UJfU37rGKpBsrq6jAva/CsEX8w7tYoGY3ifFeUxpnCRElMiZ6yCxYvGkxveCgenPe2 zDNiCDE7+r2dg8AYjm14+dV28zxSzXQa2db1F7lGV3XuZvRaw0oiVUVOJ5qjcg4dBvOO tI6g== X-Gm-Message-State: AIVw1118fshyUtphd2r+0l4KjeCxpUITp6somIcMqTP5jGtdvyiJi7M+ bk0NihEpFOgl6w== X-Received: by 10.84.141.1 with SMTP id 1mr24173729plu.141.1501644011180; Tue, 01 Aug 2017 20:20:11 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id x29sm11973268pff.2.2017.08.01.20.20.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Aug 2017 20:20:10 -0700 (PDT) From: Jacob Chen To: linux-rockchip@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, heiko@sntech.de, robh+dt@kernel.org, mchehab@kernel.org, linux-media@vger.kernel.org, laurent.pinchart+renesas@ideasonboard.com, hans.verkuil@cisco.com, tfiga@chromium.org, nicolas@ndufresne.ca, Jacob Chen Subject: [PATCH v5 1/6] v4l: add portduff blend modes Date: Wed, 2 Aug 2017 11:19:42 +0800 Message-Id: <1501643987-27847-2-git-send-email-jacob-chen@iotwrt.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501643987-27847-1-git-send-email-jacob-chen@iotwrt.com> References: <1501643987-27847-1-git-send-email-jacob-chen@iotwrt.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 At peresent, we don't have a control for Compositing and Blend. All drivers are just doing copies while actually many hardwares supports more functions. So Adding V4L2 controls for Compositing and Blend, used for for composting streams. The values are based on porter duff operations. Defined in below links. https://developer.xamarin.com/api/type/Android.Graphics.PorterDuff+Mode/ Signed-off-by: Jacob Chen Suggested-by: Nicolas Dufresne --- drivers/media/v4l2-core/v4l2-ctrls.c | 20 +++++++++++++++++++- include/uapi/linux/v4l2-controls.h | 20 +++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index b9e08e3..561d7d5 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -478,7 +478,21 @@ const char * const *v4l2_ctrl_get_menu(u32 id) "Region Grid", NULL, }; - + static const char * const porter_duff_modes[] = { + "Source", + "Source Top", + "Source In", + "Source Out", + "Source Over", + "Destination", + "Destination Top", + "Destination In", + "Destination Out", + "Destination Over", + "Add", + "Clear", + NULL + }; switch (id) { case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ: @@ -564,6 +578,8 @@ const char * const *v4l2_ctrl_get_menu(u32 id) return vpx_golden_frame_sel; case V4L2_CID_JPEG_CHROMA_SUBSAMPLING: return jpeg_chroma_subsampling; + case V4L2_CID_PORTER_DUFF_MODE: + return porter_duff_modes; case V4L2_CID_DV_TX_MODE: return dv_tx_mode; case V4L2_CID_DV_TX_RGB_RANGE: @@ -886,6 +902,7 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_PIXEL_RATE: return "Pixel Rate"; case V4L2_CID_TEST_PATTERN: return "Test Pattern"; case V4L2_CID_DEINTERLACING_MODE: return "Deinterlacing Mode"; + case V4L2_CID_PORTER_DUFF_MODE: return "PorterDuff Blend Modes"; /* DV controls */ /* Keep the order of the 'case's the same as in v4l2-controls.h! */ @@ -1060,6 +1077,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_DV_RX_IT_CONTENT_TYPE: case V4L2_CID_TEST_PATTERN: case V4L2_CID_DEINTERLACING_MODE: + case V4L2_CID_PORTER_DUFF_MODE: case V4L2_CID_TUNE_DEEMPHASIS: case V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_SEL: case V4L2_CID_DETECT_MD_MODE: diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 0d2e1e0..986a02b6 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -893,7 +893,25 @@ enum v4l2_jpeg_chroma_subsampling { #define V4L2_CID_PIXEL_RATE (V4L2_CID_IMAGE_PROC_CLASS_BASE + 2) #define V4L2_CID_TEST_PATTERN (V4L2_CID_IMAGE_PROC_CLASS_BASE + 3) #define V4L2_CID_DEINTERLACING_MODE (V4L2_CID_IMAGE_PROC_CLASS_BASE + 4) - +#define V4L2_CID_PORTER_DUFF_MODE (V4L2_CID_IMAGE_PROC_CLASS_BASE + 5) +/* + * For details: see + * https://developer.android.com/reference/android/graphics/PorterDuff.Mode.html + */ +enum v4l2_porter_duff_mode { + V4L2_PORTER_DUFF_SRC = 0, + V4L2_PORTER_DUFF_SRCATOP = 1, + V4L2_PORTER_DUFF_SRCIN = 2, + V4L2_PORTER_DUFF_SRCOUT = 3, + V4L2_PORTER_DUFF_SRCOVER = 4, + V4L2_PORTER_DUFF_DST = 5, + V4L2_PORTER_DUFF_DSTATOP = 6, + V4L2_PORTER_DUFF_DSTIN = 7, + V4L2_PORTER_DUFF_DSTOUT = 8, + V4L2_PORTER_DUFF_DSTOVER = 9, + V4L2_PORTER_DUFF_ADD = 10, + V4L2_PORTER_DUFF_CLEAR = 11, +}; /* DV-class control IDs defined by V4L2 */ #define V4L2_CID_DV_CLASS_BASE (V4L2_CTRL_CLASS_DV | 0x900)