[xiph-cvs] r6576 - trunk/postfish

[xiphmont at xiph.org]

Author: xiphmont
Date: 2004-04-22 07:20:15 -0400 (Thu, 22 Apr 2004)
New Revision: 6576

Modified:
   trunk/postfish/freq.c
   trunk/postfish/multicompand.c
   trunk/postfish/output.c
   trunk/postfish/subband.c
   trunk/postfish/version.h
Log:
subbander end-of-frame tracker was not being properly initialized

<p><p>Modified: trunk/postfish/freq.c
===================================================================
--- trunk/postfish/freq.c	2004-04-22 10:39:28 UTC (rev 6575)
+++ trunk/postfish/freq.c	2004-04-22 11:20:15 UTC (rev 6576)
@@ -476,7 +476,6 @@
     break;
   case 3: /* we've pushed out EOF already */
     f->out.samples=0;
-    return &f->out;
   }
   
   /* finish up the state feedabck */

Modified: trunk/postfish/multicompand.c
===================================================================
--- trunk/postfish/multicompand.c	2004-04-22 10:39:28 UTC (rev 6575)
+++ trunk/postfish/multicompand.c	2004-04-22 11:20:15 UTC (rev 6576)
@@ -302,7 +302,7 @@
   run_filter(overdB,lx,input_size,lookahead,mode,iir,attack,decay,ps);
   
   if(adj){
-    float corner_multiplier=(1.-1./(c.over_ratio*.001));
+    float corner_multiplier=(1.-1./(c.over_ratio/1000.));
     if(c.over_softknee){
       for(k=0;k<input_size;k++)
         adj[k]+=soft_knee(overdB[k]-zerocorner)*corner_multiplier;
@@ -325,7 +325,7 @@
              iir,attack,decay,ps);
   
   if(adj){
-    float base_multiplier=(1.-1./(c.base_ratio*.001));
+    float base_multiplier=(1.-1./(c.base_ratio/1000.));
     for(k=0;k<input_size;k++)
       adj[k]-=(basedB[k]+adj[k])*base_multiplier;
   }
@@ -344,7 +344,7 @@
              iir,attack,decay,ps);
   
   if(adj){
-    float corner_multiplier=(1./(c.under_ratio*.001)-1.);
+    float corner_multiplier=(1./(c.under_ratio/1000.)-1.);
     if(c.under_softknee){
       for(k=0;k<input_size;k++)
         adj[k]=soft_knee(zerocorner-underdB[k])*corner_multiplier;
@@ -356,7 +356,7 @@
 }
 
 static void multicompand_work(void *vs){
-
+  return;
   multicompand_state *ms=(multicompand_state *)vs;
   subband_state *ss=&ms->ss;
   int i,j,k,bypass_visible=1;

Modified: trunk/postfish/output.c
===================================================================
--- trunk/postfish/output.c	2004-04-22 10:39:28 UTC (rev 6575)
+++ trunk/postfish/output.c	2004-04-22 11:20:15 UTC (rev 6576)
@@ -233,20 +233,11 @@
     /* get data */
     link=input_read();
     result=link->samples;
-
     link=mute_read(link);
     result|=link->samples;
 
     link=declip_read(link);
     result|=link->samples;
-
-    /* XXXX Temporary! Until later plugins can handle mute, we zero out
-       muted channels here */
-    for(i=0;i<input_ch;i++)
-      if((link->active & (1<<i))==0)
-	memset(link->data[i],0,sizeof(*link->data[i])*input_size);
-
-
     link=multicompand_read(link);
     result|=link->samples;
     link=singlecomp_read(link);
@@ -275,6 +266,7 @@
     /************/
 
     if(link->samples>0){
+
       memset(rms,0,sizeof(*rms)*(input_ch+2));
       memset(peak,0,sizeof(*peak)*(input_ch+2));
       ch=link->channels;
@@ -373,9 +365,11 @@
       
       /* inform Lord Vader his shuttle is ready */
       push_output_feedback(peak,rms);
+
       write(eventpipe[1],"",1);
       
     }
+
   }
 
   if(playback_fd){
@@ -408,3 +402,4 @@
   }
 }
 
+

Modified: trunk/postfish/subband.c
===================================================================
--- trunk/postfish/subband.c	2004-04-22 10:39:28 UTC (rev 6575)
+++ trunk/postfish/subband.c	2004-04-22 11:20:15 UTC (rev 6576)
@@ -505,6 +505,7 @@
       memset(f->cache1[i],0,sizeof(**f->cache1)*input_size);
       memset(f->cache0[i],0,sizeof(**f->cache0)*input_size);
     }
+    f->lap_samples=0;
 
     /* and set up state variables */
     /* set the vars to 'active' so that if the first frame is an

Modified: trunk/postfish/version.h
===================================================================
--- trunk/postfish/version.h	2004-04-22 10:39:28 UTC (rev 6575)
+++ trunk/postfish/version.h	2004-04-22 11:20:15 UTC (rev 6576)
@@ -1,2 +1,2 @@
 #define VERSION "$Id$ "
-/* DO NOT EDIT: Automated versioning hack [Thu Apr 22 06:37:00 EDT 2004] */
+/* DO NOT EDIT: Automated versioning hack [Thu Apr 22 07:19:26 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.