diff options
Diffstat (limited to 'net/asterisk/files/patch-rtp.c')
| -rw-r--r-- | net/asterisk/files/patch-rtp.c | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/net/asterisk/files/patch-rtp.c b/net/asterisk/files/patch-rtp.c index 11767dca198f..06289f357208 100644 --- a/net/asterisk/files/patch-rtp.c +++ b/net/asterisk/files/patch-rtp.c @@ -1,9 +1,9 @@ $FreeBSD$ ---- rtp.c.orig Tue Nov 25 23:15:28 2003 -+++ rtp.c Fri Jan 30 01:47:34 2004 -@@ -114,7 +114,7 @@ +--- rtp.c.orig Sat Sep 18 16:56:28 2004 ++++ rtp.c Sun Oct 10 15:57:22 2004 +@@ -127,7 +127,7 @@ { switch(buf & TYPE_MASK) { case TYPE_DONTSEND: @@ -12,31 +12,15 @@ $FreeBSD$ break; case TYPE_SILENCE: return 4; -@@ -1028,19 +1028,6 @@ - while((f = ast_smoother_read(rtp->smoother))) - ast_rtp_raw_write(rtp, f, codec); - break; -- case AST_FORMAT_G729A: -- if (!rtp->smoother) { -- rtp->smoother = ast_smoother_new(20); -- } -- if (!rtp->smoother) { -- ast_log(LOG_WARNING, "Unable to create g729 smoother :(\n"); -- return -1; -- } -- ast_smoother_feed(rtp->smoother, _f); -- -- while((f = ast_smoother_read(rtp->smoother))) -- ast_rtp_raw_write(rtp, f, codec); -- break; - case AST_FORMAT_GSM: - if (!rtp->smoother) { - rtp->smoother = ast_smoother_new(33); -@@ -1071,6 +1058,7 @@ - case AST_FORMAT_H261: - case AST_FORMAT_H263: - case AST_FORMAT_G723_1: -+ case AST_FORMAT_G729A: - case AST_FORMAT_SPEEX: - // Don't buffer outgoing frames; send them one-per-packet: - if (_f->offset < hdrlen) { +@@ -841,8 +841,10 @@ + /* Must be an even port number by RTP spec */ + rtp->us.sin_port = htons(x); + rtp->us.sin_addr = addr; +- if (rtp->rtcp) ++ if (rtp->rtcp) { + rtp->rtcp->us.sin_port = htons(x + 1); ++ rtp->rtcp->us.sin_addr = addr; ++ } + if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) && + (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us)))) + break; |