[asterisk-commits] jpeeler: branch jpeeler/bug12415 r189808 - in /team/jpeeler/bug12415/channels...

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Apr 21 16:27:19 2009
New Revision: 189808

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189808
Log:
trust whatever is necessary for these non frame based codecs

Modified:
    team/jpeeler/bug12415/channels/chan_h323.c
    team/jpeeler/bug12415/channels/h323/ast_h323.cxx

Modified: team/jpeeler/bug12415/channels/chan_h323.c
URL: http://svn.digium.com/svn-view/asterisk/team/jpeeler/bug12415/channels/chan_h323.c?view=diff&rev=189808&r1=189807&r2=189808
==============================================================================
--- team/jpeeler/bug12415/channels/chan_h323.c (original)
+++ team/jpeeler/bug12415/channels/chan_h323.c Tue Apr 21 16:27:19 2009
@@ -2456,8 +2456,7 @@
 			if (pvt->options.autoframing) {
 				ast_rtp_codecs_packetization_set(ast_rtp_instance_get_codecs(pvt->rtp), pvt->rtp, &pvt->peer_prefs);
 			} else {
-				ast_debug(2, "Autoframing option not set, ignoring peer's packetization settings");
-				ast_log(LOG_WARNING, "jpeeler: autoframing not set\n");
+				ast_debug(2, "Autoframing option not set, ignoring peer's packetization settings\n");
 				ast_rtp_codecs_packetization_set(ast_rtp_instance_get_codecs(pvt->rtp), pvt->rtp, &pvt->options.prefs);
 			}
 		}

Modified: team/jpeeler/bug12415/channels/h323/ast_h323.cxx
URL: http://svn.digium.com/svn-view/asterisk/team/jpeeler/bug12415/channels/h323/ast_h323.cxx?view=diff&rev=189808&r1=189807&r2=189808
==============================================================================
--- team/jpeeler/bug12415/channels/h323/ast_h323.cxx (original)
+++ team/jpeeler/bug12415/channels/h323/ast_h323.cxx Tue Apr 21 16:27:19 2009
@@ -1771,11 +1771,11 @@
 						struct ast_format_list format;
 						ast_codec_pref_append(&prefs, ast_codec);
 						format = ast_codec_pref_getsize(&prefs, ast_codec);
-						//if ((ast_codec == AST_FORMAT_ALAW) || (ast_codec == AST_FORMAT_ULAW)) {
-						//	ms = remoteCapabilities[i].GetTxFramesInPacket();
-						//	if (ms > 60)
-								//ms = format.cur_ms;
-						//} else
+						if ((ast_codec == AST_FORMAT_ALAW) || (ast_codec == AST_FORMAT_ULAW)) {
+							ms = remoteCapabilities[i].GetTxFramesInPacket();
+							if (ms > 60)
+								ms = format.cur_ms;
+						} else
 							ms = remoteCapabilities[i].GetTxFramesInPacket() * format.inc_ms;
 						ast_codec_pref_setsize(&prefs, ast_codec, ms);
 					}