From: Sean Bright Date: Wed, 7 Mar 2012 16:13:45 +0000 (+0000) Subject: Return g729 and g723.1 frames with the number of samples set properly. X-Git-Tag: 10.3.0~57 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f669e1cd8507a9690fff4fbdc5493e5acd7bca41;p=thirdparty%2Fasterisk.git Return g729 and g723.1 frames with the number of samples set properly. If the wctc4xxp returns more than a single packet, we need to update the number of samples in the returned frame accordingly. Acked-by: Shaun Ruffell ........ Merged revisions 358484 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@358485 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c index 2fb2a2c430..2eec96d064 100644 --- a/codecs/codec_dahdi.c +++ b/codecs/codec_dahdi.c @@ -268,13 +268,13 @@ static struct ast_frame *dahdi_encoder_frameout(struct ast_trans_pvt *pvt) } } else { pvt->f.datalen = res; - pvt->f.samples = dahdip->required_samples; pvt->f.frametype = AST_FRAME_VOICE; ast_format_copy(&pvt->f.subclass.format, &pvt->t->dst_format); pvt->f.mallocd = 0; pvt->f.offset = AST_FRIENDLY_OFFSET; pvt->f.src = pvt->t->name; pvt->f.data.ptr = pvt->outbuf.c; + pvt->f.samples = ast_codec_get_samples(&pvt->f); pvt->samples = 0; pvt->datalen = 0;