From patchwork Fri Oct 10 14:18:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 24583 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 B0223BE080 for ; Fri, 10 Oct 2025 14:18:20 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E296D6B611; Fri, 10 Oct 2025 16:18:17 +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="phnYVqeE"; dkim-atps=neutral Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C89B76B5F8 for ; Fri, 10 Oct 2025 16:18:14 +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=phnYVqeESlpUTyQ8gpMKPlT0ce n39W4JEeDulavAZ5qc2TvFO8NqtjTcb4ZoKuVaW7yI9NRHZtMcSCFmAghYr976tmgyDd5xha3FAKG A8dw7NLVwEnOP3HfrhO2W5/f9x2KnnKkL5thzSvnKtRVyPjcpW0u8cVoWy2UJrg+S9I73w3OioMX2 rDhUNmi4mnL39fbwz+gSaSzirZZwOIb499h3S2VTQ+SnjAJy4HZYEoWIOgXU4FCngaTcV5cl07giS Cl4CwGXcOxnVZONAxVxjEWUMCBi66dxq+1YuVfCb68hGpVnxYNbYPbJAQhbXrUg8iFiz7BjPCtNcB BVTuF4AA==; 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 1v7Dwj-007uJd-RI; Fri, 10 Oct 2025 16:18:14 +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: Fri, 10 Oct 2025 19:48:25 +0530 Message-ID: <20251010141826.42995-3-uajain@igalia.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251010141826.42995-1-uajain@igalia.com> References: <20251010141826.42995-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); } }