[{"id":3859,"web_url":"https://patchwork.libcamera.org/comment/3859/","msgid":"<20200229131722.GF18738@pendragon.ideasonboard.com>","date":"2020-02-29T13:17:22","subject":"Re: [libcamera-devel] [PATCH v2 02/27] gst: Add utility to convert\n\tStreamFormats to GstCaps","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Nicolas,\n\nThank you for the patch.\n\nOn Thu, Feb 27, 2020 at 03:03:42PM -0500, Nicolas Dufresne wrote:\n> This transforms the basic information found in StreamFormats to GstCaps.\n> This can be handy to reply to early caps query or inside a device\n> provider. Note that we ignored generated range as they are harmful to\n> caps negotiation. We also don't simplify the caps for readability\n> reasons, so some of the discrete value may be included in a range.\n> \n> Signed-off-by: Nicolas Dufresne \n> ---\n> src/gstreamer/gstlibcamera-utils.cpp | 98 ++++++++++++++++++++++++++++\n> src/gstreamer/gstlibcamera-utils.h | 18 +++++\n> src/gstreamer/meson.build | 1 +\n> 3 files changed, 117 insertions(+)\n> create mode 100644 src/gstreamer/gstlibcamera-utils.cpp\n> create mode 100644 src/gstreamer/gstlibcamera-utils.h\n> \n> diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp\n> new file mode 100644\n> index 0000000..dc129c3\n> --- /dev/null\n> +++ b/src/gstreamer/gstlibcamera-utils.cpp\n> @@ -0,0 +1,98 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2020, Collabora Ltd.\n> + * Author: Nicolas Dufresne \n> + *\n> + * gstlibcamera-utils.c - GStreamer libcamera Utility Function\n> + */\n> +\n> +#include \"gstlibcamera-utils.h\"\n\nMissing blank line here.\n\n> +#include \n> +\n> +using namespace libcamera;\n> +\n> +static struct {\n> +\tGstVideoFormat gst_format;\n> +\tguint drm_fourcc;\n> +} format_map[] = {\n> +\t{ GST_VIDEO_FORMAT_ENCODED, DRM_FORMAT_MJPEG },\n> +\t{ GST_VIDEO_FORMAT_RGB, DRM_FORMAT_BGR888 },\n> +\t{ GST_VIDEO_FORMAT_BGR, DRM_FORMAT_RGB888 },\n> +\t{ GST_VIDEO_FORMAT_ARGB, DRM_FORMAT_BGRA8888 },\n> +\t{ GST_VIDEO_FORMAT_NV12, DRM_FORMAT_NV12 },\n> +\t{ GST_VIDEO_FORMAT_NV21, DRM_FORMAT_NV21 },\n> +\t{ GST_VIDEO_FORMAT_NV16, DRM_FORMAT_NV16 },\n> +\t{ GST_VIDEO_FORMAT_NV61, DRM_FORMAT_NV61 },\n> +\t{ GST_VIDEO_FORMAT_NV24, DRM_FORMAT_NV24 },\n> +\t{ GST_VIDEO_FORMAT_UYVY, DRM_FORMAT_UYVY },\n> +\t{ GST_VIDEO_FORMAT_VYUY, DRM_FORMAT_VYUY },\n> +\t{ GST_VIDEO_FORMAT_YUY2, DRM_FORMAT_YUYV },\n> +\t{ GST_VIDEO_FORMAT_YVYU, DRM_FORMAT_YVYU },\n> +\t/* \\todo NV42 is used in libcamera but is not mapped in GStreamer yet. */\n> +};\n> +\n> +static inline GstVideoFormat\n> +drm_to_gst_format(guint drm_fourcc)\n> +{\n> +\tfor (const auto &item : format_map)\n\n\tfor (const auto &item : format_map) {\n> +\t\tif (item.drm_fourcc == drm_fourcc)\n> +\t\t\treturn item.gst_format;\n\t}\n\nSweet, I didn't know C++ allowed range loops on plain C arrays :-)\n\n> +\treturn GST_VIDEO_FORMAT_UNKNOWN;\n> +}\n> +\n> +static GstStructure *\n> +bare_structure_from_fourcc(guint fourcc)\n> +{\n> +\tGstVideoFormat gst_format = drm_to_gst_format(fourcc);\n> +\n> +\tif (gst_format == GST_VIDEO_FORMAT_UNKNOWN)\n> +\t\treturn nullptr;\n> +\n> +\tif (gst_format != GST_VIDEO_FORMAT_ENCODED)\n> +\t\treturn gst_structure_new(\"video/x-raw\", \"format\", G_TYPE_STRING,\n> +\t\t\t\t\t gst_video_format_to_string(gst_format), nullptr);\n> +\n> +\tswitch (fourcc) {\n> +\tcase DRM_FORMAT_MJPEG:\n> +\t\treturn gst_structure_new_empty(\"image/jpeg\");\n> +\tdefault:\n> +\t\treturn nullptr;\n> +\t}\n> +}\n> +\n> +GstCaps *\n> +gst_libcamera_stream_formats_to_caps(const StreamFormats &formats)\n> +{\n> +\tGstCaps *caps = gst_caps_new_empty();\n> +\n> +\tfor (unsigned int fourcc : formats.pixelformats()) {\n> +\t\tg_autoptr(GstStructure) bare_s = bare_structure_from_fourcc(fourcc);\n> +\n> +\t\tif (!bare_s) {\n> +\t\t\tGST_WARNING(\"Unsupported DRM format %\" GST_FOURCC_FORMAT,\n> +\t\t\t\t GST_FOURCC_ARGS(fourcc));\n> +\t\t\tcontinue;\n> +\t\t}\n> +\n> +\t\tfor (const Size &size : formats.sizes(fourcc)) {\n> +\t\t\tGstStructure *s = gst_structure_copy(bare_s);\n> +\t\t\tgst_structure_set(s,\n> +\t\t\t\t\t \"width\", G_TYPE_INT, size.width,\n> +\t\t\t\t\t \"height\", G_TYPE_INT, size.height,\n> +\t\t\t\t\t nullptr);\n> +\t\t\tgst_caps_append_structure(caps, s);\n> +\t\t}\n> +\n> +\t\tconst SizeRange &range = formats.range(fourcc);\n> +\t\tif (range.hStep && range.vStep) {\n> +\t\t\tGstStructure *s = gst_structure_copy(bare_s);\n> +\t\t\tgst_structure_set(s,\n> +\t\t\t\t\t \"width\", GST_TYPE_INT_RANGE, range.min.width, range.max.width, range.hStep,\n> +\t\t\t\t\t \"height\", GST_TYPE_INT_RANGE, range.min.height, range.max.height, range.vStep,\n> +\t\t\t\t\t nullptr);\n> +\t\t\tgst_caps_append_structure(caps, s);\n> +\t\t}\n> +\t}\n> +\n> +\treturn caps;\n> +}\n> diff --git a/src/gstreamer/gstlibcamera-utils.h b/src/gstreamer/gstlibcamera-utils.h\n> new file mode 100644\n> index 0000000..33160b8\n> --- /dev/null\n> +++ b/src/gstreamer/gstlibcamera-utils.h\n> @@ -0,0 +1,18 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2020, Collabora Ltd.\n> + * Author: Nicolas Dufresne \n> + *\n> + * gstlibcamera-utils.h - GStreamer libcamera Utility Functions\n> + */\n> +\n> +#ifndef __GST_LIBCAMERA_UTILS_H_\n\ns/__GST_LIBCAMERA_UTILS_H_/__GST_LIBCAMERA_UTILS_H__/\n\nMissing\n\n#define __GST_LIBCAMERA_UTILS_H__\n\n> +\n> +#include \n> +#include \n> +\n> +#include \n> +\n> +GstCaps *gst_libcamera_stream_formats_to_caps(const libcamera::StreamFormats &formats);\n> +\n> +#endif /* __GST_LIBCAMERA_UTILS_H_ */\n\n__GST_LIBCAMERA_UTILS_H__ here too.\n\n> diff --git a/src/gstreamer/meson.build b/src/gstreamer/meson.build\n> index 832b8a5..f409107 100644\n> --- a/src/gstreamer/meson.build\n> +++ b/src/gstreamer/meson.build\n> @@ -1,4 +1,5 @@\n> libcamera_gst_sources = [\n> + 'gstlibcamera-utils.cpp',\n> 'gstlibcamera.c',\n> 'gstlibcamerasrc.cpp',\n> ]","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 95DE562689\n\tfor ;\n\tSat, 29 Feb 2020 14:17:46 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0B0622AF;\n\tSat, 29 Feb 2020 14:17:45 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582982266;\n\tbh=HJ+VgkpjhnBJatSkpCv7EkyNaRKmI9pwbM39Ok1aV/Q=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=N2AtbH81wFSGKJQYVA5cOw/xGsEd5P+4NMouY0fu1mOC6t0nDtf0JULtini6LIi8h\n\tXGif2KR8jSImJWtIAtz+3bZ2CLvGI9wSIhNlbKa8YodHbcgZh62ywPrLyAbUnxWVUX\n\tM3n/4Hr+aF2yp+BpNWQzMkplEDa9F6BDIQarW1fM=","Date":"Sat, 29 Feb 2020 15:17:22 +0200","From":"Laurent Pinchart ","To":"Nicolas Dufresne ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200229131722.GF18738@pendragon.ideasonboard.com>","References":"<20200227200407.490616-1-nicolas.dufresne@collabora.com>\n\t<20200227200407.490616-3-nicolas.dufresne@collabora.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200227200407.490616-3-nicolas.dufresne@collabora.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v2 02/27] gst: Add utility to convert\n\tStreamFormats to GstCaps","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Sat, 29 Feb 2020 13:17:46 -0000"}},{"id":3964,"web_url":"https://patchwork.libcamera.org/comment/3964/","msgid":"<55ed8fe8d4cb6322fadbe5f84768da48f5f6d4ce.camel@collabora.com>","date":"2020-03-06T16:38:17","subject":"Re: [libcamera-devel] [PATCH v2 02/27] gst: Add utility to convert\n\tStreamFormats to GstCaps","submitter":{"id":31,"url":"https://patchwork.libcamera.org/api/people/31/","name":"Nicolas Dufresne","email":"nicolas.dufresne@collabora.com"},"content":"Le samedi 29 février 2020 à 15:17 +0200, Laurent Pinchart a écrit :\n> Hi Nicolas,\n> \n> Thank you for the patch.\n> \n> On Thu, Feb 27, 2020 at 03:03:42PM -0500, Nicolas Dufresne wrote:\n> > This transforms the basic information found in StreamFormats to GstCaps.\n> > This can be handy to reply to early caps query or inside a device\n> > provider. Note that we ignored generated range as they are harmful to\n> > caps negotiation. We also don't simplify the caps for readability\n> > reasons, so some of the discrete value may be included in a range.\n> > \n> > Signed-off-by: Nicolas Dufresne \n> > ---\n> > src/gstreamer/gstlibcamera-utils.cpp | 98 ++++++++++++++++++++++++++++\n> > src/gstreamer/gstlibcamera-utils.h | 18 +++++\n> > src/gstreamer/meson.build | 1 +\n> > 3 files changed, 117 insertions(+)\n> > create mode 100644 src/gstreamer/gstlibcamera-utils.cpp\n> > create mode 100644 src/gstreamer/gstlibcamera-utils.h\n> > \n> > diff --git a/src/gstreamer/gstlibcamera-utils.cpp\n> > b/src/gstreamer/gstlibcamera-utils.cpp\n> > new file mode 100644\n> > index 0000000..dc129c3\n> > --- /dev/null\n> > +++ b/src/gstreamer/gstlibcamera-utils.cpp\n> > @@ -0,0 +1,98 @@\n> > +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > +/*\n> > + * Copyright (C) 2020, Collabora Ltd.\n> > + * Author: Nicolas Dufresne \n> > + *\n> > + * gstlibcamera-utils.c - GStreamer libcamera Utility Function\n> > + */\n> > +\n> > +#include \"gstlibcamera-utils.h\"\n> \n> Missing blank line here.\n> \n> > +#include \n> > +\n> > +using namespace libcamera;\n> > +\n> > +static struct {\n> > +\tGstVideoFormat gst_format;\n> > +\tguint drm_fourcc;\n> > +} format_map[] = {\n> > +\t{ GST_VIDEO_FORMAT_ENCODED, DRM_FORMAT_MJPEG },\n> > +\t{ GST_VIDEO_FORMAT_RGB, DRM_FORMAT_BGR888 },\n> > +\t{ GST_VIDEO_FORMAT_BGR, DRM_FORMAT_RGB888 },\n> > +\t{ GST_VIDEO_FORMAT_ARGB, DRM_FORMAT_BGRA8888 },\n> > +\t{ GST_VIDEO_FORMAT_NV12, DRM_FORMAT_NV12 },\n> > +\t{ GST_VIDEO_FORMAT_NV21, DRM_FORMAT_NV21 },\n> > +\t{ GST_VIDEO_FORMAT_NV16, DRM_FORMAT_NV16 },\n> > +\t{ GST_VIDEO_FORMAT_NV61, DRM_FORMAT_NV61 },\n> > +\t{ GST_VIDEO_FORMAT_NV24, DRM_FORMAT_NV24 },\n> > +\t{ GST_VIDEO_FORMAT_UYVY, DRM_FORMAT_UYVY },\n> > +\t{ GST_VIDEO_FORMAT_VYUY, DRM_FORMAT_VYUY },\n> > +\t{ GST_VIDEO_FORMAT_YUY2, DRM_FORMAT_YUYV },\n> > +\t{ GST_VIDEO_FORMAT_YVYU, DRM_FORMAT_YVYU },\n> > +\t/* \\todo NV42 is used in libcamera but is not mapped in GStreamer yet.\n> > */\n> > +};\n> > +\n> > +static inline GstVideoFormat\n\nI'm also dropping the inline here, which you asked and I missed in v2.\n\n> > +drm_to_gst_format(guint drm_fourcc)\n> > +{\n> > +\tfor (const auto &item : format_map)\n> \n> \tfor (const auto &item : format_map) {\n> > +\t\tif (item.drm_fourcc == drm_fourcc)\n> > +\t\t\treturn item.gst_format;\n> \t}\n> \n> Sweet, I didn't know C++ allowed range loops on plain C arrays :-)\n> \n> > +\treturn GST_VIDEO_FORMAT_UNKNOWN;\n> > +}\n> > +\n> > +static GstStructure *\n> > +bare_structure_from_fourcc(guint fourcc)\n> > +{\n> > +\tGstVideoFormat gst_format = drm_to_gst_format(fourcc);\n> > +\n> > +\tif (gst_format == GST_VIDEO_FORMAT_UNKNOWN)\n> > +\t\treturn nullptr;\n> > +\n> > +\tif (gst_format != GST_VIDEO_FORMAT_ENCODED)\n> > +\t\treturn gst_structure_new(\"video/x-raw\", \"format\", G_TYPE_STRING,\n> > +\t\t\t\t\t gst_video_format_to_string(gst_format),\n> > nullptr);\n> > +\n> > +\tswitch (fourcc) {\n> > +\tcase DRM_FORMAT_MJPEG:\n> > +\t\treturn gst_structure_new_empty(\"image/jpeg\");\n> > +\tdefault:\n> > +\t\treturn nullptr;\n> > +\t}\n> > +}\n> > +\n> > +GstCaps *\n> > +gst_libcamera_stream_formats_to_caps(const StreamFormats &formats)\n> > +{\n> > +\tGstCaps *caps = gst_caps_new_empty();\n> > +\n> > +\tfor (unsigned int fourcc : formats.pixelformats()) {\n> > +\t\tg_autoptr(GstStructure) bare_s =\n> > bare_structure_from_fourcc(fourcc);\n> > +\n> > +\t\tif (!bare_s) {\n> > +\t\t\tGST_WARNING(\"Unsupported DRM format %\"\n> > GST_FOURCC_FORMAT,\n> > +\t\t\t\t GST_FOURCC_ARGS(fourcc));\n> > +\t\t\tcontinue;\n> > +\t\t}\n> > +\n> > +\t\tfor (const Size &size : formats.sizes(fourcc)) {\n> > +\t\t\tGstStructure *s = gst_structure_copy(bare_s);\n> > +\t\t\tgst_structure_set(s,\n> > +\t\t\t\t\t \"width\", G_TYPE_INT, size.width,\n> > +\t\t\t\t\t \"height\", G_TYPE_INT, size.height,\n> > +\t\t\t\t\t nullptr);\n> > +\t\t\tgst_caps_append_structure(caps, s);\n> > +\t\t}\n> > +\n> > +\t\tconst SizeRange &range = formats.range(fourcc);\n> > +\t\tif (range.hStep && range.vStep) {\n> > +\t\t\tGstStructure *s = gst_structure_copy(bare_s);\n> > +\t\t\tgst_structure_set(s,\n> > +\t\t\t\t\t \"width\", GST_TYPE_INT_RANGE,\n> > range.min.width, range.max.width, range.hStep,\n> > +\t\t\t\t\t \"height\", GST_TYPE_INT_RANGE,\n> > range.min.height, range.max.height, range.vStep,\n> > +\t\t\t\t\t nullptr);\n> > +\t\t\tgst_caps_append_structure(caps, s);\n> > +\t\t}\n> > +\t}\n> > +\n> > +\treturn caps;\n> > +}\n> > diff --git a/src/gstreamer/gstlibcamera-utils.h\n> > b/src/gstreamer/gstlibcamera-utils.h\n> > new file mode 100644\n> > index 0000000..33160b8\n> > --- /dev/null\n> > +++ b/src/gstreamer/gstlibcamera-utils.h\n> > @@ -0,0 +1,18 @@\n> > +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > +/*\n> > + * Copyright (C) 2020, Collabora Ltd.\n> > + * Author: Nicolas Dufresne \n> > + *\n> > + * gstlibcamera-utils.h - GStreamer libcamera Utility Functions\n> > + */\n> > +\n> > +#ifndef __GST_LIBCAMERA_UTILS_H_\n> \n> s/__GST_LIBCAMERA_UTILS_H_/__GST_LIBCAMERA_UTILS_H__/\n> \n> Missing\n> \n> #define __GST_LIBCAMERA_UTILS_H__\n> \n> > +\n> > +#include \n> > +#include \n> > +\n> > +#include \n> > +\n> > +GstCaps *gst_libcamera_stream_formats_to_caps(const\n> > libcamera::StreamFormats &formats);\n> > +\n> > +#endif /* __GST_LIBCAMERA_UTILS_H_ */\n> \n> __GST_LIBCAMERA_UTILS_H__ here too.\n> \n> > diff --git a/src/gstreamer/meson.build b/src/gstreamer/meson.build\n> > index 832b8a5..f409107 100644\n> > --- a/src/gstreamer/meson.build\n> > +++ b/src/gstreamer/meson.build\n> > @@ -1,4 +1,5 @@\n> > libcamera_gst_sources = [\n> > + 'gstlibcamera-utils.cpp',\n> > 'gstlibcamera.c',\n> > 'gstlibcamerasrc.cpp',\n> > ]","headers":{"Return-Path":"","Received":["from bhuna.collabora.co.uk (bhuna.collabora.co.uk\n\t[IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2B19860430\n\tfor ;\n\tFri, 6 Mar 2020 17:38:27 +0100 (CET)","from nicolas-tpx395.localdomain (unknown [IPv6:2610:98:8005::527])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits))\n\t(No client certificate requested) (Authenticated sender: nicolas)\n\tby bhuna.collabora.co.uk (Postfix) with ESMTPSA id 7992D296D0D;\n\tFri, 6 Mar 2020 16:38:26 +0000 (GMT)"],"Message-ID":"<55ed8fe8d4cb6322fadbe5f84768da48f5f6d4ce.camel@collabora.com>","From":"Nicolas Dufresne ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Date":"Fri, 06 Mar 2020 11:38:17 -0500","In-Reply-To":"<20200229131722.GF18738@pendragon.ideasonboard.com>","References":"<20200227200407.490616-1-nicolas.dufresne@collabora.com>\n\t<20200227200407.490616-3-nicolas.dufresne@collabora.com>\n\t<20200229131722.GF18738@pendragon.ideasonboard.com>","Content-Type":"text/plain; charset=\"UTF-8\"","User-Agent":"Evolution 3.34.4 (3.34.4-1.fc31) ","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH v2 02/27] gst: Add utility to convert\n\tStreamFormats to GstCaps","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 06 Mar 2020 16:38:27 -0000"}}]