summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog20
-rw-r--r--configure.ac24
-rw-r--r--ext/amrwb/Makefile.am4
-rw-r--r--ext/amrwb/amrwb-code/Makefile.am9
-rw-r--r--ext/amrwb/amrwb-code/amrwb/Makefile.am63
-rw-r--r--ext/amrwb/amrwb-code/amrwb/README7
-rw-r--r--ext/amrwb/gstamrwbdec.c5
-rw-r--r--ext/amrwb/gstamrwbdec.h5
-rw-r--r--ext/amrwb/gstamrwbenc.h4
-rw-r--r--ext/amrwb/gstamrwbparse.c2
-rw-r--r--ext/amrwb/gstamrwbparse.h3
-rw-r--r--gst-libs/Makefile.am2
-rw-r--r--gst-libs/ext/Makefile.am9
-rw-r--r--gst-libs/ext/amrwb/Makefile.am63
-rw-r--r--gst-libs/ext/amrwb/README7
15 files changed, 46 insertions, 181 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b5c7d79..1623e9d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
2007-05-16 Stefan Kost <ensonic@users.sf.net>
+ patch by: Stanislav Brabec <sbrabec@suse.cz>
+
+ * configure.ac:
+ * ext/amrwb/Makefile.am:
+ * ext/amrwb/amrwb-code/Makefile.am:
+ * ext/amrwb/amrwb-code/amrwb/Makefile.am:
+ * ext/amrwb/amrwb-code/amrwb/README:
+ * ext/amrwb/gstamrwbdec.c:
+ * ext/amrwb/gstamrwbdec.h (__GST_AMRWBDEC_H__):
+ * ext/amrwb/gstamrwbenc.h (__GST_AMRWBENC_H__):
+ * ext/amrwb/gstamrwbparse.c:
+ * ext/amrwb/gstamrwbparse.h (__GST_AMRWBPARSE_H__):
+ * gst-libs/Makefile.am:
+ * gst-libs/ext/Makefile.am:
+ * gst-libs/ext/amrwb/Makefile.am:
+ * gst-libs/ext/amrwb/README:
+ Use external shared libamrwb. Fixes #423741 (with lots of cleanup).
+
+2007-05-16 Stefan Kost <ensonic@users.sf.net>
+
* ext/x264/gstx264enc.c (gst_x264_enc_init_encoder):
This needs a version check.
diff --git a/configure.ac b/configure.ac
index 86eca92d..92c6827e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -449,14 +449,12 @@ AG_GST_CHECK_FEATURE(ALSA, [alsa plug-ins], gstalsa, [
dnl *** amrwb ***
translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true)
-AG_GST_CHECK_FEATURE(AMRWB, [amrwb code], amrwb, [
- if test -f "gst-libs/ext/amrwb/26204-600.zip"; then
- HAVE_AMRWB="yes"
- else
- AC_MSG_WARN(amrwb code zipfile not found. See README at ext/amrwb/)
- HAVE_AMRWB="no"
- fi
- AC_SUBST(HAVE_AMRWB)
+AG_GST_CHECK_FEATURE(AMRWB, [amrwb library], amrwb, [
+ AG_GST_CHECK_LIBHEADER(AMRWB, amrwb,
+ GP3D_IF_decode, ,
+ amrwb/dec.h,
+ AMRWB_LIBS="-lamrwb"
+ AC_SUBST(AMRWB_LIBS))
])
dnl *** BZ2 ***
@@ -634,7 +632,7 @@ AG_GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [
AG_GST_CHECK_LIBHEADER(GSM, gsm, gsm_create, , gsm.h, GSM_LIBS="-lgsm")
if test $HAVE_GSM != "yes"; then
AG_GST_CHECK_LIBHEADER(GSM, gsm, gsm_create, , gsm/gsm.h, GSM_LIBS="-lgsm")
- if test $HAVE_GSM = "yes"; then
+ if test $HAVE_GSM = "yes"; then
AC_DEFINE(GSM_HEADER_IN_SUBDIR, 1, [Define if GSM header in gsm/ subdir])
fi
fi
@@ -650,7 +648,7 @@ AG_GST_CHECK_FEATURE(IVORBIS, [integer vorbis plug-in], ivorbisdec, [
AC_CHECK_LIB(vorbisidec, vorbis_block_init,
[IVORBIS_LIBS=-lvorbisidec
HAVE_IVORBIS=yes
- case $host in
+ case $host in
arm-*-*)
IVORBIS_CFLAGS="-D_ARM_ASSEM_ $IVORBIS_CFLAGS"
esac
@@ -825,7 +823,7 @@ AG_GST_CHECK_FEATURE(NEON, [neon http client plugins], neonhttpsrc, [
dnl *** timidity ***
translit(dnm, m, l) AM_CONDITIONAL(USE_TIMIDITY, true)
AG_GST_CHECK_FEATURE(TIMIDITY, [timidity midi soft synth plugin], timidity, [
- PKG_CHECK_MODULES(TIMIDITY, libtimidity, [
+ PKG_CHECK_MODULES(TIMIDITY, libtimidity, [
HAVE_TIMIDITY="yes",
AC_MSG_CHECKING([for timidity.cfg])
timidity_cfg=""
@@ -858,7 +856,7 @@ AG_GST_CHECK_FEATURE(WILDMIDI, [wildmidi midi soft synth plugin], wildmidi, [
AC_CHECK_HEADER([wildmidi_lib.h],HAVE_WILDMIDI=yes, HAVE_WILDMIDI=no)
if test "x$HAVE_WILDMIDI" = "xyes"; then
WILDMIDI_CFLAGS=
- WILDMIDI_LIBS=-lWildMidi
+ WILDMIDI_LIBS=-lWildMidi
AC_MSG_NOTICE(compiling gstWildMidi)
else
WILDMIDI_CFLAGS=
@@ -1137,8 +1135,6 @@ gst/y4m/Makefile
gst-libs/Makefile
gst-libs/gst/Makefile
gst-libs/gst/app/Makefile
-gst-libs/ext/Makefile
-gst-libs/ext/amrwb/Makefile
sys/Makefile
sys/glsink/Makefile
sys/dvb/Makefile
diff --git a/ext/amrwb/Makefile.am b/ext/amrwb/Makefile.am
index 9dd83963..0e6b68f4 100644
--- a/ext/amrwb/Makefile.am
+++ b/ext/amrwb/Makefile.am
@@ -6,8 +6,8 @@ libgstamrwb_la_SOURCES = \
gstamrwbenc.c \
gstamrwbparse.c
-libgstamrwb_la_CFLAGS = $(GST_CFLAGS) -I$(top_builddir)/gst-libs/ext/amrwb
-libgstamrwb_la_LIBADD = $(GST_BASE_LIBS) $(AMRWB_LIBS) $(top_builddir)/gst-libs/ext/amrwb/libamrwb.la
+libgstamrwb_la_CFLAGS = $(GST_CFLAGS) $(AMRWB_CFLAGS)
+libgstamrwb_la_LIBADD = $(GST_BASE_LIBS) $(AMRWB_LIBS)
libgstamrwb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \
diff --git a/ext/amrwb/amrwb-code/Makefile.am b/ext/amrwb/amrwb-code/Makefile.am
deleted file mode 100644
index 74f0f665..00000000
--- a/ext/amrwb/amrwb-code/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-if USE_AMRWB
-AMRWB_DIR = amrwb
-else
-AMRWB_DIR =
-endif
-
-SUBDIRS = $(AMRWB_DIR)
-
-DIST_SUBDIRS = amrwb
diff --git a/ext/amrwb/amrwb-code/amrwb/Makefile.am b/ext/amrwb/amrwb-code/amrwb/Makefile.am
deleted file mode 100644
index 71a24682..00000000
--- a/ext/amrwb/amrwb-code/amrwb/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-noinst_LTLIBRARIES = libamrwb.la
-
-nodist_libamrwb_la_SOURCES = \
- enc_acelp.c \
- enc_dtx.c \
- enc_gain.c \
- enc_if.c \
- enc_lpc.c \
- enc_main.c \
- enc_rom.c \
- enc_util.c \
- if_rom.c \
- dec_acelp.c \
- dec_dtx.c \
- dec_gain.c \
- dec_if.c \
- dec_lpc.c \
- dec_main.c \
- dec_rom.c \
- dec_util.c
-
-libamrwb_la_CFLAGS = -I./amrwb-code/c-code
-libamrwb_la_LIBADD = $(GST_BASE_LIBS) $(AMRWB_LIBS)
-libamrwb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-nodist_noinst_HEADERS = \
- dec_acelp.h \
- dec_dtx.h \
- dec_gain.h \
- dec.h \
- dec_if.h \
- dec_lpc.h \
- dec_main.h \
- dec_util.h \
- enc_acelp.h \
- enc_dtx.h \
- enc_gain.h \
- enc.h \
- enc_if.h \
- enc_lpc.h \
- enc_main.h \
- enc_util.h \
- if_rom.h \
- typedef.h
-
-download:
- wget http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-600.zip
-
-26204-600.zip:
- echo "Please download the 26204-600.zip file"
- echo "You can run make download to download it"
- exit 1
-
-enc_acelp.c: 26204-600.zip
- unzip $^
- unzip 26204-600_ANSI-C_source_code.zip
- mv c-code/* .
- rm -rf c-code/ 26204-600_ANSI-C_source_code.zip makefile.gcc
- echo "" >> typedef.h # to remove compilation warning (no newline at end of file)
-
-CLEANFILES = *.c *.h 26204-600.doc readme.txt
-
-EXTRA_DIST = README
diff --git a/ext/amrwb/amrwb-code/amrwb/README b/ext/amrwb/amrwb-code/amrwb/README
deleted file mode 100644
index dcbf95e3..00000000
--- a/ext/amrwb/amrwb-code/amrwb/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Compiling AMRWB codec:
-======================
-
-To compile the amrwb codec, you need to download the source code from
-"http://www.3gpp.org/ftp/Specs/html-info/26204.htm" and drop it
-in this directory, or run "make download".
-Then you can run the "autogen" script again.
diff --git a/ext/amrwb/gstamrwbdec.c b/ext/amrwb/gstamrwbdec.c
index f8fc1d93..b382e3c0 100644
--- a/ext/amrwb/gstamrwbdec.c
+++ b/ext/amrwb/gstamrwbdec.c
@@ -17,6 +17,11 @@
* Boston, MA 02111-1307, USA.
*/
+/*
+ *
+ * gst-launch filesrc location=abc.amr ! audio/AMR-WB ! amrwbdec ! audioresample ! audioconvert ! alsasink
+ */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/ext/amrwb/gstamrwbdec.h b/ext/amrwb/gstamrwbdec.h
index dd8c36ed..68bd4172 100644
--- a/ext/amrwb/gstamrwbdec.h
+++ b/ext/amrwb/gstamrwbdec.h
@@ -22,8 +22,9 @@
#include <gst/gst.h>
#include <gst/base/gstadapter.h>
-#include "typedef.h"
-#include "dec_if.h"
+#include <amrwb/typedef.h>
+#include <amrwb/dec_if.h>
+#include <amrwb/if_rom.h>
G_BEGIN_DECLS
diff --git a/ext/amrwb/gstamrwbenc.h b/ext/amrwb/gstamrwbenc.h
index 90e46d18..2c872de2 100644
--- a/ext/amrwb/gstamrwbenc.h
+++ b/ext/amrwb/gstamrwbenc.h
@@ -22,8 +22,8 @@
#include <gst/gst.h>
#include <gst/base/gstadapter.h>
-#include "enc_if.h"
-#include "typedef.h"
+#include <amrwb/enc_if.h>
+#include <amrwb/typedef.h>
G_BEGIN_DECLS
diff --git a/ext/amrwb/gstamrwbparse.c b/ext/amrwb/gstamrwbparse.c
index e26e62d2..615b6390 100644
--- a/ext/amrwb/gstamrwbparse.c
+++ b/ext/amrwb/gstamrwbparse.c
@@ -23,9 +23,7 @@
#include <string.h>
-#include "typedef.h"
#include "gstamrwbparse.h"
-#include "dec_if.h"
GST_DEBUG_CATEGORY_STATIC (amrwbparse_debug);
diff --git a/ext/amrwb/gstamrwbparse.h b/ext/amrwb/gstamrwbparse.h
index 27009732..cec66048 100644
--- a/ext/amrwb/gstamrwbparse.h
+++ b/ext/amrwb/gstamrwbparse.h
@@ -22,6 +22,9 @@
#include <gst/gst.h>
#include <gst/base/gstadapter.h>
+#include <amrwb/typedef.h>
+#include <amrwb/dec_if.h>
+#include <amrwb/if_rom.h>
G_BEGIN_DECLS
diff --git a/gst-libs/Makefile.am b/gst-libs/Makefile.am
index c77dc621..062cb55a 100644
--- a/gst-libs/Makefile.am
+++ b/gst-libs/Makefile.am
@@ -1 +1 @@
-SUBDIRS = gst ext
+SUBDIRS = gst
diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
deleted file mode 100644
index 74f0f665..00000000
--- a/gst-libs/ext/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-if USE_AMRWB
-AMRWB_DIR = amrwb
-else
-AMRWB_DIR =
-endif
-
-SUBDIRS = $(AMRWB_DIR)
-
-DIST_SUBDIRS = amrwb
diff --git a/gst-libs/ext/amrwb/Makefile.am b/gst-libs/ext/amrwb/Makefile.am
deleted file mode 100644
index 90d68a34..00000000
--- a/gst-libs/ext/amrwb/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-noinst_LTLIBRARIES = libamrwb.la
-
-nodist_libamrwb_la_SOURCES = \
- enc_acelp.c \
- enc_dtx.c \
- enc_gain.c \
- enc_if.c \
- enc_lpc.c \
- enc_main.c \
- enc_rom.c \
- enc_util.c \
- if_rom.c \
- dec_acelp.c \
- dec_dtx.c \
- dec_gain.c \
- dec_if.c \
- dec_lpc.c \
- dec_main.c \
- dec_rom.c \
- dec_util.c
-
-libamrwb_la_CFLAGS = -I./amrwb-code/c-code
-libamrwb_la_LIBADD = $(GST_BASE_LIBS) $(AMRWB_LIBS)
-libamrwb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-nodist_noinst_HEADERS = \
- dec_acelp.h \
- dec_dtx.h \
- dec_gain.h \
- dec.h \
- dec_if.h \
- dec_lpc.h \
- dec_main.h \
- dec_util.h \
- enc_acelp.h \
- enc_dtx.h \
- enc_gain.h \
- enc.h \
- enc_if.h \
- enc_lpc.h \
- enc_main.h \
- enc_util.h \
- if_rom.h \
- typedef.h
-
-download:
- wget http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-600.zip
-
-26204-600.zip:
- echo "Please download the 26204-600.zip file"
- echo "You can run make download to download it"
- exit 1
-
-enc_acelp.c: 26204-600.zip
- unzip -u $^
- unzip -u 26204-600_ANSI-C_source_code.zip
- mv c-code/* .
- rm -rf c-code/ 26204-600_ANSI-C_source_code.zip makefile.gcc
- echo "" >> typedef.h # to remove compilation warning (no newline at end of file)
-
-CLEANFILES = *.c *.h 26204-600.doc readme.txt
-
-EXTRA_DIST = README
diff --git a/gst-libs/ext/amrwb/README b/gst-libs/ext/amrwb/README
deleted file mode 100644
index dcbf95e3..00000000
--- a/gst-libs/ext/amrwb/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Compiling AMRWB codec:
-======================
-
-To compile the amrwb codec, you need to download the source code from
-"http://www.3gpp.org/ftp/Specs/html-info/26204.htm" and drop it
-in this directory, or run "make download".
-Then you can run the "autogen" script again.
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-02 07:15:32 +0000