From: Jacob Chen <jacob-chen@iotwrt.com> 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, s.nawrocki@samsung.com, tfiga@chromium.org, nicolas@ndufresne.ca, Jacob Chen <jacob-chen@iotwrt.com> Subject: [PATCH v2 1/6] [media] v4l: add blend modes controls Date: Sat, 15 Jul 2017 14:58:35 +0800 [thread overview] Message-ID: <1500101920-24039-2-git-send-email-jacob-chen@iotwrt.com> (raw) In-Reply-To: <1500101920-24039-1-git-send-email-jacob-chen@iotwrt.com> 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 <jacob-chen@iotwrt.com> Suggested-by: Nicolas Dufresne <nicolas@ndufresne.ca> --- drivers/media/v4l2-core/v4l2-ctrls.c | 19 +++++++++++++++++++ include/uapi/linux/v4l2-controls.h | 18 +++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index b9e08e3..8a235fd 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -216,6 +216,21 @@ const char * const *v4l2_ctrl_get_menu(u32 id) "Private Packet, IVTV Format", NULL }; + static const char * const blend_modes[] = { + "Source", + "Source Top", + "Source In", + "Source Out", + "Source Over", + "Destination", + "Destination Top", + "Destination In", + "Destination Out", + "Destination Over", + "Add", + "Clear", + NULL + }; static const char * const camera_power_line_frequency[] = { "Disabled", "50 Hz", @@ -522,6 +537,8 @@ const char * const *v4l2_ctrl_get_menu(u32 id) return camera_exposure_metering; case V4L2_CID_AUTO_FOCUS_RANGE: return camera_auto_focus_range; + case V4L2_CID_BLEND: + return blend_modes; case V4L2_CID_COLORFX: return colorfx; case V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE: @@ -655,6 +672,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_BLEND: return "Compositing and Blend Modes"; /* Codec controls */ /* The MPEG controls are applicable to all codec controls @@ -1033,6 +1051,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_MPEG_STREAM_VBI_FMT: case V4L2_CID_EXPOSURE_AUTO: case V4L2_CID_AUTO_FOCUS_RANGE: + case V4L2_CID_BLEND: case V4L2_CID_COLORFX: case V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE: case V4L2_CID_TUNE_PREEMPHASIS: diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 0d2e1e0..019fdca 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -140,8 +140,24 @@ enum v4l2_colorfx { #define V4L2_CID_ALPHA_COMPONENT (V4L2_CID_BASE+41) #define V4L2_CID_COLORFX_CBCR (V4L2_CID_BASE+42) +#define V4L2_CID_BLEND (V4L2_CID_BASE+43) +enum v4l2_blend_mode { + V4L2_BLEND_SRC = 0, + V4L2_BLEND_SRCATOP = 1, + V4L2_BLEND_SRCIN = 2, + V4L2_BLEND_SRCOUT = 3, + V4L2_BLEND_SRCOVER = 4, + V4L2_BLEND_DST = 5, + V4L2_BLEND_DSTATOP = 6, + V4L2_BLEND_DSTIN = 7, + V4L2_BLEND_DSTOUT = 8, + V4L2_BLEND_DSTOVER = 9, + V4L2_BLEND_ADD = 10, + V4L2_BLEND_CLEAR = 11, +}; + /* 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
WARNING: multiple messages have this Message-ID (diff)
From: jacob-chen@iotwrt.com (Jacob Chen) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/6] [media] v4l: add blend modes controls Date: Sat, 15 Jul 2017 14:58:35 +0800 [thread overview] Message-ID: <1500101920-24039-2-git-send-email-jacob-chen@iotwrt.com> (raw) In-Reply-To: <1500101920-24039-1-git-send-email-jacob-chen@iotwrt.com> 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 <jacob-chen@iotwrt.com> Suggested-by: Nicolas Dufresne <nicolas@ndufresne.ca> --- drivers/media/v4l2-core/v4l2-ctrls.c | 19 +++++++++++++++++++ include/uapi/linux/v4l2-controls.h | 18 +++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index b9e08e3..8a235fd 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -216,6 +216,21 @@ const char * const *v4l2_ctrl_get_menu(u32 id) "Private Packet, IVTV Format", NULL }; + static const char * const blend_modes[] = { + "Source", + "Source Top", + "Source In", + "Source Out", + "Source Over", + "Destination", + "Destination Top", + "Destination In", + "Destination Out", + "Destination Over", + "Add", + "Clear", + NULL + }; static const char * const camera_power_line_frequency[] = { "Disabled", "50 Hz", @@ -522,6 +537,8 @@ const char * const *v4l2_ctrl_get_menu(u32 id) return camera_exposure_metering; case V4L2_CID_AUTO_FOCUS_RANGE: return camera_auto_focus_range; + case V4L2_CID_BLEND: + return blend_modes; case V4L2_CID_COLORFX: return colorfx; case V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE: @@ -655,6 +672,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_BLEND: return "Compositing and Blend Modes"; /* Codec controls */ /* The MPEG controls are applicable to all codec controls @@ -1033,6 +1051,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_MPEG_STREAM_VBI_FMT: case V4L2_CID_EXPOSURE_AUTO: case V4L2_CID_AUTO_FOCUS_RANGE: + case V4L2_CID_BLEND: case V4L2_CID_COLORFX: case V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE: case V4L2_CID_TUNE_PREEMPHASIS: diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 0d2e1e0..019fdca 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -140,8 +140,24 @@ enum v4l2_colorfx { #define V4L2_CID_ALPHA_COMPONENT (V4L2_CID_BASE+41) #define V4L2_CID_COLORFX_CBCR (V4L2_CID_BASE+42) +#define V4L2_CID_BLEND (V4L2_CID_BASE+43) +enum v4l2_blend_mode { + V4L2_BLEND_SRC = 0, + V4L2_BLEND_SRCATOP = 1, + V4L2_BLEND_SRCIN = 2, + V4L2_BLEND_SRCOUT = 3, + V4L2_BLEND_SRCOVER = 4, + V4L2_BLEND_DST = 5, + V4L2_BLEND_DSTATOP = 6, + V4L2_BLEND_DSTIN = 7, + V4L2_BLEND_DSTOUT = 8, + V4L2_BLEND_DSTOVER = 9, + V4L2_BLEND_ADD = 10, + V4L2_BLEND_CLEAR = 11, +}; + /* 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
next prev parent reply other threads:[~2017-07-15 6:59 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-07-15 6:58 [PATCH v2 0/6] Add Rockchip RGA V4l2 support Jacob Chen 2017-07-15 6:58 ` Jacob Chen 2017-07-15 6:58 ` Jacob Chen 2017-07-15 6:58 ` Jacob Chen [this message] 2017-07-15 6:58 ` [PATCH v2 1/6] [media] v4l: add blend modes controls Jacob Chen 2017-07-15 9:31 ` Laurent Pinchart 2017-07-15 9:31 ` Laurent Pinchart 2017-07-15 9:31 ` Laurent Pinchart 2017-07-15 6:58 ` [PATCH v2 2/6] [media] rockchip/rga: v4l2 m2m support Jacob Chen 2017-07-15 6:58 ` Jacob Chen 2017-07-15 6:58 ` Jacob Chen 2017-07-15 9:42 ` Laurent Pinchart 2017-07-15 9:42 ` Laurent Pinchart 2017-07-15 16:49 ` Personnel 2017-07-15 16:49 ` Personnel 2017-07-16 4:19 ` Jacob Chen 2017-07-16 4:19 ` Jacob Chen 2017-07-17 2:43 ` Laurent Pinchart 2017-07-17 2:43 ` Laurent Pinchart 2017-07-17 2:43 ` Laurent Pinchart 2017-07-17 3:43 ` Jacob Chen 2017-07-17 3:43 ` Jacob Chen 2017-07-17 3:43 ` Jacob Chen 2017-07-17 2:37 ` Laurent Pinchart 2017-07-17 2:37 ` Laurent Pinchart 2017-07-17 2:37 ` Laurent Pinchart 2017-07-17 14:45 ` Nicolas Dufresne 2017-07-17 14:45 ` Nicolas Dufresne 2017-07-19 10:40 ` Jacob Chen 2017-07-19 10:40 ` Jacob Chen 2017-07-15 17:42 ` kbuild test robot 2017-07-15 17:42 ` kbuild test robot 2017-07-15 17:42 ` kbuild test robot 2017-07-15 17:42 ` [PATCH] rockchip/rga: fix semicolon.cocci warnings kbuild test robot 2017-07-15 17:42 ` kbuild test robot 2017-07-15 17:42 ` kbuild test robot 2017-07-15 6:58 ` [PATCH v2 3/6] ARM: dts: rockchip: add RGA device node for RK3288 Jacob Chen 2017-07-15 6:58 ` Jacob Chen 2017-07-15 8:12 ` Heiko Stuebner 2017-07-15 8:12 ` Heiko Stuebner 2017-07-15 8:12 ` Heiko Stuebner 2017-07-15 6:58 ` [PATCH v2 4/6] ARM: dts: rockchip: add RGA device node for RK3399 Jacob Chen 2017-07-15 6:58 ` Jacob Chen 2017-07-15 6:58 ` [PATCH v2 5/6] ARM: dts: rockchip: enable RGA for rk3288 devices Jacob Chen 2017-07-15 6:58 ` Jacob Chen 2017-07-15 9:16 ` Laurent Pinchart 2017-07-15 9:16 ` Laurent Pinchart 2017-07-15 9:16 ` Laurent Pinchart 2017-07-16 4:23 ` Jacob Chen 2017-07-16 4:23 ` Jacob Chen 2017-07-16 4:23 ` Jacob Chen 2017-07-17 2:28 ` Laurent Pinchart 2017-07-17 2:28 ` Laurent Pinchart 2017-07-17 2:28 ` Laurent Pinchart 2017-07-17 3:09 ` Jacob Chen 2017-07-17 3:09 ` Jacob Chen 2017-07-15 6:58 ` [PATCH v2 6/6] dt-bindings: Document the Rockchip RGA bindings Jacob Chen 2017-07-15 6:58 ` Jacob Chen 2017-07-15 9:23 ` Laurent Pinchart 2017-07-15 9:23 ` Laurent Pinchart 2017-07-16 16:07 ` Heiko Stuebner 2017-07-16 16:07 ` Heiko Stuebner 2017-07-16 16:07 ` Heiko Stuebner 2017-07-16 16:07 ` Heiko Stuebner 2017-07-17 2:21 ` Laurent Pinchart 2017-07-17 2:21 ` Laurent Pinchart 2017-07-17 2:21 ` Laurent Pinchart
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1500101920-24039-2-git-send-email-jacob-chen@iotwrt.com \ --to=jacob-chen@iotwrt.com \ --cc=devicetree@vger.kernel.org \ --cc=hans.verkuil@cisco.com \ --cc=heiko@sntech.de \ --cc=laurent.pinchart+renesas@ideasonboard.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=mchehab@kernel.org \ --cc=nicolas@ndufresne.ca \ --cc=robh+dt@kernel.org \ --cc=s.nawrocki@samsung.com \ --cc=tfiga@chromium.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.