From 02298a3f0ba3d2755325dd5c8b4332bc97f748ce Mon Sep 17 00:00:00 2001 From: Monty Date: Mon, 18 Jun 2001 09:07:32 +0000 Subject: [PATCH 1/1] Accidentally committed some in-progress encoder changes that broke encode using floor 0. Fixed. Monty svn path=/trunk/vorbis/; revision=1502 --- lib/floor0.c | 4 +- lib/masking.h | 105 ++++++++++++++++++++++++---------------------------- lib/modes/mode_A.h | 12 +++--- lib/modes/mode_AA.h | 6 +-- lib/modes/mode_B.h | 6 +-- lib/modes/mode_C.h | 6 +-- lib/modes/mode_D.h | 6 +-- lib/modes/mode_E.h | 6 +-- lib/psy.c | 4 +- 9 files changed, 75 insertions(+), 80 deletions(-) diff --git a/lib/floor0.c b/lib/floor0.c index 4f01392..a637214 100644 --- a/lib/floor0.c +++ b/lib/floor0.c @@ -11,7 +11,7 @@ ******************************************************************** function: floor backend 0 implementation - last mod: $Id: floor0.c,v 1.43 2001/06/15 23:31:00 xiphmont Exp $ + last mod: $Id: floor0.c,v 1.44 2001/06/18 09:07:31 xiphmont Exp $ ********************************************************************/ @@ -381,6 +381,8 @@ static int floor0_forward(vorbis_block *vb,vorbis_look_floor *in, _analysis_output("lsp2",seq-1,lspwork,look->m,0,0); /* take the coefficients back to a spectral envelope curve */ + for(j=0;jn;j++) + codedflr[j]=1.f; vorbis_lsp_to_curve(codedflr,look->linearmap,look->n,look->ln, lspwork,look->m,amp,info->ampdB); diff --git a/lib/masking.h b/lib/masking.h index 86ae072..eb19c07 100644 --- a/lib/masking.h +++ b/lib/masking.h @@ -11,28 +11,19 @@ ******************************************************************** function: masking curve data for psychoacoustics - last mod: $Id: masking.h,v 1.16 2001/06/15 21:15:40 xiphmont Exp $ + last mod: $Id: masking.h,v 1.17 2001/06/18 09:07:31 xiphmont Exp $ ********************************************************************/ #ifndef _V_MASKING_H_ #define _V_MASKING_H_ +/* Not really an ATH, more a bottom curve to limit LSP dynamic range */ static float ATH_Bark_dB_lspconservative[]={ 15, 15, 15, 15, 11, 10, 8, 7, 7, 7, 6, 2, 0, 0, -3, -5, -6, -6, -4.5f, 2.5f, 10, 15, 15, 15, 15, 15, 15}; -static float ATH_Bark_dB_lineconservative[]={ - 0, 15, 15, 15, 11, 10, 8, 7, 7, 7, - 6, 2, 0, 0, -2, -5, -6, -6, -4, 0, - 2, 6, 5, 5, 15, 25, 35}; - -static float ATH_Bark_dB_lineaggressive[]={ - 0, 15, 15, 15, 11, 10, 8, 7, 7, 7, - 6, 2, 0, 0, -2, -5, -6, -6, -4, 4, - 14, 20, 19, 17, 30, 60, 60}; - /* The below masking curves are straight from the R. Ehmer (J. Acoustical Society of America) papers ca 1958-59. I modified them slightly as Ehmer does not correct for the Absolute Threshold @@ -48,12 +39,12 @@ static float ATH_Bark_dB_lineaggressive[]={ static float tone_125_40dB_SL[EHMER_MAX]={ 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 18, 16, 14, 12, 11, 9, 7, 5, 3, 2, 0, -2, -4, -6, -8, - -10, -12, -14, -16, -18, -20, -900, -900, -900,-900,-900,-900,-900,-900,-900,-900, + -10, -12, -14, -16, -18, -20, -23, -25, -28,-30,-34,-37,-40,-44,-48,-52, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_125_60dB_SL[EHMER_MAX]={ 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 38, 36, 34, 32, 31, 29, 27, 25, 23, 22, 20, 18, 16, 14, 12, - 10, 8, 6, 4, 2, 0, -3, -5, -8,-10,-14,-17,-20,-900,-900,-900, + 10, 8, 6, 4, 2, 0, -3, -5, -8,-10,-14,-17,-20,-24,-28,-32, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_125_80dB_SL[EHMER_MAX]={ 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, @@ -69,12 +60,12 @@ static float tone_125_100dB_SL[EHMER_MAX]={ static float tone_250_40dB_SL[EHMER_MAX]={ -900,-900,-900,-900,-900,-900,-900,-900, -19, -13, -7, -1, 4, 9, 15, 20, 22, 23, 22, 19, 18, 18, 16, 13, 9, 7, 3, 1, -1, -3, -6, -8, - -10, -13, -16, -19,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, + -10, -13, -16, -19, -21, -24, -28, -32, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_250_60dB_SL[EHMER_MAX]={ -900,-900,-900,-900,-900,-900,-900, -10, -5, 1, 7, 13, 19, 25, 30, 33, 36, 39, 38, 37, 38, 39, 39, 40, 38, 36, 35, 34, 33, 31, 29, 28, - 28, 28, 25, 20, 14, 10, 5, 0, -5,-10,-15,-20,-900,-900,-900,-900, + 28, 28, 25, 20, 14, 10, 5, 0, -5,-10,-15,-20,-25,-30,-35,-40, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_250_80dB_SL[EHMER_MAX]={ -900,-900,-900,-900,-900,-900,-900, -10, 10, 17, 24, 30, 37, 41, 48, 49, @@ -89,112 +80,112 @@ static float tone_250_100dB_SL[EHMER_MAX]={ 58, 52, 47, 42, 37, 31, 26, 20}; static float tone_500_40dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900, -20, -14, -8, -2, 4, 10, 17, - 23, 16, 12, 9, 6, 3, 0, -3, -7, -10, -13, -16, -20,-900,-900,-900, +-900,-900,-900,-900,-900,-900,-900, -40, -26, -20, -14, -8, -2, 4, 10, 17, + 23, 16, 12, 9, 6, 3, 0, -3, -7, -10, -13, -16, -20, -23, -26, -30, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_500_60dB_SL[EHMER_MAX]={ -900,-900,-900,-900,-900,-900,-900,-900, -18, -12, -6, 0, 6, 13, 20, 30, 39, 34, 31, 29, 29, 27, 24, 21, 18, 16, 13, 8, 6, 3, 1, -1, - -5, -2, -5, -8, -12, -15, -18,-900, -900,-900,-900,-900,-900,-900,-900,-900, + -5, -2, -5, -8, -12, -15, -18, -22, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_500_80dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-16,-10, 0, 10, 20, 32, 43, +-900,-900,-900,-900,-900,-900,-900,-900, -22,-16,-10, 0, 10, 20, 32, 43, 53, 52, 52, 50, 49, 50, 52, 55, 55, 54, 51, 49, 46, 44, 44, 42, 38, 34, 32, 29, 29, 28, 25, 23, 20, 16, 10, 7, 4, 2, -1, -4, - -7, -10, -15, -20,-900,-900,-900,-900}; + -7, -10, -15, -20, -25, -30, -35, -40}; static float tone_500_100dB_SL[EHMER_MAX]={ -900,-900,-900,-900,-900,-900,-900, -10, -7, 2, 10, 19, 27, 35, 55, 56, 62, 61, 60, 58, 57, 57, 59, 63, 65, 66, 62, 60, 57, 57, 58, 58, 57, 56, 56, 56, 57, 57, 56, 57, 57, 54, 47, 41, 37, 28, 21, 16, - 10, 3, -3, -8, -13, -18,-900,-900}; + 10, 3, -3, -8, -13, -18, -23, -28}; static float tone_1000_40dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900, -20, -10, 0, 9, 20, - 27, 20, 13, 14, 13, 5, -1, -6, -11, -20,-900,-900,-900,-900,-900,-900, +-900,-900,-900,-900,-900,-900,-900,-900, -55, -40, -30, -20, -10, 0, 9, 20, + 27, 20, 13, 14, 13, 5, -1, -6, -11, -20, -30,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_1000_60dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-13,-3, 7, 17, 25, 37, +-900,-900,-900,-900,-900,-900,-900, -43, -33,-23,-13, -3, 7, 17, 25, 37, 42, 33, 25, 25, 23, 18, 13, 9, 4, -1, -7,-13,-18, -23, -28, -33, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_1000_80dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-14, -4, 6, 16, 27, 33, 50, +-900,-900,-900,-900,-900,-900,-900, -35, -25,-14, -4, 6, 16, 27, 33, 50, 59, 57, 47, 41, 40, 43, 47, 48, 47, 42, 39, 37, 37, 36, 35, 32, 30, 27, 21, 15, 5, -2, -10, -18, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_1000_100dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-10, 0, 10, 23, 33, 45, 60, +-900,-900,-900,-900,-900,-900, -40, -30, -20,-10, 0, 10, 23, 33, 45, 60, 70, 72, 55, 49, 43, 40, 44, 54, 59, 58, 49, 43, 52, 57, 57, 58, - 58, 54, 49, 47, 42, 39, 33, 28, 20, 15, 5, 0, -5,-15,-900,-900, + 58, 54, 49, 47, 42, 39, 33, 28, 20, 15, 5, 0, -5,-15,-20,-25, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_2000_40dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900, 5, 12, 20, - 24, 14, 8, 0, -5,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, +-900,-900,-900,-900,-900,-900,-900,-900, -40, -30, -21, -12, -3, 5, 12, 20, + 24, 21, 14, 5, -5, -15, -25, -35, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_2000_60dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900, -2, 8, 19, 31, - 38, 30, 15, 15, 15, 13, 8, 5, -2,-900,-900,-900,-900,-900,-900,-900, +-900,-900,-900,-900,-900,-900,-900,-900, -40, -30, -21, -12, -2, 8, 19, 31, + 38, 34, 24, 17, 14, 13, 11, 7, 3, -2, -6, -10, -14, -20, -26, -32, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_2000_80dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900, 2, 10, 22, 38, - 52, 51, 40, 30, 28, 30, 33, 37, 37, 35, 31, 26, 20, 15, 10, 5, - 0,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, +-900,-900,-900,-900,-900,-900,-900,-900, -40, -30, -21, -12, -2, 13, 28, 40, + 51, 51, 43, 35, 28, 29, 35, 37, 37, 35, 31, 28, 25, 22, 19, 15, + 11, 8, 6, 2, -6, -14, -22, -30, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_2000_100dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900, 6, 20, 40, 55, - 66, 60, 53, 40, 35, 31, 34, 42, 58, 48, 43, 45, 52, 57, 50, 42, - 45, 45, 35, 25, 20, 11, 2,-900, -900,-900,-900,-900,-900,-900,-900,-900, +-900,-900,-900,-900,-900,-900,-900,-900, -40, -30, -21, -10, 6, 25, 42, 60, + 66, 60, 53, 43, 35, 31, 34, 47, 58, 51, 43, 45, 54, 59, 59, 56, + 54, 51, 40, 29, 20, 11, 2, -8, -17, -26, -35,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_4000_40dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900, 2, 4, 18, - 24, 10, 5, 0, -5,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, +-900,-900,-900,-900,-900,-900,-900,-900, -40, -30, -21, -12, 0, 3, 10, 18, + 24, 21, 14, 5, -5, -15, -25, -35, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_4000_60dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900, -2, 2, 4, 20, - 38, 30, 22, 15, 10, 5, 0, -10, -900,-900,-900,-900,-900,-900,-900,-900, +-900,-900,-900,-900,-900,-900,-900,-900, -40, -30, -21, -12, -2, 8, 19, 31, + 38, 33, 28, 23, 19, 14, 11, 8, 3, -2, -7, -12, -17, -22, -27, -37, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_4000_80dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900, 0, 4, 10, 35, - 51, 49, 35, 35, 36, 36, 36, 31, 25, 20, 10, 0,-900,-900,-900,-900, +-900,-900,-900,-900,-900,-900,-900,-900, -60, -50, -40, -29, -12, 5, 19, 37, + 51, 49, 40, 35, 36, 36, 36, 33, 32, 24, 18, 8, -3, -12, -20, -29, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_4000_100dB_SL[EHMER_MAX]={ --900, -5, 1, 3, 5, 8, 10, 12, 14, 20, 26, 28, 32, 36, 41, 51, - 61, 59, 45, 45, 48, 48, 40, 25, 40, 30, 18, 5, 0, -900,-900,-900, --900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, + -20, -12, -8, -4, 0, 4, 8, 11, 15, 22, 26, 28, 32, 36, 43, 52, + 62, 59, 50, 48, 50, 50, 45, 36, 45, 30, 20, 10, 0, -10, -19, -28, + -37,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_8000_40dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900, -10, 3, 10, 18, - 26, 21, 14, 5, 0, 0, 5, 10, 20, 35, 55, 45, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, -900,-900,-900,-900,-900,-900,-900,-900, +-900,-900,-900,-900,-900,-900,-900,-900, -40, -30, -21, -12, 0, 3, 10, 18, + 24, 21, 14, 5, 0, 0, 5, 10, 15, 25, 30, 45, 50, 55, 60, 65, + 70, 75, 80, 85, 90, 95, 100, 100, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_8000_60dB_SL[EHMER_MAX]={ --900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900, -10, 5, 12, 30, - 43, 40, 36, 35, 36, 38, 41, 43, 45, 60, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, -900,-900,-900,-900,-900,-900,-900,-900, +-900,-900,-900,-900,-900,-900,-900, -10, -21, -18, -14, -10, 0, 3, 15, 30, + 43, 40, 36, 35, 36, 38, 41, 43, 45, 47, 50, 55, 60, 65, 70, 75, + 80, 85, 90, 95, 100, 100, 100, 100, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_8000_80dB_SL[EHMER_MAX]={ -900,-900,-900,-900,-900,-900,-900, -10, -1, 2, 6, 10, 13, 19, 25, 35, - 63, 59, 57, 56, 57, 59, 61, 62, 63, 65, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, + 63, 55, 50, 48, 46, 45, 45, 50, 55, 65, 75, 80, 85, 90, 95, 100, + 100, 100, 100, 100,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; static float tone_8000_100dB_SL[EHMER_MAX]={ - -18, -12, -7, -3, 0, 2, 5, 8, 10, 14, 18, 20, 20, 22, 40, 40, - 70, 50, 30, 30, 30, 30, 30, 30, 30, 40, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, -900,-900,-900,-900,-900,-900,-900,-900, + -18, -12, -7, -3, 0, 2, 6, 9, 12, 19, 22, 21, 19, 21, 40, 40, + 80, 60, 35, 25, 15, 5, 5, 5, 25, 30, 35, 43, 50, 55, 60, 65, + 70, 75, 80, 85, 90, 95, 100, 100, -900,-900,-900,-900,-900,-900,-900,-900, -900,-900,-900,-900,-900,-900,-900,-900}; #if 0 /* not used for the time being */ diff --git a/lib/modes/mode_A.h b/lib/modes/mode_A.h index 4786300..71ea703 100644 --- a/lib/modes/mode_A.h +++ b/lib/modes/mode_A.h @@ -11,7 +11,7 @@ ******************************************************************** function: predefined encoding modes - last mod: $Id: mode_A.h,v 1.15 2001/05/27 06:44:05 xiphmont Exp $ + last mod: $Id: mode_A.h,v 1.16 2001/06/18 09:07:32 xiphmont Exp $ ********************************************************************/ @@ -48,7 +48,7 @@ static vorbis_info_psy _psy_set_A0={ - 1,/*athp*/ + ATH_Bark_dB_lspconservative, 1,/*decayp*/ -100., @@ -136,7 +136,7 @@ static vorbis_info_psy _psy_set_A0={ }; static vorbis_info_psy _psy_set_A={ - 1,/*athp*/ + ATH_Bark_dB_lspconservative, 1,/*decayp*/ -100.f, @@ -251,8 +251,10 @@ static vorbis_info_residue0 _residue_set1A={0, 960, 32,10,5, {5,5,5,5,5,5,5,5,5}, {99,99,99,99,99,99,99,99,99}}; -static vorbis_info_mapping0 _mapping_set0A={1, {0,0}, {0}, {0}, {0}, {0}}; -static vorbis_info_mapping0 _mapping_set1A={1, {0,0}, {0}, {1}, {1}, {1}}; +static vorbis_info_mapping0 _mapping_set0A={1, {0,0}, {0}, {0}, {0}, {0}, + 0,{0},{0}}; +static vorbis_info_mapping0 _mapping_set1A={1, {0,0}, {0}, {1}, {1}, {1}, + 0,{0},{0}}; static vorbis_info_mode _mode_set0A={0,0,0,0}; static vorbis_info_mode _mode_set1A={1,0,0,1}; diff --git a/lib/modes/mode_AA.h b/lib/modes/mode_AA.h index aa0f7ce..3663b73 100644 --- a/lib/modes/mode_AA.h +++ b/lib/modes/mode_AA.h @@ -11,7 +11,7 @@ ******************************************************************** function: predefined encoding modes - last mod: $Id: mode_AA.h,v 1.11 2001/05/27 06:44:05 xiphmont Exp $ + last mod: $Id: mode_AA.h,v 1.12 2001/06/18 09:07:32 xiphmont Exp $ ********************************************************************/ @@ -48,7 +48,7 @@ static vorbis_info_psy _psy_set_AA0={ - 1,/*athp*/ + ATH_Bark_dB_lspconservative, 1,/*decayp*/ -100., @@ -135,7 +135,7 @@ static vorbis_info_psy _psy_set_AA0={ }; static vorbis_info_psy _psy_set_AA={ - 1,/*athp*/ + ATH_Bark_dB_lspconservative, 1,/*decayp*/ -100.f, diff --git a/lib/modes/mode_B.h b/lib/modes/mode_B.h index 683977b..35fdb77 100644 --- a/lib/modes/mode_B.h +++ b/lib/modes/mode_B.h @@ -11,7 +11,7 @@ ******************************************************************** function: predefined encoding modes - last mod: $Id: mode_B.h,v 1.14 2001/05/27 06:44:05 xiphmont Exp $ + last mod: $Id: mode_B.h,v 1.15 2001/06/18 09:07:32 xiphmont Exp $ ********************************************************************/ @@ -48,7 +48,7 @@ static vorbis_info_psy _psy_set_B0={ - 1,/*athp*/ + ATH_Bark_dB_lspconservative, 1,/*decayp*/ -100., @@ -135,7 +135,7 @@ static vorbis_info_psy _psy_set_B0={ }; static vorbis_info_psy _psy_set_B={ - 1,/*athp*/ + ATH_Bark_dB_lspconservative, 1,/*decayp*/ -100.f, diff --git a/lib/modes/mode_C.h b/lib/modes/mode_C.h index aff377b..75ea967 100644 --- a/lib/modes/mode_C.h +++ b/lib/modes/mode_C.h @@ -11,7 +11,7 @@ ******************************************************************** function: predefined encoding modes - last mod: $Id: mode_C.h,v 1.13 2001/05/27 06:44:05 xiphmont Exp $ + last mod: $Id: mode_C.h,v 1.14 2001/06/18 09:07:32 xiphmont Exp $ ********************************************************************/ @@ -48,7 +48,7 @@ static vorbis_info_psy _psy_set_C0={ - 1,/*athp*/ + ATH_Bark_dB_lspconservative, 1,/*decayp*/ -100., @@ -135,7 +135,7 @@ static vorbis_info_psy _psy_set_C0={ }; static vorbis_info_psy _psy_set_C={ - 1,/*athp*/ + ATH_Bark_dB_lspconservative, 1,/*decayp*/ -100.f, diff --git a/lib/modes/mode_D.h b/lib/modes/mode_D.h index 4b2aa67..27145d1 100644 --- a/lib/modes/mode_D.h +++ b/lib/modes/mode_D.h @@ -11,7 +11,7 @@ ******************************************************************** function: predefined encoding modes - last mod: $Id: mode_D.h,v 1.14 2001/05/27 06:44:05 xiphmont Exp $ + last mod: $Id: mode_D.h,v 1.15 2001/06/18 09:07:32 xiphmont Exp $ ********************************************************************/ @@ -46,7 +46,7 @@ static vorbis_info_psy _psy_set_D0={ - 1,/*athp*/ + ATH_Bark_dB_lspconservative, 1,/*decayp*/ -100., @@ -133,7 +133,7 @@ static vorbis_info_psy _psy_set_D0={ }; static vorbis_info_psy _psy_set_D={ - 1,/*athp*/ + ATH_Bark_dB_lspconservative, 1,/*decayp*/ -100.f, diff --git a/lib/modes/mode_E.h b/lib/modes/mode_E.h index e0d2100..f870050 100644 --- a/lib/modes/mode_E.h +++ b/lib/modes/mode_E.h @@ -11,7 +11,7 @@ ******************************************************************** function: predefined encoding modes - last mod: $Id: mode_E.h,v 1.13 2001/05/27 06:44:05 xiphmont Exp $ + last mod: $Id: mode_E.h,v 1.14 2001/06/18 09:07:32 xiphmont Exp $ ********************************************************************/ @@ -46,7 +46,7 @@ static vorbis_info_psy _psy_set_E0={ - 1,/*athp*/ + ATH_Bark_dB_lspconservative, 1,/*decayp*/ -100., @@ -116,7 +116,7 @@ static vorbis_info_psy _psy_set_E0={ }; static vorbis_info_psy _psy_set_E={ - 1,/*athp*/ + ATH_Bark_dB_lspconservative, 1,/*decayp*/ -100.f, diff --git a/lib/psy.c b/lib/psy.c index 7f32aa8..467316c 100644 --- a/lib/psy.c +++ b/lib/psy.c @@ -11,7 +11,7 @@ ******************************************************************** function: psychoacoustics not including preecho - last mod: $Id: psy.c,v 1.46 2001/06/15 21:15:40 xiphmont Exp $ + last mod: $Id: psy.c,v 1.47 2001/06/18 09:07:31 xiphmont Exp $ ********************************************************************/ @@ -97,7 +97,7 @@ static void setup_curve(float **c, int i,j; float ath[EHMER_MAX]; float tempc[P_LEVELS][EHMER_MAX]; - float *ATH=ATH_Bark_dB_lineconservative; /* just for limiting here */ + float *ATH=ATH_Bark_dB_lspconservative; /* just for limiting here */ memcpy(c[0]+2,c[4]+2,sizeof(float)*EHMER_MAX); memcpy(c[2]+2,c[4]+2,sizeof(float)*EHMER_MAX); -- 2.7.4