aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
authorjuggie <juggie@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-10 19:03:11 +0000
committerjuggie <juggie@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-10 19:03:11 +0000
commitfa257271e7768a56a000260573fe22b1d0e3037a (patch)
treecc2cf6ab1a0b5474a0f682ea4a444fcf7ba408e2 /codecs
parent816a4f680343f2d1446b5771e376c9ec9726f6b4 (diff)
Revision 117802 changed frame.data to frame.data.ptr however codec_ilbc.c was not updated. This resolves that oversight.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121599 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r--codecs/codec_ilbc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index dcef62dff..3f9b10edb 100644
--- a/codecs/codec_ilbc.c
+++ b/codecs/codec_ilbc.c
@@ -87,7 +87,7 @@ static struct ast_frame *lintoilbc_sample(void)
f.mallocd = 0;
f.offset = 0;
f.src = __PRETTY_FUNCTION__;
- f.data = slin_ilbc_ex;
+ f.data.ptr = slin_ilbc_ex;
return &f;
}
@@ -102,7 +102,7 @@ static struct ast_frame *ilbctolin_sample(void)
f.mallocd = 0;
f.offset = 0;
f.src = __PRETTY_FUNCTION__;
- f.data = ilbc_slin_ex;
+ f.data.ptr = ilbc_slin_ex;
return &f;
}
@@ -134,7 +134,7 @@ static int ilbctolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
ast_log(LOG_WARNING, "Out of buffer space\n");
return -1;
}
- iLBC_decode(tmpf, plc_mode ? f->data + x : NULL, &tmp->dec, plc_mode);
+ iLBC_decode(tmpf, plc_mode ? f->data.ptr + x : NULL, &tmp->dec, plc_mode);
for ( i=0; i < ILBC_SAMPLES; i++)
dst[pvt->samples + i] = tmpf[i];
pvt->samples += ILBC_SAMPLES;
@@ -152,7 +152,7 @@ static int lintoilbc_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
/* XXX We should look at how old the rest of our stream is, and if it
is too old, then we should overwrite it entirely, otherwise we can
get artifacts of earlier talk that do not belong */
- memcpy(tmp->buf + pvt->samples, f->data, f->datalen);
+ memcpy(tmp->buf + pvt->samples, f->data.ptr, f->datalen);
pvt->samples += f->samples;
return 0;
}