Remove svn $Id$ header.

[platform/upstream/libvorbis.git] / lib / modes / setup_44u.h

diff --git a/lib/modes/setup_44u.h b/lib/modes/setup_44u.h
index 2ad76a1..7ae3af6 100644 (file)
--- a/lib/modes/setup_44u.h
+++ b/lib/modes/setup_44u.h
@@ -5,35 +5,30 @@
  * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
  function: toplevel settings for 44.1/48kHz uncoupled modes
- last mod: $Id: setup_44u.h,v 1.1 2002/07/01 11:20:19 xiphmont Exp $
 
  ********************************************************************/
 
 #include "modes/residue_44u.h"
 
-static double rate_mapping_44_un[11]={
-  48000.,60000.,70000.,80000.,86000.,
+static const double rate_mapping_44_un[12]={
+  32000.,48000.,60000.,70000.,80000.,86000.,
   96000.,110000.,120000.,140000.,160000.,240001.
 };
 
-static double rate_mapping_44_un_low[2]={
-  32000.,48000.
-};
-
-ve_setup_data_template ve_setup_44_uncoupled={
-  10,
+static const ve_setup_data_template ve_setup_44_uncoupled={
+  11,
   rate_mapping_44_un,
   quality_mapping_44,
   -1,
   40000,
   50000,
-  
+
   blocksize_short_44,
   blocksize_long_44,
 
@@ -51,79 +46,28 @@ ve_setup_data_template ve_setup_44_uncoupled={
   _psy_noisebias_trans,
   _psy_noisebias_long,
   _psy_noise_suppress,
-  
+
   _psy_compand_44,
   _psy_compand_short_mapping,
   _psy_compand_long_mapping,
 
   {_noise_start_short_44,_noise_start_long_44},
   {_noise_part_short_44,_noise_part_long_44},
-  _noise_thresh_44_2,
+  _noise_thresh_44,
 
   _psy_ath_floater,
   _psy_ath_abs,
-  
-  _psy_lowpass_44,
-
-  _psy_global_44,
-  _global_mapping_44,
-  NULL,
-
-  _floor_44_books,
-  _floor_44,
-  _floor_short_mapping_44,
-  _floor_long_mapping_44,
-
-  _mapres_template_44_uncoupled
-};
-
-ve_setup_data_template ve_setup_44_uncoupled_low={
-  1,
-  rate_mapping_44_un_low,
-  quality_mapping_44_stereo_low,
-  -1,
-  40000,
-  50000,
-  
-  blocksize_short_44_low,
-  blocksize_long_44_low,
-
-  _psy_tone_masteratt_44_low,
-  _psy_tone_0dB,
-  _psy_tone_suppress,
 
-  _vp_tonemask_adj_otherblock,
-  _vp_tonemask_adj_longblock,
-  _vp_tonemask_adj_otherblock,
-
-  _psy_noiseguards_44,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_trans_low,
-  _psy_noisebias_long_low,
-  _psy_noise_suppress,
-  
-  _psy_compand_44,
-  _psy_compand_short_mapping,
-  _psy_compand_long_mapping,
-
-  {_noise_start_short_44_low,_noise_start_long_44_low},
-  {_noise_part_short_44,_noise_part_long_44},
-  _noise_thresh_44_2,
-
-  _psy_ath_floater,
-  _psy_ath_abs,
-  
-  _psy_lowpass_44_low,
+  _psy_lowpass_44,
 
   _psy_global_44,
   _global_mapping_44,
-  NULL,
+  _psy_stereo_modes_44,
 
-  _floor_44_books,
-  _floor_44,
-  _floor_short_mapping_44_low,
-  _floor_long_mapping_44_low,
+  _floor_books,
+  _floor,
+  2,
+  _floor_mapping_44,
 
   _mapres_template_44_uncoupled
 };