[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r327402 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Sun Jul 10 07:05:42 2011
New Revision: 327402

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=327402
Log:
Some DSP cleanup and allow squelching of fax tones

Modified:
    team/irroot/distrotech-customers-trunk/include/asterisk/dsp.h
    team/irroot/distrotech-customers-trunk/main/dsp.c

Modified: team/irroot/distrotech-customers-trunk/include/asterisk/dsp.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/include/asterisk/dsp.h?view=diff&rev=327402&r1=327401&r2=327402
==============================================================================
--- team/irroot/distrotech-customers-trunk/include/asterisk/dsp.h (original)
+++ team/irroot/distrotech-customers-trunk/include/asterisk/dsp.h Sun Jul 10 07:05:42 2011
@@ -43,8 +43,9 @@
 #define DSP_FEATURE_CALL_PROGRESS	(DSP_PROGRESS_TALK | DSP_PROGRESS_RINGING | DSP_PROGRESS_BUSY | DSP_PROGRESS_CONGESTION)
 #define DSP_FEATURE_WAITDIALTONE	(1 << 20)		/*!< Enable dial tone detection */
 
-#define DSP_FAXMODE_DETECT_CNG	(1 << 0)
-#define DSP_FAXMODE_DETECT_CED	(1 << 1)
+#define DSP_FAXMODE_DETECT_CNG		(1 << 0)
+#define DSP_FAXMODE_DETECT_CED		(1 << 1)
+#define DSP_FAXMODE_DETECT_SQUELCH	(1 << 2)
 #define DSP_FAXMODE_DETECT_ALL	(DSP_FAXMODE_DETECT_CNG | DSP_FAXMODE_DETECT_CED)
 
 #define DSP_TONE_STATE_SILENCE  0

Modified: team/irroot/distrotech-customers-trunk/main/dsp.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/dsp.c?view=diff&rev=327402&r1=327401&r2=327402
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/dsp.c (original)
+++ team/irroot/distrotech-customers-trunk/main/dsp.c Sun Jul 10 07:05:42 2011
@@ -467,6 +467,10 @@
 {
 	ast_tone_detect_init(&s->cng_tone_state, FAX_TONE_CNG_FREQ, FAX_TONE_CNG_DURATION, FAX_TONE_CNG_DB, s->sample_rate);
 	ast_tone_detect_init(&s->ced_tone_state, FAX_TONE_CED_FREQ, FAX_TONE_CED_DURATION, FAX_TONE_CED_DB, s->sample_rate);
+	if (s->faxmode & DSP_FAXMODE_DETECT_SQUELCH) {
+		s->cng_tone_state.squelch = 1;
+		s->ced_tone_state.squelch = 1;
+	}
 }
 
 static void ast_dtmf_detect_init (dtmf_detect_state_t *s, unsigned int sample_rate)
@@ -1306,58 +1310,65 @@
 	return res;
 }
 
-int ast_dsp_silence(struct ast_dsp *dsp, struct ast_frame *f, int *totalsilence)
+static int ast_dsp_silence_noise_with_energy(struct ast_dsp *dsp, struct ast_frame *f, int *total, int *frames_energy, int noise)
 {
 	short *s;
 	int len;
-	
+	int x;
+	unsigned char *odata;
+
+	if (!f) {
+		return 0;
+	}
+
 	if (f->frametype != AST_FRAME_VOICE) {
 		ast_log(LOG_WARNING, "Can't calculate silence on a non-voice frame\n");
 		return 0;
 	}
 	if (!ast_format_is_slinear(&f->subclass.format)) {
-		ast_log(LOG_WARNING, "Can only calculate silence on signed-linear frames :(\n");
-		return 0;
-	}
-	s = f->data.ptr;
-	len = f->datalen/2;
-	return __ast_dsp_silence_noise(dsp, s, len, totalsilence, NULL, NULL);
+		odata = f->data.ptr;
+		len = f->datalen;
+		switch (f->subclass.format.id) {
+			case AST_FORMAT_ULAW:
+				s = alloca(len * 2);
+				for (x = 0;x < len; x++) {
+					s[x] = AST_MULAW(odata[x]);
+				}
+				break;
+			case AST_FORMAT_ALAW:
+				s = alloca(len * 2);
+				for (x = 0;x < len; x++) {
+					s[x] = AST_ALAW(odata[x]);
+				}
+				break;
+			default:
+				ast_log(LOG_WARNING, "Can only calculate silence on signed-linear, alaw or ulaw frames :(\n");
+			return 0;
+		}
+	} else {
+		s = f->data.ptr;
+		len = f->datalen/2;
+	}
+	if (noise) {
+		return __ast_dsp_silence_noise(dsp, s, len, NULL, total, frames_energy);
+	} else {
+		return __ast_dsp_silence_noise(dsp, s, len, total, NULL, frames_energy);
+	}
 }
 
 int ast_dsp_silence_with_energy(struct ast_dsp *dsp, struct ast_frame *f, int *totalsilence, int *frames_energy)
 {
-	short *s;
-	int len;
-
-	if (f->frametype != AST_FRAME_VOICE) {
-		ast_log(LOG_WARNING, "Can't calculate silence on a non-voice frame\n");
-		return 0;
-	}
-	if (!ast_format_is_slinear(&f->subclass.format)) {
-		ast_log(LOG_WARNING, "Can only calculate silence on signed-linear frames :(\n");
-		return 0;
-	}
-	s = f->data.ptr;
-	len = f->datalen/2;
-	return __ast_dsp_silence_noise(dsp, s, len, totalsilence, NULL, frames_energy);
+	return ast_dsp_silence_noise_with_energy(dsp, f, totalsilence, frames_energy, 0);
+}
+
+int ast_dsp_silence(struct ast_dsp *dsp, struct ast_frame *f, int *totalsilence)
+{
+	return ast_dsp_silence_noise_with_energy(dsp, f, totalsilence, NULL, 0);
 }
 
 int ast_dsp_noise(struct ast_dsp *dsp, struct ast_frame *f, int *totalnoise)
 {
-       short *s;
-       int len;
-
-       if (f->frametype != AST_FRAME_VOICE) {
-               ast_log(LOG_WARNING, "Can't calculate noise on a non-voice frame\n");
-               return 0;
-       }
-       if (!ast_format_is_slinear(&f->subclass.format)) {
-               ast_log(LOG_WARNING, "Can only calculate noise on signed-linear frames :(\n");
-               return 0;
-       }
-       s = f->data.ptr;
-       len = f->datalen/2;
-       return __ast_dsp_silence_noise(dsp, s, len, NULL, totalnoise, NULL);
+	return ast_dsp_silence_noise_with_energy(dsp, f, totalnoise, NULL, 1);
 }
 
 
@@ -1711,9 +1722,9 @@
 int ast_dsp_set_faxmode(struct ast_dsp *dsp, int faxmode)
 {
 	if (dsp->faxmode != faxmode) {
+		dsp->faxmode = faxmode;
 		ast_fax_detect_init(dsp);
 	}
-	dsp->faxmode = faxmode;
 	return 0;
 }