Index: codec_g723_1.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_g723_1.c,v
retrieving revision 1.12
diff -u -r1.12 codec_g723_1.c
--- codec_g723_1.c	27 Sep 2003 02:45:37 -0000	1.12
+++ codec_g723_1.c	2 Apr 2004 21:36:05 -0000
@@ -115,7 +115,7 @@
 	f.subclass = AST_FORMAT_SLINEAR;
 	f.datalen = sizeof(slin_g723_ex);
 	/* Assume 8000 Hz */
-	f.samples = sizeof(slin_g723_ex)/16;
+	f.samples = sizeof(slin_g723_ex) / sizeof(short);
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
@@ -130,7 +130,7 @@
 	f.subclass = AST_FORMAT_G723_1;
 	f.datalen = sizeof(g723_slin_ex);
 	/* All frames are 30 ms long */
-	f.samples = 30;
+	f.samples = sizeof(g723_slin_ex) / 24 * Frame;
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
@@ -167,7 +167,7 @@
 	tmp->f.subclass = AST_FORMAT_SLINEAR;
 	tmp->f.datalen = tmp->tail * 2;
 	/* Assume 8000 Hz */
-	tmp->f.samples = tmp->tail / 8;
+	tmp->f.samples = tmp->tail;
 	tmp->f.mallocd = 0;
 	tmp->f.offset = AST_FRIENDLY_OFFSET;
 	tmp->f.src = __PRETTY_FUNCTION__;
@@ -296,7 +296,7 @@
 		Coder(&tmp->cod, tmp->buf, tmp->outbuf + cnt);
 #endif
 		/* Assume 8000 Hz */
-		tmp->f.samples += 30;
+		tmp->f.samples += Frame;
 		/* FIXME:SLD: Shouldn't the [0] be [cnt]?? */
 		cnt += g723_len(tmp->outbuf[0]);
 		tmp->tail -= Frame;