mirror of
https://github.com/cookiengineer/audacity
synced 2026-01-11 23:25:53 +01:00
Update libvorbis to 1.3.3.
This commit is contained in:
lllucius
@@ -5,47 +5,47 @@
|
||||
* 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-2007 *
|
||||
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 *
|
||||
* by the Xiph.Org Foundation http://www.xiph.org/ *
|
||||
* *
|
||||
********************************************************************
|
||||
|
||||
function: key psychoacoustic settings for 44.1/48kHz
|
||||
last mod: $Id: psych_44.h,v 1.8 2008-02-02 15:53:58 richardash1981 Exp $
|
||||
last mod: $Id: psych_44.h 16962 2010-03-11 07:30:34Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
|
||||
/* preecho trigger settings *****************************************/
|
||||
|
||||
static vorbis_info_psy_global _psy_global_44[5]={
|
||||
static const vorbis_info_psy_global _psy_global_44[5]={
|
||||
|
||||
{8, /* lines per eighth octave */
|
||||
{20.f,14.f,12.f,12.f,12.f,12.f,12.f},
|
||||
{20.f,14.f,12.f,12.f,12.f,12.f,12.f},
|
||||
{-60.f,-30.f,-40.f,-40.f,-40.f,-40.f,-40.f}, 2,-75.f,
|
||||
-6.f,
|
||||
{99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
|
||||
},
|
||||
{8, /* lines per eighth octave */
|
||||
{14.f,10.f,10.f,10.f,10.f,10.f,10.f},
|
||||
{14.f,10.f,10.f,10.f,10.f,10.f,10.f},
|
||||
{-40.f,-30.f,-25.f,-25.f,-25.f,-25.f,-25.f}, 2,-80.f,
|
||||
-6.f,
|
||||
{99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
|
||||
},
|
||||
{8, /* lines per eighth octave */
|
||||
{12.f,10.f,10.f,10.f,10.f,10.f,10.f},
|
||||
{12.f,10.f,10.f,10.f,10.f,10.f,10.f},
|
||||
{-20.f,-20.f,-15.f,-15.f,-15.f,-15.f,-15.f}, 0,-80.f,
|
||||
-6.f,
|
||||
{99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
|
||||
},
|
||||
{8, /* lines per eighth octave */
|
||||
{10.f,8.f,8.f,8.f,8.f,8.f,8.f},
|
||||
{10.f,8.f,8.f,8.f,8.f,8.f,8.f},
|
||||
{-20.f,-15.f,-12.f,-12.f,-12.f,-12.f,-12.f}, 0,-80.f,
|
||||
-6.f,
|
||||
{99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
|
||||
},
|
||||
{8, /* lines per eighth octave */
|
||||
{10.f,6.f,6.f,6.f,6.f,6.f,6.f},
|
||||
{10.f,6.f,6.f,6.f,6.f,6.f,6.f},
|
||||
{-15.f,-15.f,-12.f,-12.f,-12.f,-12.f,-12.f}, 0,-85.f,
|
||||
-6.f,
|
||||
{99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
|
||||
@@ -53,7 +53,7 @@ static vorbis_info_psy_global _psy_global_44[5]={
|
||||
};
|
||||
|
||||
/* noise compander lookups * low, mid, high quality ****************/
|
||||
static compandblock _psy_compand_44[6]={
|
||||
static const compandblock _psy_compand_44[6]={
|
||||
/* sub-mode Z short */
|
||||
{{
|
||||
0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */
|
||||
@@ -106,7 +106,7 @@ static compandblock _psy_compand_44[6]={
|
||||
|
||||
/* tonal masking curve level adjustments *************************/
|
||||
|
||||
static vp_adjblock _vp_tonemask_adj_longblock[12]={
|
||||
static const vp_adjblock _vp_tonemask_adj_longblock[12]={
|
||||
|
||||
/* 63 125 250 500 1 2 4 8 16 */
|
||||
|
||||
@@ -146,7 +146,7 @@ static vp_adjblock _vp_tonemask_adj_longblock[12]={
|
||||
{{-16,-16,-16,-16,-16,-16,-16,-15,-14,-14,-14,-12, -9, -4, -2, -2, 0}}, /* 10 */
|
||||
};
|
||||
|
||||
static vp_adjblock _vp_tonemask_adj_otherblock[12]={
|
||||
static const vp_adjblock _vp_tonemask_adj_otherblock[12]={
|
||||
/* 63 125 250 500 1 2 4 8 16 */
|
||||
|
||||
{{ -3, -8,-13,-15,-10,-10, -9, -9, -9, -9, -9, 1, 1, 1, 1, 1, 1}}, /* -1 */
|
||||
@@ -186,76 +186,76 @@ static vp_adjblock _vp_tonemask_adj_otherblock[12]={
|
||||
};
|
||||
|
||||
/* noise bias (transition block) */
|
||||
static noise3 _psy_noisebias_trans[12]={
|
||||
static const noise3 _psy_noisebias_trans[12]={
|
||||
/* 63 125 250 500 1k 2k 4k 8k 16k*/
|
||||
/* -1 */
|
||||
{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20},
|
||||
{-30,-30,-30,-30,-26,-20,-16, -8, -6, -6, -2, 2, 2, 3, 6, 6, 15},
|
||||
{-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},
|
||||
/* 0
|
||||
/* 0
|
||||
{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14, -8, -4, 0, 0, 0, 0, 2, 4, 10},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -4, -4, -4, -2}}},*/
|
||||
{{{-15,-15,-15,-15,-15,-12, -6, -4, 0, 2, 4, 4, 5, 5, 5, 8, 10},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14, -8, -4, 0, 0, 0, 0, 2, 3, 6},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -4, -4, -4, -2}}},
|
||||
/* 1
|
||||
/* 1
|
||||
{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 8},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}},*/
|
||||
{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 4, 4, 5, 5, 5, 8, 10},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, -2, -2, -2, 0, 1, 4},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -6, -6, -6, -4}}},
|
||||
/* 2
|
||||
/* 2
|
||||
{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2, -2, -2, -2, 0, 2, 6},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}}, */
|
||||
{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 5, 6, 10},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -2, -1, 0, 3},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -7, -4}}},
|
||||
/* 3
|
||||
/* 3
|
||||
{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 6},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/
|
||||
{{{-15,-15,-15,-15,-15,-12,-10, -8, 0, 2, 2, 2, 4, 4, 4, 5, 8},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -2, 0, 2},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},
|
||||
/* 4
|
||||
/* 4
|
||||
{{{-20,-20,-20,-20,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -1, 1, 5},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},*/
|
||||
{{{-20,-20,-20,-20,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -3, -3, -3, -3, -2, -1, 1},
|
||||
{-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10, -8, -8, -8, -4}}},
|
||||
/* 5
|
||||
/* 5
|
||||
{{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7},
|
||||
{-32,-32,-32,-32,-28,-24,-22,-16,-12, -6, -4, -4, -4, -4, -2, -1, 2},
|
||||
{-34,-34,-34,-34,-30,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -5}}}, */
|
||||
{{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7},
|
||||
{-32,-32,-32,-32,-28,-24,-22,-16,-12, -6, -4, -4, -4, -4, -3, -1, 0},
|
||||
{-34,-34,-34,-34,-30,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -5}}},
|
||||
/* 6
|
||||
/* 6
|
||||
{{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7},
|
||||
{-32,-32,-32,-32,-28,-24,-24,-18,-14, -8, -6, -6, -6, -6, -4, -2, 1},
|
||||
{-34,-34,-34,-34,-30,-26,-24,-18,-17,-15,-15,-15,-15,-13,-13,-12, -8}}},*/
|
||||
{{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7},
|
||||
{-32,-32,-32,-32,-28,-24,-24,-18,-14, -8, -6, -6, -6, -6, -5, -2, 0},
|
||||
{-34,-34,-34,-34,-30,-26,-26,-24,-22,-19,-19,-19,-19,-18,-17,-16,-12}}},
|
||||
/* 7
|
||||
/* 7
|
||||
{{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7},
|
||||
{-32,-32,-32,-32,-28,-24,-24,-18,-14,-12,-10, -8, -8, -8, -6, -4, 0},
|
||||
{-34,-34,-34,-34,-30,-26,-26,-24,-22,-19,-19,-19,-19,-18,-17,-16,-12}}},*/
|
||||
{{{-24,-24,-24,-24,-20,-18,-14, -8, -1, 1, 1, 1, 2, 3, 3, 4, 7},
|
||||
{-32,-32,-32,-32,-28,-24,-24,-24,-18,-14,-12,-10,-10,-10, -8, -6, -2},
|
||||
{-34,-34,-34,-34,-30,-26,-26,-26,-24,-24,-24,-24,-24,-24,-24,-20,-16}}},
|
||||
/* 8
|
||||
/* 8
|
||||
{{{-24,-24,-24,-24,-22,-20,-15,-10, -8, -2, 0, 0, 0, 1, 2, 3, 7},
|
||||
{-36,-36,-36,-36,-30,-30,-30,-24,-18,-14,-12,-10,-10,-10, -8, -6, -2},
|
||||
{-36,-36,-36,-36,-34,-30,-28,-26,-24,-24,-24,-24,-24,-24,-24,-20,-16}}},*/
|
||||
{{{-24,-24,-24,-24,-22,-20,-15,-10, -8, -2, 0, 0, 0, 1, 2, 3, 7},
|
||||
{{{-24,-24,-24,-24,-22,-20,-15,-10, -8, -2, 0, 0, 0, 1, 2, 3, 7},
|
||||
{-36,-36,-36,-36,-30,-30,-30,-24,-20,-16,-16,-16,-16,-14,-12,-10, -7},
|
||||
{-36,-36,-36,-36,-34,-30,-28,-26,-24,-30,-30,-30,-30,-30,-30,-24,-20}}},
|
||||
/* 9
|
||||
/* 9
|
||||
{{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2, 2},
|
||||
{-36,-36,-36,-36,-34,-32,-32,-28,-20,-16,-16,-16,-16,-14,-12,-10, -7},
|
||||
{-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-24,-20}}},*/
|
||||
@@ -269,7 +269,7 @@ static noise3 _psy_noisebias_trans[12]={
|
||||
};
|
||||
|
||||
/* noise bias (long block) */
|
||||
static noise3 _psy_noisebias_long[12]={
|
||||
static const noise3 _psy_noisebias_long[12]={
|
||||
/*63 125 250 500 1k 2k 4k 8k 16k*/
|
||||
/* -1 */
|
||||
{{{-10,-10,-10,-10,-10, -4, 0, 0, 0, 6, 6, 6, 6, 10, 10, 12, 20},
|
||||
@@ -344,7 +344,7 @@ static noise3 _psy_noisebias_long[12]={
|
||||
};
|
||||
|
||||
/* noise bias (impulse block) */
|
||||
static noise3 _psy_noisebias_impulse[12]={
|
||||
static const noise3 _psy_noisebias_impulse[12]={
|
||||
/* 63 125 250 500 1k 2k 4k 8k 16k*/
|
||||
/* -1 */
|
||||
{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20},
|
||||
@@ -378,7 +378,7 @@ static noise3 _psy_noisebias_impulse[12]={
|
||||
{{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 4, 6, 11},
|
||||
{-32,-32,-32,-32,-28,-24,-22,-16,-10, -6, -8, -8, -6, -6, -6, -4, -2},
|
||||
{-34,-34,-34,-34,-30,-26,-24,-18,-14,-12,-12,-12,-12,-12,-10, -9, -5}}},
|
||||
/* 6
|
||||
/* 6
|
||||
{{{-20,-20,-20,-20,-20,-18,-14,-10, -4, 0, 0, 0, 0, 4, 4, 6, 11},
|
||||
{-34,-34,-34,-34,-30,-30,-24,-20,-12,-12,-14,-14,-10, -9, -8, -6, -4},
|
||||
{-34,-34,-34,-34,-34,-30,-26,-20,-16,-15,-15,-15,-15,-15,-13,-12, -8}}},*/
|
||||
@@ -413,9 +413,9 @@ static noise3 _psy_noisebias_impulse[12]={
|
||||
};
|
||||
|
||||
/* noise bias (padding block) */
|
||||
static noise3 _psy_noisebias_padding[12]={
|
||||
static const noise3 _psy_noisebias_padding[12]={
|
||||
/* 63 125 250 500 1k 2k 4k 8k 16k*/
|
||||
|
||||
|
||||
/* -1 */
|
||||
{{{-10,-10,-10,-10,-10, -4, 0, 0, 4, 8, 8, 8, 8, 10, 12, 14, 20},
|
||||
{-30,-30,-30,-30,-26,-20,-16, -8, -6, -6, -2, 2, 2, 3, 6, 6, 15},
|
||||
@@ -471,45 +471,45 @@ static noise3 _psy_noisebias_padding[12]={
|
||||
};
|
||||
|
||||
|
||||
static noiseguard _psy_noiseguards_44[4]={
|
||||
static const noiseguard _psy_noiseguards_44[4]={
|
||||
{3,3,15},
|
||||
{3,3,15},
|
||||
{10,10,100},
|
||||
{10,10,100},
|
||||
};
|
||||
|
||||
static int _psy_tone_suppress[12]={
|
||||
static const int _psy_tone_suppress[12]={
|
||||
-20,-20,-20,-20,-20,-24,-30,-40,-40,-45,-45,-45,
|
||||
};
|
||||
static int _psy_tone_0dB[12]={
|
||||
static const int _psy_tone_0dB[12]={
|
||||
90,90,95,95,95,95,105,105,105,105,105,105,
|
||||
};
|
||||
static int _psy_noise_suppress[12]={
|
||||
static const int _psy_noise_suppress[12]={
|
||||
-20,-20,-24,-24,-24,-24,-30,-40,-40,-45,-45,-45,
|
||||
};
|
||||
|
||||
static vorbis_info_psy _psy_info_template={
|
||||
static const vorbis_info_psy _psy_info_template={
|
||||
/* blockflag */
|
||||
-1,
|
||||
/* ath_adjatt, ath_maxatt */
|
||||
-140.,-140.,
|
||||
/* tonemask att boost/decay,suppr,curves */
|
||||
{0.f,0.f,0.f}, 0.,0., -40.f, {0.},
|
||||
|
||||
{0.f,0.f,0.f}, 0.,0., -40.f, {0.},
|
||||
|
||||
/*noisemaskp,supp, low/high window, low/hi guard, minimum */
|
||||
1, -0.f, .5f, .5f, 0,0,0,
|
||||
/* noiseoffset*3, noisecompand, max_curve_dB */
|
||||
{{-1},{-1},{-1}},{-1},105.f,
|
||||
/* noise normalization - channel_p, point_p, start, partition, thresh. */
|
||||
0,0,-1,-1,0.,
|
||||
/* noise normalization - noise_p, start, partition, thresh. */
|
||||
0,-1,-1,0.,
|
||||
};
|
||||
|
||||
/* ath ****************/
|
||||
|
||||
static int _psy_ath_floater[12]={
|
||||
static const int _psy_ath_floater[12]={
|
||||
-100,-100,-100,-100,-100,-100,-105,-105,-105,-105,-110,-120,
|
||||
};
|
||||
static int _psy_ath_abs[12]={
|
||||
static const int _psy_ath_abs[12]={
|
||||
-130,-130,-130,-130,-140,-140,-140,-140,-140,-140,-140,-150,
|
||||
};
|
||||
|
||||
@@ -522,7 +522,7 @@ static int _psy_ath_abs[12]={
|
||||
/* various stereo possibilities */
|
||||
|
||||
/* stereo mode by base quality level */
|
||||
static adj_stereo _psy_stereo_modes_44[12]={
|
||||
static const adj_stereo _psy_stereo_modes_44[12]={
|
||||
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 -1 */
|
||||
{{ 4, 4, 4, 4, 4, 4, 4, 3, 2, 2, 1, 0, 0, 0, 0},
|
||||
{ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 5, 4, 3},
|
||||
@@ -530,10 +530,6 @@ static adj_stereo _psy_stereo_modes_44[12]={
|
||||
{ 12,12.5, 13,13.5, 14,14.5, 15, 99, 99, 99, 99, 99, 99, 99, 99}},
|
||||
|
||||
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 0 */
|
||||
/*{{ 4, 4, 4, 4, 4, 4, 4, 3, 2, 2, 1, 0, 0, 0, 0},
|
||||
{ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 5, 4, 3},
|
||||
{ 1, 2, 3, 4, 5, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8},
|
||||
{ 12,12.5, 13,13.5, 14,14.5, 15, 99, 99, 99, 99, 99, 99, 99, 99}},*/
|
||||
{{ 4, 4, 4, 4, 4, 4, 4, 3, 2, 1, 0, 0, 0, 0, 0},
|
||||
{ 8, 8, 8, 8, 6, 6, 5, 5, 5, 5, 5, 5, 5, 4, 3},
|
||||
{ 1, 2, 3, 4, 4, 5, 6, 6, 6, 6, 6, 8, 8, 8, 8},
|
||||
@@ -548,10 +544,6 @@ static adj_stereo _psy_stereo_modes_44[12]={
|
||||
|
||||
|
||||
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 2 */
|
||||
/* {{ 3, 3, 3, 3, 3, 3, 2, 2, 2, 1, 0, 0, 0, 0, 0},
|
||||
{ 8, 8, 8, 6, 5, 5, 5, 5, 5, 5, 5, 4, 3, 2, 1},
|
||||
{ 3, 4, 4, 4, 5, 6, 6, 6, 6, 6, 6, 8, 8, 8, 8},
|
||||
{ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, */
|
||||
{{ 3, 3, 3, 3, 3, 3, 3, 2, 1, 1, 0, 0, 0, 0, 0},
|
||||
{ 8, 8, 6, 6, 5, 5, 4, 4, 4, 4, 4, 4, 3, 2, 1},
|
||||
{ 3, 4, 4, 5, 5, 6, 6, 6, 6, 6, 6, 8, 8, 8, 8},
|
||||
@@ -567,37 +559,21 @@ static adj_stereo _psy_stereo_modes_44[12]={
|
||||
{ 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 10, 10, 10, 10, 10},
|
||||
{ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
|
||||
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 5 */
|
||||
/* {{ 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0},
|
||||
{ 6, 6, 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10},
|
||||
{ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/
|
||||
{{ 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0},
|
||||
{ 6, 7, 8, 8, 8, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12},
|
||||
{ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
|
||||
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 6 */
|
||||
/* {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 3, 3, 3, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10},
|
||||
{ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}}, */
|
||||
{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 3, 3, 3, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 8, 8, 8, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12},
|
||||
{ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
|
||||
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 7 */
|
||||
/* {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 3, 3, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10},
|
||||
{ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/
|
||||
{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 3, 3, 3, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 8, 8, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12},
|
||||
{ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
|
||||
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 8 */
|
||||
/* {{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10},
|
||||
{ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},*/
|
||||
{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
{ 8, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12},
|
||||
@@ -615,7 +591,7 @@ static adj_stereo _psy_stereo_modes_44[12]={
|
||||
};
|
||||
|
||||
/* tone master attenuation by base quality mode and bitrate tweak */
|
||||
static att3 _psy_tone_masteratt_44[12]={
|
||||
static const att3 _psy_tone_masteratt_44[12]={
|
||||
{{ 35, 21, 9}, 0, 0}, /* -1 */
|
||||
{{ 30, 20, 8}, -2, 1.25}, /* 0 */
|
||||
/* {{ 25, 14, 4}, 0, 0}, *//* 1 */
|
||||
@@ -633,34 +609,34 @@ static att3 _psy_tone_masteratt_44[12]={
|
||||
};
|
||||
|
||||
/* lowpass by mode **************/
|
||||
static double _psy_lowpass_44[12]={
|
||||
static const double _psy_lowpass_44[12]={
|
||||
/* 15.1,15.8,16.5,17.9,20.5,48.,999.,999.,999.,999.,999. */
|
||||
13.9,15.1,15.8,16.5,17.2,18.9,20.1,48.,999.,999.,999.,999.
|
||||
};
|
||||
|
||||
/* noise normalization **********/
|
||||
|
||||
static int _noise_start_short_44[11]={
|
||||
static const int _noise_start_short_44[11]={
|
||||
/* 16,16,16,16,32,32,9999,9999,9999,9999 */
|
||||
32,16,16,16,32,9999,9999,9999,9999,9999,9999
|
||||
};
|
||||
static int _noise_start_long_44[11]={
|
||||
static const int _noise_start_long_44[11]={
|
||||
/* 128,128,128,256,512,512,9999,9999,9999,9999 */
|
||||
256,128,128,256,512,9999,9999,9999,9999,9999,9999
|
||||
};
|
||||
|
||||
static int _noise_part_short_44[11]={
|
||||
static const int _noise_part_short_44[11]={
|
||||
8,8,8,8,8,8,8,8,8,8,8
|
||||
};
|
||||
static int _noise_part_long_44[11]={
|
||||
static const int _noise_part_long_44[11]={
|
||||
32,32,32,32,32,32,32,32,32,32,32
|
||||
};
|
||||
|
||||
static double _noise_thresh_44[11]={
|
||||
static const double _noise_thresh_44[11]={
|
||||
/* .2,.2,.3,.4,.5,.5,9999.,9999.,9999.,9999., */
|
||||
.2,.2,.2,.4,.6,9999.,9999.,9999.,9999.,9999.,9999.,
|
||||
};
|
||||
|
||||
static double _noise_thresh_5only[2]={
|
||||
static const double _noise_thresh_5only[2]={
|
||||
.5,.5,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user