Commit f331412a authored by Tim-Philipp Müller's avatar Tim-Philipp Müller

opus: move Opus audio decoder and encoder from -bad to -base

Hook into build system after moving history.

https://bugzilla.gnome.org/show_bug.cgi?id=756282
parent a2eb4300
...@@ -687,6 +687,19 @@ AG_GST_CHECK_FEATURE(OGG, [Xiph Ogg library], ogg, [ ...@@ -687,6 +687,19 @@ AG_GST_CHECK_FEATURE(OGG, [Xiph Ogg library], ogg, [
AG_GST_PKG_CHECK_MODULES(OGG, ogg >= 1.0) AG_GST_PKG_CHECK_MODULES(OGG, ogg >= 1.0)
]) ])
dnl *** Opus ***
translit(dnm, m, l) AM_CONDITIONAL(USE_OPUS, true)
AG_GST_CHECK_FEATURE(OPUS, [opus], opus, [
PKG_CHECK_MODULES(OPUS, opus >= 0.9.4, [
AC_DEFINE([HAVE_OPUS], 1, [Define if Opus >= 0.9.4 is installed])
HAVE_OPUS="yes"
], [
HAVE_OPUS="no"
])
AC_SUBST(OPUS_CFLAGS)
AC_SUBST(OPUS_LIBS)
])
dnl *** pango *** dnl *** pango ***
translit(dnm, m, l) AM_CONDITIONAL(USE_PANGO, true) translit(dnm, m, l) AM_CONDITIONAL(USE_PANGO, true)
AG_GST_CHECK_FEATURE(PANGO, [Pango font rendering], pango, [ AG_GST_CHECK_FEATURE(PANGO, [Pango font rendering], pango, [
...@@ -731,6 +744,7 @@ AM_CONDITIONAL(USE_CDPARANOIA, false) ...@@ -731,6 +744,7 @@ AM_CONDITIONAL(USE_CDPARANOIA, false)
AM_CONDITIONAL(USE_IVORBIS, false) AM_CONDITIONAL(USE_IVORBIS, false)
AM_CONDITIONAL(USE_LIBVISUAL, false) AM_CONDITIONAL(USE_LIBVISUAL, false)
AM_CONDITIONAL(USE_OGG, false) AM_CONDITIONAL(USE_OGG, false)
AM_CONDITIONAL(USE_OPUS, false)
AM_CONDITIONAL(USE_PANGO, false) AM_CONDITIONAL(USE_PANGO, false)
AM_CONDITIONAL(USE_THEORA, false) AM_CONDITIONAL(USE_THEORA, false)
AM_CONDITIONAL(USE_VORBIS, false) AM_CONDITIONAL(USE_VORBIS, false)
...@@ -849,6 +863,7 @@ ext/alsa/Makefile ...@@ -849,6 +863,7 @@ ext/alsa/Makefile
ext/cdparanoia/Makefile ext/cdparanoia/Makefile
ext/libvisual/Makefile ext/libvisual/Makefile
ext/ogg/Makefile ext/ogg/Makefile
ext/opus/Makefile
ext/pango/Makefile ext/pango/Makefile
ext/theora/Makefile ext/theora/Makefile
ext/vorbis/Makefile ext/vorbis/Makefile
......
...@@ -22,6 +22,12 @@ else ...@@ -22,6 +22,12 @@ else
OGG_DIR= OGG_DIR=
endif endif
if USE_OPUS
OPUS_DIR=opus
else
OPUS_DIR=
endif
if USE_PANGO if USE_PANGO
PANGO_DIR = pango PANGO_DIR = pango
else else
...@@ -53,6 +59,7 @@ SUBDIRS = \ ...@@ -53,6 +59,7 @@ SUBDIRS = \
$(CDPARANOIA_DIR) \ $(CDPARANOIA_DIR) \
$(LIBVISUAL_DIR) \ $(LIBVISUAL_DIR) \
$(OGG_DIR) \ $(OGG_DIR) \
$(OPUS_DIR) \
$(PANGO_DIR) \ $(PANGO_DIR) \
$(THEORA_DIR) \ $(THEORA_DIR) \
$(VORBIS_DIR) $(VORBIS_DIR)
...@@ -62,6 +69,7 @@ DIST_SUBDIRS = \ ...@@ -62,6 +69,7 @@ DIST_SUBDIRS = \
cdparanoia \ cdparanoia \
libvisual \ libvisual \
ogg \ ogg \
opus \
pango \ pango \
theora \ theora \
vorbis vorbis
......
plugin_LTLIBRARIES = libgstopus.la plugin_LTLIBRARIES = libgstopus.la
libgstopus_la_SOURCES = gstopus.c gstopusdec.c gstopusenc.c gstopusparse.c gstopusheader.c gstopuscommon.c gstrtpopuspay.c gstrtpopusdepay.c libgstopus_la_SOURCES = gstopus.c gstopusdec.c gstopusenc.c gstopusheader.c gstopuscommon.c
libgstopus_la_CFLAGS = \ libgstopus_la_CFLAGS = \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
$(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BAD_CFLAGS) \
...@@ -8,13 +8,13 @@ libgstopus_la_CFLAGS = \ ...@@ -8,13 +8,13 @@ libgstopus_la_CFLAGS = \
$(GST_CFLAGS) \ $(GST_CFLAGS) \
$(OPUS_CFLAGS) $(OPUS_CFLAGS)
libgstopus_la_LIBADD = \ libgstopus_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \ $(top_builddir)/gst-libs/gst/tag/libgsttag-$(GST_API_VERSION).la \
-lgsttag-$(GST_API_VERSION) -lgstrtp-$(GST_API_VERSION) \ $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-$(GST_API_VERSION).la \
-lgstpbutils-$(GST_API_VERSION) \ $(top_builddir)/gst-libs/gst/audio/libgstaudio-$(GST_API_VERSION).la \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
$(GST_LIBS) \ $(GST_LIBS) \
$(OPUS_LIBS) $(OPUS_LIBS)
libgstopus_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM) libgstopus_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM)
libgstopus_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) libgstopus_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstopusenc.h gstopusdec.h gstopusparse.h gstopusheader.h gstopuscommon.h gstrtpopuspay.h gstrtpopusdepay.h noinst_HEADERS = gstopusenc.h gstopusdec.h gstopusheader.h gstopuscommon.h
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
#include "gstopusdec.h" #include "gstopusdec.h"
#include "gstopusenc.h" #include "gstopusenc.h"
#include "gstopusparse.h"
#include "gstrtpopuspay.h"
#include "gstrtpopusdepay.h"
#include <gst/tag/tag.h> #include <gst/tag/tag.h>
...@@ -42,18 +38,6 @@ plugin_init (GstPlugin * plugin) ...@@ -42,18 +38,6 @@ plugin_init (GstPlugin * plugin)
GST_TYPE_OPUS_DEC)) GST_TYPE_OPUS_DEC))
return FALSE; return FALSE;
if (!gst_element_register (plugin, "opusparse", GST_RANK_NONE,
GST_TYPE_OPUS_PARSE))
return FALSE;
if (!gst_element_register (plugin, "rtpopusdepay", GST_RANK_SECONDARY,
GST_TYPE_RTP_OPUS_DEPAY))
return FALSE;
if (!gst_element_register (plugin, "rtpopuspay", GST_RANK_SECONDARY,
GST_TYPE_RTP_OPUS_PAY))
return FALSE;
gst_tag_register_musicbrainz_tags (); gst_tag_register_musicbrainz_tags ();
return TRUE; return TRUE;
......
...@@ -42,6 +42,12 @@ else ...@@ -42,6 +42,12 @@ else
check_ogg = check_ogg =
endif endif
if USE_OPUS
check_opus = elements/opus
else
check_opus =
endif
if USE_PANGO if USE_PANGO
check_pango = elements/textoverlay check_pango = elements/textoverlay
else else
...@@ -224,6 +230,7 @@ check_PROGRAMS = \ ...@@ -224,6 +230,7 @@ check_PROGRAMS = \
$(check_encodebin) \ $(check_encodebin) \
$(check_gio) \ $(check_gio) \
$(check_ogg) \ $(check_ogg) \
$(check_opus) \
$(check_pango) \ $(check_pango) \
$(check_playback) \ $(check_playback) \
$(check_subparse) \ $(check_subparse) \
......
...@@ -12,6 +12,7 @@ encodebin ...@@ -12,6 +12,7 @@ encodebin
libvisual libvisual
multifdsink multifdsink
multisocketsink multisocketsink
opus
videorate videorate
videotestsrc videotestsrc
volume volume
...@@ -24,5 +25,6 @@ vorbistag ...@@ -24,5 +25,6 @@ vorbistag
playbin playbin
playbin-compressed playbin-compressed
playbin-complex playbin-complex
playsink
streamsynchronizer streamsynchronizer
subparse subparse
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment