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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@281912 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel.c b/main/channel.c
index 23e4529e3919b8725aae8d6af650794f1a163627..898d4738834c93989e097b595193fcd6cd68676e 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -5336,8 +5336,8 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
        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, };