{"id":16355,"url":"https://patchwork.libcamera.org/api/1.1/patches/16355/?format=json","web_url":"https://patchwork.libcamera.org/patch/16355/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220623232210.18742-9-laurent.pinchart@ideasonboard.com>","date":"2022-06-23T23:22:05","name":"[libcamera-devel,08/13] gstreamer: Combine the two pad loops in the task run handler","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"636c07da8ded58b5d97ce11248be052aa99c653b","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16355/mbox/","series":[{"id":3214,"url":"https://patchwork.libcamera.org/api/1.1/series/3214/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3214","date":"2022-06-23T23:21:57","name":"gstreamer: Queue multiple requests","version":1,"mbox":"https://patchwork.libcamera.org/series/3214/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16355/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16355/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id CA79CBD808\n\tfor ;\n\tThu, 23 Jun 2022 23:22:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3F2186564D;\n\tFri, 24 Jun 2022 01:22:44 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 87D6965643\n\tfor ;\n\tFri, 24 Jun 2022 01:22:32 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 18A1CDD;\n\tFri, 24 Jun 2022 01:22:32 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656026564;\n\tbh=Bmj0CbPPhblz1y1eJVWLXduCnnxDflL7cFuTOBcc+SQ=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=EGeKZ9Ndom5wcPl3H3l0CaPMjzm6O1axFapkP4Ekkk8U1FT8/XeOMNK6LKbdghUzE\n\tFvIrRiiYbfZyIh4spIP983o/ujxGyWPUzY/VKXeEEyU+yjJE0ZMo+enalva6ZsSIAR\n\tNYqKJdOjZP6tEih6W23mfFd/ln/prVJJ/OU2GrHoxGCkoSjZu3pwtOiYdJCv+0mk0E\n\tfDaPwn2uO7jCuus1tQoawJGjTghM9iH4ORaLvKWCXiqifnW47ER3HUph9I089QALES\n\tlPn5pbyRzT6LVdfj7Pg7K3ik8naToIAZzF8XuAeHUg0n+uVh7wdqwjQeDqRHiJ0nIA\n\tzAmyAex5q2d6g==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1656026552;\n\tbh=Bmj0CbPPhblz1y1eJVWLXduCnnxDflL7cFuTOBcc+SQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=VIVF+zprcgDuTVQ0hyVNEVMp+mu130QOIYxAokT4xM1ltYHffBCZxRoQ+4cO4inOU\n\tRq/78fOSZFBVp3saWzDI2LSTY92hysaConMO3kjsZKgCEJm4qXHO/Gy4riDhIdP5El\n\tu2qOzhI4IaXvIeZae7u9bnFVxbe0xXfSek5xsEx8="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"VIVF+zpr\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 24 Jun 2022 02:22:05 +0300","Message-Id":"<20220623232210.18742-9-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20220623232210.18742-1-laurent.pinchart@ideasonboard.com>","References":"<20220623232210.18742-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 08/13] gstreamer: Combine the two pad\n\tloops in the task run handler","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"Nicolas Dufresne ,\n\tVedant Paranjape ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"This simplifies the code, and allows removing the internal queue in the\nGstLibcameraPad object.\n\nSigned-off-by: Laurent Pinchart \n---\n src/gstreamer/gstlibcamerapad.cpp | 35 -------------------------------\n src/gstreamer/gstlibcamerapad.h | 6 ------\n src/gstreamer/gstlibcamerasrc.cpp | 11 ++++------\n 3 files changed, 4 insertions(+), 48 deletions(-)","diff":"diff --git a/src/gstreamer/gstlibcamerapad.cpp b/src/gstreamer/gstlibcamerapad.cpp\nindex c00e81c8966e..87b4057ac101 100644\n--- a/src/gstreamer/gstlibcamerapad.cpp\n+++ b/src/gstreamer/gstlibcamerapad.cpp\n@@ -18,7 +18,6 @@ struct _GstLibcameraPad {\n \tGstPad parent;\n \tStreamRole role;\n \tGstLibcameraPool *pool;\n-\tGQueue pending_buffers;\n \tGstClockTime latency;\n };\n \n@@ -155,40 +154,6 @@ gst_libcamera_pad_get_stream(GstPad *pad)\n \treturn nullptr;\n }\n \n-void\n-gst_libcamera_pad_queue_buffer(GstPad *pad, GstBuffer *buffer)\n-{\n-\tauto *self = GST_LIBCAMERA_PAD(pad);\n-\tGLibLocker lock(GST_OBJECT(self));\n-\n-\tg_queue_push_head(&self->pending_buffers, buffer);\n-}\n-\n-GstFlowReturn\n-gst_libcamera_pad_push_pending(GstPad *pad)\n-{\n-\tauto *self = GST_LIBCAMERA_PAD(pad);\n-\tGstBuffer *buffer;\n-\n-\t{\n-\t\tGLibLocker lock(GST_OBJECT(self));\n-\t\tbuffer = GST_BUFFER(g_queue_pop_tail(&self->pending_buffers));\n-\t}\n-\n-\tif (!buffer)\n-\t\treturn GST_FLOW_OK;\n-\n-\treturn gst_pad_push(pad, buffer);\n-}\n-\n-bool\n-gst_libcamera_pad_has_pending(GstPad *pad)\n-{\n-\tauto *self = GST_LIBCAMERA_PAD(pad);\n-\tGLibLocker lock(GST_OBJECT(self));\n-\treturn self->pending_buffers.length > 0;\n-}\n-\n void\n gst_libcamera_pad_set_latency(GstPad *pad, GstClockTime latency)\n {\ndiff --git a/src/gstreamer/gstlibcamerapad.h b/src/gstreamer/gstlibcamerapad.h\nindex 207695173313..103ee57ab384 100644\n--- a/src/gstreamer/gstlibcamerapad.h\n+++ b/src/gstreamer/gstlibcamerapad.h\n@@ -25,10 +25,4 @@ void gst_libcamera_pad_set_pool(GstPad *pad, GstLibcameraPool *pool);\n \n libcamera::Stream *gst_libcamera_pad_get_stream(GstPad *pad);\n \n-void gst_libcamera_pad_queue_buffer(GstPad *pad, GstBuffer *buffer);\n-\n-GstFlowReturn gst_libcamera_pad_push_pending(GstPad *pad);\n-\n-bool gst_libcamera_pad_has_pending(GstPad *pad);\n-\n void gst_libcamera_pad_set_latency(GstPad *pad, GstClockTime latency);\ndiff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp\nindex ee9c83fde777..e30d45fa2223 100644\n--- a/src/gstreamer/gstlibcamerasrc.cpp\n+++ b/src/gstreamer/gstlibcamerasrc.cpp\n@@ -311,6 +311,9 @@ gst_libcamera_src_task_run(gpointer user_data)\n \t\treturn;\n \t}\n \n+\tGstFlowReturn ret = GST_FLOW_OK;\n+\tgst_flow_combiner_reset(self->flow_combiner);\n+\n \tfor (GstPad *srcpad : state->srcpads_) {\n \t\tStream *stream = gst_libcamera_pad_get_stream(srcpad);\n \t\tGstBuffer *buffer = wrap->detachBuffer(stream);\n@@ -327,13 +330,7 @@ gst_libcamera_src_task_run(gpointer user_data)\n \t\tGST_BUFFER_OFFSET(buffer) = fb->metadata().sequence;\n \t\tGST_BUFFER_OFFSET_END(buffer) = fb->metadata().sequence;\n \n-\t\tgst_libcamera_pad_queue_buffer(srcpad, buffer);\n-\t}\n-\n-\tGstFlowReturn ret = GST_FLOW_OK;\n-\tgst_flow_combiner_reset(self->flow_combiner);\n-\tfor (GstPad *srcpad : state->srcpads_) {\n-\t\tret = gst_libcamera_pad_push_pending(srcpad);\n+\t\tret = gst_pad_push(srcpad, buffer);\n \t\tret = gst_flow_combiner_update_pad_flow(self->flow_combiner,\n \t\t\t\t\t\t\tsrcpad, ret);\n \t}\n","prefixes":["libcamera-devel","08/13"]}