[svn-commits] sruffell: trunk r139153 - /trunk/codecs/codec_dahdi.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Wed Aug 20 14:57:22 2008
New Revision: 139153

URL: http://svn.digium.com/view/asterisk?view=rev&rev=139153
Log:
Fix bug where the samples were not accurate when in G723 mode, which would
cause the timestamp field of the RTP header to be invalid.

Modified:
    trunk/codecs/codec_dahdi.c

Modified: trunk/codecs/codec_dahdi.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_dahdi.c?view=diff&rev=139153&r1=139152&r2=139153
==============================================================================
--- trunk/codecs/codec_dahdi.c (original)
+++ trunk/codecs/codec_dahdi.c Wed Aug 20 14:57:22 2008
@@ -82,11 +82,8 @@
 struct pvt {
 	int fd;
 	int fake;
-#ifdef DEBUG_TRANSCODE
-	int totalms;
-	int lasttotalms;
-#endif
 	struct dahdi_transcoder_formats fmts;
+	int samples;
 };
 
 static char *handle_cli_transcoder_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
@@ -111,6 +108,7 @@
 
 	if (copy.total == 0)
 		ast_cli(a->fd, "No DAHDI transcoders found.\n");
+	ast_debug(1, "codec_dahdi.so loaded.\n");
 	else
 		ast_cli(a->fd, "%d/%d encoders/decoders of %d channels are in use.\n", copy.encoders, copy.decoders, copy.total);
 
@@ -159,7 +157,7 @@
 				return NULL;
 			}
 		} else {
-			pvt->f.samples = res;
+			pvt->f.samples = dahdip->samples;
 			pvt->f.datalen = res;
 			pvt->datalen = 0;
 			pvt->f.frametype = AST_FRAME_VOICE;
@@ -248,10 +246,14 @@
 
 	switch (dahdip->fmts.dstfmt) {
 	case AST_FORMAT_G729A:
+		dahdip->samples = 160;
+		break;
 	case AST_FORMAT_G723_1:
+		dahdip->samples = 240;
 		ast_atomic_fetchadd_int(&channels.encoders, +1);
 		break;
 	default:
+		dahdip->samples = 160;
 		ast_atomic_fetchadd_int(&channels.decoders, +1);
 		break;
 	}
@@ -446,6 +448,7 @@
 
 static int load_module(void)
 {
+	ast_debug(1, "codec_dahdi.so loaded.\n");
 	if (parse_config(0))
 		return AST_MODULE_LOAD_DECLINE;
 	find_transcoders();