diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | ext/amrwb/Makefile.am | 5 | ||||
| -rw-r--r-- | ext/amrwb/amrwb-code/Makefile.am | 9 | ||||
| -rw-r--r-- | ext/amrwb/amrwb-code/amrwb/Makefile.am | 63 | ||||
| -rw-r--r-- | ext/amrwb/amrwb-code/amrwb/README | 7 | ||||
| -rw-r--r-- | ext/amrwb/amrwb-code/run.sh | 6 | ||||
| -rw-r--r-- | gst-libs/Makefile.am | 6 |
8 files changed, 99 insertions, 17 deletions
@@ -1,3 +1,16 @@ +2007-01-04 Thomas Vander Stichele <thomas at apestaart dot org> + + * configure.ac: + * ext/amrwb/Makefile.am: + * ext/amrwb/amrwb-code/Makefile.am: + * ext/amrwb/amrwb-code/run.sh: + * gst-libs/Makefile.am: + * gst-libs/ext/Makefile.am: + * gst-libs/ext/amrwb/Makefile.am: + * gst-libs/ext/amrwb/README: + Move amrwb code getting and building to gst-libs/ext/amrwb + Adapt everything else to match. + 2007-01-04 Julien MOUTTE <julien@moutte.net> * ext/directfb/dfbvideosink.c: diff --git a/configure.ac b/configure.ac index 117705e8..3ca71e9e 100644 --- a/configure.ac +++ b/configure.ac @@ -367,10 +367,10 @@ GST_CHECK_FEATURE(ALSA, [alsa plug-ins], gstalsa, [ dnl *** amrwb *** translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true) GST_CHECK_FEATURE(AMRWB, [amrwb code], amrwb, [ - if test -f "ext/amrwb/amrwb-code/readme.txt"; then + if test -f "gst-libs/ext/amrwb/26204-600.zip"; then HAVE_AMRWB="yes" else - AC_MSG_WARN(Not amrwb code found. See README at ext/amrwb/) + AC_MSG_WARN(amrwb code zipfile not found. See README at ext/amrwb/) HAVE_AMRWB="no" fi AC_SUBST(HAVE_AMRWB) @@ -915,6 +915,8 @@ gst/real/Makefile gst/y4m/Makefile gst-libs/Makefile gst-libs/gst/Makefile +gst-libs/ext/Makefile +gst-libs/ext/amrwb/Makefile sys/Makefile sys/glsink/Makefile sys/dvb/Makefile @@ -922,7 +924,6 @@ sys/directdraw/Makefile sys/directsound/Makefile examples/Makefile examples/directfb/Makefile -ext/amrwb/amrwb-code/Makefile ext/amrwb/Makefile ext/alsaspdif/Makefile ext/bz2/Makefile diff --git a/ext/amrwb/Makefile.am b/ext/amrwb/Makefile.am index 3efa09d8..9dd83963 100644 --- a/ext/amrwb/Makefile.am +++ b/ext/amrwb/Makefile.am @@ -1,4 +1,3 @@ -SUBDIRS = amrwb-code plugin_LTLIBRARIES = libgstamrwb.la libgstamrwb_la_SOURCES = \ @@ -7,8 +6,8 @@ libgstamrwb_la_SOURCES = \ gstamrwbenc.c \ gstamrwbparse.c -libgstamrwb_la_CFLAGS = $(GST_CFLAGS) $(AMRWB_CFLAGS) -Iamrwb-code/ -libgstamrwb_la_LIBADD = $(GST_BASE_LIBS) $(AMRWB_LIBS) amrwb-code/libamrwb.la +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_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = \ diff --git a/ext/amrwb/amrwb-code/Makefile.am b/ext/amrwb/amrwb-code/Makefile.am new file mode 100644 index 00000000..74f0f665 --- /dev/null +++ b/ext/amrwb/amrwb-code/Makefile.am @@ -0,0 +1,9 @@ +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 new file mode 100644 index 00000000..71a24682 --- /dev/null +++ b/ext/amrwb/amrwb-code/amrwb/Makefile.am @@ -0,0 +1,63 @@ +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 new file mode 100644 index 00000000..dcbf95e3 --- /dev/null +++ b/ext/amrwb/amrwb-code/amrwb/README @@ -0,0 +1,7 @@ +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/amrwb-code/run.sh b/ext/amrwb/amrwb-code/run.sh deleted file mode 100644 index 323f451a..00000000 --- a/ext/amrwb/amrwb-code/run.sh +++ /dev/null @@ -1,6 +0,0 @@ -wget http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-600.zip -unzip 26204-600.zip -unzip 26204-600_ANSI-C_source_code.zip -mv c-code/* . -rm -rf c-code/ 26204-600.zip 26204-600_ANSI-C_source_code.zip -echo "" >> typedef.h # to remove compilation warning (no newline at end of file) diff --git a/gst-libs/Makefile.am b/gst-libs/Makefile.am index 6ac3e24a..c77dc621 100644 --- a/gst-libs/Makefile.am +++ b/gst-libs/Makefile.am @@ -1,5 +1 @@ -SUBDIRS = \ - gst - -DIST_SUBDIRS = \ - gst +SUBDIRS = gst ext |