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 <sruffell@digium.com>
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@358484 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c
index aa1760285465d30c8837788ad030eca0aa9131bf..cc94a832ef835013e113fbc2fdbf2c8bfb20fb30 100644 (file)
--- a/codecs/codec_dahdi.c
+++ b/codecs/codec_dahdi.c
@@ -254,13 +254,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;
                pvt->f.subclass.codec = 1 <<  (pvt->t->dstfmt);
                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;