speex, docs, src: added speex_mode_nb and speex_mode_wb config vars

- Slightly modified patch provided by Dmitrij D. Czarkoff

3 files changed, 27 insertions, 11 deletions

diff --git a/docs/examples/config b/docs/examples/config
index 7617170..999ec1b 100644
--- a/docs/examples/config
+++ b/docs/examples/config
@@ -146,6 +146,8 @@ evdev_device		/dev/input/event0
 speex_quality		7 # 0-10
 speex_complexity	7 # 0-10
 speex_enhancement	0 # 0-1
+speex_mode_nb		3 # 1-6
+speex_mode_wb		6 # 1-6
 speex_vbr		0 # Variable Bit Rate 0-1
 speex_vad		0 # Voice Activity Detection 0-1
 speex_agc_level		8000
diff --git a/modules/speex/speex.c b/modules/speex/speex.c
index 32db0c9..e148387 100644
--- a/modules/speex/speex.c
+++ b/modules/speex/speex.c
@@ -37,7 +37,8 @@ struct audec_state {
 };
 
 
-static char speex_fmtp[128];
+static char speex_fmtp_nb[128];
+static char speex_fmtp_wb[128];
 
 
 /** Speex configuration */
@@ -45,12 +46,16 @@ static struct {
 	int quality;
 	int complexity;
 	int enhancement;
+	int mode_nb;
+	int mode_wb;
 	int vbr;
 	int vad;
 } sconf = {
 	3,  /* 0-10   */
 	2,  /* 0-10   */
 	0,  /* 0 or 1 */
+	3,  /* 1-6    */
+	6,  /* 1-6    */
 	0,  /* 0 or 1 */
 	0   /* 0 or 1 */
 };
@@ -119,8 +124,7 @@ static int decode_param(struct auenc_state *st, const struct pl *name,
 	/* mode: List supported Speex decoding modes.  The valid modes are
 	   different for narrowband and wideband, and are defined as follows:
 
-	   {1,2,3,4,5,6,7,8,any} for narrowband
-	   {0,1,2,3,4,5,6,7,8,9,10,any} for wideband and ultra-wideband
+	   {1,2,3,4,5,6,any}
 	 */
 	if (0 == pl_strcasecmp(name, "mode")) {
 		struct pl v;
@@ -437,6 +441,10 @@ static void config_parse(struct conf *conf)
 		sconf.complexity = v;
 	if (0 == conf_get_u32(conf, "speex_enhancement", &v))
 		sconf.enhancement = v;
+	if (0 == conf_get_u32(conf, "speex_mode_nb", &v))
+		sconf.vbr = v;
+	if (0 == conf_get_u32(conf, "speex_mode_wb", &v))
+		sconf.vbr = v;
 	if (0 == conf_get_u32(conf, "speex_vbr", &v))
 		sconf.vbr = v;
 	if (0 == conf_get_u32(conf, "speex_vad", &v))
@@ -447,19 +455,19 @@ static void config_parse(struct conf *conf)
 static struct aucodec speexv[] = {
 
 	/* Stereo Speex */
-	{LE_INIT, 0, "speex", 32000, 2, speex_fmtp,
+	{LE_INIT, 0, "speex", 32000, 2, speex_fmtp_wb,
 	 encode_update, encode, decode_update, decode, pkloss, 0, 0},
-	{LE_INIT, 0, "speex", 16000, 2, speex_fmtp,
+	{LE_INIT, 0, "speex", 16000, 2, speex_fmtp_wb,
 	 encode_update, encode, decode_update, decode, pkloss, 0, 0},
-	{LE_INIT, 0, "speex",  8000, 2, speex_fmtp,
+	{LE_INIT, 0, "speex",  8000, 2, speex_fmtp_nb,
 	 encode_update, encode, decode_update, decode, pkloss, 0, 0},
 
 	/* Standard Speex */
-	{LE_INIT, 0, "speex", 32000, 1, speex_fmtp,
+	{LE_INIT, 0, "speex", 32000, 1, speex_fmtp_wb,
 	 encode_update, encode, decode_update, decode, pkloss, 0, 0},
-	{LE_INIT, 0, "speex", 16000, 1, speex_fmtp,
+	{LE_INIT, 0, "speex", 16000, 1, speex_fmtp_wb,
 	 encode_update, encode, decode_update, decode, pkloss, 0, 0},
-	{LE_INIT, 0, "speex",  8000, 1, speex_fmtp,
+	{LE_INIT, 0, "speex",  8000, 1, speex_fmtp_nb,
 	 encode_update, encode, decode_update, decode, pkloss, 0, 0},
 };
 
@@ -470,8 +478,12 @@ static int speex_init(void)
 
 	config_parse(conf_cur());
 
-	(void)re_snprintf(speex_fmtp, sizeof(speex_fmtp),
-			  "mode=\"7\";vbr=%s;cng=on",
+	(void)re_snprintf(speex_fmtp_nb, sizeof(speex_fmtp_nb),
+			  "mode=\"%d\";vbr=%s;cng=on", sconf.mode_nb,
+			  sconf.vad ? "vad" : (sconf.vbr ? "on" : "off"));
+
+	(void)re_snprintf(speex_fmtp_wb, sizeof(speex_fmtp_wb),
+			  "mode=\"%d\";vbr=%s;cng=on", sconf.mode_wb,
 			  sconf.vad ? "vad" : (sconf.vbr ? "on" : "off"));
 
 	for (i=0; i<ARRAY_SIZE(speexv); i++)
diff --git a/src/config.c b/src/config.c
index 13d63a1..e581650 100644
--- a/src/config.c
+++ b/src/config.c
@@ -688,6 +688,8 @@ int config_write_template(const char *file, const struct config *cfg)
 	(void)re_fprintf(f, "speex_quality\t\t7 # 0-10\n");
 	(void)re_fprintf(f, "speex_complexity\t7 # 0-10\n");
 	(void)re_fprintf(f, "speex_enhancement\t0 # 0-1\n");
+	(void)re_fprintf(f, "speex_mode_nb\t\t3 # 1-6\n");
+	(void)re_fprintf(f, "speex_mode_wb\t\t6 # 1-6\n");
 	(void)re_fprintf(f, "speex_vbr\t\t0 # Variable Bit Rate 0-1\n");
 	(void)re_fprintf(f, "speex_vad\t\t0 # Voice Activity Detection 0-1\n");
 	(void)re_fprintf(f, "speex_agc_level\t\t8000\n");