From patchwork Sat Oct 25 14:23:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 24815 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 C9F50C32CE for ; Sat, 25 Oct 2025 14:22:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 77627606F8; Sat, 25 Oct 2025 16:22:45 +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="dqXtMd1m"; dkim-atps=neutral Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 45004606CF for ; Sat, 25 Oct 2025 16:22:40 +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=+/WAzMSdmfSQ8a+q1c0ndIBPdKevgBxECBUuNP6wYHI=; b=dqXtMd1mjcetft+z7+NLXkklon caD11WE0aIQE0ohcvBTtLZMLIv+FzMvPYWk7BW46Wc3QW1CDOGEiznXdehRZGNaALQoQkLiqfhv6m 9YGo7/pIIsjEjC/QNac1zE0gKOqaCcKAkU1puVA5nZ9Ty9jLer33aY7mMdFaBGfsAVRuMYu59mdik MHhivLLM1w0v8Sb6THn2/YJiXvw+MB7b3nuJY7v9pHB0wLTUb5IPjckkyeKgyXy+rhk/OI5qzxZFr TkpjnGUua/gNomCU2AkExbyZ/fX3CzWMRaTZD8APAMy3SmmesC+13aNjP0vAu6sa+2uTsvrnHtxna bm+tS7lA==; Received: from amazon1-vf-gw.lnd.cw.net ([195.89.103.118] helo=uajain) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1vCfAF-00F7ub-GX; Sat, 25 Oct 2025 16:22:39 +0200 From: Umang Jain To: libcamera-devel@lists.libcamera.org Cc: barnabas.pocze@ideasonboard.com, Nicolas Dufresne , Umang Jain Subject: [PATCH v3 4/4] gstreamer: Track RequestWrap's GstBuffer using GstPad Date: Sat, 25 Oct 2025 15:23:00 +0100 Message-ID: <20251025142300.64480-5-uajain@igalia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251025142300.64480-1-uajain@igalia.com> References: <20251025142300.64480-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" GstPad is the link point where the buffers are pushed/pulled in the gstreamer pipeline hence, it makes more sense to associate and track GstBuffer(s) using GstPad rather than libcamera::Stream in RequestWrap. No functional changes intended as there is only one stream per pad configuration followed in libcamerasrc. Signed-off-by: Umang Jain --- src/gstreamer/gstlibcamerasrc.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp index 7bf42be2..5ca9e3b9 100644 --- a/src/gstreamer/gstlibcamerasrc.cpp +++ b/src/gstreamer/gstlibcamerasrc.cpp @@ -48,11 +48,11 @@ struct RequestWrap { RequestWrap(std::unique_ptr request); ~RequestWrap(); - void attachBuffer(Stream *stream, GstBuffer *buffer); - GstBuffer *detachBuffer(Stream *stream); + void attachBuffer(GstPad *srcpad, GstBuffer *buffer); + GstBuffer *detachBuffer(GstPad *srcpad); std::unique_ptr request_; - std::map buffers_; + std::map buffers_; GstClockTime latency_; GstClockTime pts_; @@ -65,32 +65,33 @@ RequestWrap::RequestWrap(std::unique_ptr request) RequestWrap::~RequestWrap() { - for (std::pair &item : buffers_) { + for (std::pair &item : buffers_) { if (item.second) gst_buffer_unref(item.second); } } -void RequestWrap::attachBuffer(Stream *stream, GstBuffer *buffer) +void RequestWrap::attachBuffer(GstPad *srcpad, GstBuffer *buffer) { FrameBuffer *fb = gst_libcamera_buffer_get_frame_buffer(buffer); + Stream *stream = gst_libcamera_pad_get_stream(srcpad); request_->addBuffer(stream, fb); - auto item = buffers_.find(stream); + auto item = buffers_.find(srcpad); if (item != buffers_.end()) { gst_buffer_unref(item->second); item->second = buffer; } else { - buffers_[stream] = buffer; + buffers_[srcpad] = buffer; } } -GstBuffer *RequestWrap::detachBuffer(Stream *stream) +GstBuffer *RequestWrap::detachBuffer(GstPad *srcpad) { GstBuffer *buffer = nullptr; - auto item = buffers_.find(stream); + auto item = buffers_.find(srcpad); if (item != buffers_.end()) { buffer = item->second; item->second = nullptr; @@ -189,7 +190,6 @@ int GstLibcameraSrcState::queueRequest() std::make_unique(std::move(request)); for (GstPad *srcpad : srcpads_) { - Stream *stream = gst_libcamera_pad_get_stream(srcpad); GstLibcameraPool *pool = gst_libcamera_pad_get_pool(srcpad); GstBuffer *buffer; GstFlowReturn ret; @@ -204,7 +204,7 @@ int GstLibcameraSrcState::queueRequest() return -ENOBUFS; } - wrap->attachBuffer(stream, buffer); + wrap->attachBuffer(srcpad, buffer); } GST_TRACE_OBJECT(src_, "Requesting buffers"); @@ -354,7 +354,7 @@ int GstLibcameraSrcState::processRequest() for (gsize i = 0; i < srcpads_.size(); i++) { GstPad *srcpad = srcpads_[i]; Stream *stream = gst_libcamera_pad_get_stream(srcpad); - GstBuffer *buffer = wrap->detachBuffer(stream); + GstBuffer *buffer = wrap->detachBuffer(srcpad); FrameBuffer *fb = gst_libcamera_buffer_get_frame_buffer(buffer); const StreamConfiguration &stream_cfg = stream->configuration();