Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gst-plugins-base
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
George Kiagiadakis
gst-plugins-base
Commits
8c5725c4
Commit
8c5725c4
authored
Feb 13, 2018
by
Tim-Philipp Müller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
audiomixer, audiointerleave: add to build
https://bugzilla.gnome.org/show_bug.cgi?id=791218
parent
4647d668
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
41 additions
and
8 deletions
+41
-8
configure.ac
configure.ac
+2
-0
gst/audiomixer/Makefile.am
gst/audiomixer/Makefile.am
+2
-5
gst/audiomixer/meson.build
gst/audiomixer/meson.build
+2
-2
gst/meson.build
gst/meson.build
+1
-0
tests/check/Makefile.am
tests/check/Makefile.am
+30
-1
tests/check/elements/.gitignore
tests/check/elements/.gitignore
+2
-0
tests/check/meson.build
tests/check/meson.build
+2
-0
No files found.
configure.ac
View file @
8c5725c4
...
...
@@ -479,6 +479,7 @@ dnl these are all the gst plug-ins, compilable without additional libs
AG_GST_CHECK_PLUGIN(adder)
AG_GST_CHECK_PLUGIN(app)
AG_GST_CHECK_PLUGIN(audioconvert)
AG_GST_CHECK_PLUGIN(audiomixer)
AG_GST_CHECK_PLUGIN(audiorate)
AG_GST_CHECK_PLUGIN(audiotestsrc)
AG_GST_CHECK_PLUGIN(encoding)
...
...
@@ -893,6 +894,7 @@ gst/Makefile
gst/adder/Makefile
gst/app/Makefile
gst/audioconvert/Makefile
gst/audiomixer/Makefile
gst/audiorate/Makefile
gst/audioresample/Makefile
gst/audiotestsrc/Makefile
...
...
gst/audiomixer/Makefile.am
View file @
8c5725c4
...
...
@@ -7,14 +7,11 @@ include $(top_srcdir)/common/orc.mak
libgstaudiomixer_la_SOURCES
=
gstaudiomixer.c gstaudiointerleave.c
nodist_libgstaudiomixer_la_SOURCES
=
$(ORC_NODIST_SOURCES)
libgstaudiomixer_la_CFLAGS
=
\
-I
$(top_srcdir)
/gst-libs
\
-I
$(top_builddir)
/gst-libs
\
$(GST_PLUGINS_BASE_CFLAGS)
$(GST_BASE_CFLAGS)
\
$(GST_PLUGINS_BASE_CFLAGS)
$(GST_BASE_CFLAGS)
\
$(GST_CFLAGS)
$(ORC_CFLAGS)
libgstaudiomixer_la_LDFLAGS
=
$(GST_PLUGIN_LDFLAGS)
libgstaudiomixer_la_LIBADD
=
\
$(top_builddir)
/gst-libs/gst/audio/libgstbadaudio-
$(GST_API_VERSION)
.la
\
$(GST_PLUGINS_BASE_LIBS)
-lgstaudio-
@GST_API_VERSION@
\
$(top_builddir)
/gst-libs/gst/audio/libgstaudio-
$(GST_API_VERSION)
.la
\
$(GST_BASE_LIBS)
$(GST_LIBS)
$(ORC_LIBS)
noinst_HEADERS
=
gstaudiomixer.h gstaudiointerleave.h
...
...
gst/audiomixer/meson.build
View file @
8c5725c4
...
...
@@ -24,9 +24,9 @@ endif
gstaudiomixer = library('gstaudiomixer',
audiomixer_sources, orc_c, orc_h,
c_args : gst_plugins_ba
d_args + [ '-DGST_USE_UNSTABLE_API' ]
,
c_args : gst_plugins_ba
se_args
,
include_directories : [configinc],
dependencies : [
gstbadaudio_dep, gstaudio_dep, gst
base_dep, orc_dep],
dependencies : [
audio_dep, gst_
base_dep, orc_dep],
install : true,
install_dir : plugins_install_dir,
)
gst/meson.build
View file @
8c5725c4
subdir('adder')
subdir('app')
subdir('audioconvert')
subdir('audiomixer')
subdir('audiorate')
subdir('audioresample')
subdir('audiotestsrc')
...
...
tests/check/Makefile.am
View file @
8c5725c4
...
...
@@ -92,6 +92,12 @@ else
check_audioconvert
=
endif
if
USE_PLUGIN_AUDIOMIXER
check_audiomixer
=
elements/audiointerleave elements/audiomixer
else
check_audiomixer
=
endif
if
USE_PLUGIN_PLAYBACK
check_playback
=
elements/decodebin elements/playbin
\
elements/playbin-complex elements/streamsynchronizer
\
...
...
@@ -173,7 +179,7 @@ check_adder =
endif
if
HAVE_ORC
check_orc
=
orc/video orc/audio orc/adder orc/volume orc/videotestsrc
check_orc
=
orc/video orc/audio orc/a
udiomixer orc/a
dder orc/volume orc/videotestsrc
else
check_orc
=
endif
...
...
@@ -253,6 +259,7 @@ check_PROGRAMS = \
$(check_adder)
\
$(check_app)
\
$(check_audioconvert)
\
$(check_audiomixer)
\
$(check_audiorate)
\
$(check_audioresample)
\
$(check_audiotestsrc)
\
...
...
@@ -636,6 +643,21 @@ elements_audioconvert_LDADD = \
$(GST_BASE_LIBS)
\
$(LDADD)
elements_audiomixer_LDADD
=
\
$(top_builddir)
/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la
\
$(GST_BASE_LIBS)
$(GST_CONTROLLER_LIBS)
\
$(LDADD)
elements_audiomixer_CFLAGS
=
\
$(GST_PLUGINS_BASE_CFLAGS)
\
$(GST_BASE_CFLAGS)
$(GST_CONTROLLER_CFLAGS)
\
$(AM_CFLAGS)
elements_audiointerleave_LDADD
=
\
$(top_builddir)
/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la
\
$(GST_BASE_LIBS)
$(LDADD)
elements_audiointerleave_CFLAGS
=
\
$(GST_PLUGINS_BASE_CFLAGS)
$(GST_BASE_CFLAGS)
$(AM_CFLAGS)
elements_audiorate_LDADD
=
\
$(top_builddir)
/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la
\
$(GST_BASE_LIBS)
\
...
...
@@ -851,6 +873,9 @@ nodist_orc_audio_SOURCES = orc/audio.c
orc_adder_CFLAGS
=
$(ORC_CFLAGS)
orc_adder_LDADD
=
$(ORC_LIBS)
-lorc-test-0
.4
nodist_orc_adder_SOURCES
=
orc/adder.c
orc_audiomixer_CFLAGS
=
$(ORC_CFLAGS)
orc_audiomixer_LDADD
=
$(ORC_LIBS)
-lorc-test-0
.4
nodist_orc_audiomixer_SOURCES
=
orc/audiomixer.c
orc_volume_CFLAGS
=
$(ORC_CFLAGS)
orc_volume_LDADD
=
$(ORC_LIBS)
-lorc-test-0
.4
nodist_orc_volume_SOURCES
=
orc/volume.c
...
...
@@ -866,6 +891,10 @@ orc/audio.c: $(top_srcdir)/gst-libs/gst/audio/gstaudiopack.orc
$(MKDIR_P)
orc/
$(ORCC)
--test
-o
$@
$<
orc/audiomixer.c
:
$(top_srcdir)/gst/audiomixer/gstaudiomixerorc.orc
$(MKDIR_P)
orc
$(ORCC)
--test
-o
$@
$<
orc/adder.c
:
$(top_srcdir)/gst/adder/gstadderorc.orc
$(MKDIR_P)
orc/
$(ORCC)
--test
-o
$@
$<
...
...
tests/check/elements/.gitignore
View file @
8c5725c4
...
...
@@ -4,6 +4,8 @@ alsa
appsink
appsrc
audioconvert
audiointerleave
audiomixer
audiorate
audioresample
audiotestsrc
...
...
tests/check/meson.build
View file @
8c5725c4
...
...
@@ -31,6 +31,8 @@ base_tests = [
[ 'elements/appsink.c' ],
[ 'elements/appsrc.c' ],
[ 'elements/audioconvert.c' ],
[ 'elements/audiointerleave.c' ],
[ 'elements/audiomixer.c', false, [ gst_controller_dep ] ],
[ 'elements/audiorate.c' ],
[ 'elements/audiotestsrc.c' ],
[ 'elements/audioresample.c' ],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment