[asterisk-commits] pcadach: branch pcadach/chan_h323-live r43348 -
in /team/pcadach/chan_h323-li...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed Sep 20 10:53:01 MST 2006
Author: pcadach
Date: Wed Sep 20 12:53:01 2006
New Revision: 43348
URL: http://svn.digium.com/view/asterisk?rev=43348&view=rev
Log:
Merged revisions 43343-43345,43347 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r43343 | file | 2006-09-20 23:08:44 +0600 (Срд, 20 Сен 2006) | 2 lines
Totally break a P2P bridge upon going on hold, and re-establish it upon going off hold.
........
r43344 | qwell | 2006-09-20 23:39:59 +0600 (Срд, 20 Сен 2006) | 6 lines
Add documentation on rtp packetization.
Technically, ooh323 doesn't support it yet, but there is a patch that should be committed very soon.
Issue #7989, patch by DEA, slightly modified.
........
r43345 | pcadach | 2006-09-20 23:45:25 +0600 (Срд, 20 Сен 2006) | 1 line
Change file naming to be conform OpenH323 rules
........
r43347 | pcadach | 2006-09-20 23:48:52 +0600 (Срд, 20 Сен 2006) | 1 line
Fix missed extension replacement
........
Added:
team/pcadach/chan_h323-live/doc/rtp-packetization.txt (props changed)
- copied unchanged from r43347, trunk/doc/rtp-packetization.txt
Modified:
team/pcadach/chan_h323-live/ (props changed)
team/pcadach/chan_h323-live/configs/h323.conf.sample
team/pcadach/chan_h323-live/configs/sip.conf.sample
team/pcadach/chan_h323-live/configs/skinny.conf.sample
team/pcadach/chan_h323-live/main/rtp.c
Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Sep 20 12:53:01 2006
@@ -1,1 +1,1 @@
-/trunk:1-43341
+/trunk:1-43347
Modified: team/pcadach/chan_h323-live/configs/h323.conf.sample
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configs/h323.conf.sample?rev=43348&r1=43347&r2=43348&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configs/h323.conf.sample (original)
+++ team/pcadach/chan_h323-live/configs/h323.conf.sample Wed Sep 20 12:53:01 2006
@@ -24,6 +24,7 @@
;allow=all ; turns on all installed codecs
;disallow=g723.1 ; Hm... Proprietary, don't use it...
;allow=gsm ; Always allow GSM, it's cool :)
+;allow=ulaw ; see doc/rtp-packetization for framing options
;
; User-Input Mode (DTMF)
;
Modified: team/pcadach/chan_h323-live/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configs/sip.conf.sample?rev=43348&r1=43347&r2=43348&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configs/sip.conf.sample (original)
+++ team/pcadach/chan_h323-live/configs/sip.conf.sample Wed Sep 20 12:53:01 2006
@@ -70,7 +70,7 @@
; defaults to "asterisk"
;disallow=all ; First disallow all codecs
;allow=ulaw ; Allow codecs in order of preference
-;allow=ilbc ;
+;allow=ilbc ; see doc/rtp-packetization for framing options
;
; This option specifies a preference for which music on hold class this channel
; should listen to when put on hold if the music class has not been set on the
Modified: team/pcadach/chan_h323-live/configs/skinny.conf.sample
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configs/skinny.conf.sample?rev=43348&r1=43347&r2=43348&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configs/skinny.conf.sample (original)
+++ team/pcadach/chan_h323-live/configs/skinny.conf.sample Wed Sep 20 12:53:01 2006
@@ -7,7 +7,7 @@
dateformat=M-D-Y ; M,D,Y in any order (5 chars max)
keepalive=120
-;allow=all
+;allow=all ; see doc/rtp-packetization for framing options
;disallow=
;------------------------------ JITTER BUFFER CONFIGURATION --------------------------
Propchange: team/pcadach/chan_h323-live/doc/rtp-packetization.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/pcadach/chan_h323-live/doc/rtp-packetization.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/pcadach/chan_h323-live/doc/rtp-packetization.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: team/pcadach/chan_h323-live/main/rtp.c
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/main/rtp.c?rev=43348&r1=43347&r2=43348&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/main/rtp.c (original)
+++ team/pcadach/chan_h323-live/main/rtp.c Wed Sep 20 12:53:01 2006
@@ -2940,14 +2940,30 @@
if ((fr->subclass == AST_CONTROL_HOLD) ||
(fr->subclass == AST_CONTROL_UNHOLD) ||
(fr->subclass == AST_CONTROL_VIDUPDATE)) {
- /* If we are going on hold, then break callback mode */
+ /* If we are going on hold, then break callback mode and P2P bridging */
if (fr->subclass == AST_CONTROL_HOLD) {
if (p0_callback)
p0_callback = p2p_callback_disable(c0, p0, &p0_fds[0], &p0_iod[0]);
if (p1_callback)
p1_callback = p2p_callback_disable(c1, p1, &p1_fds[0], &p1_iod[0]);
+ p0->bridged = NULL;
+ p1->bridged = NULL;
+ if (vp0) {
+ vp0->bridged = NULL;
+ vp1->bridged = NULL;
+ }
} else if (fr->subclass == AST_CONTROL_UNHOLD) {
- /* If we are off hold, then go back to callback mode */
+ /* If we are off hold, then go back to callback mode and P2P bridging */
+ ast_clear_flag(p0, FLAG_P2P_SENT_MARK);
+ p0->bridged = p1;
+ ast_clear_flag(p1, FLAG_P2P_SENT_MARK);
+ p1->bridged = p0;
+ if (vp0) {
+ ast_clear_flag(vp0, FLAG_P2P_SENT_MARK);
+ vp0->bridged = vp1;
+ ast_clear_flag(vp1, FLAG_P2P_SENT_MARK);
+ vp1->bridged = vp0;
+ }
p0_callback = p2p_callback_enable(c0, p0, &p0_fds[0], &p0_iod[0]);
p1_callback = p2p_callback_enable(c1, p1, &p1_fds[0], &p1_iod[0]);
}
More information about the asterisk-commits
mailing list