From patchwork Fri Jun 11 19:19:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vedant Paranjape X-Patchwork-Id: 12577 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 4BD4EBD78E for ; Fri, 11 Jun 2021 19:20:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 86F526892B; Fri, 11 Jun 2021 21:20:13 +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="L1SHY3YV"; dkim-atps=neutral Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D9D98602B4 for ; Fri, 11 Jun 2021 21:20:11 +0200 (CEST) Received: by mail-pl1-x630.google.com with SMTP id v12so3306088plo.10 for ; Fri, 11 Jun 2021 12:20:11 -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=1RZ/WBSDE2Ln5+qcmLkTFKVKNDhMX+zuC02m0uNAF9c=; b=L1SHY3YVvYis6mYfc6MpuuhUXZRNjH0wlDFI/L7orPyE9Y9N1oTbohuSrMEyWeXRaF +zgOVUwEHhNOOEekkA0K5ItWlrAJV6Q+P9l8a1Wyz4TFyherq/L0TZ7GaheLq1nFguQr jlA3bdVmAlS7wx9LHnOC9VXVRCB+rta/ftkxiHXX74zbaRh8UQPEDYzDgJtiC2uYriOB oH+MlB/Q7A7IUCnVkz00rSRjewH87ITdFlvA4mn9cfmlguNxcoBnizZq6CAcTtVL4Aa1 JuA0IVRz7V0ydRacDQ8P1y8x1+cWWAfzwx6Abby3pMYr8tiZPIjHqppsyblNym+YEPsG il7A== 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=1RZ/WBSDE2Ln5+qcmLkTFKVKNDhMX+zuC02m0uNAF9c=; b=od7XTCAwujWnvkc1l3vXexgHFbkt/PSz+6o+aVOlKycH4UHQzkZj4WY42mZyLMxiio Cf+Vpo0B4KDVd0TFC1fcluO7xWSmcCJvFU2UfFMbD9yCNprowiQ2V4ff5OOdIJf75RVn pBUV/aKlEq/iqVkW8bAe2gPFWDm40vEBw7Hj7E0VAznw1mn00RGuBsg9Fng9r67rs1sC BH4C+PHGdO1+qmj1Ku3Hz3UBKii8w65UxolFGOwp6/7JyOcmSCO6NHZxrgCFiEPeJTCJ zS1ilJniPwOgDiYl0ayXEP/3xKmZHojOCPi+eMm3EgblGOSxp13bZgHVsi7BXciWXtJm Yt7Q== X-Gm-Message-State: AOAM531Vnej+MV01xPtL5FEpWjH0OcqSM1hgR+HIUSNgnRtGS/cP30DP 8XHrLw69Jjv1/MqVWxjpVq0KTiZveJ+2XpW23yE= X-Google-Smtp-Source: ABdhPJym4K955hrJIJn6Qul1WRhVLGeF4e1qD4D9Xr1hx61RIhEk1dEuu8EiDrljbn5ziqGGx8ZF7Q== X-Received: by 2002:a17:902:8645:b029:fd:25ef:3df7 with SMTP id y5-20020a1709028645b02900fd25ef3df7mr5202366plt.48.1623439209765; Fri, 11 Jun 2021 12:20:09 -0700 (PDT) Received: from localhost.localdomain ([1.186.76.76]) by smtp.googlemail.com with ESMTPSA id n17sm5513907pfv.125.2021.06.11.12.20.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 12:20:09 -0700 (PDT) From: Vedant Paranjape To: libcamera-devel@lists.libcamera.org Date: Sat, 12 Jun 2021 00:49:42 +0530 Message-Id: <20210611191942.36011-1-vedantparanjape160201@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH v4] 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. The following changes were tested using the following test code: https://pastebin.com/gNDF1cyG src/gstreamer/gstlibcamerasrc.cpp | 57 ++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp index ccc61590..5bb8c46c 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,58 @@ 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); + gboolean result = gst_element_add_pad(element, pad); + + if (result) + { + GLibLocker lock(GST_OBJECT(self)); + self->state->srcpads_.push_back(reinterpret_cast(g_object_ref(pad))); + } + else + { + GST_ELEMENT_ERROR (element, STREAM, FAILED, + ("Internal data stream error."), + ("Could not add pad to element")); + 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)); + 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 +703,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,