It's all coming back together slowly. Incremental update.

Monty

svn path=/trunk/vorbis/; revision=240

1 files changed, 3 insertions, 10 deletions

diff --git a/lib/psy.h b/lib/psy.h
index 94f1cf6c..57841a72 100644
--- a/lib/psy.h
+++ b/lib/psy.h
@@ -12,19 +12,13 @@
  ********************************************************************
 
  function: random psychoacoustics (not including preecho)
- last mod: $Id: psy.h,v 1.5 2000/01/20 04:43:03 xiphmont Exp $
+ last mod: $Id: psy.h,v 1.6 2000/01/22 13:28:28 xiphmont Exp $
 
  ********************************************************************/
 
 #ifndef _V_PSY_H_
 #define _V_PSY_H_
 
-typedef struct vorbis_info_psy{
-  double maskthresh[MAX_BARK];
-  double lrolldB;
-  double hrolldB;
-} vorbis_info_psy;
-
 typedef struct {
   int n;
   struct vorbis_info_psy *vi;
@@ -34,14 +28,13 @@ typedef struct {
 
 } psy_lookup;
 
-
 extern void   _vp_psy_init(psy_lookup *p,vorbis_info_psy *vi,int n,long rate);
 extern void   _vp_psy_clear(psy_lookup *p);
 extern void  *_vi_psy_dup(void *source);
 extern void   _vi_psy_free(void *i);
 
-extern void   _vp_noise_floor(psy_lookup *p, double *f, double *m);
-extern void   _vp_mask_floor(psy_lookup *p,double *f, double *m);
+extern void   _vp_mask_floor(psy_lookup *p,double *pcm,
+			     double *mask,double *floor);
 
 #endif