kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 07:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix timestamps for codec translations with different sized frames

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2629 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-04-05 19:45:53 +00:00
parent b5da1073b0
commit f897350521
1 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
translate.c
View File

@@ -55,6 +55,8 @@ struct ast_trans_pvt {
struct ast_translator *step; struct ast_translator *step;
struct ast_translator_pvt *state; struct ast_translator_pvt *state;
struct ast_trans_pvt *next; struct ast_trans_pvt *next;
struct timeval nextin;
struct timeval nextout;
}; };
@@ -99,6 +101,10 @@ struct ast_trans_pvt *ast_translator_build_path(int dest, int source)
if (tmp) { if (tmp) {
tmp->next = NULL; tmp->next = NULL;
tmp->nextin.tv_sec = 0;
tmp->nextin.tv_usec = 0;
tmp->nextout.tv_sec = 0;
tmp->nextout.tv_usec = 0;
tmp->step = tr_matrix[source][dest].step; tmp->step = tr_matrix[source][dest].step;
tmp->state = tmp->step->new(); tmp->state = tmp->step->new();
if (!tmp->state) { if (!tmp->state) {
@@ -131,12 +137,46 @@ struct ast_frame *ast_translate(struct ast_trans_pvt *path, struct ast_frame *f,
{ {
struct ast_trans_pvt *p; struct ast_trans_pvt *p;
struct ast_frame *out; struct ast_frame *out;
struct timeval delivery;
p = path; p = path;
/* Feed the first frame into the first translator */ /* Feed the first frame into the first translator */
p->step->framein(p->state, f); p->step->framein(p->state, f);
delivery.tv_sec = f->delivery.tv_sec; if (path->nextin.tv_sec || path->nextin.tv_usec) {
delivery.tv_usec = f->delivery.tv_usec; /* Make sure this is in line with what we were expecting */
if ((path->nextin.tv_sec != f->delivery.tv_sec) ||
(path->nextin.tv_usec != f->delivery.tv_usec)) {
/* The time has changed between what we expected and this
most recent time on the new packet. Adjust our output
time appropriately */
long sdiff;
long udiff;
sdiff = f->delivery.tv_sec - path->nextin.tv_sec;
udiff = f->delivery.tv_usec - path->nextin.tv_usec;
path->nextin.tv_sec = f->delivery.tv_sec;
path->nextin.tv_usec = f->delivery.tv_usec;
path->nextout.tv_sec += sdiff;
path->nextout.tv_usec += udiff;
if (path->nextout.tv_usec < 0) {
path->nextout.tv_usec += 1000000;
path->nextout.tv_sec--;
} else if (path->nextout.tv_usec >= 1000000) {
path->nextout.tv_usec -= 1000000;
path->nextout.tv_sec++;
}
}
} else {
/* This is our first pass. Make sure the timing looks good */
path->nextin.tv_sec = f->delivery.tv_sec;
path->nextin.tv_usec = f->delivery.tv_usec;
path->nextout.tv_sec = f->delivery.tv_sec;
path->nextout.tv_usec = f->delivery.tv_usec;
}
/* Predict next incoming sample */
path->nextin.tv_sec += (f->samples / 8000);
path->nextin.tv_usec += ((f->samples % 8000) * 125);
if (path->nextin.tv_usec >= 1000000) {
path->nextin.tv_usec -= 1000000;
path->nextin.tv_sec++;
}
if (consume) if (consume)
ast_frfree(f); ast_frfree(f);
while(p) { while(p) {
@@ -149,8 +189,18 @@ struct ast_frame *ast_translate(struct ast_trans_pvt *path, struct ast_frame *f,
if (p->next) if (p->next)
p->next->step->framein(p->next->state, out); p->next->step->framein(p->next->state, out);
else { else {
out->delivery.tv_sec = delivery.tv_sec; /* Use next predicted outgoing timestamp */
out->delivery.tv_usec = delivery.tv_usec; out->delivery.tv_sec = path->nextout.tv_sec;
out->delivery.tv_usec = path->nextout.tv_usec;
/* Predict next outgoing timestamp from samples in this
frame. */
path->nextout.tv_sec += (out->samples / 8000);
path->nextout.tv_usec += ((out->samples % 8000) * 125);
if (path->nextout.tv_usec >= 1000000) {
path->nextout.tv_sec++;
path->nextout.tv_usec -= 1000000;
}
return out; return out;
} }
p = p->next; p = p->next;