audio: Move audioaggregator base class to a library

It's useful enough already to be used in other elements for audio aggregation,
let's give people the opportunity to use it and give it some API testing.

https://bugzilla.gnome.org/show_bug.cgi?id=760733
This commit is contained in:
Sebastian Dröge 2016-01-16 18:56:26 +02:00
parent a2376d00cf
commit 8a1fa31c67
10 changed files with 67 additions and 7 deletions

View file

@ -3570,6 +3570,7 @@ gst-libs/gst/wayland/Makefile
gst-libs/gst/base/Makefile gst-libs/gst/base/Makefile
gst-libs/gst/player/Makefile gst-libs/gst/player/Makefile
gst-libs/gst/video/Makefile gst-libs/gst/video/Makefile
gst-libs/gst/audio/Makefile
sys/Makefile sys/Makefile
sys/dshowdecwrapper/Makefile sys/dshowdecwrapper/Makefile
sys/acmenc/Makefile sys/acmenc/Makefile
@ -3723,6 +3724,8 @@ pkgconfig/gstreamer-bad-base.pc
pkgconfig/gstreamer-bad-base-uninstalled.pc pkgconfig/gstreamer-bad-base-uninstalled.pc
pkgconfig/gstreamer-bad-video.pc pkgconfig/gstreamer-bad-video.pc
pkgconfig/gstreamer-bad-video-uninstalled.pc pkgconfig/gstreamer-bad-video-uninstalled.pc
pkgconfig/gstreamer-bad-audio.pc
pkgconfig/gstreamer-bad-audio-uninstalled.pc
tools/Makefile tools/Makefile
m4/Makefile m4/Makefile
) )

View file

@ -11,14 +11,14 @@ WAYLAND_DIR=wayland
endif endif
SUBDIRS = uridownloader adaptivedemux interfaces basecamerabinsrc codecparsers \ SUBDIRS = uridownloader adaptivedemux interfaces basecamerabinsrc codecparsers \
insertbin mpegts base video player $(GL_DIR) $(WAYLAND_DIR) insertbin mpegts base video audio player $(GL_DIR) $(WAYLAND_DIR)
noinst_HEADERS = gst-i18n-plugin.h gettext.h glib-compat-private.h noinst_HEADERS = gst-i18n-plugin.h gettext.h glib-compat-private.h
DIST_SUBDIRS = uridownloader adaptivedemux interfaces gl basecamerabinsrc \ DIST_SUBDIRS = uridownloader adaptivedemux interfaces gl basecamerabinsrc \
codecparsers insertbin mpegts wayland base video player codecparsers insertbin mpegts wayland base video audio player
#dependencies #dependencies
video: base video, audio: base
adaptivedemux: uridownloader adaptivedemux: uridownloader

View file

@ -0,0 +1,26 @@
# variables used for enum generation
lib_LTLIBRARIES = libgstbadaudio-@GST_API_VERSION@.la
CLEANFILES =
libgstbadaudio_@GST_API_VERSION@_la_SOURCES = \
gstaudioaggregator.c
nodist_libgstbadaudio_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
libgstbadaudio_@GST_API_VERSION@_la_CFLAGS = \
-DGST_USE_UNSTABLE_API \
-I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \
$(GST_CFLAGS) $(ORC_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS)
libgstbadaudio_@GST_API_VERSION@_la_LIBADD = \
$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
libgstbadaudio_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
noinst_HEADERS = gstaudioaggregator.h

View file

@ -4,7 +4,7 @@ ORC_SOURCE=gstaudiomixerorc
include $(top_srcdir)/common/orc.mak include $(top_srcdir)/common/orc.mak
libgstaudiomixer_la_SOURCES = gstaudiomixer.c gstaudioaggregator.c gstaudiointerleave.c libgstaudiomixer_la_SOURCES = gstaudiomixer.c gstaudiointerleave.c
nodist_libgstaudiomixer_la_SOURCES = $(ORC_NODIST_SOURCES) nodist_libgstaudiomixer_la_SOURCES = $(ORC_NODIST_SOURCES)
libgstaudiomixer_la_CFLAGS = \ libgstaudiomixer_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
@ -14,9 +14,10 @@ libgstaudiomixer_la_CFLAGS = \
libgstaudiomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudiomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstaudiomixer_la_LIBADD = \ libgstaudiomixer_la_LIBADD = \
$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \ $(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
$(top_builddir)/gst-libs/gst/audio/libgstbadaudio-$(GST_API_VERSION).la \
$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
$(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS)
libgstaudiomixer_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) libgstaudiomixer_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstaudiomixer.h gstaudioaggregator.h gstaudiointerleave.h noinst_HEADERS = gstaudiomixer.h gstaudiointerleave.h

View file

@ -27,7 +27,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include "gstaudioaggregator.h" #include <gst/audio/gstaudioaggregator.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -26,7 +26,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include "gstaudioaggregator.h" #include <gst/audio/gstaudioaggregator.h>
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -0,0 +1,15 @@
prefix=
exec_prefix=
libdir=${pcfiledir}/../gst-libs/gst/audio
includedir=${pcfiledir}/../gst-libs
pluginsdir=${pcfiledir}/..
Name: GStreamer bad audio library, uninstalled
Description: Bad audio library for GStreamer, Not Installed
Version: @VERSION@
Requires: gstreamer-@GST_API_VERSION@
Libs: -L${libdir} ${libdir}/libgstbadaudio-@GST_API_VERSION@.la @BADBASE_LIBS@
Cflags: -I${includedir} -I@srcdir@/.. @BADBASE_CFLAGS@
libraries=badaudio

View file

@ -0,0 +1,15 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_API_VERSION@
pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
Name: GStreamer bad audio library, uninstalled
Description: Bad audio library for GStreamer elements, Not Installed
Version: @VERSION@
Requires: gstreamer-@GST_API_VERSION@
Libs: -L${libdir} ${libdir}/libgstbadaudio-@GST_API_VERSION@.la @BADBASE_LIBS@
Cflags: -I${includedir} -I@srcdir@/.. @BADBASE_CFLAGS@
libraries=badaudio