[{"id":32006,"web_url":"https://patchwork.libcamera.org/comment/32006/","msgid":"<9f2ad0a86eaff844a575953a361e846921dff6f2.camel@collabora.com>","date":"2024-11-04T14:58:01","subject":"Re: [PATCH v3] gstreamer: Implement caps negotiation for\n\tvideo/x-bayer","submitter":{"id":31,"url":"https://patchwork.libcamera.org/api/people/31/","name":"Nicolas Dufresne","email":"nicolas.dufresne@collabora.com"},"content":"Thanks.\n\nLe lundi 04 novembre 2024 à 12:36 +0100, mailinglist1@johanneskirchmair.de a\nécrit :\n> From: Johannes Kirchmair <johannes.kirchmair@skidata.com>\n> \n> The parsing of video/x-bayer sources from string makes it possible to\n> use cameras providing e.g SGRBG8 streams via gst-launch.\n> \n> Like:\n> gst-launch-1.0 libcamerasrc camera-name=<cam> ! video/x-bayer,format=grbg\n> \n> Without this change the gstreamer plugin complains about \"Unsupported\n> media type: video/x-bayer\".\n> \n> Signed-off-by: Johannes Kirchmair <johannes.kirchmair@skidata.com>\n\nReviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>\n\n> \n> Changes in v3:\n> - commit msg \"parsing\" -> \"negotiations\" and \"is\"->\"it\"\n> - change format argument of bayer_format_to_string to PixelFormat\n> - make bayer_format_to_string return nullptr if no entry found\n> - make bayer_formats const\n> - use range-based for loops\n> \n> Changes in v2:\n> - Coding style changes\n> - Removed printf that slipped in\n> ---\n>  src/gstreamer/gstlibcamera-utils.cpp | 87 ++++++++++++++--------------\n>  1 file changed, 44 insertions(+), 43 deletions(-)\n> \n> diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp\n> index 79f71246..0820c4b8 100644\n> --- a/src/gstreamer/gstlibcamera-utils.cpp\n> +++ b/src/gstreamer/gstlibcamera-utils.cpp\n> @@ -254,52 +254,50 @@ gst_format_to_pixel_format(GstVideoFormat gst_format)\n>  \treturn PixelFormat{};\n>  }\n>  \n> +static const struct {\n> +\tPixelFormat format;\n> +\tconst gchar *name;\n> +} bayer_map[]{\n> +\t{ formats::SBGGR8, \"bggr\" },\n> +\t{ formats::SGBRG8, \"gbrg\" },\n> +\t{ formats::SGRBG8, \"grbg\" },\n> +\t{ formats::SRGGB8, \"rggb\" },\n> +\t{ formats::SBGGR10, \"bggr10le\" },\n> +\t{ formats::SGBRG10, \"gbrg10le\" },\n> +\t{ formats::SGRBG10, \"grbg10le\" },\n> +\t{ formats::SRGGB10, \"rggb10le\" },\n> +\t{ formats::SBGGR12, \"bggr12le\" },\n> +\t{ formats::SGBRG12, \"gbrg12le\" },\n> +\t{ formats::SGRBG12, \"grbg12le\" },\n> +\t{ formats::SRGGB12, \"rggb12le\" },\n> +\t{ formats::SBGGR14, \"bggr14le\" },\n> +\t{ formats::SGBRG14, \"gbrg14le\" },\n> +\t{ formats::SGRBG14, \"grbg14le\" },\n> +\t{ formats::SRGGB14, \"rggb14le\" },\n> +\t{ formats::SBGGR16, \"bggr16le\" },\n> +\t{ formats::SGBRG16, \"gbrg16le\" },\n> +\t{ formats::SGRBG16, \"grbg16le\" },\n> +\t{ formats::SRGGB16, \"rggb16le\" },\n> +};\n> +\n>  static const gchar *\n> -bayer_format_to_string(int format)\n> +bayer_format_to_string(PixelFormat format)\n>  {\n> -\tswitch (format) {\n> -\tcase formats::SBGGR8:\n> -\t\treturn \"bggr\";\n> -\tcase formats::SGBRG8:\n> -\t\treturn \"gbrg\";\n> -\tcase formats::SGRBG8:\n> -\t\treturn \"grbg\";\n> -\tcase formats::SRGGB8:\n> -\t\treturn \"rggb\";\n> -\tcase formats::SBGGR10:\n> -\t\treturn \"bggr10le\";\n> -\tcase formats::SGBRG10:\n> -\t\treturn \"gbrg10le\";\n> -\tcase formats::SGRBG10:\n> -\t\treturn \"grbg10le\";\n> -\tcase formats::SRGGB10:\n> -\t\treturn \"rggb10le\";\n> -\tcase formats::SBGGR12:\n> -\t\treturn \"bggr12le\";\n> -\tcase formats::SGBRG12:\n> -\t\treturn \"gbrg12le\";\n> -\tcase formats::SGRBG12:\n> -\t\treturn \"grbg12le\";\n> -\tcase formats::SRGGB12:\n> -\t\treturn \"rggb12le\";\n> -\tcase formats::SBGGR14:\n> -\t\treturn \"bggr14le\";\n> -\tcase formats::SGBRG14:\n> -\t\treturn \"gbrg14le\";\n> -\tcase formats::SGRBG14:\n> -\t\treturn \"grbg14le\";\n> -\tcase formats::SRGGB14:\n> -\t\treturn \"rggb14le\";\n> -\tcase formats::SBGGR16:\n> -\t\treturn \"bggr16le\";\n> -\tcase formats::SGBRG16:\n> -\t\treturn \"gbrg16le\";\n> -\tcase formats::SGRBG16:\n> -\t\treturn \"grbg16le\";\n> -\tcase formats::SRGGB16:\n> -\t\treturn \"rggb16le\";\n> +\tfor (auto &b: bayer_map) {\n> +\t\tif (b.format == format)\n> +\t\t\treturn b.name;\n>  \t}\n> -\treturn NULL;\n> +\treturn nullptr;\n> +}\n> +\n> +static PixelFormat\n> +bayer_format_from_string(const gchar *name)\n> +{\n> +\tfor (auto &b: bayer_map) {\n> +\t\tif (strcmp(b.name, name) == 0)\n> +\t\t\treturn b.format;\n> +\t}\n> +\treturn PixelFormat{};\n>  }\n>  \n>  static GstStructure *\n> @@ -474,6 +472,9 @@ gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,\n>  \t\tconst gchar *format = gst_structure_get_string(s, \"format\");\n>  \t\tgst_format = gst_video_format_from_string(format);\n>  \t\tstream_cfg.pixelFormat = gst_format_to_pixel_format(gst_format);\n> +\t} else if (gst_structure_has_name(s, \"video/x-bayer\")) {\n> +\t\tconst gchar *format = gst_structure_get_string(s, \"format\");\n> +\t\tstream_cfg.pixelFormat = bayer_format_from_string(format);\n>  \t} else if (gst_structure_has_name(s, \"image/jpeg\")) {\n>  \t\tstream_cfg.pixelFormat = formats::MJPEG;\n>  \t} else {","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 885D1BDC71\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  4 Nov 2024 14:58:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8D96E65399;\n\tMon,  4 Nov 2024 15:58:06 +0100 (CET)","from bali.collaboradmins.com (bali.collaboradmins.com\n\t[IPv6:2a01:4f8:201:9162::2])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E362065399\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  4 Nov 2024 15:58:04 +0100 (CET)","from nicolas-tpx395.localdomain (unknown\n\t[IPv6:2606:6d00:15:862e::580])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (4096 bits)\n\tserver-digest SHA256)\n\t(No client certificate requested) (Authenticated sender: nicolas)\n\tby bali.collaboradmins.com (Postfix) with ESMTPSA id 87ADB17E369B;\n\tMon,  4 Nov 2024 15:58:03 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=collabora.com header.i=@collabora.com\n\theader.b=\"TjYOHJYt\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com;\n\ts=mail; t=1730732284;\n\tbh=5CZKlsqI53r9FFV4PX6QYxyzbIviOWOfRpq1w3EvBjY=;\n\th=Subject:From:To:Cc:Date:In-Reply-To:References:From;\n\tb=TjYOHJYtzZ0ieFgk2NGksLTl7tlZASvrd+R/SG8o/936LKyRVO3bHMGhe/BKDnO/B\n\tRLcrTZlKurCHbhY+MQOC3MDlBSJxv6QZmSHeZNeP+0u736t27iYfnYOO0rV3hNHqgW\n\tlVWpVD7f4Ua4GBtfu/vvKcYFVdkhY9FH+m9eEV6ZeVBhjhpoQq/Nq83sqDvRaS5gA7\n\tb6PuVe2WkWQyfwzNi/DoRo8IuK6ZPBxgtTAMFLMCsbNkaHaWm5UTYnvmEFndcGCd9+\n\tbbjIf7zjqggOidAfLPkU0rUqjDiRLQuW/YR7vmd8BXeTEUD9pwC6M0ytj5swdN9T6j\n\takttptCtuZ4mA==","Message-ID":"<9f2ad0a86eaff844a575953a361e846921dff6f2.camel@collabora.com>","Subject":"Re: [PATCH v3] gstreamer: Implement caps negotiation for\n\tvideo/x-bayer","From":"Nicolas Dufresne <nicolas.dufresne@collabora.com>","To":"mailinglist1@johanneskirchmair.de, libcamera-devel@lists.libcamera.org","Cc":"johannes.kirchmair@skidata.com, kieran.bingham@ideasonboard.com, \n\tpobrn@protonmail.com, pavel@ucw.cz","Date":"Mon, 04 Nov 2024 09:58:01 -0500","In-Reply-To":"<20241104113653.393702-1-mailinglist1@johanneskirchmair.de>","References":"<20241104113653.393702-1-mailinglist1@johanneskirchmair.de>","Organization":"Collabora","Content-Type":"text/plain; charset=\"UTF-8\"","User-Agent":"Evolution 3.54.1 (3.54.1-1.fc41) ","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":32007,"web_url":"https://patchwork.libcamera.org/comment/32007/","msgid":"<173073254896.2721096.13784404667794658687@ping.linuxembedded.co.uk>","date":"2024-11-04T15:02:28","subject":"Re: [PATCH v3] gstreamer: Implement caps negotiation for\n\tvideo/x-bayer","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Nicolas Dufresne (2024-11-04 14:58:01)\n> Thanks.\n> \n> Le lundi 04 novembre 2024 à 12:36 +0100, mailinglist1@johanneskirchmair.de a\n> écrit :\n> > From: Johannes Kirchmair <johannes.kirchmair@skidata.com>\n> > \n> > The parsing of video/x-bayer sources from string makes it possible to\n> > use cameras providing e.g SGRBG8 streams via gst-launch.\n> > \n> > Like:\n> > gst-launch-1.0 libcamerasrc camera-name=<cam> ! video/x-bayer,format=grbg\n> > \n> > Without this change the gstreamer plugin complains about \"Unsupported\n> > media type: video/x-bayer\".\n> > \n> > Signed-off-by: Johannes Kirchmair <johannes.kirchmair@skidata.com>\n> \n> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>\n\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n\nI'll merge this assuming the CI tests all pass cleanly.\n\n--\nKieran\n\n\n> \n> > \n> > Changes in v3:\n> > - commit msg \"parsing\" -> \"negotiations\" and \"is\"->\"it\"\n> > - change format argument of bayer_format_to_string to PixelFormat\n> > - make bayer_format_to_string return nullptr if no entry found\n> > - make bayer_formats const\n> > - use range-based for loops\n> > \n> > Changes in v2:\n> > - Coding style changes\n> > - Removed printf that slipped in\n> > ---\n> >  src/gstreamer/gstlibcamera-utils.cpp | 87 ++++++++++++++--------------\n> >  1 file changed, 44 insertions(+), 43 deletions(-)\n> > \n> > diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp\n> > index 79f71246..0820c4b8 100644\n> > --- a/src/gstreamer/gstlibcamera-utils.cpp\n> > +++ b/src/gstreamer/gstlibcamera-utils.cpp\n> > @@ -254,52 +254,50 @@ gst_format_to_pixel_format(GstVideoFormat gst_format)\n> >       return PixelFormat{};\n> >  }\n> >  \n> > +static const struct {\n> > +     PixelFormat format;\n> > +     const gchar *name;\n> > +} bayer_map[]{\n> > +     { formats::SBGGR8, \"bggr\" },\n> > +     { formats::SGBRG8, \"gbrg\" },\n> > +     { formats::SGRBG8, \"grbg\" },\n> > +     { formats::SRGGB8, \"rggb\" },\n> > +     { formats::SBGGR10, \"bggr10le\" },\n> > +     { formats::SGBRG10, \"gbrg10le\" },\n> > +     { formats::SGRBG10, \"grbg10le\" },\n> > +     { formats::SRGGB10, \"rggb10le\" },\n> > +     { formats::SBGGR12, \"bggr12le\" },\n> > +     { formats::SGBRG12, \"gbrg12le\" },\n> > +     { formats::SGRBG12, \"grbg12le\" },\n> > +     { formats::SRGGB12, \"rggb12le\" },\n> > +     { formats::SBGGR14, \"bggr14le\" },\n> > +     { formats::SGBRG14, \"gbrg14le\" },\n> > +     { formats::SGRBG14, \"grbg14le\" },\n> > +     { formats::SRGGB14, \"rggb14le\" },\n> > +     { formats::SBGGR16, \"bggr16le\" },\n> > +     { formats::SGBRG16, \"gbrg16le\" },\n> > +     { formats::SGRBG16, \"grbg16le\" },\n> > +     { formats::SRGGB16, \"rggb16le\" },\n> > +};\n> > +\n> >  static const gchar *\n> > -bayer_format_to_string(int format)\n> > +bayer_format_to_string(PixelFormat format)\n> >  {\n> > -     switch (format) {\n> > -     case formats::SBGGR8:\n> > -             return \"bggr\";\n> > -     case formats::SGBRG8:\n> > -             return \"gbrg\";\n> > -     case formats::SGRBG8:\n> > -             return \"grbg\";\n> > -     case formats::SRGGB8:\n> > -             return \"rggb\";\n> > -     case formats::SBGGR10:\n> > -             return \"bggr10le\";\n> > -     case formats::SGBRG10:\n> > -             return \"gbrg10le\";\n> > -     case formats::SGRBG10:\n> > -             return \"grbg10le\";\n> > -     case formats::SRGGB10:\n> > -             return \"rggb10le\";\n> > -     case formats::SBGGR12:\n> > -             return \"bggr12le\";\n> > -     case formats::SGBRG12:\n> > -             return \"gbrg12le\";\n> > -     case formats::SGRBG12:\n> > -             return \"grbg12le\";\n> > -     case formats::SRGGB12:\n> > -             return \"rggb12le\";\n> > -     case formats::SBGGR14:\n> > -             return \"bggr14le\";\n> > -     case formats::SGBRG14:\n> > -             return \"gbrg14le\";\n> > -     case formats::SGRBG14:\n> > -             return \"grbg14le\";\n> > -     case formats::SRGGB14:\n> > -             return \"rggb14le\";\n> > -     case formats::SBGGR16:\n> > -             return \"bggr16le\";\n> > -     case formats::SGBRG16:\n> > -             return \"gbrg16le\";\n> > -     case formats::SGRBG16:\n> > -             return \"grbg16le\";\n> > -     case formats::SRGGB16:\n> > -             return \"rggb16le\";\n> > +     for (auto &b: bayer_map) {\n> > +             if (b.format == format)\n> > +                     return b.name;\n> >       }\n> > -     return NULL;\n> > +     return nullptr;\n> > +}\n> > +\n> > +static PixelFormat\n> > +bayer_format_from_string(const gchar *name)\n> > +{\n> > +     for (auto &b: bayer_map) {\n> > +             if (strcmp(b.name, name) == 0)\n> > +                     return b.format;\n> > +     }\n> > +     return PixelFormat{};\n> >  }\n> >  \n> >  static GstStructure *\n> > @@ -474,6 +472,9 @@ gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,\n> >               const gchar *format = gst_structure_get_string(s, \"format\");\n> >               gst_format = gst_video_format_from_string(format);\n> >               stream_cfg.pixelFormat = gst_format_to_pixel_format(gst_format);\n> > +     } else if (gst_structure_has_name(s, \"video/x-bayer\")) {\n> > +             const gchar *format = gst_structure_get_string(s, \"format\");\n> > +             stream_cfg.pixelFormat = bayer_format_from_string(format);\n> >       } else if (gst_structure_has_name(s, \"image/jpeg\")) {\n> >               stream_cfg.pixelFormat = formats::MJPEG;\n> >       } else {\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 76C70BDB1C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  4 Nov 2024 15:02:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8D755653D3;\n\tMon,  4 Nov 2024 16:02:33 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2517865399\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  4 Nov 2024 16:02:32 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 196E055A;\n\tMon,  4 Nov 2024 16:02:25 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"aTBXRkVo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1730732545;\n\tbh=Jo9FeI1MFeziXR56lp/doyBnF1fq8W8aug7UoDJyFTU=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=aTBXRkVoduUB1lnneymFN1AKKaOOllQrRcWv1RJSSRUkSvoQ0YCUjNFZ5bxPxahPa\n\tVIfIqFzLcR//WppGF70Jf9SC6KdGr1nBOmIu0d4yM+UC6fo1zvkDSuNR78b0MT3RrK\n\t55AOsDHA+SSrEv0kpRBvRWRULkwe5Oa+z8uaENEE=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<9f2ad0a86eaff844a575953a361e846921dff6f2.camel@collabora.com>","References":"<20241104113653.393702-1-mailinglist1@johanneskirchmair.de>\n\t<9f2ad0a86eaff844a575953a361e846921dff6f2.camel@collabora.com>","Subject":"Re: [PATCH v3] gstreamer: Implement caps negotiation for\n\tvideo/x-bayer","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Cc":"johannes.kirchmair@skidata.com, pobrn@protonmail.com, pavel@ucw.cz","To":"Nicolas Dufresne <nicolas.dufresne@collabora.com>,\n\tlibcamera-devel@lists.libcamera.org, mailinglist1@johanneskirchmair.de","Date":"Mon, 04 Nov 2024 15:02:28 +0000","Message-ID":"<173073254896.2721096.13784404667794658687@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":32009,"web_url":"https://patchwork.libcamera.org/comment/32009/","msgid":"<173073317142.2721096.18371715141199497468@ping.linuxembedded.co.uk>","date":"2024-11-04T15:12:51","subject":"Re: [PATCH v3] gstreamer: Implement caps negotiation for\n\tvideo/x-bayer","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Kieran Bingham (2024-11-04 15:02:28)\n> Quoting Nicolas Dufresne (2024-11-04 14:58:01)\n> > Thanks.\n> > \n> > Le lundi 04 novembre 2024 à 12:36 +0100, mailinglist1@johanneskirchmair.de a\n> > écrit :\n> > > From: Johannes Kirchmair <johannes.kirchmair@skidata.com>\n> > > \n> > > The parsing of video/x-bayer sources from string makes it possible to\n> > > use cameras providing e.g SGRBG8 streams via gst-launch.\n> > > \n> > > Like:\n> > > gst-launch-1.0 libcamerasrc camera-name=<cam> ! video/x-bayer,format=grbg\n> > > \n> > > Without this change the gstreamer plugin complains about \"Unsupported\n> > > media type: video/x-bayer\".\n> > > \n> > > Signed-off-by: Johannes Kirchmair <johannes.kirchmair@skidata.com>\n> > \n> > Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>\n> \n> \n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> \n> \n> I'll merge this assuming the CI tests all pass cleanly.\n\nhttps://gitlab.freedesktop.org/camera/libcamera/-/jobs/66072263 reports:\n\n```\n5c8010e4f8dc2d4e41ce817c03289b1155ccd659 gstreamer: Implement caps negotiation for video/x-bayer\n------------------------------------------------------------------------------------------------\nNo 'Signed-off-by' trailer matching author 'Johannes Kirchmair <johannes.kirchmair@skidata.com>', see Documentation/contributing.rst\n--- src/gstreamer/gstlibcamera-utils.cpp\n+++ src/gstreamer/gstlibcamera-utils.cpp\n@@ -283,7 +283,7 @@\n static const gchar *\n bayer_format_to_string(PixelFormat format)\n {\n-\tfor (auto &b: bayer_map) {\n+\tfor (auto &b : bayer_map) {\n \t\tif (b.format == format)\n \t\t\treturn b.name;\n \t}\n@@ -293,7 +293,7 @@\n static PixelFormat\n bayer_format_from_string(const gchar *name)\n {\n-\tfor (auto &b: bayer_map) {\n+\tfor (auto &b : bayer_map) {\n \t\tif (strcmp(b.name, name) == 0)\n \t\t\treturn b.format;\n \t}\n---\n3 potential issues detected, please review\nCleaning up project directory and file based variables 00:02\nERROR: Job failed: exit code 1\n```\n\nThe no Signed-off-by is odd - as I can see it there, so I'll check that.\nAh - it looks like the patch was missing the '---' separator before the\nchangelog. I'll fix that.\n\nI'll also add the appropriate spaces when merging...\n\nJohannes, for future patches, please add the post-commit hook to your\nlibcamera repository to run the checkstyle locally:\n\n--\nKieran\n\n\n> \n> --\n> Kieran\n> \n> \n> > \n> > > \n> > > Changes in v3:\n> > > - commit msg \"parsing\" -> \"negotiations\" and \"is\"->\"it\"\n> > > - change format argument of bayer_format_to_string to PixelFormat\n> > > - make bayer_format_to_string return nullptr if no entry found\n> > > - make bayer_formats const\n> > > - use range-based for loops\n> > > \n> > > Changes in v2:\n> > > - Coding style changes\n> > > - Removed printf that slipped in\n> > > ---\n> > >  src/gstreamer/gstlibcamera-utils.cpp | 87 ++++++++++++++--------------\n> > >  1 file changed, 44 insertions(+), 43 deletions(-)\n> > > \n> > > diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp\n> > > index 79f71246..0820c4b8 100644\n> > > --- a/src/gstreamer/gstlibcamera-utils.cpp\n> > > +++ b/src/gstreamer/gstlibcamera-utils.cpp\n> > > @@ -254,52 +254,50 @@ gst_format_to_pixel_format(GstVideoFormat gst_format)\n> > >       return PixelFormat{};\n> > >  }\n> > >  \n> > > +static const struct {\n> > > +     PixelFormat format;\n> > > +     const gchar *name;\n> > > +} bayer_map[]{\n> > > +     { formats::SBGGR8, \"bggr\" },\n> > > +     { formats::SGBRG8, \"gbrg\" },\n> > > +     { formats::SGRBG8, \"grbg\" },\n> > > +     { formats::SRGGB8, \"rggb\" },\n> > > +     { formats::SBGGR10, \"bggr10le\" },\n> > > +     { formats::SGBRG10, \"gbrg10le\" },\n> > > +     { formats::SGRBG10, \"grbg10le\" },\n> > > +     { formats::SRGGB10, \"rggb10le\" },\n> > > +     { formats::SBGGR12, \"bggr12le\" },\n> > > +     { formats::SGBRG12, \"gbrg12le\" },\n> > > +     { formats::SGRBG12, \"grbg12le\" },\n> > > +     { formats::SRGGB12, \"rggb12le\" },\n> > > +     { formats::SBGGR14, \"bggr14le\" },\n> > > +     { formats::SGBRG14, \"gbrg14le\" },\n> > > +     { formats::SGRBG14, \"grbg14le\" },\n> > > +     { formats::SRGGB14, \"rggb14le\" },\n> > > +     { formats::SBGGR16, \"bggr16le\" },\n> > > +     { formats::SGBRG16, \"gbrg16le\" },\n> > > +     { formats::SGRBG16, \"grbg16le\" },\n> > > +     { formats::SRGGB16, \"rggb16le\" },\n> > > +};\n> > > +\n> > >  static const gchar *\n> > > -bayer_format_to_string(int format)\n> > > +bayer_format_to_string(PixelFormat format)\n> > >  {\n> > > -     switch (format) {\n> > > -     case formats::SBGGR8:\n> > > -             return \"bggr\";\n> > > -     case formats::SGBRG8:\n> > > -             return \"gbrg\";\n> > > -     case formats::SGRBG8:\n> > > -             return \"grbg\";\n> > > -     case formats::SRGGB8:\n> > > -             return \"rggb\";\n> > > -     case formats::SBGGR10:\n> > > -             return \"bggr10le\";\n> > > -     case formats::SGBRG10:\n> > > -             return \"gbrg10le\";\n> > > -     case formats::SGRBG10:\n> > > -             return \"grbg10le\";\n> > > -     case formats::SRGGB10:\n> > > -             return \"rggb10le\";\n> > > -     case formats::SBGGR12:\n> > > -             return \"bggr12le\";\n> > > -     case formats::SGBRG12:\n> > > -             return \"gbrg12le\";\n> > > -     case formats::SGRBG12:\n> > > -             return \"grbg12le\";\n> > > -     case formats::SRGGB12:\n> > > -             return \"rggb12le\";\n> > > -     case formats::SBGGR14:\n> > > -             return \"bggr14le\";\n> > > -     case formats::SGBRG14:\n> > > -             return \"gbrg14le\";\n> > > -     case formats::SGRBG14:\n> > > -             return \"grbg14le\";\n> > > -     case formats::SRGGB14:\n> > > -             return \"rggb14le\";\n> > > -     case formats::SBGGR16:\n> > > -             return \"bggr16le\";\n> > > -     case formats::SGBRG16:\n> > > -             return \"gbrg16le\";\n> > > -     case formats::SGRBG16:\n> > > -             return \"grbg16le\";\n> > > -     case formats::SRGGB16:\n> > > -             return \"rggb16le\";\n> > > +     for (auto &b: bayer_map) {\n> > > +             if (b.format == format)\n> > > +                     return b.name;\n> > >       }\n> > > -     return NULL;\n> > > +     return nullptr;\n> > > +}\n> > > +\n> > > +static PixelFormat\n> > > +bayer_format_from_string(const gchar *name)\n> > > +{\n> > > +     for (auto &b: bayer_map) {\n> > > +             if (strcmp(b.name, name) == 0)\n> > > +                     return b.format;\n> > > +     }\n> > > +     return PixelFormat{};\n> > >  }\n> > >  \n> > >  static GstStructure *\n> > > @@ -474,6 +472,9 @@ gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,\n> > >               const gchar *format = gst_structure_get_string(s, \"format\");\n> > >               gst_format = gst_video_format_from_string(format);\n> > >               stream_cfg.pixelFormat = gst_format_to_pixel_format(gst_format);\n> > > +     } else if (gst_structure_has_name(s, \"video/x-bayer\")) {\n> > > +             const gchar *format = gst_structure_get_string(s, \"format\");\n> > > +             stream_cfg.pixelFormat = bayer_format_from_string(format);\n> > >       } else if (gst_structure_has_name(s, \"image/jpeg\")) {\n> > >               stream_cfg.pixelFormat = formats::MJPEG;\n> > >       } else {\n> >","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id BF85CBDB1C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  4 Nov 2024 15:12:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BBD02653D8;\n\tMon,  4 Nov 2024 16:12:55 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 05F9265399\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  4 Nov 2024 16:12:53 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0871322E;\n\tMon,  4 Nov 2024 16:12:47 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"UUY3/0hw\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1730733167;\n\tbh=R/rKJF3/f/e1opav5zSmfgPqllSAcBBxQGrocm6AFAg=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=UUY3/0hwxc5oa21tHu7+HugCBqba4c0bkrpjeKGpWWX650Za3wTMpSgOKriqNDUgk\n\tiJMRhokpdmMeIdPM6aLLXSiNA1rzhIXaQ0NtCtCEewzrAkSTmz087rCce35GFF5TwP\n\tQSTB3XNB0xhw4jLJsHRS348U2kDNDbVBr1XtL62Q=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<173073254896.2721096.13784404667794658687@ping.linuxembedded.co.uk>","References":"<20241104113653.393702-1-mailinglist1@johanneskirchmair.de>\n\t<9f2ad0a86eaff844a575953a361e846921dff6f2.camel@collabora.com>\n\t<173073254896.2721096.13784404667794658687@ping.linuxembedded.co.uk>","Subject":"Re: [PATCH v3] gstreamer: Implement caps negotiation for\n\tvideo/x-bayer","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Cc":"johannes.kirchmair@skidata.com, pobrn@protonmail.com, pavel@ucw.cz","To":"Nicolas Dufresne <nicolas.dufresne@collabora.com>,\n\tlibcamera-devel@lists.libcamera.org, mailinglist1@johanneskirchmair.de","Date":"Mon, 04 Nov 2024 15:12:51 +0000","Message-ID":"<173073317142.2721096.18371715141199497468@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":32010,"web_url":"https://patchwork.libcamera.org/comment/32010/","msgid":"<173073326015.2721096.10342558235592660154@ping.linuxembedded.co.uk>","date":"2024-11-04T15:14:20","subject":"Re: [PATCH v3] gstreamer: Implement caps negotiation for\n\tvideo/x-bayer","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Kieran Bingham (2024-11-04 15:12:51)\n> Quoting Kieran Bingham (2024-11-04 15:02:28)\n> > Quoting Nicolas Dufresne (2024-11-04 14:58:01)\n> > > Thanks.\n> > > \n> > > Le lundi 04 novembre 2024 à 12:36 +0100, mailinglist1@johanneskirchmair.de a\n> > > écrit :\n> > > > From: Johannes Kirchmair <johannes.kirchmair@skidata.com>\n> > > > \n> > > > The parsing of video/x-bayer sources from string makes it possible to\n> > > > use cameras providing e.g SGRBG8 streams via gst-launch.\n> > > > \n> > > > Like:\n> > > > gst-launch-1.0 libcamerasrc camera-name=<cam> ! video/x-bayer,format=grbg\n> > > > \n> > > > Without this change the gstreamer plugin complains about \"Unsupported\n> > > > media type: video/x-bayer\".\n> > > > \n> > > > Signed-off-by: Johannes Kirchmair <johannes.kirchmair@skidata.com>\n> > > \n> > > Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>\n> > \n> > \n> > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> > \n> > \n> > I'll merge this assuming the CI tests all pass cleanly.\n> \n> https://gitlab.freedesktop.org/camera/libcamera/-/jobs/66072263 reports:\n> \n> ```\n> 5c8010e4f8dc2d4e41ce817c03289b1155ccd659 gstreamer: Implement caps negotiation for video/x-bayer\n> ------------------------------------------------------------------------------------------------\n> No 'Signed-off-by' trailer matching author 'Johannes Kirchmair <johannes.kirchmair@skidata.com>', see Documentation/contributing.rst\n> --- src/gstreamer/gstlibcamera-utils.cpp\n> +++ src/gstreamer/gstlibcamera-utils.cpp\n> @@ -283,7 +283,7 @@\n>  static const gchar *\n>  bayer_format_to_string(PixelFormat format)\n>  {\n> -       for (auto &b: bayer_map) {\n> +       for (auto &b : bayer_map) {\n>                 if (b.format == format)\n>                         return b.name;\n>         }\n> @@ -293,7 +293,7 @@\n>  static PixelFormat\n>  bayer_format_from_string(const gchar *name)\n>  {\n> -       for (auto &b: bayer_map) {\n> +       for (auto &b : bayer_map) {\n>                 if (strcmp(b.name, name) == 0)\n>                         return b.format;\n>         }\n> ---\n> 3 potential issues detected, please review\n> Cleaning up project directory and file based variables 00:02\n> ERROR: Job failed: exit code 1\n> ```\n> \n> The no Signed-off-by is odd - as I can see it there, so I'll check that.\n> Ah - it looks like the patch was missing the '---' separator before the\n> changelog. I'll fix that.\n> \n> I'll also add the appropriate spaces when merging...\n> \n> Johannes, for future patches, please add the post-commit hook to your\n> libcamera repository to run the checkstyle locally:\n\nArgh, I did it again. Someone pinged me halfway through sending a mail\nand I didn't complete it!\n\n - To add checkstyle locally, please run:\n\n cp utils/hooks/post-commit .git/hooks/post-commit\n\nfrom the top of your libcamera tree.\n\n\n--\nKieran","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 04941BDB1C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  4 Nov 2024 15:14:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BAC26653D4;\n\tMon,  4 Nov 2024 16:14:24 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1243765399\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  4 Nov 2024 16:14:23 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 434C022E;\n\tMon,  4 Nov 2024 16:14:16 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"adMRT8fl\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1730733256;\n\tbh=92FoEZF8ZT6PfH7D4cBFXg7gPafT+VI9ZLPIzT5XVu8=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=adMRT8flpSp0xtjE1cC8jup11OINo5Kra/K2FzmZi+D1G3syeJGZMfikMN5dauohw\n\tSCmU69B3YE7dHap74wUKe6N5THRPIZEvB6Dysv13rFhB/+EU6Ja1jfaCopXB7v3I9Y\n\tlciXLkbM3AzfpjUCIu1CDu3ukNhg9pRRK3C4uMmo=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<173073317142.2721096.18371715141199497468@ping.linuxembedded.co.uk>","References":"<20241104113653.393702-1-mailinglist1@johanneskirchmair.de>\n\t<9f2ad0a86eaff844a575953a361e846921dff6f2.camel@collabora.com>\n\t<173073254896.2721096.13784404667794658687@ping.linuxembedded.co.uk>\n\t<173073317142.2721096.18371715141199497468@ping.linuxembedded.co.uk>","Subject":"Re: [PATCH v3] gstreamer: Implement caps negotiation for\n\tvideo/x-bayer","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Cc":"johannes.kirchmair@skidata.com, pobrn@protonmail.com, pavel@ucw.cz","To":"Nicolas Dufresne <nicolas.dufresne@collabora.com>,\n\tlibcamera-devel@lists.libcamera.org, mailinglist1@johanneskirchmair.de","Date":"Mon, 04 Nov 2024 15:14:20 +0000","Message-ID":"<173073326015.2721096.10342558235592660154@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]