Treshold inversion + documentation

[mirrors/Programs.git] / c / goertzel / goertzel.c

diff --git a/c/goertzel/goertzel.c b/c/goertzel/goertzel.c
index 95e30992663201fe3b2f4f4cf50b25a02b9c03e3..f22a1fcb1a911c011008ba7c266e279e46b6e6ef 100644 (file)
--- a/c/goertzel/goertzel.c
+++ b/c/goertzel/goertzel.c
@@ -65,18 +65,23 @@ void print_help(char ** argv) {
                "\n"
                "\t-r <samplerate>\tInput samplerate (deault 8000 Hz)\n"
                "\t-c <count>\tFrame size in samples (default 4000 Samples)\n"
-               "\t-d <ratio>\tFrame size (default 2) (samplerate will be divided by this number to get frame size same as -c)\n"
+               "\t-d <divisor>\tFrame size ( count = samplerate/divisor ) (default 2)\n"
                "\n"
-               "\t-f <freq>\tAdd frequency in Hz to detect (use multiple times, if no added 440 Hz will be...)\n"
+               "\t-f <freq>\tAdd frequency in Hz to detect (use multiple times, default 440 Hz)\n"
+               "\n"
+               "\t-n <format>\tSet number output format\n"
+               "\t\tf: float\t23.4223 (default)\n"
+               "\t\ti: integer\t23\n"
+               "\t\tb: binary\t(0|1)\n"
+               "\t\tB: Boolean\t(false|true)\n"
+               "\n"
+               "\t-t <treshold>\tSet treshold (used in filter, see -l) (defaults -1)\n"
+               "\t-l <filter>\tSet line filter\n"
+               "\t\tf: Falldown:\tprint only when over treshold or just crossed (default)\n"
+               "\t\tt: Treshold:\tprint only when over treshold\n"
+               "\t\tc: Crossed:\tprint only when treshold crossed\n"
+               "\t-u\t\tInvert\ttreshold (values under treshold will be displayed)\n"
                "\n"
-               "\t-t <treshold>\tSet treshold (used to hide magnitudes lower than treshold) (defaults -1)\n"
-               "\t-n <format>\tSet output format\n"
-               "\t\tf: float (default)\n"
-               "\t\ti: integer\n"
-               "\t\tb: binary (0|1)\n"
-               "\t\tB: Boolean (false|true)\n"
-               "\t-l\t\tDo not repeat values while still over treshold\n"
-               "\t-b\t\tDo not print first value that will fall under treshold\n"
                "\t-q\t\tQuiet mode: print only values\n"
                "\n"
                "\t-?\t\tPrint help\n"
@@ -108,15 +113,18 @@ void addfreq(int *freqs, int freq) {
 int main(int argc, char ** argv) {
        int samplerate = 8000;
        int samplecount = 4000;
+
        int treshold = -1;
-       char noreturn = 0;
-       char repeat = 1;
+       char filter = 0;
+       char under = 0;
+
        char format=0;
        char verbose=1;
+
        int freqs[argc+1]; freqs[0]=-1;
 
        int opt;
-       while ((opt = getopt(argc, argv, "?i:o:a:r:c:d:f:t:n:lbq")) != -1) {
+       while ((opt = getopt(argc, argv, "?i:o:a:r:c:d:f:t:n:l:uq")) != -1) {
                switch (opt) {
                        case 'i':
                                freopen(optarg, "r", stdin);
@@ -146,10 +154,10 @@ int main(int argc, char ** argv) {
                                format = optarg[0];
                                break;
                        case 'l':
-                               repeat = 0;
+                               filter = optarg[0];
                                break;
-                       case 'b':
-                               noreturn = 1;
+                       case 'u':
+                               under = 1;
                                break;
                        case 'q':
                                verbose = 0;
@@ -182,9 +190,10 @@ int main(int argc, char ** argv) {
                puts("");
        }
 
-       char print=0, printnow=0, printlast = 0;
+       int i;
+       char print=0, printnow=0;
+       char laststate[argc]; for(i=0;freqs[i]!=-1;i++) laststate[i]=-1;
        while(!feof(stdin)) {
-               int i;
 
                //Sample data
                for(i=0;i<samplecount && !feof(stdin);i++) {
@@ -200,11 +209,20 @@ int main(int argc, char ** argv) {
                for(i=0;freqs[i]!=-1;i++) {
                        power[i] = goertzel_mag(samplecount, freqs[i], samplerate, samples);
 
-                       //Set print true if over treshold or if changed to false (print for the last time after going under treshold)
-                       printnow = power[i] > treshold;
-                       print = !(!repeat && printlast && !(!printnow)) && (print || printnow || (printlast && !noreturn));
+                       //Decide if we will print
+                       printnow = under ? power[i] < treshold : power[i] > treshold; //Is over/under treshold?
+                       switch(filter) {
+                               case 'c': //Print if treshold crossed
+                                       print = print || (laststate[i] != printnow);
+                                       break;
+                               default:
+                               case 'f': //Print if over treshold or falled down
+                                       print = print || (laststate[i] != printnow);
+                               case 't': //Print if over treshold
+                                       print = print || printnow;
+                       }
+                       laststate[i] = printnow; //Store last state
                }
-               printlast = printnow;
                fflush(stdout);
 
                //Print data
@@ -214,7 +232,7 @@ int main(int argc, char ** argv) {
                                printf("\t");
                                switch(format) {
                                        case 'i':
-                                               printf("%d",(int)power[i]);
+                                               printf("%d",(int)round(power[i]));
                                                break;
                                        case 'b':
                                                printf("%d",power[i]>treshold);