From patchwork Fri Nov 10 12:07:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaslo Ziska X-Patchwork-Id: 19199 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 73AA1BDE6B for ; Fri, 10 Nov 2023 12:12:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id AC9E3629AB; Fri, 10 Nov 2023 13:12:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1699618369; bh=8SHAyFth/9eDDb4vHkh8QH16SbUAiglJBG9nQMr6o6Q=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=d/pD9DlhWh/f/jhVRJG2E0ZXuxmKFhe2KBU9NFUAW+Q9/9TfXlM+fAPfMF0pIpnrM G0p2f2Z3wUZAAGIbEU/4RAE82b7dRb+/tITUzTERFN599OyxzdrLdZsjt9DuuKMAsf sVMdcKhUJY8X8kH/M1/zmTcyTDdBSGMePV7MqSk98sXjn1fVJbCb8LdVa5f5WWkPEb tnjRt+FPeweXgojOrXrznoZ6/oHYdEWQ2uzlNUQMcYgJhNe1BbDa1+V6ybJYu3ubl6 aKL5xSKrBK6YWHfgsmveTcnKRVAfb7ZuWbQs9l3yn67YVWZ1knIwQZ2HO7nhuqeeCi qSojaYKB6vrBw== Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.163]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 60D6C61DB6 for ; Fri, 10 Nov 2023 13:12:48 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=ziska.de header.i=@ziska.de header.b="FNCXnPTr"; dkim=permerror (0-bit key) header.d=ziska.de header.i=@ziska.de header.b="l1jRZjNF"; dkim-atps=neutral ARC-Seal: i=1; a=rsa-sha256; t=1699618367; cv=none; d=strato.com; s=strato-dkim-0002; b=HJsI3ctbD7ZF87q1f7Y+v87/f3nUZfrQ6XYrv0dRAj3H7jWvCh5yz6wdQTHcavdA2U i+nPp9nEFinS33FtoMyWfpWy0CBVv4YLY9HZ1rULpS7u28LfKoU1hY9sOiEJO8baw+Y7 TbrLJL3v6+WlrEHU8Y2R87PtEHWXuY01/0JQRnCVqpMkl+XUQjd1up2s9pPulv2YOG0H ZV1ZJHXuaEcg2eF7C9j2rmNksYFNyNIMyv4Az4pgB7dBGAmSl7AeHdFt3kI0gTqR3Pb7 mT/p2cXqcPB/W8jLF2uXsvziSymRyEU88np15/4L/ZeS3Fghnz/AOVwk6njTHVp71TSL qGYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1699618367; s=strato-dkim-0002; d=strato.com; h=Message-ID:Date:Subject:Cc:To:From:Cc:Date:From:Subject:Sender; bh=ohOq1RSR+oWI9FuID15YxNed9LRYarY/PID8hAP0o5U=; b=HNL3r6HO5TfBws6AqGJoZEzg9p3PC4+oNMo9hHl2c8Mp8UHLF1urm3aYYPMrQw4ta+ njrfZ2DHeVzBBt08a2NMeGA82+iM1uytBah4jQHm+tcZV9MPnWanIhM5WkUL2fVJIMAO EZFVgCR/8C2bkjcal4Ayo/ohLNXu7yiPAZvEyYvL4bJ37qNuhXbq6Mmo+7RAJvyIiuq0 s553Vzyy8c5361Z76jVBrwUPafeEuOKX0t7Z2OjKUyrM02e7nBT8ckgPTahARepMqpKE +eeUiLpBeZQRpd25h5z2x4iHg08xhuJ0wAlvEnL4HscicFO+S9agdFAhMYgTqH5K+Xyt 3Wqw== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1699618367; s=strato-dkim-0002; d=ziska.de; h=Message-ID:Date:Subject:Cc:To:From:Cc:Date:From:Subject:Sender; bh=ohOq1RSR+oWI9FuID15YxNed9LRYarY/PID8hAP0o5U=; b=FNCXnPTrLpWJIa5/g3Zth8nmWIyz88CNjwxcl2C6jZP50Ir5OTwhNFkHlmuUB8fZc4 RDX2GUF5JxYLjLA2iRrcMt6Q614xG3nmDHxkeNLrxIHYYlhUh/ek7BdVHlYhvm7Y4Mrx OHDPzoCx43sTUWVsZvdCZEbuI15o5W+qpEf8fH5le/4GZRpdoc0igSqvFHv1cLdBlzL3 cXsI/F/r7ibdQVsv4jdv8wCusPUn/IzV67/6UOPhnxwh20unBcWnaMxn8dlCWT5ywltu F/UDtaHGl2Uz7nR9omzR1DCjlVI5aCpl0JEF9dO27GsuU+QUSDLI2iqfA40ZYgnzYMWa wvYw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1699618367; s=strato-dkim-0003; d=ziska.de; h=Message-ID:Date:Subject:Cc:To:From:Cc:Date:From:Subject:Sender; bh=ohOq1RSR+oWI9FuID15YxNed9LRYarY/PID8hAP0o5U=; b=l1jRZjNFn2U6zZg6drFa36Q+Y3s5TqH+8QwQekDDagK+9mP9lG7fItEMhevMhwxtzG K+utDzc+QLovfAIQzzBg== X-RZG-AUTH: ":Jm0XeU+IYfb0x77LHmrjN5Wlb7TBwusDqIM6Hizy8VdfzvKi4yoFC9cHhIq5B/Jayry4rG79lXjQgouSiQamHMjd97FH" Received: from archlinux.fritz.box by smtp.strato.de (RZmta 49.9.1 AUTH) with ESMTPSA id 6bb150zAACCl9JT (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 10 Nov 2023 13:12:47 +0100 (CET) To: libcamera-devel@lists.libcamera.org Date: Fri, 10 Nov 2023 13:07:29 +0100 Message-ID: <20231110121133.17950-1-jaslo@ziska.de> X-Mailer: git-send-email 2.42.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2] gstreamer: Implement element EOS handling 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: Jaslo Ziska via libcamera-devel From: Jaslo Ziska Reply-To: Jaslo Ziska Cc: Jaslo Ziska , Nicolas Dufresne Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a function for the send_event method which handles the GST_EVENT_EOS event. This function will set an atomic to the received event and push this EOS event to all source pads in the running task. Also set the GST_ELEMENT_FLAG_SOURCE flag to identify libcamerasrc as a source element which enables it to receive EOS events sent to the (pipeline) bin containing it. This in turn enables libcamerasrc to for example receive EOS events from gst-launch-1.0 when using the -e flag. Signed-off-by: Jaslo Ziska Acked-by: Nicolas Dufresne --- Use std::atomic instead of glib_atomic_int_* plus a seperate GstEvent pointer and add a commit message. src/gstreamer/gstlibcamerasrc.cpp | 37 ++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) -- 2.42.1 diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp index 63d99571..8e197956 100644 --- a/src/gstreamer/gstlibcamerasrc.cpp +++ b/src/gstreamer/gstlibcamerasrc.cpp @@ -9,7 +9,6 @@ /** * \todo The following is a list of items that needs implementation in the GStreamer plugin * - Implement GstElement::send_event - * + Allowing application to send EOS * + Allowing application to use FLUSH/FLUSH_STOP * + Prevent the main thread from accessing streaming thread * - Implement renegotiation (even if slow) @@ -29,6 +28,7 @@ #include "gstlibcamerasrc.h" +#include #include #include @@ -144,6 +144,8 @@ struct _GstLibcameraSrc { gchar *camera_name; controls::AfModeEnum auto_focus_mode = controls::AfModeManual; + std::atomic pending_eos; + GstLibcameraSrcState *state; GstLibcameraAllocator *allocator; GstFlowCombiner *flow_combiner; @@ -397,6 +399,14 @@ gst_libcamera_src_task_run(gpointer user_data) bool doResume = false; + if (GstEvent *event = self->pending_eos.exchange(nullptr)) { + for (GstPad *srcpad : state->srcpads_) + gst_pad_push_event(srcpad, gst_event_ref(event)); + gst_event_unref(event); + + return; + } + /* * Create and queue one request. If no buffers are available the * function returns -ENOBUFS, which we ignore here as that's not a @@ -747,6 +757,28 @@ gst_libcamera_src_change_state(GstElement *element, GstStateChange transition) return ret; } +static gboolean +gst_libcamera_src_send_event(GstElement *element, GstEvent *event) +{ + GstLibcameraSrc *self = GST_LIBCAMERA_SRC(element); + gboolean ret = FALSE; + + switch (GST_EVENT_TYPE(event)) { + case GST_EVENT_EOS: { + if (GstEvent *old_event = self->pending_eos.exchange(event)) + gst_event_unref(old_event); + + ret = TRUE; + break; + } + default: + gst_event_unref(event); + break; + } + + return ret; +} + static void gst_libcamera_src_finalize(GObject *object) { @@ -779,6 +811,8 @@ gst_libcamera_src_init(GstLibcameraSrc *self) state->srcpads_.push_back(gst_pad_new_from_template(templ, "src")); gst_element_add_pad(GST_ELEMENT(self), state->srcpads_.back()); + GST_OBJECT_FLAG_SET(self, GST_ELEMENT_FLAG_SOURCE); + /* C-style friend. */ state->src_ = self; self->state = state; @@ -844,6 +878,7 @@ gst_libcamera_src_class_init(GstLibcameraSrcClass *klass) element_class->request_new_pad = gst_libcamera_src_request_new_pad; element_class->release_pad = gst_libcamera_src_release_pad; element_class->change_state = gst_libcamera_src_change_state; + element_class->send_event = gst_libcamera_src_send_event; gst_element_class_set_metadata(element_class, "libcamera Source", "Source/Video",