diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-22 19:16:52 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-22 19:16:52 +0000 |
| commit | ff49af076a1ff127d2d371d1cd442df463b1b21b (patch) | |
| tree | fb38482bc64fc36a0be3b22fc18172d3e0b4cc39 /channels | |
| parent | f16a9a480a3e93cb430dbfb664e98291b688332e (diff) | |
Oops that wasn't quite right. Partially revert changes until real data is collected.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2749 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_iax2.c | 8 | ||||
| -rwxr-xr-x | channels/iax2-parser.c | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index fee41ac16..bdf83c6ac 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4565,14 +4565,6 @@ static int socket_read(int *id, int fd, short events, void *cbdata) f.src = "IAX2"; f.mallocd = 0; f.offset = 0; - f.delivery.tv_sec = peer->rxtrunktime.tv_sec; - f.delivery.tv_usec = peer->rxtrunktime.tv_usec; - f.delivery.tv_sec += ts / 1000; - f.delivery.tv_usec += ts % 1000; - if (f.delivery.tv_usec >= 1000000) { - f.delivery.tv_usec -= 1000000; - f.delivery.tv_sec += 1; - } if (f.datalen && (f.frametype == AST_FRAME_VOICE)) f.samples = get_samples(&f); else diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c index d8d58d60c..07ca8cf48 100755 --- a/channels/iax2-parser.c +++ b/channels/iax2-parser.c @@ -570,7 +570,8 @@ void iax_frame_wrap(struct iax_frame *fr, struct ast_frame *f) fr->af.samples = f->samples; fr->af.offset = AST_FRIENDLY_OFFSET; fr->af.src = f->src; - fr->af.delivery = f->delivery; + fr->af.delivery.tv_sec = 0; + fr->af.delivery.tv_usec = 0; fr->af.data = fr->afdata; if (fr->af.datalen) memcpy(fr->af.data, f->data, fr->af.datalen); |