Merged revisions 378985 via svnmerge from

file:///srv/subversion/repos/asterisk/trunk

................
  r378985 | mjordan | 2013-01-13 16:07:00 -0600 (Sun, 13 Jan 2013) | 20 lines

  Reset RTP timestamp; sequence number on SSRC change

  In r370252 for ASTERISK-18404, Asterisk's handling of RTP was modified to
  better account for out of order RTP packets. This was accomplished by using the
  RTP timestamp and sequence number to check for out of order packets. However,
  when a SSRC change occurs, the timestamp and sequence number will no longer
  have any relation to the previously received packets. The variables tracking
  the timestamp and sequence number therefore have to be reset.

  (closes issue ASTERISK-20906)
  Reported by: Eelco Brolman
  patches:
    dtmf_on_hold.patch uploaded by Eelco Brolman (license #6442)
  ........

  Merged revisions 378967 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........

  Merged revisions 378984 from http://svn.asterisk.org/svn/asterisk/branches/11
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378993 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index 46ed35ff4bc835118a7c994901c2b17669a176c5..4450a51b5f08ea5673befb1489a0046f89a69117 100644 (file)
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -3625,6 +3625,9 @@ static struct ast_frame *ast_rtp_read(struct ast_rtp_instance *instance, int rtc
 
                f = ast_frisolate(&srcupdate);
                AST_LIST_INSERT_TAIL(&frames, f, frame_list);
+
+               rtp->last_seqno = 0;
+               rtp->last_end_timestamp = 0;
        }
 
        rtp->rxssrc = ssrc;