diff options
author | David Vossel <dvossel@digium.com> | 2011-02-22 23:04:49 +0000 |
---|---|---|
committer | David Vossel <dvossel@digium.com> | 2011-02-22 23:04:49 +0000 |
commit | d760e81f37b231a99865a40f67838c51079ed4f8 (patch) | |
tree | b061487de973558358757bd1b6e457aaccf41638 /codecs/Makefile | |
parent | 736133f874f270be81810c2c1fb36c47e6a479bf (diff) |
Media Project Phase2: SILK 8khz-24khz, SLINEAR 8khz-192khz, SPEEX 32khz, hd audio ConfBridge, and other stuff
-Functional changes
1. Dynamic global format list build by codecs defined in codecs.conf
2. SILK 8khz, 12khz, 16khz, and 24khz with custom attributes defined in codecs.conf
3. Negotiation of SILK attributes in chan_sip.
4. SPEEX 32khz with translation
5. SLINEAR 8khz, 12khz, 24khz, 32khz, 44.1khz, 48khz, 96khz, 192khz with translation
using codec_resample.c
6. Various changes to RTP code required to properly handle the dynamic format list
and formats with attributes.
7. ConfBridge now dynamically jumps to the best possible sample rate. This allows
for conferences to take advantage of HD audio (Which sounds awesome)
8. Audiohooks are no longer limited to 8khz audio, and most effects have been
updated to take advantage of this such as Volume, DENOISE, PITCH_SHIFT.
9. codec_resample now uses its own code rather than depending on libresample.
-Organizational changes
Global format list is moved from frame.c to format.c
Various format specific functions moved from frame.c to format.c
Review: https://reviewboard.asterisk.org/r/1104/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@308582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'codecs/Makefile')
-rw-r--r-- | codecs/Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index 846c16364..6ef08daed 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -29,11 +29,13 @@ GSM_INCLUDE:=-Igsm/inc $(if $(filter codec_gsm,$(EMBEDDED_MODS)),modules.link,codec_gsm.so): gsm/lib/libgsm.a endif + clean:: $(MAKE) -C gsm clean $(MAKE) -C lpc10 clean $(MAKE) -C ilbc clean rm -f g722/*.[oa] + rm -f speex/*.[oa] gsm/lib/libgsm.a: @mkdir -p gsm/lib @@ -47,7 +49,17 @@ $(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBL $(LIBILBC): @$(MAKE) -C ilbc all _ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations -Wshadow,$(_ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)" + $(if $(filter codec_ilbc,$(EMBEDDED_MODS)),modules.link,codec_ilbc.so): $(LIBILBC) $(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): g722/g722_encode.o g722/g722_decode.o g722/g722_encode.o g722/g722_decode.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,codec_g722) + +ifeq ($(BUILD_CPU),x86_64) +SPEEX_RESAMPLE_CFLAGS:=-fPIC +else +SPEEX_RESAMPLE_CFLAGS:= +endif + +$(if $(filter codec_resample,$(EMBEDDED_MODS)),modules.link,codec_resample.so): speex/resample.o +speex/resample.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,codec_resample) $(SPEEX_RESAMPLE_CFLAGS) |