[asterisk-commits] russell: branch russell/jack r94777 - in /team/russell/jack: ./ apps/ include...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Dec 26 09:08:24 CST 2007
Author: russell
Date: Wed Dec 26 09:08:24 2007
New Revision: 94777
URL: http://svn.digium.com/view/asterisk?view=rev&rev=94777
Log:
change the way libresample gets included a bit ...
Added:
team/russell/jack/include/asterisk/libresample.h (with props)
team/russell/jack/res/libresample/
- copied from r94537, team/russell/jack/main/libresample/
team/russell/jack/res/libresample/LICENSE.txt
- copied unchanged from r94775, team/russell/jack/main/libresample/LICENSE.txt
team/russell/jack/res/libresample/Makefile.in
- copied unchanged from r94775, team/russell/jack/main/libresample/Makefile.in
team/russell/jack/res/libresample/README.txt
- copied unchanged from r94775, team/russell/jack/main/libresample/README.txt
team/russell/jack/res/libresample/config.guess
- copied unchanged from r94775, team/russell/jack/main/libresample/config.guess
team/russell/jack/res/libresample/config.sub
- copied unchanged from r94775, team/russell/jack/main/libresample/config.sub
team/russell/jack/res/libresample/configure
- copied unchanged from r94775, team/russell/jack/main/libresample/configure
team/russell/jack/res/libresample/configure.in
- copied unchanged from r94775, team/russell/jack/main/libresample/configure.in
team/russell/jack/res/libresample/include/
- copied from r94775, team/russell/jack/main/libresample/include/
team/russell/jack/res/libresample/install-sh
- copied unchanged from r94775, team/russell/jack/main/libresample/install-sh
team/russell/jack/res/libresample/src/
- copied from r94775, team/russell/jack/main/libresample/src/
team/russell/jack/res/libresample/tests/
- copied from r94775, team/russell/jack/main/libresample/tests/
team/russell/jack/res/libresample/win/
- copied from r94775, team/russell/jack/main/libresample/win/
team/russell/jack/res/res_resample.c (with props)
Removed:
team/russell/jack/main/libresample/
Modified:
team/russell/jack/Makefile
team/russell/jack/apps/app_jack.c
team/russell/jack/main/Makefile
team/russell/jack/res/Makefile
Modified: team/russell/jack/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/jack/Makefile?view=diff&rev=94777&r1=94776&r2=94777
==============================================================================
--- team/russell/jack/Makefile (original)
+++ team/russell/jack/Makefile Wed Dec 26 09:08:24 2007
@@ -178,8 +178,8 @@
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
-MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include -I$(ASTTOPDIR)/main/libresample/include -I$(ASTTOPDIR)/main/libresample/src
-OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include -I$(ASTTOPDIR)/main/libresample/include -I$(ASTTOPDIR)/main/libresample/src
+MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
+OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
# Create OPTIONS variable, but probably we can assign directly to ASTCFLAGS
OPTIONS=
Modified: team/russell/jack/apps/app_jack.c
URL: http://svn.digium.com/view/asterisk/team/russell/jack/apps/app_jack.c?view=diff&rev=94777&r1=94776&r2=94777
==============================================================================
--- team/russell/jack/apps/app_jack.c (original)
+++ team/russell/jack/apps/app_jack.c Wed Dec 26 09:08:24 2007
@@ -33,13 +33,14 @@
/*** MODULEINFO
<depend>jack</depend>
+ <depend>res_resample</depend>
***/
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <values.h>
+#include <limits.h>
#include <jack/jack.h>
#include <jack/ringbuffer.h>
@@ -48,8 +49,7 @@
#include "asterisk/channel.h"
#include "asterisk/strings.h"
#include "asterisk/lock.h"
-
-#include "libresample.h"
+#include "asterisk/libresample.h"
#define RESAMPLE_QUALITY 0
Added: team/russell/jack/include/asterisk/libresample.h
URL: http://svn.digium.com/view/asterisk/team/russell/jack/include/asterisk/libresample.h?view=auto&rev=94777
==============================================================================
--- team/russell/jack/include/asterisk/libresample.h (added)
+++ team/russell/jack/include/asterisk/libresample.h Wed Dec 26 09:08:24 2007
@@ -1,0 +1,44 @@
+/**********************************************************************
+
+ resample.h
+
+ Real-time library interface by Dominic Mazzoni
+
+ Based on resample-1.7:
+ http://www-ccrma.stanford.edu/~jos/resample/
+
+ License: LGPL - see the file LICENSE.txt for more information
+
+**********************************************************************/
+
+#ifndef LIBRESAMPLE_INCLUDED
+#define LIBRESAMPLE_INCLUDED
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+void *resample_open(int highQuality,
+ double minFactor,
+ double maxFactor);
+
+void *resample_dup(const void *handle);
+
+int resample_get_filter_width(const void *handle);
+
+int resample_process(void *handle,
+ double factor,
+ float *inBuffer,
+ int inBufferLen,
+ int lastFlag,
+ int *inBufferUsed,
+ float *outBuffer,
+ int outBufferLen);
+
+void resample_close(void *handle);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* LIBRESAMPLE_INCLUDED */
Propchange: team/russell/jack/include/asterisk/libresample.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/russell/jack/include/asterisk/libresample.h
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/russell/jack/include/asterisk/libresample.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: team/russell/jack/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/jack/main/Makefile?view=diff&rev=94777&r1=94776&r2=94777
==============================================================================
--- team/russell/jack/main/Makefile (original)
+++ team/russell/jack/main/Makefile Wed Dec 26 09:08:24 2007
@@ -28,8 +28,6 @@
cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o \
strcompat.o threadstorage.o dial.o event.o adsistub.o audiohook.o \
astobj2.o hashtab.o global_datastores.o
-
-OBJS+=libresample/src/filterkit.o libresample/src/resample.o libresample/src/resamplesubs.o
# we need to link in the objects statically, not as a library, because
# otherwise modules will not have them available if none of the static
@@ -171,4 +169,3 @@
@$(MAKE) -C db1-ast clean
@$(MAKE) -C stdtime clean
@$(MAKE) -C minimime clean
- rm -f libresample/src/*.o
Modified: team/russell/jack/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/jack/res/Makefile?view=diff&rev=94777&r1=94776&r2=94777
==============================================================================
--- team/russell/jack/res/Makefile (original)
+++ team/russell/jack/res/Makefile Wed Dec 26 09:08:24 2007
@@ -47,6 +47,11 @@
ael/pval.o: ael/pval.c
+libresample/src/filterkit.o: ASTCFLAGS+=-Ilibresample/include -Ilibresample/src
+
+res_resample.so: res_resample.o libresample/src/filterkit.o libresample/src/resample.o libresample/src/resamplesubs.o
+
clean::
rm -f snmp/*.o
rm -f ael/*.o
+ rm -f libresample/src/*.o
Added: team/russell/jack/res/res_resample.c
URL: http://svn.digium.com/view/asterisk/team/russell/jack/res/res_resample.c?view=auto&rev=94777
==============================================================================
--- team/russell/jack/res/res_resample.c (added)
+++ team/russell/jack/res/res_resample.c Wed Dec 26 09:08:24 2007
@@ -1,0 +1,46 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Copyright (C) 2007, Digium, Inc.
+ *
+ * Russell Bryant <russell at 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
+ *
+ * \brief libresample
+ *
+ * \author Russell Bryant <russell at 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,
+ );
Propchange: team/russell/jack/res/res_resample.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/russell/jack/res/res_resample.c
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/russell/jack/res/res_resample.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
More information about the asterisk-commits
mailing list