[asterisk-commits] jpeeler: branch 1.8 r281913 - in /branches/1.8: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Aug 11 22:03:37 2010
New Revision: 281913

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=281913
Log:
Merged revisions 281912 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r281912 | jpeeler | 2010-08-11 22:01:38 -0500 (Wed, 11 Aug 2010) | 27 lines
  
  Merged revisions 281911 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r281911 | jpeeler | 2010-08-11 22:00:14 -0500 (Wed, 11 Aug 2010) | 20 lines
    
    Ensure SSRC is changed when media source is changed to resolve audio delay.
    
    This change causes the SSRC to change right before the channels are bridged,
    which is what used to happen. It seems that fixes were made to attempt limiting
    SSRC changes, targeted mainly at sending DTMF. DTMF is not affecting the SSRC
    with this change.
    
    There are two other control frames sent in ast_channel_bridge that probably
    should also be changed to AST_CONTROL_SRCCHANGE as well, but I'm going to leave
    this change up to the discretion of resolving issue #17007.
    
    For reference - old review implementing new control frame SRCCHANGE:
    https://reviewboard.asterisk.org/r/540
    
    (closes issue #17404)
    Reported by: sdolloff
    Patches: 
          bug17404.patch uploaded by jpeeler (license 325)
    Tested by: sdolloff
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/main/channel.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-merged (original)
+++ branch-1.6.2-merged Wed Aug 11 22:03:37 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551,280671,280739,280983,281051,281391,281430,281567,281574,281722,281763,281873
+/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551,280671,280739,280983,281051,281391,281430,281567,281574,281722,281763,281873,281912

Modified: branches/1.8/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/channel.c?view=diff&rev=281913&r1=281912&r2=281913
==============================================================================
--- branches/1.8/main/channel.c (original)
+++ branches/1.8/main/channel.c Wed Aug 11 22:03:37 2010
@@ -6716,8 +6716,8 @@
 	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 */
-	ast_indicate(c0, AST_CONTROL_SRCUPDATE);
-	ast_indicate(c1, AST_CONTROL_SRCUPDATE);
+	ast_indicate(c0, AST_CONTROL_SRCCHANGE);
+	ast_indicate(c1, AST_CONTROL_SRCCHANGE);
 
 	for (/* ever */;;) {
 		struct timeval now = { 0, };