mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-10 08:22:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

Use external shared libamrwb. Fixes #423741 (with lots of cleanup).

Browse source 
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 2007-05-16 13:50:51 +00:00 committed by Stefan Kost
parent ddb70fda50
commit a7c38b8b37
15 changed files with 46 additions and 181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ChangeLog
View file

@ -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> 2007-05-16 Stefan Kost <ensonic@users.sf.net>
* ext/x264/gstx264enc.c (gst_x264_enc_init_encoder): * ext/x264/gstx264enc.c (gst_x264_enc_init_encoder):

16
configure.ac
View file

@ -449,14 +449,12 @@ AG_GST_CHECK_FEATURE(ALSA, [alsa plug-ins], gstalsa, [
dnl *** amrwb *** dnl *** amrwb ***
translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true) translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true)
AG_GST_CHECK_FEATURE(AMRWB, [amrwb code], amrwb, [ AG_GST_CHECK_FEATURE(AMRWB, [amrwb library], amrwb, [
if test -f "gst-libs/ext/amrwb/26204-600.zip"; then AG_GST_CHECK_LIBHEADER(AMRWB, amrwb,
HAVE_AMRWB="yes" GP3D_IF_decode, ,
else amrwb/dec.h,
AC_MSG_WARN(amrwb code zipfile not found. See README at ext/amrwb/) AMRWB_LIBS="-lamrwb"
HAVE_AMRWB="no" AC_SUBST(AMRWB_LIBS))
fi
AC_SUBST(HAVE_AMRWB)
]) ])
dnl *** BZ2 *** dnl *** BZ2 ***
@ -1137,8 +1135,6 @@ gst/y4m/Makefile
gst-libs/Makefile gst-libs/Makefile
gst-libs/gst/Makefile gst-libs/gst/Makefile
gst-libs/gst/app/Makefile gst-libs/gst/app/Makefile
gst-libs/ext/Makefile
gst-libs/ext/amrwb/Makefile
sys/Makefile sys/Makefile
sys/glsink/Makefile sys/glsink/Makefile
sys/dvb/Makefile sys/dvb/Makefile

4
ext/amrwb/Makefile.am
View file

@ -6,8 +6,8 @@ libgstamrwb_la_SOURCES = \
gstamrwbenc.c \ gstamrwbenc.c \
gstamrwbparse.c gstamrwbparse.c
libgstamrwb_la_CFLAGS = $(GST_CFLAGS) -I$(top_builddir)/gst-libs/ext/amrwb libgstamrwb_la_CFLAGS = $(GST_CFLAGS) $(AMRWB_CFLAGS)
libgstamrwb_la_LIBADD = $(GST_BASE_LIBS) $(AMRWB_LIBS) $(top_builddir)/gst-libs/ext/amrwb/libamrwb.la libgstamrwb_la_LIBADD = $(GST_BASE_LIBS) $(AMRWB_LIBS)
libgstamrwb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstamrwb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \ noinst_HEADERS = \

9
ext/amrwb/amrwb-code/Makefile.am
View file

@ -1,9 +0,0 @@
if USE_AMRWB
AMRWB_DIR = amrwb
else
AMRWB_DIR =
endif
SUBDIRS = $(AMRWB_DIR)
DIST_SUBDIRS = amrwb

63
ext/amrwb/amrwb-code/amrwb/Makefile.am
View file

@ -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

7
ext/amrwb/amrwb-code/amrwb/README
View file

@ -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.

5
ext/amrwb/gstamrwbdec.c
View file

@ -17,6 +17,11 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
/*
*
* gst-launch filesrc location=abc.amr ! audio/AMR-WB ! amrwbdec ! audioresample ! audioconvert ! alsasink
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif

5
ext/amrwb/gstamrwbdec.h
View file

@ -22,8 +22,9 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstadapter.h> #include <gst/base/gstadapter.h>
#include "typedef.h" #include <amrwb/typedef.h>
#include "dec_if.h" #include <amrwb/dec_if.h>
#include <amrwb/if_rom.h>
G_BEGIN_DECLS G_BEGIN_DECLS

4
ext/amrwb/gstamrwbenc.h
View file

@ -22,8 +22,8 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstadapter.h> #include <gst/base/gstadapter.h>
#include "enc_if.h" #include <amrwb/enc_if.h>
#include "typedef.h" #include <amrwb/typedef.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
ext/amrwb/gstamrwbparse.c
View file

@ -23,9 +23,7 @@
#include <string.h> #include <string.h>
#include "typedef.h"
#include "gstamrwbparse.h" #include "gstamrwbparse.h"
#include "dec_if.h"
GST_DEBUG_CATEGORY_STATIC (amrwbparse_debug); GST_DEBUG_CATEGORY_STATIC (amrwbparse_debug);

3
ext/amrwb/gstamrwbparse.h
View file

@ -22,6 +22,9 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstadapter.h> #include <gst/base/gstadapter.h>
#include <amrwb/typedef.h>
#include <amrwb/dec_if.h>
#include <amrwb/if_rom.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
gst-libs/Makefile.am
View file

@ -1 +1 @@
SUBDIRS = gst ext SUBDIRS = gst

9
gst-libs/ext/Makefile.am
View file

@ -1,9 +0,0 @@
if USE_AMRWB
AMRWB_DIR = amrwb
else
AMRWB_DIR =
endif
SUBDIRS = $(AMRWB_DIR)
DIST_SUBDIRS = amrwb

63
gst-libs/ext/amrwb/Makefile.am
View file

@ -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

7
gst-libs/ext/amrwb/README
View file

@ -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.