From 191dabc708352673c7a2ede49180527d8fdaf887 Mon Sep 17 00:00:00 2001 From: markster Date: Sun, 30 May 2004 20:24:48 +0000 Subject: Minor RTP video fixes, be more careful about closing fd's in meetme (bug #1743) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3111 f38db490-d61c-443f-a65b-d21fe96a405b --- rtp.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'rtp.c') diff --git a/rtp.c b/rtp.c index 5fe648dfb..c02780fab 100755 --- a/rtp.c +++ b/rtp.c @@ -544,6 +544,8 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) rtp->lastividtimestamp = timestamp; rtp->f.samples = timestamp - rtp->lastividtimestamp; rtp->lastividtimestamp = timestamp; + rtp->f.delivery.tv_sec = 0; + rtp->f.delivery.tv_usec = 0; if (mark) rtp->f.subclass |= 0x1; @@ -1043,12 +1045,14 @@ static int ast_rtp_raw_write(struct ast_rtp *rtp, struct ast_frame *f, int codec /* Re-calculate last TS */ rtp->lastts = rtp->lastts + ms * 90; /* If it's close to our prediction, go for it */ - if (abs(rtp->lastts - pred) < 7200) { - rtp->lastts = pred; - rtp->lastovidtimestamp += f->samples; - } else { - ast_log(LOG_DEBUG, "Difference is %d, ms is %d\n", abs(rtp->lastts - pred), ms); - rtp->lastovidtimestamp = rtp->lastts; + if (!f->delivery.tv_sec && !f->delivery.tv_usec) { + if (abs(rtp->lastts - pred) < 7200) { + rtp->lastts = pred; + rtp->lastovidtimestamp += f->samples; + } else { + ast_log(LOG_DEBUG, "Difference is %d, ms is %d (%d), pred/ts/samples %d/%d/%d\n", abs(rtp->lastts - pred), ms, ms * 90, rtp->lastts, pred, f->samples); + rtp->lastovidtimestamp = rtp->lastts; + } } } /* Get a pointer to the header */ -- cgit v1.2.3