summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/check/Makefile.am18
-rw-r--r--tests/check/elements/.gitignore1
-rw-r--r--tests/check/meson.build1
-rw-r--r--tests/examples/Makefile.am4
-rw-r--r--tests/examples/compositor/Makefile.am5
-rw-r--r--tests/examples/compositor/crossfade.c133
-rw-r--r--tests/examples/compositor/meson.build15
-rw-r--r--tests/examples/meson.build1
8 files changed, 3 insertions, 175 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index a4e0fa980..9cdfd96cb 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -127,7 +127,7 @@ check_kate=
endif
if HAVE_ORC
-check_orc = orc/bayer orc/compositor
+check_orc = orc/bayer
else
check_orc =
endif
@@ -269,7 +269,6 @@ check_PROGRAMS = \
elements/camerabin \
elements/gdppay \
elements/gdpdepay \
- elements/compositor \
$(check_jifmux) \
elements/jpegparse \
elements/h263parse \
@@ -572,12 +571,6 @@ orc/bayer.c: $(top_srcdir)/gst/bayer/gstbayerorc.orc
$(MKDIR_P) orc
$(ORCC) --test -o $@ $<
-elements_compositor_LDADD = \
- $(GST_PLUGINS_BASE_LIBS) $(GST_VIDEO_LIBS) $(GST_BASE_LIBS) $(LDADD)
-elements_compositor_CFLAGS = \
- $(GST_PLUGINS_BASE_CFLAGS) \
- $(GST_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
-
elements_hlsdemux_m3u8_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) -I$(top_srcdir)/ext/hls
elements_hlsdemux_m3u8_LDADD = $(GST_BASE_LIBS) $(LDADD)
elements_hlsdemux_m3u8_SOURCES = elements/hlsdemux_m3u8.c
@@ -589,15 +582,6 @@ elements_hls_demux_LDADD = \
$(GST_BASE_LIBS) $(LDADD)
elements_hls_demux_SOURCES = elements/test_http_src.c elements/test_http_src.h elements/adaptive_demux_engine.c elements/adaptive_demux_engine.h elements/adaptive_demux_common.c elements/adaptive_demux_common.h elements/hls_demux.c
-orc_compositor_CFLAGS = $(ORC_CFLAGS)
-orc_compositor_LDADD = $(ORC_LIBS) -lorc-test-0.4
-nodist_orc_compositor_SOURCES = orc/compositor.c
-orc_videobox_CFLAGS = $(ORC_CFLAGS)
-
-orc/compositor.c: $(top_srcdir)/gst/compositor/compositororc.orc
- $(MKDIR_P) orc/
- $(ORCC) --test -o $@ $<
-
elements_webrtcbin_LDADD = \
$(top_builddir)/gst-libs/gst/webrtc/libgstwebrtc-@GST_API_VERSION@.la \
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_SDP_LIBS) $(LDADD)
diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore
index 6f667b1f4..fb28a31a1 100644
--- a/tests/check/elements/.gitignore
+++ b/tests/check/elements/.gitignore
@@ -9,7 +9,6 @@ camerabin
ccconverter
cccombiner
ccextractor
-compositor
curlfilesink
curlftpsink
curlhttpsink
diff --git a/tests/check/meson.build b/tests/check/meson.build
index bed4bc858..1bd19dceb 100644
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -54,7 +54,6 @@ if host_machine.system() != 'windows'
[['elements/ccconverter.c']],
[['elements/cccombiner.c']],
[['elements/ccextractor.c']],
- [['elements/compositor.c'], not cdata.has('HAVE_UNISTD_H')],
[['elements/curlhttpsink.c'], not curl_dep.found(), [curl_dep]],
[['elements/curlfilesink.c'],
not curl_dep.found() or not cdata.has('HAVE_UNISTD_H'), [curl_dep]],
diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
index 5dc561460..d4e04d9e4 100644
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@ -58,10 +58,10 @@ playout_SOURCES = playout.c
playout_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
playout_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_LIBS)
-SUBDIRS= codecparsers compositor mpegts $(DIRECTFB_DIR) $(GTK_EXAMPLES) $(OPENCV_EXAMPLES) \
+SUBDIRS= codecparsers mpegts $(DIRECTFB_DIR) $(GTK_EXAMPLES) $(OPENCV_EXAMPLES) \
$(AVSAMPLE_DIR) $(WAYLAND_DIR) $(MATRIXMIX_DIR) \
$(IPCPIPELINE_DIR) $(WEBRTC_DIR)
-DIST_SUBDIRS= codecparsers compositor mpegts camerabin2 directfb mxf opencv uvch264 \
+DIST_SUBDIRS= codecparsers mpegts camerabin2 directfb mxf opencv uvch264 \
avsamplesink waylandsink audiomixmatrix ipcpipeline webrtc
include $(top_srcdir)/common/parallel-subdirs.mak
diff --git a/tests/examples/compositor/Makefile.am b/tests/examples/compositor/Makefile.am
deleted file mode 100644
index 2099130fc..000000000
--- a/tests/examples/compositor/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-noinst_PROGRAMS = crossfade
-
-crossfade_SOURCES = crossfade.c
-crossfade_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS)
-crossfade_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS)
diff --git a/tests/examples/compositor/crossfade.c b/tests/examples/compositor/crossfade.c
deleted file mode 100644
index 503503ca9..000000000
--- a/tests/examples/compositor/crossfade.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * GStreamer
- * Copyright (C) 2017 Thibault Saunier <thibault.saunier@osg-samsung.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/**
- * Simple crossfade example using the compositor element.
- *
- * Takes two video files and crossfades them for 10 seconds and returns.
- */
-
-#include <stdlib.h>
-#include <gst/gst.h>
-#include <gst/controller/gstdirectcontrolbinding.h>
-#include <gst/controller/gstinterpolationcontrolsource.h>
-
-typedef struct
-{
- GstElement *compositor;
- guint z_order;
-} VideoInfo;
-
-static gchar *
-ensure_uri (const gchar * location)
-{
- if (gst_uri_is_valid (location))
- return g_strdup (location);
- else
- return gst_filename_to_uri (location, NULL);
-}
-
-static void
-_pad_added_cb (GstElement * decodebin, GstPad * pad, VideoInfo * info)
-{
- GstPad *sinkpad =
- gst_element_get_request_pad (GST_ELEMENT (info->compositor), "sink_%u");
- GstControlSource *control_source;
- gboolean is_last = info->z_order == 1;
-
- control_source = gst_interpolation_control_source_new ();
-
- gst_util_set_object_arg (G_OBJECT (sinkpad), "operator",
- info->z_order == 0 ? "source" : "add");
- gst_object_add_control_binding (GST_OBJECT (sinkpad),
- gst_direct_control_binding_new_absolute (GST_OBJECT (sinkpad), "alpha",
- control_source));
-
- g_object_set (control_source, "mode", GST_INTERPOLATION_MODE_LINEAR, NULL);
-
- gst_timed_value_control_source_set (GST_TIMED_VALUE_CONTROL_SOURCE
- (control_source), 0, is_last ? 0.0 : 1.0);
- gst_timed_value_control_source_set (GST_TIMED_VALUE_CONTROL_SOURCE
- (control_source), 10 * GST_SECOND, is_last ? 1.0 : 0.0);
- g_object_set (sinkpad, "zorder", info->z_order, NULL);
-
- gst_pad_link (pad, sinkpad);
-
- g_free (info);
-}
-
-int
-main (int argc, char *argv[])
-{
- gint i;
- GstMessage *message;
- GstElement *compositor, *sink, *pipeline;
- GstBus *bus;
-
- if (argc != 3) {
- g_error ("Need to provide 2 input videos");
- return -1;
- }
-
- gst_init (&argc, &argv);
- pipeline = gst_element_factory_make ("pipeline", NULL);
- compositor = gst_element_factory_make ("compositor", NULL);
- sink =
- gst_parse_bin_from_description ("videoconvert ! autovideosink", TRUE,
- NULL);
-
- gst_util_set_object_arg (G_OBJECT (compositor), "background", "black");
-
- gst_bin_add_many (GST_BIN (pipeline), compositor, sink, NULL);
- g_assert (gst_element_link (compositor, sink));
-
- for (i = 1; i < 3; i++) {
- gchar *uri = ensure_uri (argv[i]);
- VideoInfo *info = g_malloc0 (sizeof (VideoInfo));
- GstElement *uridecodebin = gst_element_factory_make ("uridecodebin", NULL);
-
- g_object_set (uridecodebin, "uri", uri, "expose-all-streams", FALSE,
- "caps", gst_caps_from_string ("video/x-raw(ANY)"), NULL);
-
- info->compositor = compositor;
- info->z_order = i - 1;
- g_signal_connect (uridecodebin, "pad-added", (GCallback) _pad_added_cb,
- info);
-
- gst_bin_add (GST_BIN (pipeline), uridecodebin);
- }
-
- bus = gst_element_get_bus (pipeline);
- gst_element_set_state (pipeline, GST_STATE_PLAYING);
-
- message =
- gst_bus_timed_pop_filtered (bus, 11 * GST_SECOND,
- GST_MESSAGE_EOS | GST_MESSAGE_ERROR);
- GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (pipeline),
- GST_DEBUG_GRAPH_SHOW_ALL, "go");
- if (message)
- gst_print ("%" GST_PTR_FORMAT "\n", message);
- else
- gst_print ("Timeout\n");
- gst_element_set_state (pipeline, GST_STATE_NULL);
- gst_object_unref (pipeline);
-
- return 0;
-}
diff --git a/tests/examples/compositor/meson.build b/tests/examples/compositor/meson.build
deleted file mode 100644
index be803d1b1..000000000
--- a/tests/examples/compositor/meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
-examples = [ 'crossfade' ]
-
-foreach example : examples
- exe_name = example
- src_file = '@0@.c'.format(example)
-
- executable(exe_name,
- src_file,
- install: false,
- include_directories : [configinc],
- dependencies : [glib_dep, gst_dep, gstcontroller_dep],
- c_args : ['-DHAVE_CONFIG_H=1' ],
- )
-endforeach
-
diff --git a/tests/examples/meson.build b/tests/examples/meson.build
index 54a2d38a2..6a0568239 100644
--- a/tests/examples/meson.build
+++ b/tests/examples/meson.build
@@ -2,7 +2,6 @@ subdir('audiomixmatrix')
subdir('avsamplesink')
subdir('camerabin2')
subdir('codecparsers')
-subdir('compositor')
subdir('directfb')
subdir('ipcpipeline')
subdir('mpegts')