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

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Apr 21 19:47:46 2009
New Revision: 189812

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189812
Log:
Don't know why this code was here. rtp-packetization.txt shows the max framing for g711 to be 150. Also setting to format.cur_ms would use the default packetization for the codec, not taking into account the remote side's capabilities.

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=189812&r1=189811&r2=189812
==============================================================================
--- team/jpeeler/bug12415/channels/chan_h323.c (original)
+++ team/jpeeler/bug12415/channels/chan_h323.c Tue Apr 21 19:47:46 2009
@@ -2454,6 +2454,7 @@
 		}
 		if (pvt->rtp) {
 			if (pvt->options.autoframing) {
+				ast_debug(2, "Autoframing option set, using peer's packetization settings\n");
 				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\n");

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=189812&r1=189811&r2=189812
==============================================================================
--- team/jpeeler/bug12415/channels/h323/ast_h323.cxx (original)
+++ team/jpeeler/bug12415/channels/h323/ast_h323.cxx Tue Apr 21 19:47:46 2009
@@ -1773,8 +1773,6 @@
 						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
 							ms = remoteCapabilities[i].GetTxFramesInPacket() * format.inc_ms;
 						ast_codec_pref_setsize(&prefs, ast_codec, ms);