From patchwork Thu Oct 31 09:11:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mailinglist1@johanneskirchmair.de X-Patchwork-Id: 21780 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 8A01FC31E9 for ; Thu, 31 Oct 2024 09:12:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A3E79653A9; Thu, 31 Oct 2024 10:12:36 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=johanneskirchmair.de header.i=@johanneskirchmair.de header.b="JIohFUUP"; dkim-atps=neutral Received: from mx8.mail-out.lima-city.de (mx8.mail-out.lima-city.de [91.216.248.210]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5B9C96539F for ; Thu, 31 Oct 2024 10:12:35 +0100 (CET) From: mailinglist1@johanneskirchmair.de DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=johanneskirchmair.de; s=securedbylima-20161106; t=1730365954; bh=7J96vF52usTkFEV2byh/fjSVGcGKV7F8GcpNr6jgzOo=; h=From:To:Cc:Subject:Date:From; b=JIohFUUPZQr8EzUHXTK348WdCY3gPx65g8r8lyg+Z6gbTadms6yYoeZzo6cna95zi 1zvl5XS/mUa7B4GjdBlxjoEgoA4OGSkjBNYCDA3U9WgughYZ8/+SMw7RjNAL3G09Xw hnL3KfxViR34ROVguYVW1u0/P1NDDbJ1WiHgxywM= To: libcamera-devel@lists.libcamera.org Cc: johannes.kirchmair@skidata.com, kieran.bingham@ideasonboard.com, nicolas.dufresne@collabora.com, pavel@ucw.cz Subject: [PATCH v2] gstreamer:Implement caps parsing for video/x-bayer Date: Thu, 31 Oct 2024 10:11:57 +0100 Message-Id: <20241031091157.304305-1-mailinglist1@johanneskirchmair.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Johannes Kirchmair The parsing of video/x-bayer sources from string makes is possible to use cameras providing e.g SGRBG8 streams via gst-launch. Like: gst-launch-1.0 libcamerasrc camera-name= ! video/x-bayer,format=grbg Without this change the gstreamer plugin complains about "Unsupported media type: video/x-bayer". Signed-off-by: Johannes Kirchmair Changes in v2: - Coding style changes - Removed printf that slipped in --- src/gstreamer/gstlibcamera-utils.cpp | 85 ++++++++++++++-------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp index 79f71246..80631295 100644 --- a/src/gstreamer/gstlibcamera-utils.cpp +++ b/src/gstreamer/gstlibcamera-utils.cpp @@ -254,54 +254,54 @@ gst_format_to_pixel_format(GstVideoFormat gst_format) return PixelFormat{}; } +static struct { + PixelFormat format; + const gchar *name; +} bayer_formats[]{ + { formats::SBGGR8, "bggr" }, + { formats::SGBRG8, "gbrg" }, + { formats::SGRBG8, "grbg" }, + { formats::SRGGB8, "rggb" }, + { formats::SBGGR10, "bggr10le" }, + { formats::SGBRG10, "gbrg10le" }, + { formats::SGRBG10, "grbg10le" }, + { formats::SRGGB10, "rggb10le" }, + { formats::SBGGR12, "bggr12le" }, + { formats::SGBRG12, "gbrg12le" }, + { formats::SGRBG12, "grbg12le" }, + { formats::SRGGB12, "rggb12le" }, + { formats::SBGGR14, "bggr14le" }, + { formats::SGBRG14, "gbrg14le" }, + { formats::SGRBG14, "grbg14le" }, + { formats::SRGGB14, "rggb14le" }, + { formats::SBGGR16, "bggr16le" }, + { formats::SGBRG16, "gbrg16le" }, + { formats::SGRBG16, "grbg16le" }, + { formats::SRGGB16, "rggb16le" }, +}; + +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) + static const gchar * bayer_format_to_string(int format) { - switch (format) { - case formats::SBGGR8: - return "bggr"; - case formats::SGBRG8: - return "gbrg"; - case formats::SGRBG8: - return "grbg"; - case formats::SRGGB8: - return "rggb"; - case formats::SBGGR10: - return "bggr10le"; - case formats::SGBRG10: - return "gbrg10le"; - case formats::SGRBG10: - return "grbg10le"; - case formats::SRGGB10: - return "rggb10le"; - case formats::SBGGR12: - return "bggr12le"; - case formats::SGBRG12: - return "gbrg12le"; - case formats::SGRBG12: - return "grbg12le"; - case formats::SRGGB12: - return "rggb12le"; - case formats::SBGGR14: - return "bggr14le"; - case formats::SGBRG14: - return "gbrg14le"; - case formats::SGRBG14: - return "grbg14le"; - case formats::SRGGB14: - return "rggb14le"; - case formats::SBGGR16: - return "bggr16le"; - case formats::SGBRG16: - return "gbrg16le"; - case formats::SGRBG16: - return "grbg16le"; - case formats::SRGGB16: - return "rggb16le"; + for (unsigned int i = 0; i < ARRAY_SIZE(bayer_formats); i++) { + if ((uint32_t)bayer_formats[i].format == (uint32_t)format) + return bayer_formats[i].name; } return NULL; } +static PixelFormat +bayer_format_from_string(const gchar *name) +{ + for (unsigned int i = 0; i < ARRAY_SIZE(bayer_formats); i++) { + if (strcmp(bayer_formats[i].name, name) == 0) + return bayer_formats[i].format; + } + return PixelFormat{}; +} + static GstStructure * bare_structure_from_format(const PixelFormat &format) { @@ -474,6 +474,9 @@ gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg, const gchar *format = gst_structure_get_string(s, "format"); gst_format = gst_video_format_from_string(format); stream_cfg.pixelFormat = gst_format_to_pixel_format(gst_format); + } else if (gst_structure_has_name(s, "video/x-bayer")) { + const gchar *format = gst_structure_get_string(s, "format"); + stream_cfg.pixelFormat = bayer_format_from_string(format); } else if (gst_structure_has_name(s, "image/jpeg")) { stream_cfg.pixelFormat = formats::MJPEG; } else {