From patchwork Thu Jun 30 00:02:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 16444 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 D366BBD808 for ; Thu, 30 Jun 2022 00:03:30 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6591065647; Thu, 30 Jun 2022 02:03:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1656547410; bh=cqISnPxLu396AkxqcxXMBX2VVrZrc2x5mzNe5IcBhIk=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=mDjntka9ZLjOUJsezYlimhJfT/dW2kLLS3XLjISuwTyiaDYB9W70p6jRnMG0mEeEG aKEat5JOO4YlMVXKUhszWSuwnCxO1FOrf81TaP+hma0PZkpnaRWbB0QP0CGHNBGECn wn7go33ZaD/Y3sytHjDIxw3HhNq2vt5NkM5G4RkoaEpxn+fREumaSkFik1oNefc3c3 Vlx3xMAz0Cu9tKx2Ny3wcleDtyWzUiXFsQNHNRju9+k5Kv2bdQEbqX9etvcyJ7Ux2y VdTALoL4S43a9FyTv0930hRdzF3+p8WmwQQ2dOw/MSUlR3Y9L89VzyRBhPrzv6EqwD gztXEPflAWRhg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 33F0E6563F for ; Thu, 30 Jun 2022 02:03:17 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="n2AWoTRK"; dkim-atps=neutral Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id C1FE06D1; Thu, 30 Jun 2022 02:03:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1656547397; bh=cqISnPxLu396AkxqcxXMBX2VVrZrc2x5mzNe5IcBhIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n2AWoTRKYFs9vgheaKN2tD/FRvLDX2QYevuLYSikgPjWiMPAjOhyM93Rd2QfCP3QY wQ6Zjzm7S/sDpAlKeFPnZ6WcnbjD82OKNAbZ4zXwmD+CGgaAc5z+1/ciewe48XWckV xGpwi0tFpRbBJgE/g2IRtGVtx3eM9rXz2gPaqYt4= To: libcamera-devel@lists.libcamera.org Date: Thu, 30 Jun 2022 03:02:44 +0300 Message-Id: <20220630000251.31295-6-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220630000251.31295-1-laurent.pinchart@ideasonboard.com> References: <20220630000251.31295-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 05/12] gstreamer: Rename queued requests queue to queuedRequests_ 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: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Cc: Nicolas Dufresne Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" To prepare for the addition of a completed requests queue, rename the existing queued requests queue from requests_ to queuedRequests_. Signed-off-by: Laurent Pinchart Reviewed-by: Nicolas Dufresne Reviewed-by: Umang Jain --- src/gstreamer/gstlibcamerasrc.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp index 37f201e89828..f2f48d53991a 100644 --- a/src/gstreamer/gstlibcamerasrc.cpp +++ b/src/gstreamer/gstlibcamerasrc.cpp @@ -108,7 +108,7 @@ struct GstLibcameraSrcState { std::shared_ptr cam_; std::unique_ptr config_; std::vector srcpads_; - std::queue> requests_; + std::queue> queuedRequests_; guint group_id_; void requestCompleted(Request *request); @@ -155,8 +155,8 @@ GstLibcameraSrcState::requestCompleted(Request *request) GST_DEBUG_OBJECT(src_, "buffers are ready"); - std::unique_ptr wrap = std::move(requests_.front()); - requests_.pop(); + std::unique_ptr wrap = std::move(queuedRequests_.front()); + queuedRequests_.pop(); g_return_if_fail(wrap->request_.get() == request); @@ -311,7 +311,7 @@ gst_libcamera_src_task_run(gpointer user_data) GLibLocker lock(GST_OBJECT(self)); GST_TRACE_OBJECT(self, "Requesting buffers"); state->cam_->queueRequest(wrap->request_.get()); - state->requests_.push(std::move(wrap)); + state->queuedRequests_.push(std::move(wrap)); /* The RequestWrap will be deleted in the completion handler. */ }