Changeset 3024:df2a82f5057f in roaraudio

Timestamp:

11/01/09 10:08:39 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support for lowpasses as input filters

Location:

roarclients

Files:

• Makefile (modified) (2 diffs)
• roarvumeter.c (modified) (9 diffs)

roarclients/Makefile

@@ -4 +4 @@
 TARGETS_IO=roarcat roarcatplay roarcatvio roarbidir roarmon roarmonhttp roarradio
 TARGETS_CTL=roarctl roarlight roarinterconnect
-TARGETS_DSP=roarfilt
+TARGETS_DSP=roarfilt roarvumeter
 TARGETS_MISC=roarsockconnect roarphone roarshout
-TARGETS_M=roarvumeter
+TARGETS_M=
 
 TARGETS=$(TARGETS_IO) $(TARGETS_CTL) $(TARGETS_DSP) $(TARGETS_MISC) $(TARGETS_DEVEL) $(TARGETS_EXAMPLE) $(TARGETS_TESTS) $(TARGETS_M)
@@ -63 +63 @@
         ${CC} ${LDFLAGS} -o roarsin roarsin.o $(LIBROARDSP)
 roarvumeter: roarvumeter.o
-        ${CC} ${LDFLAGS} -o roarvumeter roarvumeter.o $(LIBROAR) $(lib_m)
+        ${CC} ${LDFLAGS} -o roarvumeter roarvumeter.o $(LIBROAR) $(LIBROARDSP) $(lib_m)
 roarsockconnect: roarsockconnect.o
         $L

roarclients/roarvumeter.c

@@ -24 +24 @@
 
 #include <roaraudio.h>
+#include <libroardsp/libroardsp.h>
 
 #ifdef ROAR_HAVE_LIBM
@@ -49 +50 @@
 }
 
-int vumeter16bit2ch (struct roar_vio_calls * vio, int samples, int16_t * buf, int mode) {
+int vumeter16bit2ch (struct roar_vio_calls * vio, int samples, int16_t * buf, int mode, struct roardsp_filterchain * fc) {
  int i;
  int samples_half = samples/2;
  int64_t suml, sumr;
  double  rmsl, rmsr;
+ int run_filters = roardsp_fchain_num(fc);
 
  printf("\e[s");
@@ -60 +62 @@
  while (roar_vio_read(vio, buf, samples * 2) > 0) {
   suml = sumr = 0;
+
+  if ( run_filters ) {
+   roardsp_fchain_calc(fc, buf, samples * 2);
+  }
 
   for (i = 0; i < samples; i += 2) {
@@ -83 +89 @@
 }
 
-int vumeter (struct roar_vio_calls * vio, int samples, int bits, int channels, int mode) {
+int vumeter (struct roar_vio_calls * vio, int samples, int bits, int channels, int mode, struct roardsp_filterchain * fc) {
  void * buf = malloc((samples*bits*channels)/8);
 
@@ -91 +97 @@
  if ( bits == 16 ) {
   if ( channels == 2 ) {
-   vumeter16bit2ch(vio, samples, (int16_t *) buf, mode);
+   vumeter16bit2ch(vio, samples, (int16_t *) buf, mode, fc);
    free(buf);
    return 0;
@@ -105 +111 @@
 
 int main (int argc, char * argv[]) {
+ struct roar_connection       con;
+ struct roar_stream           s;
+ struct roardsp_filterchain   fchain;
+ struct roardsp_filter      * filter;
+ float  lowpass_freq = 0;
  int    rate     = ROAR_RATE_DEFAULT;
  int    bits     = 16;
@@ -131 +142 @@
   } else if ( strcmp(k, "--db") == 0 ) {
    mode = MODE_DB;
+  } else if ( strcmp(k, "--lowpass") == 0 ) {
+   lowpass_freq = atof(argv[++i]);
   } else if ( strcmp(k, "--help") == 0 ) {
    usage();
@@ -144 +157 @@
   samples = rate/10;
 
- if ( roar_vio_simple_stream(&stream, rate, channels, bits, codec, server, ROAR_DIR_MONITOR, "roarvumeter") == -1) {
+ if ( roar_simple_connect(&con, server, "roarvumeter") == -1 ) {
+  fprintf(stderr, "Error: can not connect to server!\n");
+  return 1;
+ }
+
+ if ( roar_vio_simple_new_stream_obj(&stream, &con, &s, rate, channels, bits, codec, ROAR_DIR_MONITOR) == -1) {
   fprintf(stderr, "Error: can not start monetoring\n");
   return 1;
@@ -155 +173 @@
  }
 
- vumeter(&re, samples*channels, bits, channels, mode);
+ if ( roardsp_fchain_init(&fchain) == -1 ) {
+  roar_vio_close(&re);
+  fprintf(stderr, "Error: can not init filterchain\n");
+  return 1;
+ }
+
+ if ( lowpass_freq > 1 ) {
+  if ( roardsp_filter_new(&filter, &s, ROARDSP_FILTER_LOWP) == -1 ) {
+   fprintf(stderr, "Error: can not open lowpass\n");
+   roar_vio_close(&re);
+   roardsp_fchain_uninit(&fchain);
+   return 1;
+  }
+
+  if ( roardsp_filter_ctl(filter, ROARDSP_FCTL_FREQ, &lowpass_freq) == -1 ) {
+   fprintf(stderr, "Error: can not set filter frequency\n");
+   roar_vio_close(&re);
+   roardsp_fchain_uninit(&fchain);
+   return 1;
+  }
+
+  if ( roardsp_fchain_add(&fchain, filter) == -1 ) {
+   fprintf(stderr, "Error: can not set filter frequency\n");
+   roar_vio_close(&re);
+   roardsp_fchain_uninit(&fchain);
+   return 1;
+  }
+ }
+
+ vumeter(&re, samples*channels, bits, channels, mode, &fchain);
 
  printf("\n"); // if the reach this then roard has quited and we should print a newline
 
  roar_vio_close(&re);
+
+ roar_disconnect(&con);
+
+ roardsp_fchain_uninit(&fchain);
 
  return 0;