[asterisk-commits] russell: branch russell/jack r95503 - in /team/russell/jack: ./ codecs/ main/...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Dec 31 15:25:37 CST 2007 

Author: russell
Date: Mon Dec 31 15:25:36 2007
New Revision: 95503

URL: http://svn.digium.com/view/asterisk?view=rev&rev=95503
Log:
sync with trunk

Added:
    team/russell/jack/main/libresample/   (props changed)
      - copied from r95501, trunk/main/libresample/
    team/russell/jack/main/libresample/LICENSE.txt
      - copied unchanged from r95501, trunk/main/libresample/LICENSE.txt
    team/russell/jack/main/libresample/Makefile.asterisk
      - copied unchanged from r95501, trunk/main/libresample/Makefile.asterisk
    team/russell/jack/main/libresample/Makefile.in
      - copied unchanged from r95501, trunk/main/libresample/Makefile.in
    team/russell/jack/main/libresample/README.txt
      - copied unchanged from r95501, trunk/main/libresample/README.txt
    team/russell/jack/main/libresample/config.guess
      - copied unchanged from r95501, trunk/main/libresample/config.guess
    team/russell/jack/main/libresample/config.sub
      - copied unchanged from r95501, trunk/main/libresample/config.sub
    team/russell/jack/main/libresample/configure
      - copied unchanged from r95501, trunk/main/libresample/configure
    team/russell/jack/main/libresample/configure.in
      - copied unchanged from r95501, trunk/main/libresample/configure.in
    team/russell/jack/main/libresample/include/
      - copied from r95501, trunk/main/libresample/include/
    team/russell/jack/main/libresample/include/libresample.h
      - copied unchanged from r95501, trunk/main/libresample/include/libresample.h
    team/russell/jack/main/libresample/install-sh
      - copied unchanged from r95501, trunk/main/libresample/install-sh
    team/russell/jack/main/libresample/src/
      - copied from r95501, trunk/main/libresample/src/
    team/russell/jack/main/libresample/src/configtemplate.h
      - copied unchanged from r95501, trunk/main/libresample/src/configtemplate.h
    team/russell/jack/main/libresample/src/filterkit.c
      - copied unchanged from r95501, trunk/main/libresample/src/filterkit.c
    team/russell/jack/main/libresample/src/filterkit.h
      - copied unchanged from r95501, trunk/main/libresample/src/filterkit.h
    team/russell/jack/main/libresample/src/resample.c
      - copied unchanged from r95501, trunk/main/libresample/src/resample.c
    team/russell/jack/main/libresample/src/resample_defs.h
      - copied unchanged from r95501, trunk/main/libresample/src/resample_defs.h
    team/russell/jack/main/libresample/src/resamplesubs.c
      - copied unchanged from r95501, trunk/main/libresample/src/resamplesubs.c
    team/russell/jack/main/libresample/tests/
      - copied from r95501, trunk/main/libresample/tests/
    team/russell/jack/main/libresample/tests/compareresample.c
      - copied unchanged from r95501, trunk/main/libresample/tests/compareresample.c
    team/russell/jack/main/libresample/tests/resample-sndfile.c
      - copied unchanged from r95501, trunk/main/libresample/tests/resample-sndfile.c
    team/russell/jack/main/libresample/tests/testresample.c
      - copied unchanged from r95501, trunk/main/libresample/tests/testresample.c
    team/russell/jack/main/libresample/win/
      - copied from r95501, trunk/main/libresample/win/
    team/russell/jack/main/libresample/win/libresample.dsp
      - copied unchanged from r95501, trunk/main/libresample/win/libresample.dsp
    team/russell/jack/main/libresample/win/libresample.vcproj
      - copied unchanged from r95501, trunk/main/libresample/win/libresample.vcproj
Modified:
    team/russell/jack/   (props changed)
    team/russell/jack/CHANGES
    team/russell/jack/codecs/Makefile
    team/russell/jack/codecs/codec_resample.c
    team/russell/jack/main/Makefile

Propchange: team/russell/jack/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Dec 31 15:25:36 2007
@@ -1,1 +1,1 @@
-/trunk:1-95495
+/trunk:1-95502

Modified: team/russell/jack/CHANGES
URL: http://svn.digium.com/view/asterisk/team/russell/jack/CHANGES?view=diff&rev=95503&r1=95502&r2=95503
==============================================================================
--- team/russell/jack/CHANGES (original)
+++ team/russell/jack/CHANGES Mon Dec 31 15:25:36 2007
@@ -429,3 +429,6 @@
   * A new option when starting a remote asterisk (rasterisk, asterisk -r) for
     specifying which socket to use to connect to the running Asterisk daemon
     (-s)
+  * Added a new codec translation module, codec_resample, which re-samples
+     signed linear audio between 8 kHz and 16 kHz to help support wideband
+     codecs.

Modified: team/russell/jack/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/jack/codecs/Makefile?view=diff&rev=95503&r1=95502&r2=95503
==============================================================================
--- team/russell/jack/codecs/Makefile (original)
+++ team/russell/jack/codecs/Makefile Mon Dec 31 15:25:36 2007
@@ -54,3 +54,5 @@
 	@$(MAKE) -C g722 all
 
 $(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): $(LIBG722)
+
+codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/main/libresample/include

Modified: team/russell/jack/codecs/codec_resample.c
URL: http://svn.digium.com/view/asterisk/team/russell/jack/codecs/codec_resample.c?view=diff&rev=95503&r1=95502&r2=95503
==============================================================================
--- team/russell/jack/codecs/codec_resample.c (original)
+++ team/russell/jack/codecs/codec_resample.c Mon Dec 31 15:25:36 2007
@@ -39,7 +39,8 @@
 
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/libresample.h"
+
+#include "libresample.h"
 
 #include "slin_resample_ex.h"
 

Modified: team/russell/jack/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/jack/main/Makefile?view=diff&rev=95503&r1=95502&r2=95503
==============================================================================
--- team/russell/jack/main/Makefile (original)
+++ team/russell/jack/main/Makefile Mon Dec 31 15:25:36 2007
@@ -111,6 +111,9 @@
 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
 
@@ -152,7 +155,7 @@
 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 +172,4 @@
 	@$(MAKE) -C db1-ast clean
 	@$(MAKE) -C stdtime clean
 	@$(MAKE) -C minimime clean
+	@$(MAKE) -f Makefile.asterisk -C libresample clean

Propchange: team/russell/jack/main/libresample/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Dec 31 15:25:36 2007
@@ -1,0 +1,2 @@
+*.d
+libresample.a

More information about the asterisk-commits mailing list