Patch Detail
Show a patch.
GET /api/1.1/patches/23464/?format=api
{ "id": 23464, "url": "https://patchwork.libcamera.org/api/1.1/patches/23464/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23464/", "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": "<20250604130741.9228-4-laurent.pinchart@ideasonboard.com>", "date": "2025-06-04T13:07:37", "name": "[v2,3/7] gstreamer: Reduce indentation in gst_libcamera_create_video_pool()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c51c381b7337a185a578cda90be2e35ed2393d20", "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/23464/mbox/", "series": [ { "id": 5204, "url": "https://patchwork.libcamera.org/api/1.1/series/5204/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5204", "date": "2025-06-04T13:07:34", "name": "gstreamer: Miscellaneous cleanups + two fixes", "version": 2, "mbox": "https://patchwork.libcamera.org/series/5204/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23464/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23464/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 2E14AC31E9\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 4 Jun 2025 13:08:03 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 89D0C68DCA;\n\tWed, 4 Jun 2025 15:08:00 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8C91068DC0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 4 Jun 2025 15:07:55 +0200 (CEST)", "from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 873B2F06;\n\tWed, 4 Jun 2025 15:07:52 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"XFuNdR1R\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1749042472;\n\tbh=k5AMkQ9sZMlhVVl9Foe/Ti7UHKmGFRzesfL1xPPaMO0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=XFuNdR1RfprzlQqRTGqy/ufiQdQ1xUlDpDaHXBz5cYfRzi9T1AJDGiGQw4+DHNqsx\n\tpQK9hbLhP1oQxlwmky5gRQAlRT1KN0eStRBti4xtpMe0WeIs048RdZ5NKoTBEkMV+n\n\t+pqbCm3fxlQko2b+TpTKcHixrt0EoDFz+dca0DM8=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Hou Qi <qi.hou@nxp.com>,\n\tNicolas Dufresne <nicolas.dufresne@collabora.com>", "Subject": "[PATCH v2 3/7] gstreamer: Reduce indentation in\n\tgst_libcamera_create_video_pool()", "Date": "Wed, 4 Jun 2025 16:07:37 +0300", "Message-ID": "<20250604130741.9228-4-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.49.0", "In-Reply-To": "<20250604130741.9228-1-laurent.pinchart@ideasonboard.com>", "References": "<20250604130741.9228-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Now that video pool creation is handled by a dedicated function, the\nlogic can be simplified by returning early instead of nesting scopes. Do\nso to decrease indentation and improve readability, and document the\nimplementation of the function with comments.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>\n---\nChanges since v1:\n\n- Fixed regression that didn't allocate a pool when the peer allocation\n can't be queried\n- Document the implementation of the gst_libcamera_create_video_pool()\n function with comments\n---\n src/gstreamer/gstlibcamerasrc.cpp | 57 ++++++++++++++++---------------\n 1 file changed, 30 insertions(+), 27 deletions(-)", "diff": "diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp\nindex 79b94c7ee7c2..b907a5759740 100644\n--- a/src/gstreamer/gstlibcamerasrc.cpp\n+++ b/src/gstreamer/gstlibcamerasrc.cpp\n@@ -543,45 +543,48 @@ gst_libcamera_create_video_pool(GstLibcameraSrc *self, GstPad *srcpad,\n {\n \tGstQuery *query = NULL;\n \tconst gboolean need_pool = true;\n-\tgboolean has_video_meta = false;\n \tGstBufferPool *video_pool = NULL;\n \n+\t/*\n+\t * Get the peer allocation hints to check if it supports the meta API.\n+\t * If so, the stride will be negotiated, and there's no need to create a\n+\t * video pool.\n+\t */\n \tquery = gst_query_new_allocation(caps, need_pool);\n+\n \tif (!gst_pad_peer_query(srcpad, query))\n \t\tGST_DEBUG_OBJECT(self, \"Didn't get downstream ALLOCATION hints\");\n-\telse\n-\t\thas_video_meta = gst_query_find_allocation_meta(query, GST_VIDEO_META_API_TYPE, NULL);\n+\telse if (gst_query_find_allocation_meta(query, GST_VIDEO_META_API_TYPE, NULL))\n+\t\treturn { NULL, 0 };\n \n-\tif (!has_video_meta) {\n-\t\tGstBufferPool *pool = NULL;\n+\tGST_WARNING_OBJECT(self, \"Downstream doesn't support video meta, need to copy frame.\");\n \n-\t\tif (gst_query_get_n_allocation_pools(query) > 0)\n-\t\t\tgst_query_parse_nth_allocation_pool(query, 0, &pool, NULL, NULL, NULL);\n+\t/*\n+\t * If the allocation query has pools, use the first one. Otherwise,\n+\t * create a new pool.\n+\t */\n+\tif (gst_query_get_n_allocation_pools(query) > 0)\n+\t\tgst_query_parse_nth_allocation_pool(query, 0, &video_pool, NULL, NULL, NULL);\n \n-\t\tif (pool)\n-\t\t\tvideo_pool = pool;\n-\t\telse {\n-\t\t\tGstStructure *config;\n-\t\t\tguint min_buffers = 3;\n-\t\t\tvideo_pool = gst_video_buffer_pool_new();\n+\tif (!video_pool) {\n+\t\tGstStructure *config;\n+\t\tguint min_buffers = 3;\n \n-\t\t\tconfig = gst_buffer_pool_get_config(video_pool);\n-\t\t\tgst_buffer_pool_config_set_params(config, caps, info->size, min_buffers, 0);\n+\t\tvideo_pool = gst_video_buffer_pool_new();\n+\t\tconfig = gst_buffer_pool_get_config(video_pool);\n+\t\tgst_buffer_pool_config_set_params(config, caps, info->size, min_buffers, 0);\n \n-\t\t\tGST_DEBUG_OBJECT(self, \"Own pool config is %\" GST_PTR_FORMAT, config);\n+\t\tGST_DEBUG_OBJECT(self, \"Own pool config is %\" GST_PTR_FORMAT, config);\n \n-\t\t\tgst_buffer_pool_set_config(GST_BUFFER_POOL_CAST(video_pool), config);\n-\t\t}\n+\t\tgst_buffer_pool_set_config(GST_BUFFER_POOL_CAST(video_pool), config);\n+\t}\n \n-\t\tGST_WARNING_OBJECT(self, \"Downstream doesn't support video meta, need to copy frame.\");\n-\n-\t\tif (!gst_buffer_pool_set_active(video_pool, true)) {\n-\t\t\tgst_caps_unref(caps);\n-\t\t\tGST_ELEMENT_ERROR(self, RESOURCE, SETTINGS,\n-\t\t\t\t\t (\"Failed to active buffer pool\"),\n-\t\t\t\t\t (\"gst_libcamera_src_negotiate() failed.\"));\n-\t\t\treturn { NULL, -EINVAL };\n-\t\t}\n+\tif (!gst_buffer_pool_set_active(video_pool, true)) {\n+\t\tgst_caps_unref(caps);\n+\t\tGST_ELEMENT_ERROR(self, RESOURCE, SETTINGS,\n+\t\t\t\t (\"Failed to active buffer pool\"),\n+\t\t\t\t (\"gst_libcamera_src_negotiate() failed.\"));\n+\t\treturn { NULL, -EINVAL };\n \t}\n \n \tgst_query_unref(query);\n", "prefixes": [ "v2", "3/7" ] }