9 files changed, 15 insertions, 87 deletions
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