Patch Detail
Show a patch.
GET /api/1.1/patches/16443/?format=api
{ "id": 16443, "url": "https://patchwork.libcamera.org/api/1.1/patches/16443/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16443/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20220630000251.31295-8-laurent.pinchart@ideasonboard.com>", "date": "2022-06-30T00:02:46", "name": "[libcamera-devel,v2,07/12] 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=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/16443/mbox/", "series": [ { "id": 3234, "url": "https://patchwork.libcamera.org/api/1.1/series/3234/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3234", "date": "2022-06-30T00:02:39", "name": "gstreamer: Queue multiple requests", "version": 2, "mbox": "https://patchwork.libcamera.org/series/3234/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16443/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16443/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 96A4DBD808\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 30 Jun 2022 00:03:29 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2420B65641;\n\tThu, 30 Jun 2022 02:03:29 +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 0EB6265643\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 30 Jun 2022 02:03:18 +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 9CDDE6D1;\n\tThu, 30 Jun 2022 02:03:17 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656547409;\n\tbh=KArOEihn7NjCMl3nOghpphHMjMcqw6JxyM+mUR+IgcA=;\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=eTMnab/NgkL+IVnFs4ASg7p3YdFIPOfepcj5UYlmT9gWI3+Wi7c97qhqVyjtt3hu/\n\t8BUjfafMeoLsR3JY2KyRVBsW1jXOdP86o+siRkvZpblNmEV3fxGHajTJQ4rJlJYCRp\n\tGANNX7KGMcknewGPEj7s7bDDHKXdK4+IMNdKTgK4xFyFvqm5oZPbRfIKHVR6aB8Ggu\n\t6vQO5XY5GEwR6wXrUZeid6FZ4qYp5yFbazF6X8HA5K+NR5XWF2C1Jye/SP1CZ9VwAi\n\tfzQKAP0et9Zcol6O2Z8iOsLK6uuWf3tGZbNYbtCOnx6zd5vSsS/AuhjrkAlpNIoGY/\n\tyRQXPTXGxIv6g==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1656547397;\n\tbh=KArOEihn7NjCMl3nOghpphHMjMcqw6JxyM+mUR+IgcA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=JvwOTLAYiliiKgvUepWFyAhRaW6px6mXzOS6+CICfmCGBMboYdlGXwsU1apKD3g8x\n\tq4Mk5lJ0VrMB1DyyW3917F8CJAl3gbitk+67yDAFf6+R3isH7egny+DOZ6z/FmEQKB\n\tj8D6MFdv4M+eK1bH1DJiARDNfUZHRnQh62GuQXAo=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"JvwOTLAY\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 30 Jun 2022 03:02:46 +0300", "Message-Id": "<20220630000251.31295-8-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", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 07/12] 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Cc": "Nicolas Dufresne <nicolas.dufresne@collabora.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This simplifies the code, and allows removing the internal queue in the\nGstLibcameraPad object.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>\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 2cb915637874..8c1cd7017d98 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", "v2", "07/12" ] }