From patchwork Thu Jun 10 08:02:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vedant Paranjape X-Patchwork-Id: 12544 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 7DE17C320B for ; Thu, 10 Jun 2021 08:02:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BF8FC6892C; Thu, 10 Jun 2021 10:02:24 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iNJNbH/+"; dkim-atps=neutral Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 581576892B for ; Thu, 10 Jun 2021 10:02:23 +0200 (CEST) Received: by mail-pj1-x1036.google.com with SMTP id fy24-20020a17090b0218b029016c5a59021fso3286948pjb.0 for ; Thu, 10 Jun 2021 01:02:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qSPpFaDkOImbCrU3uKegSkTvSFR8BJwZwXsAe8WdFR8=; b=iNJNbH/+d0gGYg5ejQ0J3r1EKRzZOsfmMj5RWh8fr1KuL22MS69UOTdzGZDDwoRVTj pQhYP1uSCJjPFY1TX42MbmDD8YJEdGzDtHq1pY55PJ9nXqr8XGxPpBkUPiGheGgHEG3N SvWK/Q21qIbm60L1umBWi/9bjihdeAd3UwRYmCpRPnwz2JAK+b9Nxp/6XNGg1ZOPg1sY VvpxfHpZfrXJA7rcQIs390IHrT//72Ov9wL4p0wciOYfAMz5nMCE7SH1WD7VZWg1fXXZ vPNhRHSiNYWibUyYVtZG7voOluAcM/l7/NHVPvD9jSFEZmFL0ifEkpMtX94ACL4Z1yXC KDtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qSPpFaDkOImbCrU3uKegSkTvSFR8BJwZwXsAe8WdFR8=; b=Vx2B/t2YmioH89Jju/dqu6gixGiLIrj3SOJ+Gx39qid/dETEX4pKvw84tuHvi3Jn3h lcuKeTwDD7auXumViFmWROC/v41Bn0O3X1vdHsTmgJDcb7MPwQw9chM/pEyatkGjfyKi Dx+vHgASOzh7OGrXs5alLgnzgsoFZJofMM8wj9O0N464HC8jy4nT70iAm/3KNb8OHzYk 3GldqxTE47qpXpcbySXO+Ol9BNSHJovgznHJz9meaDPo10UFJdlVT0ApTyPNxICgayR/ Kmw3nwBSjOFrwZmDFBAqazC7/0upaELRkC1ERtWr3hUUp9o06pXGCbm+xFsNY5baX/Au RxGQ== X-Gm-Message-State: AOAM530bCdgdOLA2Yml9U3klkd1HunQEyjHubdb9h0Xyf9j+cRSsvFgh cd+CGDq8sDG3Ua18T8P6nkHeVgC+THLGq/sSsLw= X-Google-Smtp-Source: ABdhPJz0kKBifL1bHq3aQWdX4AIDSqy+KeJQr57vdG2RVfPqkhVQsO9IS5pc/URZeTJ9l49Qnp5K8w== X-Received: by 2002:a17:90a:af85:: with SMTP id w5mr2058719pjq.235.1623312141365; Thu, 10 Jun 2021 01:02:21 -0700 (PDT) Received: from localhost.localdomain ([1.186.76.76]) by smtp.googlemail.com with ESMTPSA id h6sm1634843pfk.40.2021.06.10.01.02.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jun 2021 01:02:20 -0700 (PDT) From: Vedant Paranjape To: libcamera-devel@lists.libcamera.org Date: Thu, 10 Jun 2021 13:32:01 +0530 Message-Id: <20210610080201.87151-1-vedantparanjape160201@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH v3] gstreamer: Added virtual functions needed to support request pads 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: , Cc: Vedant Paranjape Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Using request pads needs virtual functions to create new request pads and release the allocated pads. Added way to generate unique stream_id in gst_libcamera_src_task_enter(). It failed to execute when more than one pad was added. This patch defines the functions gst_libcamera_src_request_new_pad() and gst_libcamera_src_release_pad() which handle, creating and releasing request pads. Also assigns these functions to their callback handlers in GstLibcameraSrcClass. gst_pad_create_stream_id() failed as this gstreamer element has more than 2 source pads, and a nullptr was passed to it's stream_id argument. This function fails to auto generate a stream id for scenario of more than one source pad present. Used a gint which increments everytime new stream_id is requested and group_id to generate an unique stream_id by appending them togther as %i%i. This doesn't enable request pad support in gstreamer element. This is one of the series of changes needed to make it work. Signed-off-by: Vedant Paranjape In _request_new_pad and _release_pad, a GLibLock is taken on self->state. But since self->state is a C++ object, GST_OBJECT(self->state) fails and returns null, so GLibLocker throws a warning "invalid cast from '(null)' to 'GstObject'. This means that it actually fails to get lock the resource that needs to be protected, i.e., the srcpads_ vector. --- src/gstreamer/gstlibcamerasrc.cpp | 56 ++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp index ccc61590..d8c17b9c 100644 --- a/src/gstreamer/gstlibcamerasrc.cpp +++ b/src/gstreamer/gstlibcamerasrc.cpp @@ -361,10 +361,11 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread, GST_DEBUG_OBJECT(self, "Streaming thread has started"); guint group_id = gst_util_group_id_next(); + gint stream_id_num = 0; StreamRoles roles; for (GstPad *srcpad : state->srcpads_) { /* Create stream-id and push stream-start. */ - g_autofree gchar *stream_id = gst_pad_create_stream_id(srcpad, GST_ELEMENT(self), nullptr); + g_autofree gchar *stream_id = gst_pad_create_stream_id(srcpad, GST_ELEMENT(self), g_strdup_printf("%i%i", group_id, stream_id_num++)); GstEvent *event = gst_event_new_stream_start(stream_id); gst_event_set_group_id(event, group_id); gst_pad_push_event(srcpad, event); @@ -640,6 +641,57 @@ gst_libcamera_src_init(GstLibcameraSrc *self) self->state = state; } +static GstPad* +gst_libcamera_src_request_new_pad(GstElement *element, GstPadTemplate *templ, + const gchar *name, [[maybe_unused]] const GstCaps *caps) +{ + GstLibcameraSrc *self = GST_LIBCAMERA_SRC(element); + g_autoptr(GstPad) pad = NULL; + + GST_DEBUG_OBJECT(self, "new request pad created"); + + pad = gst_pad_new_from_template(templ, name); + g_object_ref_sink(pad); + + { + GLibLocker lock(GST_OBJECT(self->state)); + self->state->srcpads_.push_back(reinterpret_cast(g_object_ref(pad))); + + if (!gst_element_add_pad(element, pad)) + { + GST_ELEMENT_ERROR (element, STREAM, FAILED, + ("Internal data stream error."), ("Could not add pad to element")); + self->state->srcpads_.pop_back(); + return NULL; + } + } + + return reinterpret_cast(g_steal_pointer(&pad)); +} + +static void +gst_libcamera_src_release_pad(GstElement *element, GstPad *pad) +{ + GstLibcameraSrc *self = GST_LIBCAMERA_SRC(element); + + GST_DEBUG_OBJECT (self, "Pad %" GST_PTR_FORMAT " being released", pad); + + { + GLibLocker lock(GST_OBJECT(self->state)); + std::vector &pads = self->state->srcpads_; + auto begin_iterator = pads.begin(); + auto end_iterator = pads.end(); + auto pad_iterator = std::find(begin_iterator, end_iterator, pad); + + if (pad_iterator != end_iterator) + { + g_object_unref(*pad_iterator); + pads.erase(pad_iterator); + } + } + gst_element_remove_pad(element, pad); +} + static void gst_libcamera_src_class_init(GstLibcameraSrcClass *klass) { @@ -650,6 +702,8 @@ gst_libcamera_src_class_init(GstLibcameraSrcClass *klass) object_class->get_property = gst_libcamera_src_get_property; object_class->finalize = gst_libcamera_src_finalize; + 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; gst_element_class_set_metadata(element_class,