Merged revisions 281913 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r281913 | jpeeler | 2010-08-11 22:03:37 -0500 (Wed, 11 Aug 2010) | 34 lines

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

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

diff --git a/main/channel.c b/main/channel.c
index 32d559d0f71acf2b1a197ccc026ba2dd2cc6e97d..3c64c57a1e76e72ed4c7aece352e0a245e95a9af 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -6716,8 +6716,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, };