[xiph-cvs] r6597 - trunk/postfish

[xiphmont at xiph.org]

Author: xiphmont
Date: 2004-04-26 02:49:08 -0400 (Mon, 26 Apr 2004)
New Revision: 6597

Modified:
   trunk/postfish/limit.c
   trunk/postfish/version.h
Log:
Upgrade limiter signal path to transition between inactive and active smoothly

<p><p>Modified: trunk/postfish/limit.c
===================================================================
--- trunk/postfish/limit.c	2004-04-26 06:15:52 UTC (rev 6596)
+++ trunk/postfish/limit.c	2004-04-26 06:49:08 UTC (rev 6597)
@@ -40,34 +40,14 @@
   iir_state *iir;
   iir_filter decay;
 
+  int prev_active;
+  int initted;
 } limit_state;
 
 limit_settings limitset;
 limit_state limitstate;
+float *window;
 
-static void _analysis(char *base,int i,float *v,int n,int dB,int offset){
-  int j;
-  FILE *of;
-  char buffer[80];
-
-  sprintf(buffer,"%s_%d.m",base,i);
-  of=fopen(buffer,"a");
-  
-  if(!of)perror("failed to open data dump file");
-  
-  for(j=0;j<n;j++){
-    fprintf(of,"%f ",(float)j+offset);
-    if(dB)
-      fprintf(of,"%f\n",todB(v[j]));
-    else
-      fprintf(of,"%f\n",(v[j]));
-  }
-  fprintf(of,"\n");
-  fclose(of);
-}
-
-static int offset=0;
-
 /* feedback! */
 typedef struct limit_feedback{
   feedback_generic parent_class;
@@ -107,6 +87,12 @@
   for(i=0;i<input_ch;i++)
     limitstate.out.data[i]=malloc(input_size*sizeof(**limitstate.out.data));
 
+  window=malloc(input_size*sizeof(*window));
+  for(i=0;i<input_size;i++){
+    window[i]=sin((i+.5)/input_size*M_PI*.5);
+    window[i]*=window[i];
+  }
+
   return(0);
 }
 
@@ -127,6 +113,7 @@
   /* reset cached pipe state */
   while(pull_limit_feedback(NULL,NULL));
   memset(limitstate.iir,0,input_ch*sizeof(&limitstate.iir));
+  limitstate.initted=0;
   return 0;
 }
 
@@ -139,9 +126,11 @@
   float peakfeed[input_ch];
   float attfeed[input_ch];
 
-  int active=limit_active;
+  int activeC=limit_active;
+  int activeP=limitstate.prev_active;
+
   int visible=limit_visible;
-  int bypass=!(active || visible);
+  int bypass;
   int i,k;
 
   float thresh=limitset.thresh/10.-.01;
@@ -157,42 +146,59 @@
     return &limitstate.out;
   }
 
+  if(!limitstate.initted){
+    limitstate.initted=1;
+    limitstate.prev_active=activeC;
+  }
+
   depth=depth*.2;
   depth*=depth;
 
   for(i=0;i<input_ch;i++){
     localpeak=0.;
     localatt=0.;
+
+    bypass=!(activeC || activeP || visible) || mute_channel_muted(in->active,i);
     
-    if(!bypass){
+    if((activeC || activeP) && !mute_channel_muted(in->active,i)){
+      
       float *inx=in->data[i];
       float *x=limitstate.out.data[i];
       
-      if(active){
-
-	/* 'knee' the actual samples, compute attenuation depth */
-	for(k=0;k<in->samples;k++){
-	  float dB=todB(inx[k]);
-	  float knee=limit_knee(dB-thresh,depth)+thresh;
-	  float att=dB-knee;
-
-	  if(att>localatt)localatt=att;
-
-	  x[k]=att;
-	}
+      /* 'knee' the actual samples, compute attenuation depth */
+      for(k=0;k<in->samples;k++){
+	float dB=todB(inx[k]);
+	float knee=limit_knee(dB-thresh,depth)+thresh;
+	float att=dB-knee;
         
-
-	compute_iir_freefall2(x,input_size,limitstate.iir+i,&limitstate.decay);
-
+	if(att>localatt)localatt=att;
         
-	for(k=0;k<in->samples;k++)
-	  x[k]=inx[k]*fromdB(-x[k]);
-     
+	x[k]=att;
+      }
         
+      
+      compute_iir_freefall2(x,input_size,limitstate.iir+i,&limitstate.decay);
+      
+      
+      for(k=0;k<in->samples;k++)
+	x[k]=inx[k]*fromdB(-x[k]);
+      
+      if(activeP && !activeC){
+	/* transition to inactive */
+	for(k=0;k<input_size;k++){
+	  float w2=1.-window[k];
+	  x[k]= x[k]*w2 + in->data[i][k]*window[k];
+	}
       }
-    }
-    
-    if(!active){
+      if(!activeP && activeC){
+	/* transition to active */
+	for(k=0;k<input_size;k++){
+	  float w2=1.-window[k];
+	  x[k]= x[k]*window[k] + in->data[i][k]*w2;
+	}
+      }
+      
+    }else{
       float *temp=in->data[i];
       in->data[i]=limitstate.out.data[i];
       limitstate.out.data[i]=temp;
@@ -237,8 +243,8 @@
         memset(limitstate.out.data[i]+limitstate.out.samples,0,sizeof(**limitstate.out.data)*tozero);
   }
 
-  offset+=input_size;
-
+  limitstate.out.active=in->active;
+  limitstate.prev_active=activeC;
   return &limitstate.out;
 }
 

Modified: trunk/postfish/version.h
===================================================================
--- trunk/postfish/version.h	2004-04-26 06:15:52 UTC (rev 6596)
+++ trunk/postfish/version.h	2004-04-26 06:49:08 UTC (rev 6597)
@@ -1,2 +1,2 @@
 #define VERSION "$Id$ "
-/* DO NOT EDIT: Automated versioning hack [Mon Apr 26 02:02:47 EDT 2004] */
+/* DO NOT EDIT: Automated versioning hack [Mon Apr 26 02:47:13 EDT 2004] */

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.