Changeset 3025:e0985044be84 in roaraudio

Timestamp:

11/01/09 10:49:24 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

wrote a bad working beat detection

File:

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

roarclients/roarvumeter.c

@@ -32 +32 @@
 #define BUFSIZE 1024
 
-#define MODE_PC    1
-#define MODE_DB    2
+#define MODE_PC    0x01
+#define MODE_DB    0x02
+#define MODE_BEAT  0x04
 
 void usage (void) {
@@ -51 +52 @@
 
 int vumeter16bit2ch (struct roar_vio_calls * vio, int samples, int16_t * buf, int mode, struct roardsp_filterchain * fc) {
+ struct roar_stream    beat_stream[1];
+ struct roardsp_filter beat_lp[1];
+ float                 beat_lpfreq = 1;
  int i;
  int samples_half = samples/2;
  int64_t suml, sumr;
  double  rmsl, rmsr;
- int run_filters = roardsp_fchain_num(fc);
+ int run_filters    = roardsp_fchain_num(fc);
+ int beat_detection = mode & MODE_BEAT;
+ char * beat[2]     = {"     ", "Beat!"};
+ char * dbeat       = beat[0];
+ int16_t beat_val, beat_old;
+
+ if ( beat_detection ) {
+  mode -= MODE_BEAT;
+
+  roar_stream_new(beat_stream, 10, 1, 16, ROAR_CODEC_PCM);
+  roardsp_filter_init(beat_lp, beat_stream, ROARDSP_FILTER_LOWP);
+  roardsp_filter_ctl(beat_lp, ROARDSP_FCTL_FREQ, &beat_lpfreq);
+ }
 
  printf("\e[s");
@@ -75 +91 @@
   rmsr = sqrt((double)sumr/(double)samples_half);
 
+  if ( beat_detection ) {
+   beat_old = beat_val = (rmsl + rmsr) / 2;
+   roardsp_filter_calc(beat_lp, &beat_val, 2);
+   if ( (float)beat_old > (float)beat_val*1.15f ) {
+    dbeat = beat[1];
+   } else {
+    dbeat = beat[0];
+   }
+  }
+
   switch (mode) {
    case MODE_PC:
-     printf("L: %3i%% R: %3i%%          \e[u", (int)(rmsl/327.68), (int)(rmsr/327.68));
+     printf("L: %3i%% R: %3i%% %s          \e[u", (int)(rmsl/327.68), (int)(rmsr/327.68), dbeat);
     break;
    case MODE_DB:
-     printf("L: %6.2fdB R: %6.2fdB          \e[u", 20*log10(rmsl/32768.), 20*log10(rmsr/32768.));
+     printf("L: %6.2fdB R: %6.2fdB %s          \e[u", 20*log10(rmsl/32768.), 20*log10(rmsr/32768.), dbeat);
     break;
   }
@@ -86 +112 @@
   fflush(stdout);
  }
+
+ roardsp_filter_uninit(beat_lp);
+
  return 0;
 }
@@ -125 +154 @@
  struct roar_vio_calls stream, re;
  int    i;
- int    mode = MODE_PC;
+ int    mode = 0;
 
  for (i = 1; i < argc; i++) {
@@ -141 +170 @@
    samples = atoi(argv[++i]);
   } else if ( strcmp(k, "--db") == 0 ) {
-   mode = MODE_DB;
+   mode |= MODE_DB;
+  } else if ( strcmp(k, "--beat") == 0 ) {
+   mode |= MODE_BEAT;
   } else if ( strcmp(k, "--lowpass") == 0 ) {
    lowpass_freq = atof(argv[++i]);
@@ -154 +185 @@
  }
 
+ if ( !mode )
+  mode = MODE_PC;
+
  if ( samples == -1 )
   samples = rate/10;