[asterisk-commits] kpfleming: trunk r73550 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Thu Jul  5 17:29:37 2007
New Revision: 73550

URL: http://svn.digium.com/view/asterisk?view=rev&rev=73550
Log:
Merged revisions 73548 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r73548 | kpfleming | 2007-07-05 17:20:44 -0500 (Thu, 05 Jul 2007) | 10 lines

Merged revisions 73547 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r73547 | kpfleming | 2007-07-05 17:11:51 -0500 (Thu, 05 Jul 2007) | 2 lines

we shouldn't allow G.723.1 endpoints to use VAD, just like we don't support it for G.729

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=73550&r1=73549&r2=73550
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Jul  5 17:29:37 2007
@@ -6449,6 +6449,9 @@
 	if (codec == AST_FORMAT_G729A) {
 		/* Indicate that we don't support VAD (G.729 annex B) */
 		ast_build_string(a_buf, a_size, "a=fmtp:%d annexb=no\r\n", rtp_code);
+	} else if (codec == AST_FORMAT_G723_1) {
+		/* Indicate that we don't support VAD (G.723.1 annex A) */
+		ast_build_string(a_buf, a_size, "a=fmtp:%d annexa=no\r\n", rtp_code);
 	} else if (codec == AST_FORMAT_ILBC) {
 		/* Add information about us using only 20/30 ms packetization */
 		ast_build_string(a_buf, a_size, "a=fmtp:%d mode=%d\r\n", rtp_code, fmt.cur_ms);