!* Equalizer: specify parameters by their name

Author: stsaz

README.md

@@ -130,7 +130,7 @@ phiola http://server/stream -tee "@artist - @title.mp3"
 phiola http://server/music.mp3 -dup @stdout.wav | phiola convert @stdin -aac_q 64 -o output.m4a
 
 # Play audio with 2-band Equalizer (at 600Hz, 2.0 Q-factor width, -6 dB gain; at 10KHz, +3 dB gain)
-phiola file.mp3 -equalizer "600 2.0q -6.0  10000 2.0q 3.0"
+phiola file.mp3 -equalizer "f 600 w 2.0q g -6.0,  f 10000 w 2.0q g 3.0"
 ```
 
 While audio is playing, you can control phiola via keyboard.  The most commonly used commands are:

src/afilter/sox.c

@@ -5,6 +5,7 @@
 #include <sox/sox-phi.h>
 #include <util/aformat.h>
 #include <ffsys/globals.h>
+#include <ffbase/args.h>
 
 static const phi_core *core;
 #define errlog(t, ...)  phi_errlog(core, NULL, t, __VA_ARGS__)
@@ -39,24 +40,44 @@ static int request_input_conversion(phi_track *t)
 	t->aconv.out = t->audio.format;
 	t->aconv.out.format = PHI_PCM_32;
 	t->aconv.out.interleaved = 1;
-	if (!t->conf.oaudio.format.format)
-		t->conf.oaudio.format.format = PHI_PCM_FLOAT64;
 	t->oaudio.format = t->aconv.out;
 	t->data_out = t->data_in;
 	return PHI_BACK;
 }
 
-static int argv_extract(ffstr *s, char **argv, uint n)
+struct sox_eq_conf {
+	const char *frequency, *width, *gain;
+};
+
+#define O(m)  (void*)(ffsize)FF_OFF(struct sox_eq_conf, m)
+static const struct ffarg sox_eq_args[] = {
+	{ "frequency",	's',	O(frequency) },
+	{ "gain",		's',	O(gain) },
+	{ "width",		's',	O(width) },
+	{}
+};
+#undef O
+
+static int sox_argv_extract(struct sox *c, phi_track *t, ffstr *s, char **argv, uint n)
 {
-	for (uint i = 0;  i < n;  i++) {
-		ffstr a;
-		ffstr_splitby(s, ' ', &a, s);
-		if (!a.len)
-			return -1;
-		a.ptr[a.len] = '\0';
-		argv[i] = a.ptr;
-	}
+	struct sox_eq_conf eqc = {};
+	ffstr sc = {};
+	ffstr_splitby(s, ',', &sc, s);
 	ffstr_skipchar(s, ' ');
+	sc.ptr[sc.len] = '\0';
+
+	struct ffargs a = {};
+	if (ffargs_process_line(&a, sox_eq_args, &eqc, FFARGS_O_PARTIAL | FFARGS_O_DUPLICATES, sc.ptr)) {
+		errlog(t, "%s", a.error);
+		return -1;
+	}
+
+	if (!eqc.frequency || !eqc.width || !eqc.gain)
+		return -1;
+
+	argv[0] = (char*)eqc.frequency;
+	argv[1] = (char*)eqc.width;
+	argv[2] = (char*)eqc.gain;
 	return 0;
 }
 
@@ -94,7 +115,7 @@ static int sox_process(struct sox *c, phi_track *t)
 		uint i = 1;
 		while (s.len) {
 			char *argv[3];
-			if (argv_extract(&s, argv, 3)) {
+			if (sox_argv_extract(c, t, &s, argv, 3)) {
 				errlog(t, "Equalizer: incorrect parameters");
 				t->error = PHI_E_FILTER_CONF;
 				return PHI_ERR;
@@ -103,7 +124,7 @@ static int sox_process(struct sox *c, phi_track *t)
 				errlog(t, "phi_sox_filter");
 				return PHI_ERR;
 			}
-			dbglog(t, "added filter #%u 'equalizer'", i);
+			dbglog(t, "added filter #%u 'equalizer': %s %s %s", i, argv[0], argv[1], argv[2]);
 			i++;
 		}
 

src/exe/play.h

@@ -43,8 +43,12 @@ Options:\n\
                           `attenuate`  Integer\n\
                           `gain`       Integer\n\
   `-equalizer` \"OPTIONS\"  SoX Equalizer (doesn't work with `-norm`). Options:\n\
-                            frequency width gain ...\n\
-                          Refer to the official SoX documentation for more info.\n\
+                          `frequency`  Hz\n\
+                          `width`q     Q-factor value plus 'q' character (larger = narrower)\n\
+                          `gain`       dB\n\
+                          [, ...]\n\
+                        Add more parameters after comma for multi-band equalizer.\n\
+                        Refer to the official SoX documentation for more info.\n\
 \n\
   `-audio` STRING         Audio library name (e.g. alsa)\n\
   `-device` NUMBER        Playback device number\n\

src/jni/queue.h

@@ -458,6 +458,27 @@ enum {
 	QC_EQUALIZER = 1,
 };
 
+/* "F W G ..." -> "f F w W g G, ..." */
+static char* eq_convert(const char *sz)
+{
+	ffvec buf = {};
+	ffstr s = FFSTR_INITZ(sz), f, w, g;
+	ffstr_skipchar(&s, ' ');
+	while (s.len) {
+		ffstr_splitby(&s, ' ', &f, &s);
+		ffstr_splitby(&s, ' ', &w, &s);
+		ffstr_splitby(&s, ' ', &g, &s);
+		ffstr_skipchar(&s, ' ');
+		if (!f.len || !w.len || !g.len)
+			break;
+		if (buf.len)
+			ffvec_addchar(&buf, ',');
+		ffvec_addfmt(&buf, "f %S w %S g %S", &f, &w, &g);
+	}
+	ffvec_addchar(&buf, '\0');
+	return buf.ptr;
+}
+
 JNIEXPORT void JNICALL
 Java_com_github_stsaz_phiola_Phiola_quConfStr(JNIEnv *env, jobject thiz, int setting, jstring jval)
 {
@@ -467,7 +488,7 @@ Java_com_github_stsaz_phiola_Phiola_quConfStr(JNIEnv *env, jobject thiz, int set
 	switch (setting) {
 	case QC_EQUALIZER:
 		ffmem_free(x->play.equalizer);
-		x->play.equalizer = (*val) ? ffsz_dup(val) : NULL;  break;
+		x->play.equalizer = (*val) ? eq_convert(val) : NULL;  break;
 	}
 
 	// Apply settings for the active playlist

test.sh

@@ -546,6 +546,15 @@ test_norm() {
 	./phiola pl pl.wav -norm ""
 }
 
+test_equalizer() {
+	if ! test -f pl.wav ; then
+		./phiola rec -rate 48000 -o pl.wav -f -u 2
+	fi
+	./phiola pl -equ " f 1000 w 1.0q" pl.wav || true # missing parameter
+	./phiola pl -equ " f 1000 unknown 1.0q g -6.0" pl.wav || true # unknown parameter
+	./phiola -D pl -equ " w 1.0q g -6.0 f 1000 , w 1.0q f 10000 g -6.0 " pl.wav | grep equalizer
+}
+
 test_dir_read() {
 	./phiola i -inc '*.wav' .
 	./phiola i -inc '*.wav' -exc 'co*.wav' .
@@ -931,6 +940,7 @@ TESTS=(
 	rename
 	server
 	# http
+	equalizer
 	clean
 	# rec_play_alsa
 	# wasapi_exclusive