diff options
| author | Sean Bright <sean@malleable.com> | 2012-03-07 16:16:03 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2012-03-07 16:16:03 +0000 |
| commit | 5aba1ca84a7a07190cb54f3950ebfbc65388fea8 (patch) | |
| tree | 4e339dd469540eab97d3a8f225f866fd7f847909 /codecs | |
| parent | deded253b3c68b5694f5c762d9f3ada61b39cef2 (diff) | |
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>
........
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
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/codec_dahdi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c index 1a745a417..832f856ad 100644 --- a/codecs/codec_dahdi.c +++ b/codecs/codec_dahdi.c @@ -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; |