diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-31 21:22:31 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-31 21:22:31 +0000 |
| commit | 04838b9d59f12f0deb605272d784125bee52e4cb (patch) | |
| tree | 823393d4498b07581162c3e5266a494aa638a45c /main/Makefile | |
| parent | 9c384ade94b8670b96e11fe795ceaa5bc66ed3b9 (diff) | |
Merge changes from team/russell/codec_resample
This commit imports libresample for use in Asterisk. It also adds a new codec
module, codec_resample. This module uses libresample to re-sample signed linear
audio between 8 kHz and 16 kHz.
It also provides an alternative for converting between 16 kHz G.722 and 8 kHz
signed linear when using G.722, which will likely be useful as some people have
complained about volume issues when the current codec_g722 converts to 8 kHz
signed linear. But, to test this, you will have to disable the g722-to-slin and
g722-to-slin16 translators in codec_g722.c.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@95501 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile index ffbd4bf7f..fc5fbd747 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 @@ -152,7 +155,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 +172,4 @@ clean:: @$(MAKE) -C db1-ast clean @$(MAKE) -C stdtime clean @$(MAKE) -C minimime clean + @$(MAKE) -f Makefile.asterisk -C libresample clean |