{"id":16347,"url":"https://patchwork.libcamera.org/api/patches/16347/?format=json","web_url":"https://patchwork.libcamera.org/patch/16347/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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-2-laurent.pinchart@ideasonboard.com>","date":"2022-06-23T23:21:58","name":"[libcamera-devel,01/13] gstreamer: Use gst_task_resume() when available","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"6191c87384f6e718e547381317ee54f38857e627","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16347/mbox/","series":[{"id":3214,"url":"https://patchwork.libcamera.org/api/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/16347/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16347/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 0E4E7BD808\n\tfor ;\n\tThu, 23 Jun 2022 23:22:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 287706563E;\n\tFri, 24 Jun 2022 01:22:31 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4E6FA61FB2\n\tfor ;\n\tFri, 24 Jun 2022 01:22:29 +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 BC1AA6BB;\n\tFri, 24 Jun 2022 01:22:28 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656026551;\n\tbh=qua9aQjOuEGceXdbuVSrk+ABtj/736fvVqX3osuGcMo=;\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=0UX2lAdvU/E/4XVDjCudFDCcUb8l3rxNS3UAo4UqLE3Olv2RrtUCZvWqSJLRpEILr\n\t5ec5g/dbmQAEeeDatu3HtyQF1BO3t9ezwNPLv4CHWcDxoP9/11aCwmDPGRMfoMROo+\n\tKgOI69aQdb4/NmyXtuah/EIg8RWXxyVIX/inGFoTE4OZdco3S8F81WxdPyt4nBeufS\n\tFb0A6tGnTsDXIBHf7MFlUknPycG+CRARG7u7lALjoryGKoHaAQs0TPzu70HeDZX7tD\n\tNToKNJ6HGM9MOXELauhLSlTshqmSElP8eRN2DX+3gA28kPLp+vXZ53P9oB5NyiaQTx\n\t+NNlPSTOv1nJg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1656026549;\n\tbh=qua9aQjOuEGceXdbuVSrk+ABtj/736fvVqX3osuGcMo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=sCWZ9CFnWzpK4KUnU1wKXgFT2iQ+n9lludia5tlAaLgkFfNFpl+Yhsam/k6OC6Ho8\n\tcKHy3XqGLzBWTQbslbhiP+daLadqUKh0yo0p7TckzbY4Wa5yoGKlgqiJUubfcuYpED\n\toJaJHnTN7yHd04jto+V4QGKOfUOIVOb/KIiP0WtU="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"sCWZ9CFn\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 24 Jun 2022 02:21:58 +0300","Message-Id":"<20220623232210.18742-2-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 01/13] gstreamer: Use gst_task_resume()\n\twhen available","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":"The gst_libcamera_resume_task() helper is an implementation of the\ngst_task_resume() function that predates its addition to GStreamer. Use\ngst_task_resume() when available, and rename gst_libcamera_resume_task()\nto gst_task_resume() to support older GStreamer versions.\n\nSigned-off-by: Laurent Pinchart \n---\n src/gstreamer/gstlibcamera-utils.cpp | 16 ++++++++++------\n src/gstreamer/gstlibcamera-utils.h | 4 +++-\n src/gstreamer/gstlibcamerasrc.cpp | 4 ++--\n 3 files changed, 15 insertions(+), 9 deletions(-)","diff":"diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp\nindex 3f2422863c03..c97c0d438de2 100644\n--- a/src/gstreamer/gstlibcamera-utils.cpp\n+++ b/src/gstreamer/gstlibcamera-utils.cpp\n@@ -224,16 +224,20 @@ gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,\n \tstream_cfg.size.height = height;\n }\n \n-void\n-gst_libcamera_resume_task(GstTask *task)\n+#if !GST_CHECK_VERSION(1, 17, 1)\n+gboolean\n+gst_task_resume(GstTask *task)\n {\n \t/* We only want to resume the task if it's paused. */\n \tGLibLocker lock(GST_OBJECT(task));\n-\tif (GST_TASK_STATE(task) == GST_TASK_PAUSED) {\n-\t\tGST_TASK_STATE(task) = GST_TASK_STARTED;\n-\t\tGST_TASK_SIGNAL(task);\n-\t}\n+\tif (GST_TASK_STATE(task) != GST_TASK_PAUSED)\n+\t\treturn FALSE;\n+\n+\tGST_TASK_STATE(task) = GST_TASK_STARTED;\n+\tGST_TASK_SIGNAL(task);\n+\treturn TRUE;\n }\n+#endif\n \n G_LOCK_DEFINE_STATIC(cm_singleton_lock);\n static std::weak_ptr cm_singleton_ptr;\ndiff --git a/src/gstreamer/gstlibcamera-utils.h b/src/gstreamer/gstlibcamera-utils.h\nindex d54f15885d0c..164189a28965 100644\n--- a/src/gstreamer/gstlibcamera-utils.h\n+++ b/src/gstreamer/gstlibcamera-utils.h\n@@ -18,7 +18,9 @@ GstCaps *gst_libcamera_stream_formats_to_caps(const libcamera::StreamFormats &fo\n GstCaps *gst_libcamera_stream_configuration_to_caps(const libcamera::StreamConfiguration &stream_cfg);\n void gst_libcamera_configure_stream_from_caps(libcamera::StreamConfiguration &stream_cfg,\n \t\t\t\t\t GstCaps *caps);\n-void gst_libcamera_resume_task(GstTask *task);\n+#if !GST_CHECK_VERSION(1, 17, 1)\n+gboolean gst_task_resume(GstTask *task);\n+#endif\n std::shared_ptr gst_libcamera_get_camera_manager(int &ret);\n \n /**\ndiff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp\nindex 46fd02d207be..9d6be075a474 100644\n--- a/src/gstreamer/gstlibcamerasrc.cpp\n+++ b/src/gstreamer/gstlibcamerasrc.cpp\n@@ -192,7 +192,7 @@ GstLibcameraSrcState::requestCompleted(Request *request)\n \t\tgst_libcamera_pad_queue_buffer(srcpad, buffer);\n \t}\n \n-\tgst_libcamera_resume_task(this->src_->task);\n+\tgst_task_resume(src_->task);\n }\n \n static bool\n@@ -453,7 +453,7 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread,\n \t\tGstLibcameraPool *pool = gst_libcamera_pool_new(self->allocator,\n \t\t\t\t\t\t\t\tstream_cfg.stream());\n \t\tg_signal_connect_swapped(pool, \"buffer-notify\",\n-\t\t\t\t\t G_CALLBACK(gst_libcamera_resume_task), task);\n+\t\t\t\t\t G_CALLBACK(gst_task_resume), task);\n \n \t\tgst_libcamera_pad_set_pool(srcpad, pool);\n \t\tgst_flow_combiner_add_pad(self->flow_combiner, srcpad);\n","prefixes":["libcamera-devel","01/13"]}