[svn-commits] oej: branch oej/pinefrog-1.4 r246626 - /team/oej/pinefrog-1.4/main/rtp.c

[SVN commits to the Digium repositories]

Author: oej
Date: Mon Feb 15 07:44:40 2010
New Revision: 246626

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=246626
Log:
Small fixes

Modified:
    team/oej/pinefrog-1.4/main/rtp.c

Modified: team/oej/pinefrog-1.4/main/rtp.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-1.4/main/rtp.c?view=diff&rev=246626&r1=246625&r2=246626
==============================================================================
--- team/oej/pinefrog-1.4/main/rtp.c (original)
+++ team/oej/pinefrog-1.4/main/rtp.c Mon Feb 15 07:44:40 2010
@@ -182,7 +182,7 @@
 	int *ioidrtcp;
 	unsigned short seqno;		/*!< Sequence number, RFC 3550, page 13. */
 	unsigned short rxseqno;
-	struct sched_context *sched;
+	struct sched_context *sched;	/*!< The scheduler context */
 	struct io_context *io;		/*!< for RTP callback */
 	struct io_context *iortcp;	/*!< for RTCP callback */
 	void *data;
@@ -1519,6 +1519,7 @@
 	/* Stuff that is needed for RTCP - regardless of p2p bridge or not */
 	mark = seqno & (1 << 23);
 	timestamp = ntohl(rtpheader[1]);
+	ssrc = ntohl(rtpheader[2]);
 
 	if (!mark && rtp->rxssrc && rtp->rxssrc != ssrc) {
 		if (option_debug || rtpdebug)
@@ -1543,7 +1544,6 @@
 	ext = seqno & (1 << 28);
 	cc = (seqno & 0xF000000) >> 24;
 	seqno &= 0xffff;
-	ssrc = ntohl(rtpheader[2]);
 
 	rtp->rxcount++; /* Only count reasonably valid packets, this'll make the rtcp stats more accurate */
 
@@ -2459,9 +2459,9 @@
 
 void ast_rtp_stop(struct ast_rtp *rtp)
 {
-	if (rtp->rtcp && rtp->sched != -1) {
+	if (rtp->rtcp && rtp->rtcp->schedid != -1) {
 		AST_SCHED_DEL(rtp->sched, rtp->rtcp->schedid);
-		rtp->sched = -1;
+		rtp->rtcp->schedid = -1;
 	}
 	/* Send RTCP goodbye packet */
 	if (rtp->isactive) {
@@ -4457,4 +4457,3 @@
 	ast_cli_register_multiple(cli_rtp, sizeof(cli_rtp) / sizeof(struct ast_cli_entry));
 	ast_rtp_reload();
 }
-