[asterisk-commits] oej: branch oej/teapot-1.8 r402904 - in /team/oej/teapot-1.8: channels/ main/...

[SVN commits to the Asterisk project]

Author: oej
Date: Wed Nov 20 03:55:10 2013
New Revision: 402904

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402904
Log:
I see no reason to change the RTP ssrc just because we change bridge status. Maybe setting 
the marker bit could be ok, to mark a change in audio streams. But why change the SSRC?
It breaks so many systems, but propably fixed something somewhere. THis needs to be discussed.

Added:
    team/oej/teapot-1.8/patches/do-not-update-ssrc-on-bridge-please.diff   (with props)
Modified:
    team/oej/teapot-1.8/channels/chan_sip.c
    team/oej/teapot-1.8/main/channel.c

Modified: team/oej/teapot-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/teapot-1.8/channels/chan_sip.c?view=diff&rev=402904&r1=402903&r2=402904
==============================================================================
--- team/oej/teapot-1.8/channels/chan_sip.c (original)
+++ team/oej/teapot-1.8/channels/chan_sip.c Wed Nov 20 03:55:10 2013
@@ -7300,6 +7300,7 @@
 		}
 		break;
 	case AST_CONTROL_SRCUPDATE:
+		ast_debug(3, "Got control frame AST_CONTROL_SRCUPDATE on %s\n", p->callid);
 		ast_rtp_instance_update_source(p->rtp);
 		break;
 	case AST_CONTROL_SRCCHANGE:

Modified: team/oej/teapot-1.8/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/teapot-1.8/main/channel.c?view=diff&rev=402904&r1=402903&r2=402904
==============================================================================
--- team/oej/teapot-1.8/main/channel.c (original)
+++ team/oej/teapot-1.8/main/channel.c Wed Nov 20 03:55:10 2013
@@ -7559,8 +7559,10 @@
 	manager_bridge_event(1, 1, c0, c1);
 
 	/* Before we enter in and bridge these two together tell them both the source of audio has changed */
+#ifdef SRCUPDATE_ALWAYS
 	ast_indicate(c0, AST_CONTROL_SRCUPDATE);
 	ast_indicate(c1, AST_CONTROL_SRCUPDATE);
+#endif
 
 	for (/* ever */;;) {
 		struct timeval now = { 0, };
@@ -7733,8 +7735,10 @@
 	ast_clear_flag(c1, AST_FLAG_END_DTMF_ONLY);
 
 	/* Now that we have broken the bridge the source will change yet again */
+#ifdef SRCUPDATE_ALWAYS
 	ast_indicate(c0, AST_CONTROL_SRCUPDATE);
 	ast_indicate(c1, AST_CONTROL_SRCUPDATE);
+#endif
 
 	ast_channel_lock_both(c0, c1);
 	c0->_bridge = NULL;

Added: team/oej/teapot-1.8/patches/do-not-update-ssrc-on-bridge-please.diff
URL: http://svnview.digium.com/svn/asterisk/team/oej/teapot-1.8/patches/do-not-update-ssrc-on-bridge-please.diff?view=auto&rev=402904
==============================================================================
--- team/oej/teapot-1.8/patches/do-not-update-ssrc-on-bridge-please.diff (added)
+++ team/oej/teapot-1.8/patches/do-not-update-ssrc-on-bridge-please.diff Wed Nov 20 03:55:10 2013
@@ -1,0 +1,38 @@
+Index: main/channel.c
+===================================================================
+--- main/channel.c	(revision 402889)
++++ main/channel.c	(working copy)
+@@ -7559,8 +7559,10 @@
+ 	manager_bridge_event(1, 1, c0, c1);
+ 
+ 	/* Before we enter in and bridge these two together tell them both the source of audio has changed */
++#ifdef SRCUPDATE_ALWAYS
+ 	ast_indicate(c0, AST_CONTROL_SRCUPDATE);
+ 	ast_indicate(c1, AST_CONTROL_SRCUPDATE);
++#endif
+ 
+ 	for (/* ever */;;) {
+ 		struct timeval now = { 0, };
+@@ -7733,8 +7735,10 @@
+ 	ast_clear_flag(c1, AST_FLAG_END_DTMF_ONLY);
+ 
+ 	/* Now that we have broken the bridge the source will change yet again */
++#ifdef SRCUPDATE_ALWAYS
+ 	ast_indicate(c0, AST_CONTROL_SRCUPDATE);
+ 	ast_indicate(c1, AST_CONTROL_SRCUPDATE);
++#endif
+ 
+ 	ast_channel_lock_both(c0, c1);
+ 	c0->_bridge = NULL;
+Index: channels/chan_sip.c
+===================================================================
+--- channels/chan_sip.c	(revision 402903)
++++ channels/chan_sip.c	(working copy)
+@@ -7300,6 +7300,7 @@
+ 		}
+ 		break;
+ 	case AST_CONTROL_SRCUPDATE:
++		ast_debug(3, "Got control frame AST_CONTROL_SRCUPDATE on %s\n", p->callid);
+ 		ast_rtp_instance_update_source(p->rtp);
+ 		break;
+ 	case AST_CONTROL_SRCCHANGE:

Propchange: team/oej/teapot-1.8/patches/do-not-update-ssrc-on-bridge-please.diff
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/oej/teapot-1.8/patches/do-not-update-ssrc-on-bridge-please.diff
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/oej/teapot-1.8/patches/do-not-update-ssrc-on-bridge-please.diff
------------------------------------------------------------------------------
    svn:mime-type = text/plain