[asterisk-commits] sruffell: branch sruffell/asterisk-trunk-transcoder r174843 - /team/sruffell/...

[SVN commits to the Asterisk project]

Author: sruffell
Date: Wed Feb 11 00:57:36 2009
New Revision: 174843

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=174843
Log:
Syncing with recent changes in asterisk-1.4-transcoder.

Primarily this merge is to make sure all PLC support is disabled.  This branch
still most likely needs a conversion to use the smoother before merging into the
trunk.

Modified:
    team/sruffell/asterisk-trunk-transcoder/codecs/codec_dahdi.c

Modified: team/sruffell/asterisk-trunk-transcoder/codecs/codec_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/team/sruffell/asterisk-trunk-transcoder/codecs/codec_dahdi.c?view=diff&rev=174843&r1=174842&r2=174843
==============================================================================
--- team/sruffell/asterisk-trunk-transcoder/codecs/codec_dahdi.c (original)
+++ team/sruffell/asterisk-trunk-transcoder/codecs/codec_dahdi.c Wed Feb 11 00:57:36 2009
@@ -164,7 +164,7 @@
 	struct pollfd p = {0};
 	if (!count) return;
 	res = write(dahdip->fd, buffer, count);
-	if (option_verbose > 3) {
+	if (option_verbose > 10) {
 		if (-1 == res) {
 			ast_log(LOG_ERROR, "Failed to write to transcoder: %s\n", strerror(errno));
 		}
@@ -278,7 +278,6 @@
 {
 	struct codec_dahdi_pvt *dahdip = pvt->pvt;
 
-	if (pvt->samples) ast_log(LOG_WARNING, " -- %d\n", pvt->samples);
 	if (!f->subclass) {
 		/* We're just faking a return for calculation purposes. */
 		dahdip->fake = 2;
@@ -494,22 +493,31 @@
 	if (is_encoder(zt)) {
 		zt->t.framein = dahdi_encoder_framein;
 		zt->t.frameout = dahdi_encoder_frameout;
+#if 0
 		zt->t.buffer_samples = 0;
+#endif
 	} else {
 		zt->t.framein = dahdi_decoder_framein;
 		zt->t.frameout = dahdi_decoder_frameout;
+#if 0
 		if (AST_FORMAT_G723_1 == zt->t.srcfmt) {
 			zt->t.plc_samples = G723_SAMPLES;
 		} else {
 			zt->t.plc_samples = G729_SAMPLES;
 		}
 		zt->t.buffer_samples = zt->t.plc_samples * 8;
+#endif
 	}
 	zt->t.destroy = dahdi_destroy;
+	zt->t.buffer_samples = 0;
 	zt->t.newpvt = dahdi_new;
 	zt->t.sample = fakesrc_sample;
+#if 0
 	zt->t.useplc = global_useplc;
-	zt->t.native_plc = 1;
+#endif
+	zt->t.useplc = 0;
+	zt->t.native_plc = 0;
+
 	zt->t.desc_size = sizeof(struct codec_dahdi_pvt);
 	if ((res = ast_register_translator(&zt->t))) {
 		ast_free(zt);
@@ -571,10 +579,11 @@
 	for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {
 	       if (!strcasecmp(var->name, "genericplc")) {
 		       global_useplc = ast_true(var->value);
-			   ast_verb(3, "codec_dahdi: %susing generic PLC\n",
-					   global_useplc ? "" : "not ");
+		       ast_verb(3, "codec_dahdi: %susing generic PLC\n",
+				global_useplc ? "" : "not ");
 	       }
 	}
+
 	ast_config_destroy(cfg);
 	return 0;
 }
@@ -676,6 +685,7 @@
 
 static int load_module(void)
 {
+	ast_ulaw_init();
 	if (parse_config(0))
 		return AST_MODULE_LOAD_DECLINE;
 	find_transcoders();