Bringing rc2 (minus the modes it needs) onto mainline.

Monty

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

1 files changed, 100 insertions, 16 deletions

diff --git a/lib/psy.h b/lib/psy.h
index 4047f59b..6c97deaa 100644
--- a/lib/psy.h
+++ b/lib/psy.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: random psychoacoustics (not including preecho)
- last mod: $Id: psy.h,v 1.21 2001/06/15 21:15:40 xiphmont Exp $
+ last mod: $Id: psy.h,v 1.22 2001/08/13 01:36:57 xiphmont Exp $
 
  ********************************************************************/
 
@@ -19,6 +19,14 @@
 #define _V_PSY_H_
 #include "smallft.h"
 
+#include "backends.h"
+
+#define BLOCKTYPE_IMPULSE    0
+#define BLOCKTYPE_PADDING    1
+#define BLOCKTYPE_TRANSITION 0 
+#define BLOCKTYPE_LONG       1
+
+
 #ifndef EHMER_MAX
 #define EHMER_MAX 56
 #endif
@@ -27,24 +35,49 @@
 #define MAX_BARK 27
 #define P_BANDS 17
 #define P_LEVELS 11
+
+typedef struct vp_couple{
+  int limit;        /* sample post */
+
+  float amppost_8phase;
+  float thresh_8phase;
+
+  float amppost_6phase;
+  float thresh_6phase;
+
+  float amppost_point;
+  float thresh_point;
+  
+} vp_couple;
+
+typedef struct vp_couple_pass{  
+  float granulem;
+  float igranulem;
+
+  vp_couple couple_pass[8];
+} vp_couple_pass;
+
+typedef struct vp_attenblock{
+  float block[P_BANDS][P_LEVELS];
+} vp_attenblock;
+
 typedef struct vorbis_info_psy{
   float  *ath;
-  int    decayp;
 
   float  ath_adjatt;
   float  ath_maxatt;
 
-  int   eighth_octave_lines;
-
   /*     0  1  2   3   4   5   6   7   8   9  10  11  12  13  14  15   16   */
   /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
   /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
 
-  int tonemaskp;
-  float toneatt[P_BANDS][P_LEVELS];
+  float tone_masteratt;
+  float tone_maxatt;
+  vp_attenblock *toneatt;
 
   int peakattp;
-  float peakatt[P_BANDS][P_LEVELS];
+  int curvelimitp;
+  vp_attenblock *peakatt;
 
   int noisemaskp;
   float noisemaxsupp;
@@ -53,20 +86,49 @@ typedef struct vorbis_info_psy{
   int   noisewindowlomin;
   int   noisewindowhimin;
   int   noisewindowfixed;
-  float noisemedian[P_BANDS*2];
+  float noiseoff[P_BANDS];
+  float noisethresh[P_BANDS];
 
   float max_curve_dB;
-  float bound_att_dB;
+
+  int coupling_passes;
+  vp_couple_pass *couple_pass;
 
 } vorbis_info_psy;
 
+typedef struct{
+  float     decaydBpms;
+  int       eighth_octave_lines;
+
+  /* for block long/short tuning; encode only */
+  int       envelopesa;
+  float     preecho_thresh[4];
+  float     postecho_thresh[4];
+  float     preecho_minenergy;
+
+  float     ampmax_att_per_sec;
+
+  /* delay caching... how many samples to keep around prior to our
+     current block to aid in analysis? */
+  int       delaycache;
+} vorbis_info_psy_global;
+
+typedef struct {
+  float   ampmax;
+  float **decay;
+  int     decaylines;
+  int     channels;
+
+  vorbis_info_psy_global *gi;
+} vorbis_look_psy_global;
+
+
 typedef struct {
   int n;
   struct vorbis_info_psy *vi;
 
   float ***tonecurves;
-  float **peakatt;
-  int   *noisemedian;
+  float *noisethresh;
   float *noiseoffset;
 
   float *ath;
@@ -77,21 +139,43 @@ typedef struct {
   long  shiftoc;
   int   eighth_octave_lines; /* power of two, please */
   int   total_octave_lines;  
-
+  long  rate; /* cache it */
 } vorbis_look_psy;
 
-extern void   _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,int n,long rate);
+extern void   _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,
+			   vorbis_info_psy_global *gi,int n,long rate);
 extern void   _vp_psy_clear(vorbis_look_psy *p);
 extern void  *_vi_psy_dup(void *source);
 
 extern void   _vi_psy_free(vorbis_info_psy *i);
 extern vorbis_info_psy *_vi_psy_copy(vorbis_info_psy *i);
 
-extern float  _vp_compute_mask(vorbis_look_psy *p,
+extern void _vp_remove_floor(vorbis_look_psy *p,
+			     vorbis_look_psy_global *g,
+			     float *logmdct, 
+			     float *mdct,
+			     float *codedflr,
+			     float *residue,
+			     float local_specmax);
+
+extern void   _vp_compute_mask(vorbis_look_psy *p,
+			       vorbis_look_psy_global *g,
+			       int channel,
 			       float *fft, 
 			       float *mdct, 
-			       float *mask,
-			       float prev_maxamp);
+			       float *mask, 
+			       float global_specmax,
+			       float local_specmax,
+			       int lastsize);
+
+extern void _vp_quantize_couple(vorbis_look_psy *p,
+			 vorbis_info_mapping0 *vi,
+			 float **pcm,
+			 float **sofar,
+			 float **quantized,
+			 int   *nonzero,
+			 int   passno);
+
 extern float _vp_ampmax_decay(float amp,vorbis_dsp_state *vd);
 
 #endif