Changeset 140:86cc22a8ed64 in roaraudio

Timestamp:

07/14/08 13:36:45 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

logscale parameter should ne float not int tu support 1/x-scaling

File:

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

roarclients/roarfilt.c

@@ -44 +44 @@
 }
 
-void logs2 (void * data, int scale, int len) {
+void logs2 (void * data, float scale, int len) {
  int16_t * samples = (int16_t *) data;
  int i;
  float div = logf(scale);
- int scalemul = scale - 1;
+ float scalemul = scale - 1;
  int neg;
 
  len /= 2;
 
- printf("logs2(data=%p, scale=%i, len=%i): scalemul=%i, div=%f\n", data, scale, len, scalemul, div);
+ //printf("logs2(data=%p, scale=%f, len=%i): scalemul=%f, div=%f\n", data, scale, len, scalemul, div);
 
  for (i = 0; i < len; i++) {
@@ -60 +60 @@
 
 
-  samples[i] = (neg ? 32768.0 : 32767.0)*logf(1 + ((float)scalemul*samples[i]/(neg ? 32768.0 : 32767.0))) / div;
+  samples[i] = (neg ? 32768.0 : 32767.0)*logf(1 + (scalemul*(float)samples[i]/(neg ? 32768.0 : 32767.0))) / div;
 
   if ( neg )
@@ -77 +77 @@
  int    i;
  int    mul = 1, div = 1;
- int    logscale = 0;
+ float  logscale = 0;
  char buf[BUFSIZE];
 
@@ -102 +102 @@
    div  = atoi(argv[++i]);
   } else if ( strcmp(k, "--log") == 0 ) {
-   logscale = atoi(argv[++i]);
+   logscale = atof(argv[++i]);
   } else if ( strcmp(k, "--help") == 0 ) {
    usage();