diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2007-01-04 18:32:23 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2007-01-04 18:32:23 +0000 |
| commit | d6d713c84fd662c23fc1990261bf3e5079797abe (patch) | |
| tree | 63f39f1a236462620dbe0abead5354426664f3de /channels/chan_iax2.c | |
| parent | d6185804495f8fc4fe34e8ccaf2ba36cabcba0a8 (diff) | |
Merged revisions 49465 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49465 | kpfleming | 2007-01-04 12:31:55 -0600 (Thu, 04 Jan 2007) | 2 lines
only do IAX2 frame caching for voice and video frames
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49466 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index b315724cb..aa55ead00 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1137,7 +1137,7 @@ static struct chan_iax2_pvt *new_iax(struct sockaddr_in *sin, int lockpeer, cons static struct iax_frame *iaxfrdup2(struct iax_frame *fr) { - struct iax_frame *new = iax_frame_new(DIRECTION_INGRESS, fr->af.datalen); + struct iax_frame *new = iax_frame_new(DIRECTION_INGRESS, fr->af.datalen, fr->cacheable); if (new) { size_t mallocd_datalen = new->mallocd_datalen; memcpy(new, fr, sizeof(*new)); @@ -3930,7 +3930,7 @@ static int iax2_send(struct chan_iax2_pvt *pvt, struct ast_frame *f, unsigned in if (now) { fr = &frb.fr2; } else - fr = iax_frame_new(DIRECTION_OUTGRESS, ast_test_flag(pvt, IAX_ENCRYPTED) ? f->datalen + 32 : f->datalen); + fr = iax_frame_new(DIRECTION_OUTGRESS, ast_test_flag(pvt, IAX_ENCRYPTED) ? f->datalen + 32 : f->datalen, (f->frametype == AST_FRAME_VOICE) || (f->frametype == AST_FRAME_VIDEO)); if (!fr) { ast_log(LOG_WARNING, "Out of memory\n"); return -1; |