mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 05:59:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

Dist compositor crossfade example and pythons script for meson build

Browse source 
And add to autotools build so it gets disted.
This commit is contained in:
Tim-Philipp Müller 2018-02-15 18:50:51 +00:00
parent 886ced3684
commit e95fb277cb
6 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -61,6 +61,7 @@ gst*orc.h
/tests/examples/ipcpipeline/ipcpipeline1 /tests/examples/ipcpipeline/ipcpipeline1
/tests/examples/codecparsers/parse-jpeg /tests/examples/codecparsers/parse-jpeg
/tests/examples/codecparsers/parse-vp8 /tests/examples/codecparsers/parse-vp8
/tests/examples/compositor/crossfade
/tests/examples/shapewipe/shapewipe-example /tests/examples/shapewipe/shapewipe-example
/tests/examples/jack/jack_client /tests/examples/jack/jack_client
/tests/examples/opencv/gstmotioncells_dynamic_test /tests/examples/opencv/gstmotioncells_dynamic_test

1
Makefile.am
View file

@ -16,6 +16,7 @@ EXTRA_DIST = \
meson_options.txt \ meson_options.txt \
gst-libs/gst/interfaces/build_mkenum.py \ gst-libs/gst/interfaces/build_mkenum.py \
gst-libs/gst/mpegts/mpegts_enum.py \ gst-libs/gst/mpegts/mpegts_enum.py \
gst-libs/gst/webrtc/webrtc_mkenum.py \
ext/srtp/srtp_mkenum.py \ ext/srtp/srtp_mkenum.py \
ext/vulkan/vkconfig.h.meson ext/vulkan/vkconfig.h.meson

1
configure.ac
View file

@ -2599,6 +2599,7 @@ tests/examples/Makefile
tests/examples/avsamplesink/Makefile tests/examples/avsamplesink/Makefile
tests/examples/camerabin2/Makefile tests/examples/camerabin2/Makefile
tests/examples/codecparsers/Makefile tests/examples/codecparsers/Makefile
tests/examples/compositor/Makefile
tests/examples/directfb/Makefile tests/examples/directfb/Makefile
tests/examples/audiomixmatrix/Makefile tests/examples/audiomixmatrix/Makefile
tests/examples/ipcpipeline/Makefile tests/examples/ipcpipeline/Makefile

4
tests/examples/Makefile.am
View file

@ -58,10 +58,10 @@ playout_SOURCES = playout.c
playout_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) playout_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
playout_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_LIBS) playout_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_LIBS)
SUBDIRS= codecparsers mpegts $(DIRECTFB_DIR) $(GTK_EXAMPLES) $(OPENCV_EXAMPLES) \ SUBDIRS= codecparsers compositor mpegts $(DIRECTFB_DIR) $(GTK_EXAMPLES) $(OPENCV_EXAMPLES) \
$(AVSAMPLE_DIR) $(WAYLAND_DIR) $(MATRIXMIX_DIR) \ $(AVSAMPLE_DIR) $(WAYLAND_DIR) $(MATRIXMIX_DIR) \
$(IPCPIPELINE_DIR) $(WEBRTC_DIR) $(IPCPIPELINE_DIR) $(WEBRTC_DIR)
DIST_SUBDIRS= codecparsers mpegts camerabin2 directfb mxf opencv uvch264 \ DIST_SUBDIRS= codecparsers compositor mpegts camerabin2 directfb mxf opencv uvch264 \
avsamplesink waylandsink audiomixmatrix ipcpipeline webrtc avsamplesink waylandsink audiomixmatrix ipcpipeline webrtc
include $(top_srcdir)/common/parallel-subdirs.mak include $(top_srcdir)/common/parallel-subdirs.mak

5
tests/examples/compositor/Makefile.am Normal file
View file

@ -0,0 +1,5 @@
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)

2
tests/examples/compositor/crossfade.c
View file

@ -37,7 +37,7 @@ typedef struct
gboolean is_last; gboolean is_last;
} VideoInfo; } VideoInfo;
gchar * static gchar *
ensure_uri (const gchar * location) ensure_uri (const gchar * location)
{ {
if (gst_uri_is_valid (location)) if (gst_uri_is_valid (location))