[asterisk-commits] seanbright: branch 10 r358485 - in /branches/10: ./ codecs/codec_dahdi.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Mar  7 10:13:45 2012
New Revision: 358485

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=358485
Log:
Make sure that if the wctc4xxp returns more than a single packet, we update
the number of samples in the returned frame accordingly.

Acked-by: Shaun Ruffell <sruffell at digium.com>
........

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

Modified:
    branches/10/   (props changed)
    branches/10/codecs/codec_dahdi.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/codecs/codec_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/codecs/codec_dahdi.c?view=diff&rev=358485&r1=358484&r2=358485
==============================================================================
--- branches/10/codecs/codec_dahdi.c (original)
+++ branches/10/codecs/codec_dahdi.c Wed Mar  7 10:13:45 2012
@@ -268,13 +268,13 @@
 		}
 	} 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;