From 01a261bf6b32b17e632ea62d5996db546055cd73 Mon Sep 17 00:00:00 2001
From: Monty <xiphmont@xiph.org>
Date: Fri, 22 Jun 2007 01:02:19 +0000
Subject: [PATCH] Attempted fix for bug #300; the last comment identified a
 legitimate static bounds overrun that would have explained the behavior.

svn path=/trunk/vorbis/; revision=13168
---
 lib/modes/psych_16.h | 9 ++++++++-
 lib/modes/psych_44.h | 2 +-
 lib/modes/psych_8.h  | 2 +-
 lib/modes/setup_16.h | 4 ++--
 lib/modes/setup_22.h | 4 ++--
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/modes/psych_16.h b/lib/modes/psych_16.h
index c6098bf..bfc8e4f 100644
--- a/lib/modes/psych_16.h
+++ b/lib/modes/psych_16.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: 16kHz settings 
- last mod: $Id: psych_16.h,v 1.3 2003/09/02 06:05:47 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -112,6 +112,13 @@ static noise3 _psy_noisebias_16[4]={
     {-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24,-20,-20,-20}}},
 };
 
+static noiseguard _psy_noiseguards_16[4]={
+  {10,10,-1},
+  {10,10,-1},
+  {20,20,-1},
+  {20,20,-1},
+};
+
 static double _noise_thresh_16[4]={ .3,.5,.5,.5 };
 
 static int _noise_start_16[3]={ 256,256,9999 };
diff --git a/lib/modes/psych_44.h b/lib/modes/psych_44.h
index f22109d..b6c6132 100644
--- a/lib/modes/psych_44.h
+++ b/lib/modes/psych_44.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: key psychoacoustic settings for 44.1/48kHz
- last mod: $Id: psych_44.h,v 1.29 2003/09/02 07:32:17 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
diff --git a/lib/modes/psych_8.h b/lib/modes/psych_8.h
index 1cbdd41..b6c8bc3 100644
--- a/lib/modes/psych_8.h
+++ b/lib/modes/psych_8.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: 8kHz psychoacoustic settings 
- last mod: $Id: psych_8.h,v 1.3 2003/09/02 06:05:47 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
diff --git a/lib/modes/setup_16.h b/lib/modes/setup_16.h
index d7ed5b6..15afd06 100644
--- a/lib/modes/setup_16.h
+++ b/lib/modes/setup_16.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: 16kHz settings 
- last mod: $Id: setup_16.h,v 1.5 2002/10/11 11:14:42 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -65,7 +65,7 @@ ve_setup_data_template ve_setup_16_stereo={
   _vp_tonemask_adj_16,
   _vp_tonemask_adj_16,
 
-  _psy_noiseguards_8,
+  _psy_noiseguards_16,
   _psy_noisebias_16_impulse,
   _psy_noisebias_16_short,
   _psy_noisebias_16_short,
diff --git a/lib/modes/setup_22.h b/lib/modes/setup_22.h
index 8a35825..e6363ee 100644
--- a/lib/modes/setup_22.h
+++ b/lib/modes/setup_22.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: 22kHz settings 
- last mod: $Id: setup_22.h,v 1.3 2002/07/11 10:02:29 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -44,7 +44,7 @@ ve_setup_data_template ve_setup_22_stereo={
   _vp_tonemask_adj_16,
   _vp_tonemask_adj_16,
 
-  _psy_noiseguards_8,
+  _psy_noiseguards_16,
   _psy_noisebias_16_impulse,
   _psy_noisebias_16_short,
   _psy_noisebias_16_short,
-- 
2.7.4