kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 16:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Send empty frames when missing frames arrive (hope this doesn't break anything)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4035 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-10-19 21:07:10 +00:00
parent 17e80052e5
commit 7bcb9629fd
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtp.c
View File

@@ -91,6 +91,7 @@ struct ast_rtp {
struct ast_smoother *smoother; struct ast_smoother *smoother;
int *ioid; int *ioid;
unsigned short seqno; unsigned short seqno;
unsigned short rxseqno;
struct sched_context *sched; struct sched_context *sched;
struct io_context *io; struct io_context *io;
void *data; void *data;
@@ -361,6 +362,7 @@ struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp)
if ((rtp->rtcp->them.sin_addr.s_addr != sin.sin_addr.s_addr) || if ((rtp->rtcp->them.sin_addr.s_addr != sin.sin_addr.s_addr) ||
(rtp->rtcp->them.sin_port != sin.sin_port)) { (rtp->rtcp->them.sin_port != sin.sin_port)) {
memcpy(&rtp->them, &sin, sizeof(rtp->them)); memcpy(&rtp->them, &sin, sizeof(rtp->them));
rtp->rxseqno = 0;
ast_log(LOG_DEBUG, "RTP NAT: Using address %s:%d\n", ast_inet_ntoa(iabuf, sizeof(iabuf), rtp->rtcp->them.sin_addr), ntohs(rtp->rtcp->them.sin_port)); ast_log(LOG_DEBUG, "RTP NAT: Using address %s:%d\n", ast_inet_ntoa(iabuf, sizeof(iabuf), rtp->rtcp->them.sin_addr), ntohs(rtp->rtcp->them.sin_port));
} }
} }
@@ -401,6 +403,7 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
int hdrlen = 12; int hdrlen = 12;
int mark; int mark;
int ext; int ext;
int x;
char iabuf[INET_ADDRSTRLEN]; char iabuf[INET_ADDRSTRLEN];
unsigned int timestamp; unsigned int timestamp;
unsigned int *rtpheader; unsigned int *rtpheader;
@@ -439,6 +442,7 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
if ((rtp->them.sin_addr.s_addr != sin.sin_addr.s_addr) || if ((rtp->them.sin_addr.s_addr != sin.sin_addr.s_addr) ||
(rtp->them.sin_port != sin.sin_port)) { (rtp->them.sin_port != sin.sin_port)) {
memcpy(&rtp->them, &sin, sizeof(rtp->them)); memcpy(&rtp->them, &sin, sizeof(rtp->them));
rtp->rxseqno = 0;
ast_log(LOG_DEBUG, "RTP NAT: Using address %s:%d\n", ast_inet_ntoa(iabuf, sizeof(iabuf), rtp->them.sin_addr), ntohs(rtp->them.sin_port)); ast_log(LOG_DEBUG, "RTP NAT: Using address %s:%d\n", ast_inet_ntoa(iabuf, sizeof(iabuf), rtp->them.sin_addr), ntohs(rtp->them.sin_port));
} }
} }
@@ -500,6 +504,19 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
if (!rtp->lastrxts) if (!rtp->lastrxts)
rtp->lastrxts = timestamp; rtp->lastrxts = timestamp;
if (rtp->rxseqno) {
for (x=rtp->rxseqno + 1; x < seqno; x++) {
/* Queue empty frames */
rtp->f.mallocd = 0;
rtp->f.datalen = 0;
rtp->f.data = NULL;
rtp->f.offset = 0;
rtp->f.samples = 0;
rtp->f.src = "RTPMissedFrame";
}
}
rtp->rxseqno = seqno;
if (rtp->dtmfcount) { if (rtp->dtmfcount) {
#if 0 #if 0
printf("dtmfcount was %d\n", rtp->dtmfcount); printf("dtmfcount was %d\n", rtp->dtmfcount);
@@ -908,6 +925,7 @@ void ast_rtp_set_peer(struct ast_rtp *rtp, struct sockaddr_in *them)
rtp->rtcp->them.sin_port = htons(ntohs(them->sin_port) + 1); rtp->rtcp->them.sin_port = htons(ntohs(them->sin_port) + 1);
rtp->rtcp->them.sin_addr = them->sin_addr; rtp->rtcp->them.sin_addr = them->sin_addr;
} }
rtp->rxseqno = 0;
} }
void ast_rtp_get_peer(struct ast_rtp *rtp, struct sockaddr_in *them) void ast_rtp_get_peer(struct ast_rtp *rtp, struct sockaddr_in *them)