[svn-commits] mogorman: trunk r47586 - in /trunk: codecs/codec_zap.c main/frame.c

[svn-commits at lists.digium.com]

Author: mogorman
Date: Mon Nov 13 16:01:43 2006
New Revision: 47586

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47586
Log:
fix bytesize to  5.3kb for g723 codec and add support for multimode of tc400p

Modified:
    trunk/codecs/codec_zap.c
    trunk/main/frame.c

Modified: trunk/codecs/codec_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_zap.c?view=diff&rev=47586&r1=47585&r2=47586
==============================================================================
--- trunk/codecs/codec_zap.c (original)
+++ trunk/codecs/codec_zap.c Mon Nov 13 16:01:43 2006
@@ -58,6 +58,7 @@
 #define BUFFER_SAMPLES	8000
 
 static unsigned int global_useplc = 0;
+static int cardsmode = 0;
 
 struct format_map {
 	unsigned int map[32][32];
@@ -127,7 +128,7 @@
 		ztp->fake = 1;
 		ztp->f.frametype = AST_FRAME_VOICE;
 		ztp->f.subclass = 0;
-		ztp->f.samples = 160;
+		ztp->f.samples = (hdr->srcfmt == ZT_FORMAT_G729A || hdr->dstfmt == ZT_FORMAT_G729A) ? 160: 240;
 		ztp->f.data = NULL;
 		ztp->f.offset = 0;
 		ztp->f.datalen = 0;
@@ -231,7 +232,7 @@
 	return zap_translate(pvt, pvt->t->dstfmt, pvt->t->srcfmt);
 }
 
-static struct ast_frame *fakesrc_sample(void)
+static struct ast_frame *g729_fakesrc_sample()
 {
 	/* Don't bother really trying to test hardware ones. */
 	static struct ast_frame f = {
@@ -243,38 +244,53 @@
 	return &f;
 }
 
+static struct ast_frame *g723_fakesrc_sample()
+{
+	/* Don't bother really trying to test hardware ones. */
+	static struct ast_frame f = {
+		.frametype = AST_FRAME_VOICE,
+		.samples = 240,
+		.src = __PRETTY_FUNCTION__
+	};
+
+	return &f;
+}
+
 static int register_translator(int dst, int src)
 {
 	struct translator *zt;
 	int res;
-
-	if (!(zt = ast_calloc(1, sizeof(*zt))))
-		return -1;
-
-	snprintf((char *) (zt->t.name), sizeof(zt->t.name), "zap%sto%s", 
-		 ast_getformatname((1 << src)), ast_getformatname((1 << dst)));
-	zt->t.srcfmt = (1 << src);
-	zt->t.dstfmt = (1 << dst);
-	zt->t.newpvt = zap_new;
-	zt->t.framein = zap_framein;
-	zt->t.frameout = zap_frameout;
-	zt->t.destroy = zap_destroy;
-	zt->t.sample = fakesrc_sample;
-	zt->t.useplc = global_useplc;
-	zt->t.buf_size = BUFFER_SAMPLES * 2;
-	zt->t.desc_size = sizeof(struct pvt);
-	if ((res = ast_register_translator(&zt->t))) {
-		free(zt);
-		return -1;
-	}
-
-	AST_LIST_LOCK(&translators);
-	AST_LIST_INSERT_HEAD(&translators, zt, entry);
-	AST_LIST_UNLOCK(&translators);
-
-	global_format_map.map[dst][src] = 1;
-
-	return res;
+	
+	if (!((cardsmode  == 1 && (dst == 8 || src == 8)) || (cardsmode == 2 && (dst == 0 || src == 0)) || (cardsmode == 0))) {
+		return -1;
+	}
+		if (!(zt = ast_calloc(1, sizeof(*zt))))
+			return -1;
+	
+		snprintf((char *) (zt->t.name), sizeof(zt->t.name), "zap%sto%s", 
+			 ast_getformatname((1 << src)), ast_getformatname((1 << dst)));
+		zt->t.srcfmt = (1 << src);
+		zt->t.dstfmt = (1 << dst);
+		zt->t.newpvt = zap_new;
+		zt->t.framein = zap_framein;
+		zt->t.frameout = zap_frameout;
+		zt->t.destroy = zap_destroy;
+		zt->t.sample = (dst == 8 || src == 8) ? g729_fakesrc_sample() : g723_fakesrc_sample();
+		zt->t.useplc = global_useplc;
+		zt->t.buf_size = BUFFER_SAMPLES * 2;
+		zt->t.desc_size = sizeof(struct pvt);
+		if ((res = ast_register_translator(&zt->t))) {
+			free(zt);
+			return -1;
+		}
+	
+		AST_LIST_LOCK(&translators);
+		AST_LIST_INSERT_HEAD(&translators, zt, entry);
+		AST_LIST_UNLOCK(&translators);
+	
+		global_format_map.map[dst][src] = 1;
+	
+		return res;
 }
 
 static void drop_translator(int dst, int src)
@@ -315,6 +331,7 @@
 {
 	struct ast_variable *var;
 	struct ast_config *cfg = ast_config_load("codecs.conf");
+	cardsmode = 0;
 
 	if (!cfg)
 		return;
@@ -327,6 +344,16 @@
 					   global_useplc ? "" : "not ");
 	       }
 	}
+	for (var = ast_variable_browse(cfg, "transcoder_card"); var; var = var->next) {
+		if (!strcasecmp(var->name, "mode")) {
+			if(strstr(var->value, "g729"))
+				cardsmode = 1;
+			else if(strstr(var->value, "g723"))
+				cardsmode = 2;
+			else if(strstr(var->value, "mixed"))
+				cardsmode = 0;
+		}
+	}
 
 	ast_config_destroy(cfg);
 }

Modified: trunk/main/frame.c
URL: http://svn.digium.com/view/asterisk/trunk/main/frame.c?view=diff&rev=47586&r1=47585&r2=47586
==============================================================================
--- trunk/main/frame.c (original)
+++ trunk/main/frame.c Mon Nov 13 16:01:43 2006
@@ -102,7 +102,7 @@
 
 /*! \brief Definition of supported media formats (codecs) */
 static struct ast_format_list AST_FORMAT_LIST[] = {					/*!< Bit number: comment  - Bit numbers are hard coded in show_codec() */
-	{ 1, AST_FORMAT_G723_1 , "g723" , "G.723.1", 24, 30, 300, 30, 30 },	/*!<  1 */
+	{ 1, AST_FORMAT_G723_1 , "g723" , "G.723.1", 20, 30, 300, 30, 30 },	/*!<  1 */
 	{ 1, AST_FORMAT_GSM, "gsm" , "GSM", 33, 20, 300, 20, 20 },		/*!<  2: codec_gsm.c */
 	{ 1, AST_FORMAT_ULAW, "ulaw", "G.711 u-law", 80, 10, 150, 10, 20 },	/*!<  3: codec_ulaw.c */
 	{ 1, AST_FORMAT_ALAW, "alaw", "G.711 A-law", 80, 10, 150, 10, 20 },	/*!<  4: codec_alaw.c */
@@ -1377,6 +1377,9 @@
 
 	/* XXX Still need speex, g723, and lpc10 XXX */	
 	switch(format) {
+	case AST_FORMAT_G723_1:
+		len = (samples / 240) * 20;
+		break;
 	case AST_FORMAT_ILBC:
 		len = (samples / 240) * 50;
 		break;