From patchwork Tue Sep 21 17:39:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vedant Paranjape X-Patchwork-Id: 13880 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 3AE04BF01C for ; Tue, 21 Sep 2021 17:40:23 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id EF7BA6918F; Tue, 21 Sep 2021 19:40:22 +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="HdP6Wh5j"; dkim-atps=neutral Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2DAE360247 for ; Tue, 21 Sep 2021 19:40:21 +0200 (CEST) Received: by mail-pf1-x430.google.com with SMTP id j6so200225pfa.4 for ; Tue, 21 Sep 2021 10:40:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tb4uXsSEYUVCuLNaLZVZWGtIEeTVTZs1So588/ItGS8=; b=HdP6Wh5jDsfb7R08nTVTSe4HEl0u/Ya3olPXo9enQ8UOJ6gXI2ev45uPe/LliHB9MU ksKOBfcNm/X2+L1nGLhNkQ/QR+po94gAkk1NhTObW3x/Io/3IYZQFQWMNhE2Iu8ngyWE 8btIO3za939/ZytIZtSNC7gpaKkC65TEAWTOFSIFJD/BDpSXvdKRbqPV632YdmpzODRw 2AbRxUXyvTDHTRBlUNq2fYLyx41rur1TvzVWTr/DpIlOeZ6sSVhOaNna06CBAx2+e7Yb K2sDSKAJmAxZ8mPENRuoD0ByQIgRymNHn0514bSZMruLOLGWd7ohJl3Pj6qnY/I7NuHR VBAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tb4uXsSEYUVCuLNaLZVZWGtIEeTVTZs1So588/ItGS8=; b=0zNLpFp2qVlnwNDlIqM+gs2WrKI+Fi+35Cy5Hk9UMYIpJeO0kPHz6AeMxKfE5z5NuE DAYkVKGlvAtHhGqLK4ODE+7H3A1fOU+FmrQNJCI3RcaoabmFXeGdvBIbBbgJGMNWz5Hs ZBZSwElNDLPPYqhF2RVrzLowuA/HiGsm4b1diAm5TVEAyhKN4D7JtAzKuqdEcyZCWmaM HWczxXbLPh2CCEV3DnUhUF0G/a8c8jkjoAnQ7Mf2M/pj/GdVLf9lVOe8V0LAayekAfIf SkGEToX/JwjwjyBU1uB33/o6jeQFLn5AjVEIM+eV8l8ilZxpHkawxmGpV9pO1Ro5jxJj LfyA== X-Gm-Message-State: AOAM533PPCpJ9iE1V2asr/1WocaYvIGWBGFFEG4iGhjgD874ZMOnVuA9 kdTvk894Dgxj8ZTXEM3lvMjjrQCITbi5PA== X-Google-Smtp-Source: ABdhPJwzns9XmSq/4v95jqJVXmSNdb2T4rFplPfpLnGpABWYBgpPJwgBXxf3rFbfkA5rM+z3jUh2QQ== X-Received: by 2002:a63:4464:: with SMTP id t36mr29431811pgk.4.1632246019530; Tue, 21 Sep 2021 10:40:19 -0700 (PDT) Received: from localhost.localdomain ([1.186.167.167]) by smtp.googlemail.com with ESMTPSA id k190sm19800772pgc.11.2021.09.21.10.40.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 10:40:19 -0700 (PDT) From: Vedant Paranjape To: libcamera-devel@lists.libcamera.org Date: Tue, 21 Sep 2021 23:09:54 +0530 Message-Id: <20210921173955.20408-2-vedantparanjape160201@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210921173955.20408-1-vedantparanjape160201@gmail.com> References: <20210921173955.20408-1-vedantparanjape160201@gmail.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 2/3] test: gstreamer: Simplify single stream test using functions from GstUtils 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: Nicolas Dufresne , Vedant Paranjape Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Simplify memory handling and complexity of the test by using gst_parse_bin_from_description_full [1]. [1]: https://gstreamer.freedesktop.org/documentation/gstreamer/gstutils.html?gi-language=c#gst_parse_bin_from_description_full Signed-off-by: Vedant Paranjape Reviewed-by: Nicolas Dufresne Reviewed-by: Paul Elder --- .../gstreamer_single_stream_test.cpp | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/test/gstreamer/gstreamer_single_stream_test.cpp b/test/gstreamer/gstreamer_single_stream_test.cpp index 2b561d6bf9f2..bd74ada0e244 100644 --- a/test/gstreamer/gstreamer_single_stream_test.cpp +++ b/test/gstreamer/gstreamer_single_stream_test.cpp @@ -33,20 +33,18 @@ protected: if (status_ != TestPass) return status_; - g_autoptr(GstElement) convert0 = gst_element_factory_make("videoconvert", "convert0"); - g_autoptr(GstElement) sink0 = gst_element_factory_make("fakesink", "sink0"); - g_object_ref_sink(convert0); - g_object_ref_sink(sink0); - - if (!convert0 || !sink0) { - g_printerr("Not all elements could be created. %p.%p\n", - convert0, sink0); - + const gchar *streamDescription = "videoconvert ! fakesink"; + g_autoptr(GError) error0 = NULL; + stream0_ = gst_parse_bin_from_description_full(streamDescription, TRUE, + NULL, + GST_PARSE_FLAG_FATAL_ERRORS, + &error0); + + if (!stream0_) { + g_printerr("Bin could not be created (%s)\n", error0->message); return TestFail; } - - convert0_ = reinterpret_cast(g_steal_pointer(&convert0)); - sink0_ = reinterpret_cast(g_steal_pointer(&sink0)); + g_object_ref_sink(stream0_); if (createPipeline() != TestPass) return TestFail; @@ -57,8 +55,8 @@ protected: int run() override { /* Build the pipeline */ - gst_bin_add_many(GST_BIN(pipeline_), libcameraSrc_, convert0_, sink0_, NULL); - if (gst_element_link_many(libcameraSrc_, convert0_, sink0_, NULL) != TRUE) { + gst_bin_add_many(GST_BIN(pipeline_), libcameraSrc_, stream0_, NULL); + if (gst_element_link(libcameraSrc_, stream0_) != TRUE) { g_printerr("Elements could not be linked.\n"); return TestFail; } @@ -74,13 +72,11 @@ protected: void cleanup() override { - g_clear_object(&convert0_); - g_clear_object(&sink0_); + g_clear_object(&stream0_); } private: - GstElement *convert0_; - GstElement *sink0_; + GstElement *stream0_; }; TEST_REGISTER(GstreamerSingleStreamTest)