Changeset 682:6cf3ae19ffd3 in roaraudio

Timestamp:

08/27/08 15:46:45 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for libroardsp filter chains

File:

• roarclients/roarfilt.c (modified) (7 diffs)

roarclients/roarfilt.c

@@ -24 +24 @@
 
 #include <roaraudio.h>
+#include <libroardsp/libroardsp.h>
 #include <math.h>
 
@@ -49 +50 @@
         "  --div VAL          - Set div\n"
         "  --lowpass freq     - lowpass filter\n"
+        "  --filter  name     - add filter name\n"
+        "  --ffreq   freq     - set filter freq\n"
        );
 
@@ -131 +134 @@
  float  lp       = 0;
  char buf[BUFSIZE];
+ struct roardsp_filterchain fc;
+ struct roardsp_filter      filter;
+ struct roar_stream         stream;
 
  memset(&g_lowpass, 0, sizeof(g_lowpass));
+
+ roardsp_fchain_init(&fc);
 
  for (i = 1; i < argc; i++) {
@@ -162 +170 @@
    g_lowpass.a = 65536 - lp;
 //   printf("lowpass: A=%i, B=%i\n", g_lowpass.a, g_lowpass.b);
+  } else if ( strcmp(k, "--filter") == 0 ) {
+   stream.info.channels = channels;
+   stream.info.bits     = bits;
+   stream.info.rate     = rate;
+   roardsp_filter_init(&filter, &stream, roardsp_filter_str2id(argv[++i]));
+   roardsp_fchain_add(&fc, &filter);
+  } else if ( strcmp(k, "--ffreq") == 0 ) {
+   lp = atof(argv[++i]);
+   roardsp_filter_ctl(&filter, ROARDSP_FCTL_FREQ, &lp);
   } else if ( strcmp(k, "--help") == 0 ) {
    usage();
@@ -177 +194 @@
  }
 
- if ( mul == div && logscale == 0 && lp == 0 ) {
+ if ( mul == div && logscale == 0 && g_lowpass.a == 0 && roardsp_fchain_num(&fc) == 0 ) {
   fprintf(stderr, "Error: filter is useless!\n");
   return 0;
@@ -190 +207 @@
    if ( g_lowpass.a )
     lowpass2((void*)buf, i, channels);
+   roardsp_fchain_calc(&fc, (void*)buf, (8*i)/bits);
    if (write(fh, buf, i) != i)
     break;
@@ -206 +224 @@
  roar_simple_close(fh);
 
+ roardsp_fchain_uninit(&fc);
+
  return 0;
 }