mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-29 23:32:33 +00:00
Use external shared libamrwb. Fixes #423741 (with lots of cleanup).
Original commit message from CVS: 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).
This commit is contained in:
Stanislav Brabec
Stefan Kost
parent
ddb70fda50
commit
a7c38b8b37
15 changed files with 46 additions and 181 deletions
20
ChangeLog
20
ChangeLog
|
|
@ -1,3 +1,23 @@
|
|||
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):
|
||||
|
|
|
|||
24
configure.ac
24
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
|
||||
|
|
|
|||
|
|
@ -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 = \
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
if USE_AMRWB
|
||||
AMRWB_DIR = amrwb
|
||||
else
|
||||
AMRWB_DIR =
|
||||
endif
|
||||
|
||||
SUBDIRS = $(AMRWB_DIR)
|
||||
|
||||
DIST_SUBDIRS = amrwb
|
||||
|
|
@ -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
|
||||
|
|
@ -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.
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -23,9 +23,7 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#include "typedef.h"
|
||||
#include "gstamrwbparse.h"
|
||||
#include "dec_if.h"
|
||||
|
||||
|
||||
GST_DEBUG_CATEGORY_STATIC (amrwbparse_debug);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
SUBDIRS = gst ext
|
||||
SUBDIRS = gst
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
if USE_AMRWB
|
||||
AMRWB_DIR = amrwb
|
||||
else
|
||||
AMRWB_DIR =
|
||||
endif
|
||||
|
||||
SUBDIRS = $(AMRWB_DIR)
|
||||
|
||||
DIST_SUBDIRS = amrwb
|
||||
|
|
@ -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
|
||||
|
|
@ -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.
|
||||
Loading…
Reference in a new issue