[xiph-commits] r7886 - trunk/postfish

[xiphmont at motherfish-iii.xiph.org]

Author: xiphmont
Date: 2004-09-27 21:49:44 -0700 (Mon, 27 Sep 2004)
New Revision: 7886

Modified:
   trunk/postfish/singlecomp.c
   trunk/postfish/version.h
Log:
Eliminate mute transitioning from the single band compander that is no
longer needed.



Modified: trunk/postfish/singlecomp.c
===================================================================
--- trunk/postfish/singlecomp.c	2004-09-28 04:45:24 UTC (rev 7885)
+++ trunk/postfish/singlecomp.c	2004-09-28 04:49:44 UTC (rev 7886)
@@ -591,13 +591,10 @@
         for(k=0;k<input_size;k++)
           ox[k]=ix[k]*fromdB_a(adj[k]);
 
-	/* is this frame preceeded/followed by an 'inactive' or muted frame?
+	/* is this frame preceeded/followed by an 'inactive' frame?
 	   If so, smooth the transition */
 	if(!activeP){
-	  if(mutedP){
-	    for(k=0;k<input_size/2;k++)
-	      ox[k]*=window[k];
-	  }else{
+	  if(!mutedP){
 	    for(k=0;k<input_size/2;k++){
 	      float w=window[k];
 	      ox[k]= ox[k]*w + ix[k]*(1.-w);
@@ -605,13 +602,8 @@
 	  }
 	}
 	if(!activeC){
-	  float *cox=ox+input_size/2;
-	  if(mutedC){
-	    for(k=0;k<input_size/2;k++){
-	      float w=1.-window[k];
-	      cox[k]*=w;
-	    }
-	  }else{
+	  if(!mutedC){
+	    float *cox=ox+input_size/2;
 	    float *cix=ix+input_size/2;
 	    for(k=0;k<input_size/2;k++){
 	      float w=window[k];

Modified: trunk/postfish/version.h
===================================================================
--- trunk/postfish/version.h	2004-09-28 04:45:24 UTC (rev 7885)
+++ trunk/postfish/version.h	2004-09-28 04:49:44 UTC (rev 7886)
@@ -1,2 +1,2 @@
 #define VERSION "$Id$ "
-/* DO NOT EDIT: Automated versioning hack [Tue Sep 28 01:01:38 EDT 2004] */
+/* DO NOT EDIT: Automated versioning hack [Tue Sep 28 01:07:54 EDT 2004] */