From patchwork Thu Jun 10 07:09:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vedant Paranjape X-Patchwork-Id: 12532 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 DBEF5BD78E for ; Thu, 10 Jun 2021 07:10:05 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3075E6892B; Thu, 10 Jun 2021 09:10:05 +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="du9bfTVw"; dkim-atps=neutral Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C83F1602C5 for ; Thu, 10 Jun 2021 09:10:03 +0200 (CEST) Received: by mail-pj1-x1032.google.com with SMTP id g24so3081542pji.4 for ; Thu, 10 Jun 2021 00:10:03 -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=2DIOQLcICHxmqfkjA/1fwLUex5jwJeqagQeEWy0MNQo=; b=du9bfTVwRFOpXsjR6eI2vbvfUp3VRCMAnEezoSlIR3fLsijR9Dh6eixiCi2pxTcvyM 1GyAA9H97Tp9tdIme5tXYniY99mALNB3gMFG7AUu/fApZKBHBvbYqIlQs6Y7d7cFmP0L HgLU2NLdWHtKCwMV6V1b2PF7GqPOZOBo66A+ytMcZ8ogtyUGjgtQpfBdw+W2lHOwGPGP 8Zq8a21SESB5p0JRhkG+86EFf61gKV/LerhBI3f6IgId/6c1WyJ8OXCM6s8W6dbSuT2R LsdPztYgCZw/Sh9u7W/KjdXqjvP4SsVkG7qDpwh3xUGEABNqn+jqjPVnZVhWg+zmTlnh fFSA== 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=2DIOQLcICHxmqfkjA/1fwLUex5jwJeqagQeEWy0MNQo=; b=b1IC6QafPAHO6p2Idhw/yOnA8wISNhmYYVZgQjxWkXDHtjNX88aKkvKVWZe1cZ6WNi LrTJGYXRqhbQoc0EnJRRwCJyfEOH8RFqTt2AflOr5XPAWXcSLCLo/X++/ACTcc+09ngw pRZdH/UwZ3qkuQO2ifMqXbRMTukN6q3NwEyAhOezW/U14oZl1+Edey7HyW8JGiYsANJw w/atI9EjxFovuFMsy/d5iVBAkjq5qYHz0NXYeZeNESudMYvXQiorX59M+481ou30X6YF HqpaBYFPlmU0Vnv/94e77i6MkRTK9xK/kLBaz1se49pzF5ty4cJKx0do2pGEx5cjAaQl IeGA== X-Gm-Message-State: AOAM531d7zQYAm25CVCf6+a3yhEON5AAzWhk3KiKO32r7b9+/NA7R3Va XmWu2WlFGcp5/WXN356f4ox/Zm3jQGHePEH9fQw= X-Google-Smtp-Source: ABdhPJz+sMyExgSRUUv9boGX8m5Ed4GCSfZ0YxzPjD88c300GiLXTQXfqWRczSh7uLChPrecCN4TOw== X-Received: by 2002:a17:902:e804:b029:115:b33c:7c7b with SMTP id u4-20020a170902e804b0290115b33c7c7bmr3696715plg.28.1623309001825; Thu, 10 Jun 2021 00:10:01 -0700 (PDT) Received: from localhost.localdomain ([1.186.76.76]) by smtp.googlemail.com with ESMTPSA id c4sm1584707pfo.195.2021.06.10.00.09.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jun 2021 00:10:01 -0700 (PDT) From: Vedant Paranjape To: libcamera-devel@lists.libcamera.org Date: Thu, 10 Jun 2021 12:39:30 +0530 Message-Id: <20210610070930.67031-1-vedantparanjape160201@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH v2] 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. It defines the functions gst_libcamera_src_request_new_pad() and gst_libcamera_src_release_pad() which handle, creating and releasing request pads. It also assigned these functions to their callback handlers in GstLibcameraSrcClass. gst_pad_create_stream_id() failed since, this element has more than 2 source pads, and we were passing nullptr to it's stream_id argument. It fails to auto generate a stream id. 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 --- 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,