From patchwork Mon Oct 13 06:31:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: uajain X-Patchwork-Id: 24601 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 B15AAC3264 for ; Mon, 13 Oct 2025 06:31:23 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A426060449; Mon, 13 Oct 2025 08:31:21 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="I3bSQRnm"; dkim-atps=neutral Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4887D60445 for ; Mon, 13 Oct 2025 08:31:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=lQCB/mFJNjsE+FX8VE5OPZLqLNj33oVg34Lks0OQBvw=; b=I3bSQRnmJhMCPgj/zjIH/Hg5IJ zo4x8e7hZa5TCGFKl2lsIaXCD88d5on3WUEaqchqm/Fu4Ox/kIt8iiCMd/w5hhXJDwo7p32jnLCwa zc2yRAg10qQ0Jolx85qNqOUaH8BYnLIimOxo5hIMUDjI1hlm6gJ6hVVCBKlHz/kdr7hZc83qrtXTO 4/mU4HJ2dglj+7KPkbgOzPulvOwQHs454K6wQXbGRnE45l6NHwyggKq3iQl7cTkrmCo5r3fpVHXHr cPH5Jn4Vn6leF2nmcay95GQJNDjLv98cXdSrXYXGEPv0F/Hw9aDf+pnY30zx2Xb7h1/D1e1gSa32S 3TaZo19w==; Received: from [49.36.127.56] (helo=uajain) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1v8C5X-008oQ5-4F; Mon, 13 Oct 2025 08:31:19 +0200 From: Umang Jain To: libcamera-devel@lists.libcamera.org Cc: Nicolas Dufresne , Umang Jain Subject: [PATCH 1/3] gstreamer: Shorten function name Date: Mon, 13 Oct 2025 12:01:26 +0530 Message-ID: <20251013063132.89521-2-uajain@igalia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013063132.89521-1-uajain@igalia.com> References: <20251013063132.89521-1-uajain@igalia.com> 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" Shorten the following utility function name: gst_libcamera_stream_configuration_to_caps() to gst_libcamera_stream_cfg_to_caps() Comestic fix only for slight readability enhancement. Signed-off-by: Umang Jain --- src/gstreamer/gstlibcamera-utils.cpp | 4 ++-- src/gstreamer/gstlibcamera-utils.h | 4 ++-- src/gstreamer/gstlibcamerasrc.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp index bfb094c9..09f274b5 100644 --- a/src/gstreamer/gstlibcamera-utils.cpp +++ b/src/gstreamer/gstlibcamera-utils.cpp @@ -408,8 +408,8 @@ gst_libcamera_stream_formats_to_caps(const StreamFormats &formats) } GstCaps * -gst_libcamera_stream_configuration_to_caps(const StreamConfiguration &stream_cfg, - GstVideoTransferFunction transfer) +gst_libcamera_stream_cfg_to_caps(const StreamConfiguration &stream_cfg, + GstVideoTransferFunction transfer) { GstCaps *caps = gst_caps_new_empty(); GstStructure *s = bare_structure_from_format(stream_cfg.pixelFormat); diff --git a/src/gstreamer/gstlibcamera-utils.h b/src/gstreamer/gstlibcamera-utils.h index 35df56fb..06ea9289 100644 --- a/src/gstreamer/gstlibcamera-utils.h +++ b/src/gstreamer/gstlibcamera-utils.h @@ -16,8 +16,8 @@ #include GstCaps *gst_libcamera_stream_formats_to_caps(const libcamera::StreamFormats &formats); -GstCaps *gst_libcamera_stream_configuration_to_caps(const libcamera::StreamConfiguration &stream_cfg, - GstVideoTransferFunction transfer); +GstCaps *gst_libcamera_stream_cfg_to_caps(const libcamera::StreamConfiguration &stream_cfg, + GstVideoTransferFunction transfer); void gst_libcamera_configure_stream_from_caps(libcamera::StreamConfiguration &stream_cfg, GstCaps *caps, GstVideoTransferFunction *transfer); void gst_libcamera_get_framerate_from_caps(GstCaps *caps, GstStructure *element_caps); diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp index 79a025a5..9ff90d9a 100644 --- a/src/gstreamer/gstlibcamerasrc.cpp +++ b/src/gstreamer/gstlibcamerasrc.cpp @@ -645,7 +645,7 @@ gst_libcamera_src_negotiate(GstLibcameraSrc *self) GstPad *srcpad = state->srcpads_[i]; const StreamConfiguration &stream_cfg = state->config_->at(i); - g_autoptr(GstCaps) caps = gst_libcamera_stream_configuration_to_caps(stream_cfg, transfer[i]); + g_autoptr(GstCaps) caps = gst_libcamera_stream_cfg_to_caps(stream_cfg, transfer[i]); gst_libcamera_framerate_to_caps(caps, element_caps); if (status == CameraConfiguration::Adjusted && @@ -673,7 +673,7 @@ gst_libcamera_src_negotiate(GstLibcameraSrc *self) GstBufferPool *video_pool = nullptr; GstVideoInfo info; - g_autoptr(GstCaps) caps = gst_libcamera_stream_configuration_to_caps(stream_cfg, transfer[i]); + g_autoptr(GstCaps) caps = gst_libcamera_stream_cfg_to_caps(stream_cfg, transfer[i]); gst_video_info_from_caps(&info, caps); gst_libcamera_pad_set_video_info(srcpad, &info); From patchwork Mon Oct 13 06:31:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: uajain X-Patchwork-Id: 24602 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 C97B0BE080 for ; Mon, 13 Oct 2025 06:31:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 80B276045F; Mon, 13 Oct 2025 08:31:23 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="U4VQxn8o"; dkim-atps=neutral Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 88A9560456 for ; Mon, 13 Oct 2025 08:31:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=sinmmKyOZNnkWcJXDSqQq/ayHiQE9n4/IUMrWDssnDQ=; b=U4VQxn8oF2QMM7aGVmkxp+eXgQ +ypG0SN31SxJh8R8fMUrI9YTeoo+6MfRD5oGkVHW8jveNv+o/z1xbrHwJS83I6E8VatCdG+NNL99O ikV+xZPcxre1MoanQgWUt093Lf3blC//qh1mHBjoRDMTu7Zc8/POMRB0yZ8OnaGpar7hg0cMesprz QqTttpCqK7JL//6rsEBYOTAEsHw7ob15ffQIPYtpG+momPzmU7fLCU3L1A3Mh7oEpWG6M5KJw5Vqq eAY7rHiXLLX1YcSBup8z7Wld7I6VEsPR5/pj/Qpj93wSeRj7YKArlx3ud8YI8S6AAhugxLMgvaBQD Iqhjb+Eg==; Received: from [49.36.127.56] (helo=uajain) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1v8C5Z-008oQ5-8v; Mon, 13 Oct 2025 08:31:21 +0200 From: Umang Jain To: libcamera-devel@lists.libcamera.org Cc: Nicolas Dufresne , Umang Jain Subject: [PATCH 2/3] gstreamer: Associate libcamera::Stream with GstPad Date: Mon, 13 Oct 2025 12:01:27 +0530 Message-ID: <20251013063132.89521-3-uajain@igalia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013063132.89521-1-uajain@igalia.com> References: <20251013063132.89521-1-uajain@igalia.com> 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" Instead of trying to figure out which libcamera::Stream, the GstPad is configured with (from the libcamera pool), associate the Stream with the GstPad directly using gst_pad_set_element_private(). The libcamera::Stream can now be obtained using gst_pad_get_element_private() hence, drop the getter gst_libcamera_pad_get_stream(). Additionally, drop retrieving the stream configuration using the same index, as of the srcpads_ vector in processRequest(). This can break in future, if CameraConfiguration moves away from vector for storing stream configurations. Hence, retrieve the stream configuration correctly, from GstPad's configured stream. Signed-off-by: Umang Jain --- src/gstreamer/gstlibcamerapad.cpp | 11 ----------- src/gstreamer/gstlibcamerapad.h | 2 -- src/gstreamer/gstlibcamerasrc.cpp | 10 +++++++--- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/gstreamer/gstlibcamerapad.cpp b/src/gstreamer/gstlibcamerapad.cpp index 22b96719..7855ef22 100644 --- a/src/gstreamer/gstlibcamerapad.cpp +++ b/src/gstreamer/gstlibcamerapad.cpp @@ -189,17 +189,6 @@ void gst_libcamera_pad_set_video_info(GstPad *pad, const GstVideoInfo *info) self->info = *info; } -Stream * -gst_libcamera_pad_get_stream(GstPad *pad) -{ - auto *self = GST_LIBCAMERA_PAD(pad); - - if (self->pool) - return gst_libcamera_pool_get_stream(self->pool); - - return nullptr; -} - void gst_libcamera_pad_set_latency(GstPad *pad, GstClockTime latency) { diff --git a/src/gstreamer/gstlibcamerapad.h b/src/gstreamer/gstlibcamerapad.h index f98b8a7f..5f355aa9 100644 --- a/src/gstreamer/gstlibcamerapad.h +++ b/src/gstreamer/gstlibcamerapad.h @@ -31,6 +31,4 @@ GstVideoInfo gst_libcamera_pad_get_video_info(GstPad *pad); void gst_libcamera_pad_set_video_info(GstPad *pad, const GstVideoInfo *info); -libcamera::Stream *gst_libcamera_pad_get_stream(GstPad *pad); - void gst_libcamera_pad_set_latency(GstPad *pad, GstClockTime latency); diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp index 9ff90d9a..a5dbdfd4 100644 --- a/src/gstreamer/gstlibcamerasrc.cpp +++ b/src/gstreamer/gstlibcamerasrc.cpp @@ -195,7 +195,7 @@ int GstLibcameraSrcState::queueRequest() std::make_unique(std::move(request)); for (GstPad *srcpad : srcpads_) { - Stream *stream = gst_libcamera_pad_get_stream(srcpad); + Stream *stream = (Stream *)gst_pad_get_element_private(srcpad); GstLibcameraPool *pool = gst_libcamera_pad_get_pool(srcpad); GstBuffer *buffer; GstFlowReturn ret; @@ -359,11 +359,11 @@ int GstLibcameraSrcState::processRequest() for (gsize i = 0; i < srcpads_.size(); i++) { GstPad *srcpad = srcpads_[i]; - Stream *stream = gst_libcamera_pad_get_stream(srcpad); + Stream *stream = (Stream *)gst_pad_get_element_private(srcpad); GstBuffer *buffer = wrap->detachBuffer(stream); FrameBuffer *fb = gst_libcamera_buffer_get_frame_buffer(buffer); - const StreamConfiguration &stream_cfg = config_->at(i); + const StreamConfiguration &stream_cfg = stream->configuration(); GstBufferPool *video_pool = gst_libcamera_pad_get_video_pool(srcpad); if (video_pool) { @@ -698,6 +698,9 @@ gst_libcamera_src_negotiate(GstLibcameraSrc *self) gst_libcamera_pad_set_pool(srcpad, pool); gst_libcamera_pad_set_video_pool(srcpad, video_pool); + /* Associate the configured stream with the src pad. */ + gst_pad_set_element_private(srcpad, (gpointer)stream_cfg.stream()); + /* Clear all reconfigure flags. */ gst_pad_check_reconfigure(srcpad); } @@ -894,6 +897,7 @@ gst_libcamera_src_task_leave([[maybe_unused]] GstTask *task, for (GstPad *srcpad : state->srcpads_) { gst_libcamera_pad_set_latency(srcpad, GST_CLOCK_TIME_NONE); gst_libcamera_pad_set_pool(srcpad, nullptr); + gst_pad_set_element_private(srcpad, nullptr); } } From patchwork Mon Oct 13 06:31:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: uajain X-Patchwork-Id: 24603 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 7C58BBE080 for ; Mon, 13 Oct 2025 06:31:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2C8F2603DF; Mon, 13 Oct 2025 08:31:27 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="dtvKFMEA"; dkim-atps=neutral Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8B038603DF for ; Mon, 13 Oct 2025 08:31:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=9XbOup754exRgtaqVxJCK4dfG7uRNLtEtiev6PZTboI=; b=dtvKFMEAATjenmspTRjFfqILS+ xzEsSb59vhx3AOOlflmas9kL4wzkhdNGhiafsMbeb0a4bI5UD5J9QNmfvQFJB4k6voJSPoPJ3u0q7 6Rf/g+vJoI0ecQw8cIKdmQVfZLZ3oNGZgkINVOtKq+8xggMS4VAheCqDL0AswNHj/klNjzkpxuDOc 4U96mX7hfXniaWLRNUpb01MHzu3R4SrCOhnAICqHMf/y3HZYnkmO1RwFs5F8IlON+oOjA+IY2Du5E 5wQkARl/xVyI5vf/te6Vj5ASkWRPEdDGmFQYKgEAvSpmzWKbteP1RPRlTKtRS7hOAGO5eR5QTqwXE 94SPcL2Q==; Received: from [49.36.127.56] (helo=uajain) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1v8C5b-008oQ5-De; Mon, 13 Oct 2025 08:31:24 +0200 From: Umang Jain To: libcamera-devel@lists.libcamera.org Cc: Nicolas Dufresne , Umang Jain Subject: [PATCH 3/3] gstreamer: Improve logging for buffer pool activation Date: Mon, 13 Oct 2025 12:01:28 +0530 Message-ID: <20251013063132.89521-4-uajain@igalia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013063132.89521-1-uajain@igalia.com> References: <20251013063132.89521-1-uajain@igalia.com> 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" If the negotiation is going to fail, log the GST_ELEMENT_ERROR in gst_libcamera_src_negotiate(), instead of logging in downstream method chain. Signed-off-by: Umang Jain --- src/gstreamer/gstlibcamerasrc.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp index a5dbdfd4..5a1b2676 100644 --- a/src/gstreamer/gstlibcamerasrc.cpp +++ b/src/gstreamer/gstlibcamerasrc.cpp @@ -581,9 +581,7 @@ gst_libcamera_create_video_pool(GstLibcameraSrc *self, GstPad *srcpad, } if (!gst_buffer_pool_set_active(pool, true)) { - GST_ELEMENT_ERROR(self, RESOURCE, SETTINGS, - ("Failed to active buffer pool"), - ("gst_libcamera_src_negotiate() failed.")); + GST_ERROR("Failed to activate buffer pool"); return { nullptr, -EINVAL }; } @@ -686,8 +684,12 @@ gst_libcamera_src_negotiate(GstLibcameraSrc *self) std::tie(video_pool, ret) = gst_libcamera_create_video_pool(self, srcpad, caps, &info); - if (ret) + if (ret) { + GST_ELEMENT_ERROR(self, RESOURCE, SETTINGS, + ("Failed to create video pool: %s", g_strerror(-ret)), + ("gst_libcamera_src_negotiate() failed.")); return false; + } } GstLibcameraPool *pool = gst_libcamera_pool_new(self->allocator,