[asterisk-commits] file: trunk r90589 - in /trunk: ./ main/rtp.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Dec  3 14:07:34 2007
New Revision: 90589

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

........
r90588 | file | 2007-12-03 16:05:42 -0400 (Mon, 03 Dec 2007) | 2 lines

Do not create a smoother for G723.1 frames, they need to be left alone to their native 20/24 byte size.

........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

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

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=90589&r1=90588&r2=90589
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Mon Dec  3 14:07:34 2007
@@ -3119,7 +3119,7 @@
 		rtp->smoother = NULL;
 	}
 
-	if (!rtp->smoother && subclass != AST_FORMAT_SPEEX) {
+	if (!rtp->smoother && subclass != AST_FORMAT_SPEEX && subclass != AST_FORMAT_G723_1) {
 		struct ast_format_list fmt = ast_codec_pref_getsize(&rtp->pref, subclass);
 		if (fmt.inc_ms) { /* if codec parameters is set / avoid division by zero */
 			if (!(rtp->smoother = ast_smoother_new((fmt.cur_ms * fmt.fr_len) / fmt.inc_ms))) {