From: Automerge script Date: Tue, 25 Sep 2012 17:25:10 +0000 (+0000) Subject: Merged revisions 373631,373633,373645 via svnmerge from X-Git-Tag: 10.10.0-digiumphones-rc1~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2608668e369ee5e43f756f5aea648dd3e14d8af;p=thirdparty%2Fasterisk.git Merged revisions 373631,373633,373645 via svnmerge from file:///srv/subversion/repos/asterisk/branches/10 ................ r373631 | jrose | 2012-09-25 11:24:34 -0500 (Tue, 25 Sep 2012) | 10 lines chan_sip: Set Quality of Service for video rtp instance (closes issue ASTERISK-20201) Reported by: ddkprog Patches: chan_sip.c.diff uploaded by ddkprog (license 6008) ........ Merged revisions 373617 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ................ r373633 | rmudgett | 2012-09-25 11:33:31 -0500 (Tue, 25 Sep 2012) | 5 lines Make rebuild GSM, ilbc, or lpc10 codecs if the respective sources change. ........ Merged revisions 373618 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ................ r373645 | rmudgett | 2012-09-25 12:19:52 -0500 (Tue, 25 Sep 2012) | 14 lines Fix valgrind found memcpy issues in codec_ilbc. Valgrind found codec_ilbc using memcpy instead of memmove for overlapping memory blocks. (issue ASTERISK-19890) (closes issue ASTERISK-20231) Reported by: Walter Doekes Patches: ASTERISK-20231.patch (license #5674) patch uploaded by Walter Doekes ........ Merged revisions 373640 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@373664 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 9331438e6a..d6945acecf 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5337,6 +5337,7 @@ static int dialog_initialize_rtp(struct sip_pvt *dialog) ast_rtp_instance_set_keepalive(dialog->vrtp, dialog->rtpkeepalive); ast_rtp_instance_set_prop(dialog->vrtp, AST_RTP_PROPERTY_RTCP, 1); + ast_rtp_instance_set_qos(dialog->vrtp, global_tos_video, global_cos_video, "SIP VIDEO"); } if (ast_test_flag(&dialog->flags[1], SIP_PAGE2_TEXTSUPPORT)) { diff --git a/codecs/Makefile b/codecs/Makefile index 6ef08daed6..eeeccd25bc 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -17,44 +17,70 @@ MODULE_PREFIX=codec MENUSELECT_CATEGORY=CODECS MENUSELECT_DESCRIPTION=Codec Translators -LIBILBC:=ilbc/libilbc.a -LIBLPC10:=lpc10/liblpc10.a +SUB_GSM := gsm + +SUB_ILBC := ilbc +LIBILBC := $(SUB_ILBC)/libilbc.a + +SUB_LPC10 := lpc10 +LIBLPC10 := $(SUB_LPC10)/liblpc10.a + +SUB_DIRS := \ + $(SUB_GSM) \ + $(SUB_ILBC) \ + $(SUB_LPC10) \ all: _all include $(ASTTOPDIR)/Makefile.moddir_rules ifneq ($(GSM_INTERNAL),no) -GSM_INCLUDE:=-Igsm/inc -$(if $(filter codec_gsm,$(EMBEDDED_MODS)),modules.link,codec_gsm.so): gsm/lib/libgsm.a +GSM_INCLUDE := -I$(SUB_GSM)/inc endif +$(SUB_GSM): + @mkdir -p $(SUB_GSM)/lib + @$(MAKE) -C $(SUB_GSM) lib/libgsm.a + +# Don't run the implicit rules for this target. +$(SUB_GSM)/lib/libgsm.a: $(SUB_GSM) ; + +ifneq ($(GSM_INTERNAL),no) +$(if $(filter codec_gsm,$(EMBEDDED_MODS)),modules.link,codec_gsm.so): $(SUB_GSM)/lib/libgsm.a +endif clean:: - $(MAKE) -C gsm clean - $(MAKE) -C lpc10 clean - $(MAKE) -C ilbc clean + for dir in $(SUB_DIRS); do \ + $(MAKE) -C $$dir clean; \ + done rm -f g722/*.[oa] rm -f speex/*.[oa] -gsm/lib/libgsm.a: - @mkdir -p gsm/lib - @$(MAKE) -C gsm lib/libgsm.a +.PHONY: $(SUB_DIRS) -$(LIBLPC10): - @$(MAKE) -C lpc10 all +$(SUB_LPC10): + @$(MAKE) -C $(SUB_LPC10) all + +# Don't run the implicit rules for this target. +$(LIBLPC10): $(SUB_LPC10) ; $(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10) -$(LIBILBC): - @$(MAKE) -C ilbc all _ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations -Wshadow,$(_ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)" +$(SUB_ILBC): + @$(MAKE) -C $(SUB_ILBC) all _ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations -Wshadow,$(_ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)" + +# Don't run the implicit rules for this target. +$(LIBILBC): $(SUB_ILBC) ; $(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 @@ -62,4 +88,5 @@ 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) diff --git a/codecs/ilbc/iLBC_decode.c b/codecs/ilbc/iLBC_decode.c index 978d480ec1..e7bda11644 100644 --- a/codecs/ilbc/iLBC_decode.c +++ b/codecs/ilbc/iLBC_decode.c @@ -251,7 +251,7 @@ /* update memory */ - memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); + memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); memcpy(mem+CB_MEML-SUBL, @@ -299,7 +299,7 @@ /* update memory */ - memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); + memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); memcpy(mem+CB_MEML-SUBL, &reverseDecresidual[subframe*SUBL], SUBL*sizeof(float)); diff --git a/codecs/ilbc/iLBC_encode.c b/codecs/ilbc/iLBC_encode.c index 4636414030..4c2e6f714c 100644 --- a/codecs/ilbc/iLBC_encode.c +++ b/codecs/ilbc/iLBC_encode.c @@ -308,7 +308,7 @@ /* update memory */ - memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); + memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); memcpy(mem+CB_MEML-SUBL, @@ -386,7 +386,7 @@ /* update memory */ - memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); + memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); memcpy(mem+CB_MEML-SUBL, &reverseDecresidual[subframe*SUBL], SUBL*sizeof(float));