Return g729 and g723.1 frames with the number of samples set properly.
authorSean Bright <sean@malleable.com>
Wed, 7 Mar 2012 16:16:03 +0000 (16:16 +0000)
committerSean Bright <sean@malleable.com>
Wed, 7 Mar 2012 16:16:03 +0000 (16:16 +0000)
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 <sruffell@digium.com>
........

Merged revisions 358484 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 358485 from http://svn.asterisk.org/svn/asterisk/branches/10

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358486 65c4cc65-6c06-0410-ace0-fbb531ad65f3

codecs/codec_dahdi.c

index 1a745a4..832f856 100644 (file)
@@ -265,13 +265,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;