aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xbuild_tools/strip_nonapi3
-rw-r--r--codecs/Makefile2
-rw-r--r--codecs/codec_resample.c4
-rw-r--r--main/Makefile8
-rw-r--r--main/libresample/LICENSE.txt (renamed from res/libresample/LICENSE.txt)0
-rw-r--r--main/libresample/Makefile.asterisk (renamed from res/libresample/Makefile.asterisk)0
-rw-r--r--main/libresample/Makefile.in (renamed from res/libresample/Makefile.in)0
-rw-r--r--main/libresample/README.txt (renamed from res/libresample/README.txt)0
-rwxr-xr-xmain/libresample/config.guess (renamed from res/libresample/config.guess)0
-rwxr-xr-xmain/libresample/config.sub (renamed from res/libresample/config.sub)0
-rwxr-xr-xmain/libresample/configure (renamed from res/libresample/configure)0
-rw-r--r--main/libresample/configure.in (renamed from res/libresample/configure.in)0
-rw-r--r--main/libresample/include/libresample.h (renamed from res/libresample/include/libresample.h)0
-rwxr-xr-xmain/libresample/install-sh (renamed from res/libresample/install-sh)0
-rw-r--r--main/libresample/src/configtemplate.h (renamed from res/libresample/src/configtemplate.h)0
-rw-r--r--main/libresample/src/filterkit.c (renamed from res/libresample/src/filterkit.c)0
-rw-r--r--main/libresample/src/filterkit.h (renamed from res/libresample/src/filterkit.h)0
-rw-r--r--main/libresample/src/resample.c (renamed from res/libresample/src/resample.c)16
-rw-r--r--main/libresample/src/resample_defs.h (renamed from res/libresample/src/resample_defs.h)0
-rw-r--r--main/libresample/src/resamplesubs.c (renamed from res/libresample/src/resamplesubs.c)0
-rw-r--r--main/libresample/tests/compareresample.c (renamed from res/libresample/tests/compareresample.c)0
-rw-r--r--main/libresample/tests/resample-sndfile.c (renamed from res/libresample/tests/resample-sndfile.c)0
-rw-r--r--main/libresample/tests/testresample.c (renamed from res/libresample/tests/testresample.c)0
-rw-r--r--main/libresample/win/libresample.dsp (renamed from res/libresample/win/libresample.dsp)0
-rw-r--r--main/libresample/win/libresample.vcproj (renamed from res/libresample/win/libresample.vcproj)0
-rw-r--r--main/translate.c6
-rw-r--r--res/Makefile3
-rw-r--r--res/res_resample.c44
28 files changed, 24 insertions, 62 deletions
diff --git a/build_tools/strip_nonapi b/build_tools/strip_nonapi
index 5a52eef1e..8a8d06fcc 100755
--- a/build_tools/strip_nonapi
+++ b/build_tools/strip_nonapi
@@ -14,8 +14,9 @@
# __ast_
# astman_
# pbx_
+# resample_
-FILTER="${GREP} -v -e ^ast_ -e ^_ast_ -e ^__ast_ -e ^astman_ -e ^pbx_"
+FILTER="${GREP} -v -e ^ast_ -e ^_ast_ -e ^__ast_ -e ^astman_ -e ^pbx_ -e ^resample_"
case "${OSARCH}" in
linux-gnu|FreeBSD)
diff --git a/codecs/Makefile b/codecs/Makefile
index ef76962e5..a09f67149 100644
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -55,4 +55,4 @@ $(LIBG722):
$(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): $(LIBG722)
-codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res/libresample/include
+codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/main/libresample/include
diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c
index 718ab88ae..66d60169d 100644
--- a/codecs/codec_resample.c
+++ b/codecs/codec_resample.c
@@ -24,10 +24,6 @@
* \ingroup codecs
*/
-/*** MODULEINFO
- <depend>res_resample</depend>
- ***/
-
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/Makefile b/main/Makefile
index ffbd4bf7f..304d48614 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -111,6 +111,9 @@ editline/libedit.a: CHECK_SUBDIR
db1-ast/libdb1.a: CHECK_SUBDIR
CFLAGS="$(ASTCFLAGS)" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a
+libresample/libresample.a: CHECK_SUBDIR
+ $(MAKE) -f Makefile.asterisk -C libresample libresample.a
+
ast_expr2.c ast_expr2.h:
bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
@@ -127,6 +130,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
+translate.o: ASTCFLAGS+=-Ilibresample/include
+
AST_EMBED_LDSCRIPTS:=$(sort $(EMBED_LDSCRIPTS))
AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED_LDFLAGS),$(value $(dep)))
AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
@@ -152,7 +157,7 @@ else
MAIN_TGT:=asterisk
endif
-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS)
+$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS) libresample/libresample.a
@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
@@ -169,3 +174,4 @@ clean::
@$(MAKE) -C db1-ast clean
@$(MAKE) -C stdtime clean
@$(MAKE) -C minimime clean
+ @$(MAKE) -f Makefile.asterisk -C libresample clean
diff --git a/res/libresample/LICENSE.txt b/main/libresample/LICENSE.txt
index 4ccd6ccfd..4ccd6ccfd 100644
--- a/res/libresample/LICENSE.txt
+++ b/main/libresample/LICENSE.txt
diff --git a/res/libresample/Makefile.asterisk b/main/libresample/Makefile.asterisk
index 815671a2f..815671a2f 100644
--- a/res/libresample/Makefile.asterisk
+++ b/main/libresample/Makefile.asterisk
diff --git a/res/libresample/Makefile.in b/main/libresample/Makefile.in
index 8d17d19b4..8d17d19b4 100644
--- a/res/libresample/Makefile.in
+++ b/main/libresample/Makefile.in
diff --git a/res/libresample/README.txt b/main/libresample/README.txt
index 14be45b83..14be45b83 100644
--- a/res/libresample/README.txt
+++ b/main/libresample/README.txt
diff --git a/res/libresample/config.guess b/main/libresample/config.guess
index e8c6fc0c3..e8c6fc0c3 100755
--- a/res/libresample/config.guess
+++ b/main/libresample/config.guess
diff --git a/res/libresample/config.sub b/main/libresample/config.sub
index 463186dbf..463186dbf 100755
--- a/res/libresample/config.sub
+++ b/main/libresample/config.sub
diff --git a/res/libresample/configure b/main/libresample/configure
index 638280399..638280399 100755
--- a/res/libresample/configure
+++ b/main/libresample/configure
diff --git a/res/libresample/configure.in b/main/libresample/configure.in
index e676b69f2..e676b69f2 100644
--- a/res/libresample/configure.in
+++ b/main/libresample/configure.in
diff --git a/res/libresample/include/libresample.h b/main/libresample/include/libresample.h
index ca08e044f..ca08e044f 100644
--- a/res/libresample/include/libresample.h
+++ b/main/libresample/include/libresample.h
diff --git a/res/libresample/install-sh b/main/libresample/install-sh
index e9de23842..e9de23842 100755
--- a/res/libresample/install-sh
+++ b/main/libresample/install-sh
diff --git a/res/libresample/src/configtemplate.h b/main/libresample/src/configtemplate.h
index 94ae1cea9..94ae1cea9 100644
--- a/res/libresample/src/configtemplate.h
+++ b/main/libresample/src/configtemplate.h
diff --git a/res/libresample/src/filterkit.c b/main/libresample/src/filterkit.c
index bc92285f2..bc92285f2 100644
--- a/res/libresample/src/filterkit.c
+++ b/main/libresample/src/filterkit.c
diff --git a/res/libresample/src/filterkit.h b/main/libresample/src/filterkit.h
index 9df0ae869..9df0ae869 100644
--- a/res/libresample/src/filterkit.h
+++ b/main/libresample/src/filterkit.h
diff --git a/res/libresample/src/resample.c b/main/libresample/src/resample.c
index 9dba5af96..85ff75f76 100644
--- a/res/libresample/src/resample.c
+++ b/main/libresample/src/resample.c
@@ -87,7 +87,7 @@ void *resample_open(int highQuality, double minFactor, double maxFactor)
/* Just exit if we get invalid factors */
if (minFactor <= 0.0 || maxFactor <= 0.0 || maxFactor < minFactor) {
- #ifdef DEBUG
+ #if defined(DEBUG)
fprintf(stderr,
"libresample: "
"minFactor and maxFactor must be positive real numbers,\n"
@@ -187,7 +187,7 @@ int resample_process(void *handle,
int Nx;
int i, len;
- #ifdef DEBUG
+ #if defined(DEBUG)
fprintf(stderr, "resample_process: in=%d, out=%d lastFlag=%d\n",
inBufferLen, outBufferLen, lastFlag);
#endif
@@ -197,7 +197,7 @@ int resample_process(void *handle,
outSampleCount = 0;
if (factor < hp->minFactor || factor > hp->maxFactor) {
- #ifdef DEBUG
+ #if defined(DEBUG)
fprintf(stderr,
"libresample: factor %f is not between "
"minFactor=%f and maxFactor=%f",
@@ -232,7 +232,7 @@ int resample_process(void *handle,
/* This is the maximum number of samples we can process
per loop iteration */
- #ifdef DEBUG
+ #if defined(DEBUG)
printf("XSize: %d Xoff: %d Xread: %d Xp: %d lastFlag: %d\n",
hp->XSize, hp->Xoff, hp->Xread, hp->Xp, lastFlag);
#endif
@@ -260,7 +260,7 @@ int resample_process(void *handle,
else
Nx = hp->Xread - 2 * hp->Xoff;
- #ifdef DEBUG
+ #if defined(DEBUG)
fprintf(stderr, "new len=%d Nx=%d\n", len, Nx);
#endif
@@ -277,7 +277,7 @@ int resample_process(void *handle,
Nwing, LpScl, Imp, ImpD, interpFilt);
}
- #ifdef DEBUG
+ #if defined(DEBUG)
printf("Nout: %d\n", Nout);
#endif
@@ -297,7 +297,7 @@ int resample_process(void *handle,
for (i=0; i<Nreuse; i++)
hp->X[i] = hp->X[i + (hp->Xp - hp->Xoff)];
- #ifdef DEBUG
+ #if defined(DEBUG)
printf("New Xread=%d\n", Nreuse);
#endif
@@ -306,7 +306,7 @@ int resample_process(void *handle,
/* Check to see if output buff overflowed (shouldn't happen!) */
if (Nout > hp->YSize) {
- #ifdef DEBUG
+ #if defined(DEBUG)
printf("Nout: %d YSize: %d\n", Nout, hp->YSize);
#endif
fprintf(stderr, "libresample: Output array overflow!\n");
diff --git a/res/libresample/src/resample_defs.h b/main/libresample/src/resample_defs.h
index a0e7afc37..a0e7afc37 100644
--- a/res/libresample/src/resample_defs.h
+++ b/main/libresample/src/resample_defs.h
diff --git a/res/libresample/src/resamplesubs.c b/main/libresample/src/resamplesubs.c
index c3c095dc0..c3c095dc0 100644
--- a/res/libresample/src/resamplesubs.c
+++ b/main/libresample/src/resamplesubs.c
diff --git a/res/libresample/tests/compareresample.c b/main/libresample/tests/compareresample.c
index 8773c9d4e..8773c9d4e 100644
--- a/res/libresample/tests/compareresample.c
+++ b/main/libresample/tests/compareresample.c
diff --git a/res/libresample/tests/resample-sndfile.c b/main/libresample/tests/resample-sndfile.c
index e780228c1..e780228c1 100644
--- a/res/libresample/tests/resample-sndfile.c
+++ b/main/libresample/tests/resample-sndfile.c
diff --git a/res/libresample/tests/testresample.c b/main/libresample/tests/testresample.c
index a59aa8bfd..a59aa8bfd 100644
--- a/res/libresample/tests/testresample.c
+++ b/main/libresample/tests/testresample.c
diff --git a/res/libresample/win/libresample.dsp b/main/libresample/win/libresample.dsp
index 4ebb51e46..4ebb51e46 100644
--- a/res/libresample/win/libresample.dsp
+++ b/main/libresample/win/libresample.dsp
diff --git a/res/libresample/win/libresample.vcproj b/main/libresample/win/libresample.vcproj
index c23845f47..c23845f47 100644
--- a/res/libresample/win/libresample.vcproj
+++ b/main/libresample/win/libresample.vcproj
diff --git a/main/translate.c b/main/translate.c
index d9270e907..617e46552 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -39,8 +39,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/cli.h"
#include "asterisk/term.h"
+#include "libresample.h"
+
#define MAX_RECALC 1000 /* max sample recalc */
+/* hack to ensure that the libresample code gets linked in */
+
+static attribute_unused void (*resample_hack)(void *) = resample_close;
+
/*! \brief the list of translators */
static AST_RWLIST_HEAD_STATIC(translators, ast_translator);
diff --git a/res/Makefile b/res/Makefile
index 496264f0b..cfac3183a 100644
--- a/res/Makefile
+++ b/res/Makefile
@@ -47,9 +47,6 @@ ael/ael.tab.c ael/ael.tab.h:
ael/pval.o: ael/pval.c
-res_resample.so: libresample/src/resample.o libresample/src/resamplesubs.o libresample/src/filterkit.o
-
clean::
rm -f snmp/*.o
rm -f ael/*.o
- rm -f libresample/src/*.o
diff --git a/res/res_resample.c b/res/res_resample.c
deleted file mode 100644
index ac85c3f43..000000000
--- a/res/res_resample.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Asterisk -- A telephony toolkit for Linux.
- *
- * Copyright (C) 2007, Digium, Inc.
- *
- * Russell Bryant <russell@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*!
- * \file
- *
- * \author Russell Bryant <russell@digium.com>
- */
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
-#include "asterisk/module.h"
-
-static int load_module(void)
-{
- return 0;
-}
-
-static int unload_module(void)
-{
- return -1;
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Resampling Support via libresample",
- .load = load_module,
- .unload = unload_module,
- );
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 20:12:34 +0000