diff options
| author | John Toomey <john.toomey@amd.com> | 2023-11-16 14:12:45 +0000 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2023-11-22 12:07:57 -0600 |
| commit | 9fc4376c22c3a8ddb7ac8802cd5cf261817a4fd3 (patch) | |
| tree | 79a163e521c082559c430047b57490d96d6d7787 | |
| parent | b08181c55db7eaeaf15c3b8a539420f2e43711cf (diff) | |
| download | meta-xilinx-9fc4376c22c3a8ddb7ac8802cd5cf261817a4fd3.tar.gz | |
v4l2apps: Move v4l-utils and yavta to meta-xilinx
Move the two v4l2apps from meta-petalinux to meta-xilinx
Signed-off-by: John Toomey <john.toomey@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
5 files changed, 148 insertions, 0 deletions
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch b/meta-xilinx-core/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch new file mode 100644 index 00000000..fac2d719 --- /dev/null +++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch | |||
| @@ -0,0 +1,61 @@ | |||
| 1 | From 373923a8cddb0b1854d3040a6ba0cf016a244128 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Anil Kumar M <amamidal@xilinx.com> | ||
| 3 | Date: Mon, 24 Feb 2020 14:45:46 +0530 | ||
| 4 | Subject: [PATCH] v4l-utils: Add support for new media bus codes | ||
| 5 | |||
| 6 | Add new media bus format codes for supporting xilinx | ||
| 7 | specific formats. | ||
| 8 | |||
| 9 | Signed-off-by: Anil Kumar M <amamidal@xilinx.com> | ||
| 10 | --- | ||
| 11 | include/linux/media-bus-format.h | 12 ++++++++++++ | ||
| 12 | utils/media-ctl/libv4l2subdev.c | 11 +++++++++++ | ||
| 13 | 2 files changed, 23 insertions(+) | ||
| 14 | |||
| 15 | diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h | ||
| 16 | index d6a5a3b..3fb2346 100644 | ||
| 17 | --- a/include/linux/media-bus-format.h | ||
| 18 | +++ b/include/linux/media-bus-format.h | ||
| 19 | @@ -108,6 +108,18 @@ | ||
| 20 | #define MEDIA_BUS_FMT_YUV16_1X48 0x202a | ||
| 21 | #define MEDIA_BUS_FMT_UYYVYY16_0_5X48 0x202b | ||
| 22 | |||
| 23 | +/* YUV: Xilinx Specific - next is 0x2109 */ | ||
| 24 | +#define MEDIA_BUS_FMT_VYYUYY8_1X24 0x2100 | ||
| 25 | +#define MEDIA_BUS_FMT_VYYUYY10_4X20 0x2101 | ||
| 26 | +#define MEDIA_BUS_FMT_VUY10_1X30 0x2102 | ||
| 27 | +#define MEDIA_BUS_FMT_UYYVYY12_4X24 0x2103 | ||
| 28 | +#define MEDIA_BUS_FMT_VUY12_1X36 0x2104 | ||
| 29 | +#define MEDIA_BUS_FMT_Y16_1X16 0x2105 | ||
| 30 | +#define MEDIA_BUS_FMT_UYYVYY16_4X32 0x2106 | ||
| 31 | +#define MEDIA_BUS_FMT_VUY16_1X48 0x2107 | ||
| 32 | +#define MEDIA_BUS_FMT_UYVY16_2X32 0x2108 | ||
| 33 | + | ||
| 34 | + | ||
| 35 | /* Bayer - next is 0x3021 */ | ||
| 36 | #define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001 | ||
| 37 | #define MEDIA_BUS_FMT_SGBRG8_1X8 0x3013 | ||
| 38 | diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c | ||
| 39 | index a989efb..a37541f 100644 | ||
| 40 | --- a/utils/media-ctl/libv4l2subdev.c | ||
| 41 | +++ b/utils/media-ctl/libv4l2subdev.c | ||
| 42 | @@ -34,6 +34,17 @@ | ||
| 43 | |||
| 44 | #include <linux/v4l2-subdev.h> | ||
| 45 | |||
| 46 | +/* YUV: Xilinx Specific - next is 0x2109 */ | ||
| 47 | +#define MEDIA_BUS_FMT_VYYUYY8_1X24 (0x2100) | ||
| 48 | +#define MEDIA_BUS_FMT_VYYUYY10_4X20 (0x2101) | ||
| 49 | +#define MEDIA_BUS_FMT_VUY10_1X30 (0x2102) | ||
| 50 | +#define MEDIA_BUS_FMT_UYYVYY12_4X24 (0x2103) | ||
| 51 | +#define MEDIA_BUS_FMT_VUY12_1X36 (0x2104) | ||
| 52 | +#define MEDIA_BUS_FMT_Y16_1X16 (0x2105) | ||
| 53 | +#define MEDIA_BUS_FMT_UYYVYY16_4X32 (0x2106) | ||
| 54 | +#define MEDIA_BUS_FMT_VUY16_1X48 (0x2107) | ||
| 55 | +#define MEDIA_BUS_FMT_UYVY16_2X32 (0x2108) | ||
| 56 | + | ||
| 57 | #include "mediactl.h" | ||
| 58 | #include "mediactl-priv.h" | ||
| 59 | #include "tools.h" | ||
| 60 | -- | ||
| 61 | 2.7.4 | ||
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend b/meta-xilinx-core/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend new file mode 100644 index 00000000..3d177bce --- /dev/null +++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | SRC_URI:append = " file://0001-v4l-utils-Add-support-for-new-media-bus-codes.patch" | ||
| 2 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" | ||
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0001-Add-support-for-3-planar-YUV444P-8bpc.patch b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0001-Add-support-for-3-planar-YUV444P-8bpc.patch new file mode 100644 index 00000000..42b108fe --- /dev/null +++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0001-Add-support-for-3-planar-YUV444P-8bpc.patch | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | From 4d8ac36340423844be76ceb506bc0e4f48772944 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Devarsh Thakkar <devarsh.thakkar@xilinx.com> | ||
| 3 | Date: Tue, 7 Sep 2021 06:08:55 -0700 | ||
| 4 | Subject: [PATCH 1/2] Add support for 3 planar YUV444P 8bpc | ||
| 5 | |||
| 6 | This patch adds support for single contiguous buffer 3 planar YUV444P | ||
| 7 | 8 bpc format. | ||
| 8 | |||
| 9 | Signed-off-by: Devarsh Thakkar <devarsh.thakkar@xilinx.com> | ||
| 10 | Signed-off-by: Mark Hatle <mark.hatle@amd.com> | ||
| 11 | --- | ||
| 12 | include/linux/videodev2.h | 1 + | ||
| 13 | yavta.c | 1 + | ||
| 14 | 2 files changed, 2 insertions(+) | ||
| 15 | |||
| 16 | Index: git/include/linux/videodev2.h | ||
| 17 | =================================================================== | ||
| 18 | --- git.orig/include/linux/videodev2.h | ||
| 19 | +++ git/include/linux/videodev2.h | ||
| 20 | @@ -545,6 +545,7 @@ struct v4l2_pix_format { | ||
| 21 | #define V4L2_PIX_FMT_VYUY v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16 YUV 4:2:2 */ | ||
| 22 | #define V4L2_PIX_FMT_Y41P v4l2_fourcc('Y', '4', '1', 'P') /* 12 YUV 4:1:1 */ | ||
| 23 | #define V4L2_PIX_FMT_YUV444 v4l2_fourcc('Y', '4', '4', '4') /* 16 xxxxyyyy uuuuvvvv */ | ||
| 24 | +#define V4L2_PIX_FMT_YUV444P v4l2_fourcc('4', '4', '4', 'P') /* 24 YUV444 planar */ | ||
| 25 | #define V4L2_PIX_FMT_YUV555 v4l2_fourcc('Y', 'U', 'V', 'O') /* 16 YUV-5-5-5 */ | ||
| 26 | #define V4L2_PIX_FMT_YUV565 v4l2_fourcc('Y', 'U', 'V', 'P') /* 16 YUV-5-6-5 */ | ||
| 27 | #define V4L2_PIX_FMT_YUV32 v4l2_fourcc('Y', 'U', 'V', '4') /* 32 YUV-8-8-8-8 */ | ||
| 28 | Index: git/yavta.c | ||
| 29 | =================================================================== | ||
| 30 | --- git.orig/yavta.c | ||
| 31 | +++ git/yavta.c | ||
| 32 | @@ -309,6 +309,7 @@ static struct v4l2_format_info { | ||
| 33 | { "YVYU", V4L2_PIX_FMT_YVYU, 1 }, | ||
| 34 | { "NV12", V4L2_PIX_FMT_NV12, 1 }, | ||
| 35 | { "NV12M", V4L2_PIX_FMT_NV12M, 2 }, | ||
| 36 | + { "YUV444P", V4L2_PIX_FMT_YUV444P, 1 }, | ||
| 37 | { "NV21", V4L2_PIX_FMT_NV21, 1 }, | ||
| 38 | { "NV21M", V4L2_PIX_FMT_NV21M, 2 }, | ||
| 39 | { "NV16", V4L2_PIX_FMT_NV16, 1 }, | ||
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0002-Add-support-3-planar-YUV-444-10bpc-pixel-format-in-c.patch b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0002-Add-support-3-planar-YUV-444-10bpc-pixel-format-in-c.patch new file mode 100644 index 00000000..5dfbfa2e --- /dev/null +++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta/0002-Add-support-3-planar-YUV-444-10bpc-pixel-format-in-c.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | From dedd0eb76ced425610bdd695029489f553923b2e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Rohit Visavalia <rohit.visavalia@xilinx.com> | ||
| 3 | Date: Wed, 27 Oct 2021 02:45:39 -0700 | ||
| 4 | Subject: [PATCH 2/2] Add support 3 planar YUV 444 10bpc pixel format in | ||
| 5 | contiguous memory | ||
| 6 | |||
| 7 | The new format X403 is added to support 3 planar YUV 444 10bpc | ||
| 8 | 30 bits per sample image data in a single contiguous buffer. | ||
| 9 | |||
| 10 | Signed-off-by: Rohit Visavalia <rohit.visavalia@xilinx.com> | ||
| 11 | Signed-off-by: Mark Hatle <mark.hatle@amd.com> | ||
| 12 | --- | ||
| 13 | include/linux/videodev2.h | 2 ++ | ||
| 14 | yavta.c | 1 + | ||
| 15 | 2 files changed, 3 insertions(+) | ||
| 16 | |||
| 17 | Index: git/include/linux/videodev2.h | ||
| 18 | =================================================================== | ||
| 19 | --- git.orig/include/linux/videodev2.h | ||
| 20 | +++ git/include/linux/videodev2.h | ||
| 21 | @@ -585,6 +585,8 @@ struct v4l2_pix_format { | ||
| 22 | #define V4L2_PIX_FMT_YUV444M v4l2_fourcc('Y', 'M', '2', '4') /* 24 YUV444 planar */ | ||
| 23 | #define V4L2_PIX_FMT_YVU444M v4l2_fourcc('Y', 'M', '4', '2') /* 24 YVU444 planar */ | ||
| 24 | |||
| 25 | +#define V4L2_PIX_FMT_X403 v4l2_fourcc('X', '4', '0', '3') /* 32 YUV planar 4:4:4 10-bit */ | ||
| 26 | + | ||
| 27 | /* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */ | ||
| 28 | #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B', 'A', '8', '1') /* 8 BGBG.. GRGR.. */ | ||
| 29 | #define V4L2_PIX_FMT_SGBRG8 v4l2_fourcc('G', 'B', 'R', 'G') /* 8 GBGB.. RGRG.. */ | ||
| 30 | Index: git/yavta.c | ||
| 31 | =================================================================== | ||
| 32 | --- git.orig/yavta.c | ||
| 33 | +++ git/yavta.c | ||
| 34 | @@ -324,6 +324,7 @@ static struct v4l2_format_info { | ||
| 35 | { "YVU420M", V4L2_PIX_FMT_YVU420M, 3 }, | ||
| 36 | { "YVU422M", V4L2_PIX_FMT_YVU422M, 3 }, | ||
| 37 | { "YVU444M", V4L2_PIX_FMT_YVU444M, 3 }, | ||
| 38 | + { "X403", V4L2_PIX_FMT_X403, 1 }, | ||
| 39 | { "SBGGR8", V4L2_PIX_FMT_SBGGR8, 1 }, | ||
| 40 | { "SGBRG8", V4L2_PIX_FMT_SGBRG8, 1 }, | ||
| 41 | { "SGRBG8", V4L2_PIX_FMT_SGRBG8, 1 }, | ||
diff --git a/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta_%.bbappend b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta_%.bbappend new file mode 100644 index 00000000..52eab13d --- /dev/null +++ b/meta-xilinx-core/recipes-multimedia/v4l2apps/yavta_%.bbappend | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" | ||
| 2 | SRC_URI:append = " \ | ||
| 3 | file://0001-Add-support-for-3-planar-YUV444P-8bpc.patch \ | ||
| 4 | file://0002-Add-support-3-planar-YUV-444-10bpc-pixel-format-in-c.patch \ | ||
| 5 | " | ||
