From: Joshua Colp <jcolp@digium.com>
Date: Mon, 3 Dec 2007 20:07:34 +0000 (+0000)
Subject: Merged revisions 90588 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~582
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=985c9f5cfe5d6250c5fc2db300a31ada23b0e73a;p=thirdparty%2Fasterisk.git

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.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/rtp.c b/main/rtp.c
index 87630f6e0e..97bbe59fcf 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -3119,7 +3119,7 @@ int ast_rtp_write(struct ast_rtp *rtp, struct ast_frame *_f)
 		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))) {