libvorbis: update to 1.3.5

1 files changed, 31 insertions, 135 deletions

diff --git a/sys/src/cmd/audio/libvorbis/modes/setup_X.h b/sys/src/cmd/audio/libvorbis/modes/setup_X.h
index 5b3d3f91d..a69f5d40a 100644
--- a/sys/src/cmd/audio/libvorbis/modes/setup_X.h
+++ b/sys/src/cmd/audio/libvorbis/modes/setup_X.h
@@ -5,29 +5,29 @@
  * 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-2002             *
- * 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: catch-all toplevel settings for q modes only
- last mod: $Id: setup_X.h,v 1.3 2002/07/11 06:41:05 xiphmont Exp $
+ last mod: $Id: setup_X.h 16894 2010-02-12 20:32:12Z xiphmont $
 
  ********************************************************************/
 
-static double rate_mapping_X[11]={
-  -1.,-1.,-1.,-1.,-1.,
+static const double rate_mapping_X[12]={
+  -1.,-1.,-1.,-1.,-1.,-1.,
   -1.,-1.,-1.,-1.,-1.,-1.
 };
 
-ve_setup_data_template ve_setup_X_stereo={
-  10,
+static const ve_setup_data_template ve_setup_X_stereo={
+  11,
   rate_mapping_X,
   quality_mapping_44,
   2,
   50000,
   200000,
-  
+
   blocksize_short_44,
   blocksize_long_44,
 
@@ -45,7 +45,7 @@ ve_setup_data_template ve_setup_X_stereo={
   _psy_noisebias_trans,
   _psy_noisebias_long,
   _psy_noise_suppress,
-  
+
   _psy_compand_44,
   _psy_compand_short_mapping,
   _psy_compand_long_mapping,
@@ -56,7 +56,7 @@ ve_setup_data_template ve_setup_X_stereo={
 
   _psy_ath_floater,
   _psy_ath_abs,
-  
+
   _psy_lowpass_44,
 
   _psy_global_44,
@@ -65,20 +65,20 @@ ve_setup_data_template ve_setup_X_stereo={
 
   _floor_books,
   _floor,
-  _floor_short_mapping_44,
-  _floor_long_mapping_44,
+  2,
+  _floor_mapping_44,
 
   _mapres_template_44_stereo
 };
 
-ve_setup_data_template ve_setup_X_uncoupled={
-  10,
+static const ve_setup_data_template ve_setup_X_uncoupled={
+  11,
   rate_mapping_X,
   quality_mapping_44,
   -1,
   50000,
   200000,
-  
+
   blocksize_short_44,
   blocksize_long_44,
 
@@ -96,122 +96,19 @@ ve_setup_data_template ve_setup_X_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,
-
-  _psy_ath_floater,
-  _psy_ath_abs,
-  
-  _psy_lowpass_44,
-
-  _psy_global_44,
-  _global_mapping_44,
-  NULL,
-
-  _floor_books,
-  _floor,
-  _floor_short_mapping_44,
-  _floor_long_mapping_44,
 
-  _mapres_template_44_uncoupled
-};
-
-ve_setup_data_template ve_setup_X_stereo_low={
-  1,
-  rate_mapping_X,
-  quality_mapping_44_stereo_low,
-  2,
-  50000,
-  200000,
-  
-  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_start_short_44,_noise_start_long_44},
   {_noise_part_short_44,_noise_part_long_44},
   _noise_thresh_44,
 
   _psy_ath_floater,
   _psy_ath_abs,
-  
-  _psy_lowpass_44_low,
-
-  _psy_global_44,
-  _global_mapping_44,
-  _psy_stereo_modes_44_low,
 
-  _floor_books,
-  _floor,
-  _floor_short_mapping_44_low,
-  _floor_long_mapping_44_low,
-
-  _mapres_template_44_stereo
-};
-
-
-ve_setup_data_template ve_setup_X_uncoupled_low={
-  1,
-  rate_mapping_X,
-  quality_mapping_44_stereo_low,
-  -1,
-  50000,
-  200000,
-  
-  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,
@@ -219,20 +116,20 @@ ve_setup_data_template ve_setup_X_uncoupled_low={
 
   _floor_books,
   _floor,
-  _floor_short_mapping_44_low,
-  _floor_long_mapping_44_low,
+  2,
+  _floor_mapping_44,
 
   _mapres_template_44_uncoupled
 };
 
-ve_setup_data_template ve_setup_XX_stereo={
+static const ve_setup_data_template ve_setup_XX_stereo={
   2,
   rate_mapping_X,
   quality_mapping_8,
   2,
   0,
   8000,
-  
+
   blocksize_8,
   blocksize_8,
 
@@ -250,18 +147,18 @@ ve_setup_data_template ve_setup_XX_stereo={
   NULL,
   NULL,
   _psy_noise_suppress,
-  
+
   _psy_compand_8,
   _psy_compand_8_mapping,
   NULL,
 
   {_noise_start_8,_noise_start_8},
   {_noise_part_8,_noise_part_8},
-  _noise_thresh_44_2,
+  _noise_thresh_5only,
 
   _psy_ath_floater_8,
   _psy_ath_abs_8,
-  
+
   _psy_lowpass_8,
 
   _psy_global_44,
@@ -270,20 +167,20 @@ ve_setup_data_template ve_setup_XX_stereo={
 
   _floor_books,
   _floor,
+  1,
   _floor_mapping_8,
-  NULL,
 
   _mapres_template_8_stereo
 };
 
-ve_setup_data_template ve_setup_XX_uncoupled={
+static const ve_setup_data_template ve_setup_XX_uncoupled={
   2,
   rate_mapping_X,
   quality_mapping_8,
   -1,
   0,
   8000,
-  
+
   blocksize_8,
   blocksize_8,
 
@@ -301,18 +198,18 @@ ve_setup_data_template ve_setup_XX_uncoupled={
   NULL,
   NULL,
   _psy_noise_suppress,
-  
+
   _psy_compand_8,
   _psy_compand_8_mapping,
   NULL,
 
   {_noise_start_8,_noise_start_8},
   {_noise_part_8,_noise_part_8},
-  _noise_thresh_44_2,
+  _noise_thresh_5only,
 
   _psy_ath_floater_8,
   _psy_ath_abs_8,
-  
+
   _psy_lowpass_8,
 
   _psy_global_44,
@@ -321,9 +218,8 @@ ve_setup_data_template ve_setup_XX_uncoupled={
 
   _floor_books,
   _floor,
+  1,
   _floor_mapping_8,
-  NULL,
 
   _mapres_template_8_uncoupled
 };
-