mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-10 16:43:33 +02:00
Update libvorbis to 1.3.3.
This commit is contained in:
lllucius
@@ -3,4 +3,4 @@
|
||||
EXTRA_DIST = floor_all.h psych_44.h residue_44.h setup_11.h setup_32.h \
|
||||
setup_8.h psych_11.h psych_8.h residue_44u.h setup_16.h \
|
||||
setup_44.h setup_X.h psych_16.h residue_16.h residue_8.h \
|
||||
setup_22.h setup_44u.h
|
||||
setup_22.h setup_44u.h setup_44p51.h residue_44p51.h
|
||||
|
||||
@@ -37,8 +37,9 @@ target_triplet = @target@
|
||||
subdir = lib/modes
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
|
||||
$(top_srcdir)/configure.in
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \
|
||||
$(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \
|
||||
$(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
@@ -49,9 +50,11 @@ SOURCES =
|
||||
DIST_SOURCES =
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
|
||||
ALLOCA = @ALLOCA@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
AS = @AS@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
@@ -65,6 +68,7 @@ CYGPATH_W = @CYGPATH_W@
|
||||
DEBUG = @DEBUG@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
DUMPBIN = @DUMPBIN@
|
||||
ECHO_C = @ECHO_C@
|
||||
@@ -74,7 +78,8 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GREP = @GREP@
|
||||
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
|
||||
HAVE_DOXYGEN = @HAVE_DOXYGEN@
|
||||
HTLATEX = @HTLATEX@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
@@ -85,11 +90,13 @@ LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIBTOOL_DEPS = @LIBTOOL_DEPS@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
@@ -107,7 +114,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_URL = @PACKAGE_URL@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PDFXMLTEX = @PDFXMLTEX@
|
||||
PDFLATEX = @PDFLATEX@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PROFILE = @PROFILE@
|
||||
RANLIB = @RANLIB@
|
||||
@@ -126,11 +133,11 @@ VORBIS_LIBS = @VORBIS_LIBS@
|
||||
V_LIB_AGE = @V_LIB_AGE@
|
||||
V_LIB_CURRENT = @V_LIB_CURRENT@
|
||||
V_LIB_REVISION = @V_LIB_REVISION@
|
||||
XSLTPROC = @XSLTPROC@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
abs_top_srcdir = @abs_top_srcdir@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
am__include = @am__include@
|
||||
@@ -163,7 +170,6 @@ libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
lt_ECHO = @lt_ECHO@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
@@ -187,7 +193,7 @@ top_srcdir = @top_srcdir@
|
||||
EXTRA_DIST = floor_all.h psych_44.h residue_44.h setup_11.h setup_32.h \
|
||||
setup_8.h psych_11.h psych_8.h residue_44u.h setup_16.h \
|
||||
setup_44.h setup_X.h psych_16.h residue_16.h residue_8.h \
|
||||
setup_22.h setup_44u.h
|
||||
setup_22.h setup_44u.h setup_44p51.h residue_44p51.h
|
||||
|
||||
all: all-am
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
* 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 floor settings
|
||||
last mod: $Id: floor_all.h,v 1.7 2008-02-02 15:53:58 richardash1981 Exp $
|
||||
last mod: $Id: floor_all.h 17050 2010-03-26 01:34:42Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
@@ -19,85 +19,85 @@
|
||||
#include "backends.h"
|
||||
#include "books/floor/floor_books.h"
|
||||
|
||||
static static_codebook *_floor_128x4_books[]={
|
||||
static const static_codebook*const _floor_128x4_books[]={
|
||||
&_huff_book_line_128x4_class0,
|
||||
&_huff_book_line_128x4_0sub0,
|
||||
&_huff_book_line_128x4_0sub1,
|
||||
&_huff_book_line_128x4_0sub2,
|
||||
&_huff_book_line_128x4_0sub3,
|
||||
};
|
||||
static static_codebook *_floor_256x4_books[]={
|
||||
static const static_codebook*const _floor_256x4_books[]={
|
||||
&_huff_book_line_256x4_class0,
|
||||
&_huff_book_line_256x4_0sub0,
|
||||
&_huff_book_line_256x4_0sub1,
|
||||
&_huff_book_line_256x4_0sub2,
|
||||
&_huff_book_line_256x4_0sub3,
|
||||
};
|
||||
static static_codebook *_floor_128x7_books[]={
|
||||
static const static_codebook*const _floor_128x7_books[]={
|
||||
&_huff_book_line_128x7_class0,
|
||||
&_huff_book_line_128x7_class1,
|
||||
|
||||
|
||||
&_huff_book_line_128x7_0sub1,
|
||||
&_huff_book_line_128x7_0sub2,
|
||||
&_huff_book_line_128x7_0sub3,
|
||||
&_huff_book_line_128x7_1sub1,
|
||||
&_huff_book_line_128x7_1sub2,
|
||||
&_huff_book_line_128x7_1sub3,
|
||||
&_huff_book_line_128x7_1sub3,
|
||||
};
|
||||
static static_codebook *_floor_256x7_books[]={
|
||||
static const static_codebook*const _floor_256x7_books[]={
|
||||
&_huff_book_line_256x7_class0,
|
||||
&_huff_book_line_256x7_class1,
|
||||
|
||||
|
||||
&_huff_book_line_256x7_0sub1,
|
||||
&_huff_book_line_256x7_0sub2,
|
||||
&_huff_book_line_256x7_0sub3,
|
||||
&_huff_book_line_256x7_1sub1,
|
||||
&_huff_book_line_256x7_1sub2,
|
||||
&_huff_book_line_256x7_1sub3,
|
||||
&_huff_book_line_256x7_1sub3,
|
||||
};
|
||||
static static_codebook *_floor_128x11_books[]={
|
||||
static const static_codebook*const _floor_128x11_books[]={
|
||||
&_huff_book_line_128x11_class1,
|
||||
&_huff_book_line_128x11_class2,
|
||||
&_huff_book_line_128x11_class3,
|
||||
|
||||
|
||||
&_huff_book_line_128x11_0sub0,
|
||||
&_huff_book_line_128x11_1sub0,
|
||||
&_huff_book_line_128x11_1sub1,
|
||||
&_huff_book_line_128x11_2sub1,
|
||||
&_huff_book_line_128x11_2sub2,
|
||||
&_huff_book_line_128x11_2sub3,
|
||||
&_huff_book_line_128x11_2sub3,
|
||||
&_huff_book_line_128x11_3sub1,
|
||||
&_huff_book_line_128x11_3sub2,
|
||||
&_huff_book_line_128x11_3sub3,
|
||||
&_huff_book_line_128x11_3sub3,
|
||||
};
|
||||
static static_codebook *_floor_128x17_books[]={
|
||||
static const static_codebook*const _floor_128x17_books[]={
|
||||
&_huff_book_line_128x17_class1,
|
||||
&_huff_book_line_128x17_class2,
|
||||
&_huff_book_line_128x17_class3,
|
||||
|
||||
|
||||
&_huff_book_line_128x17_0sub0,
|
||||
&_huff_book_line_128x17_1sub0,
|
||||
&_huff_book_line_128x17_1sub1,
|
||||
&_huff_book_line_128x17_2sub1,
|
||||
&_huff_book_line_128x17_2sub2,
|
||||
&_huff_book_line_128x17_2sub3,
|
||||
&_huff_book_line_128x17_2sub3,
|
||||
&_huff_book_line_128x17_3sub1,
|
||||
&_huff_book_line_128x17_3sub2,
|
||||
&_huff_book_line_128x17_3sub3,
|
||||
&_huff_book_line_128x17_3sub3,
|
||||
};
|
||||
static static_codebook *_floor_256x4low_books[]={
|
||||
static const static_codebook*const _floor_256x4low_books[]={
|
||||
&_huff_book_line_256x4low_class0,
|
||||
&_huff_book_line_256x4low_0sub0,
|
||||
&_huff_book_line_256x4low_0sub1,
|
||||
&_huff_book_line_256x4low_0sub2,
|
||||
&_huff_book_line_256x4low_0sub3,
|
||||
};
|
||||
static static_codebook *_floor_1024x27_books[]={
|
||||
static const static_codebook*const _floor_1024x27_books[]={
|
||||
&_huff_book_line_1024x27_class1,
|
||||
&_huff_book_line_1024x27_class2,
|
||||
&_huff_book_line_1024x27_class3,
|
||||
&_huff_book_line_1024x27_class4,
|
||||
|
||||
|
||||
&_huff_book_line_1024x27_0sub0,
|
||||
&_huff_book_line_1024x27_1sub0,
|
||||
&_huff_book_line_1024x27_1sub1,
|
||||
@@ -110,12 +110,12 @@ static static_codebook *_floor_1024x27_books[]={
|
||||
&_huff_book_line_1024x27_4sub2,
|
||||
&_huff_book_line_1024x27_4sub3,
|
||||
};
|
||||
static static_codebook *_floor_2048x27_books[]={
|
||||
static const static_codebook*const _floor_2048x27_books[]={
|
||||
&_huff_book_line_2048x27_class1,
|
||||
&_huff_book_line_2048x27_class2,
|
||||
&_huff_book_line_2048x27_class3,
|
||||
&_huff_book_line_2048x27_class4,
|
||||
|
||||
|
||||
&_huff_book_line_2048x27_0sub0,
|
||||
&_huff_book_line_2048x27_1sub0,
|
||||
&_huff_book_line_2048x27_1sub1,
|
||||
@@ -129,23 +129,27 @@ static static_codebook *_floor_2048x27_books[]={
|
||||
&_huff_book_line_2048x27_4sub3,
|
||||
};
|
||||
|
||||
static static_codebook *_floor_512x17_books[]={
|
||||
static const static_codebook*const _floor_512x17_books[]={
|
||||
&_huff_book_line_512x17_class1,
|
||||
&_huff_book_line_512x17_class2,
|
||||
&_huff_book_line_512x17_class3,
|
||||
|
||||
|
||||
&_huff_book_line_512x17_0sub0,
|
||||
&_huff_book_line_512x17_1sub0,
|
||||
&_huff_book_line_512x17_1sub1,
|
||||
&_huff_book_line_512x17_2sub1,
|
||||
&_huff_book_line_512x17_2sub2,
|
||||
&_huff_book_line_512x17_2sub3,
|
||||
&_huff_book_line_512x17_2sub3,
|
||||
&_huff_book_line_512x17_3sub1,
|
||||
&_huff_book_line_512x17_3sub2,
|
||||
&_huff_book_line_512x17_3sub3,
|
||||
&_huff_book_line_512x17_3sub3,
|
||||
};
|
||||
|
||||
static static_codebook **_floor_books[10]={
|
||||
static const static_codebook*const _floor_Xx0_books[]={
|
||||
0
|
||||
};
|
||||
|
||||
static const static_codebook*const *const _floor_books[11]={
|
||||
_floor_128x4_books,
|
||||
_floor_256x4_books,
|
||||
_floor_128x7_books,
|
||||
@@ -156,93 +160,101 @@ static static_codebook **_floor_books[10]={
|
||||
_floor_1024x27_books,
|
||||
_floor_2048x27_books,
|
||||
_floor_512x17_books,
|
||||
_floor_Xx0_books,
|
||||
};
|
||||
|
||||
static vorbis_info_floor1 _floor[10]={
|
||||
/* 128 x 4 */
|
||||
static const vorbis_info_floor1 _floor[11]={
|
||||
/* 0: 128 x 4 */
|
||||
{
|
||||
1,{0},{4},{2},{0},
|
||||
{{1,2,3,4}},
|
||||
4,{0,128, 33,8,16,70},
|
||||
|
||||
60,30,500, 1.,18., -1
|
||||
60,30,500, 1.,18., 128
|
||||
},
|
||||
/* 256 x 4 */
|
||||
/* 1: 256 x 4 */
|
||||
{
|
||||
1,{0},{4},{2},{0},
|
||||
{{1,2,3,4}},
|
||||
4,{0,256, 66,16,32,140},
|
||||
|
||||
60,30,500, 1.,18., -1
|
||||
60,30,500, 1.,18., 256
|
||||
},
|
||||
/* 128 x 7 */
|
||||
/* 2: 128 x 7 */
|
||||
{
|
||||
2,{0,1},{3,4},{2,2},{0,1},
|
||||
{{-1,2,3,4},{-1,5,6,7}},
|
||||
4,{0,128, 14,4,58, 2,8,28,90},
|
||||
|
||||
60,30,500, 1.,18., -1
|
||||
|
||||
60,30,500, 1.,18., 128
|
||||
},
|
||||
/* 256 x 7 */
|
||||
/* 3: 256 x 7 */
|
||||
{
|
||||
2,{0,1},{3,4},{2,2},{0,1},
|
||||
{{-1,2,3,4},{-1,5,6,7}},
|
||||
4,{0,256, 28,8,116, 4,16,56,180},
|
||||
|
||||
60,30,500, 1.,18., -1
|
||||
|
||||
60,30,500, 1.,18., 256
|
||||
},
|
||||
/* 128 x 11 */
|
||||
/* 4: 128 x 11 */
|
||||
{
|
||||
4,{0,1,2,3},{2,3,3,3},{0,1,2,2},{-1,0,1,2},
|
||||
{{3},{4,5},{-1,6,7,8},{-1,9,10,11}},
|
||||
|
||||
|
||||
2,{0,128, 8,33, 4,16,70, 2,6,12, 23,46,90},
|
||||
|
||||
60,30,500, 1,18., -1
|
||||
|
||||
60,30,500, 1,18., 128
|
||||
},
|
||||
/* 128 x 17 */
|
||||
/* 5: 128 x 17 */
|
||||
{
|
||||
6,{0,1,1,2,3,3},{2,3,3,3},{0,1,2,2},{-1,0,1,2},
|
||||
{{3},{4,5},{-1,6,7,8},{-1,9,10,11}},
|
||||
2,{0,128, 12,46, 4,8,16, 23,33,70, 2,6,10, 14,19,28, 39,58,90},
|
||||
|
||||
60,30,500, 1,18., -1
|
||||
|
||||
60,30,500, 1,18., 128
|
||||
},
|
||||
/* 256 x 4 (low bitrate version) */
|
||||
/* 6: 256 x 4 (low bitrate version) */
|
||||
{
|
||||
1,{0},{4},{2},{0},
|
||||
{{1,2,3,4}},
|
||||
4,{0,256, 66,16,32,140},
|
||||
|
||||
60,30,500, 1.,18., -1
|
||||
60,30,500, 1.,18., 256
|
||||
},
|
||||
/* 1024 x 27 */
|
||||
/* 7: 1024 x 27 */
|
||||
{
|
||||
8,{0,1,2,2,3,3,4,4},{3,4,3,4,3},{0,1,1,2,2},{-1,0,1,2,3},
|
||||
{{4},{5,6},{7,8},{-1,9,10,11},{-1,12,13,14}},
|
||||
2,{0,1024, 93,23,372, 6,46,186,750, 14,33,65, 130,260,556,
|
||||
3,10,18,28, 39,55,79,111, 158,220,312, 464,650,850},
|
||||
|
||||
60,30,500, 3,18., -1 /* lowpass */
|
||||
|
||||
60,30,500, 3,18., 1024
|
||||
},
|
||||
/* 2048 x 27 */
|
||||
/* 8: 2048 x 27 */
|
||||
{
|
||||
8,{0,1,2,2,3,3,4,4},{3,4,3,4,3},{0,1,1,2,2},{-1,0,1,2,3},
|
||||
{{4},{5,6},{7,8},{-1,9,10,11},{-1,12,13,14}},
|
||||
2,{0,2048, 186,46,744, 12,92,372,1500, 28,66,130, 260,520,1112,
|
||||
6,20,36,56, 78,110,158,222, 316,440,624, 928,1300,1700},
|
||||
|
||||
60,30,500, 3,18., -1 /* lowpass */
|
||||
|
||||
60,30,500, 3,18., 2048
|
||||
},
|
||||
/* 512 x 17 */
|
||||
/* 9: 512 x 17 */
|
||||
{
|
||||
6,{0,1,1,2,3,3},{2,3,3,3},{0,1,2,2},{-1,0,1,2},
|
||||
{{3},{4,5},{-1,6,7,8},{-1,9,10,11}},
|
||||
2,{0,512, 46,186, 16,33,65, 93,130,278,
|
||||
2,{0,512, 46,186, 16,33,65, 93,130,278,
|
||||
7,23,39, 55,79,110, 156,232,360},
|
||||
|
||||
60,30,500, 1,18., -1 /* lowpass! */
|
||||
|
||||
60,30,500, 1,18., 512
|
||||
},
|
||||
|
||||
/* 10: X x 0 (LFE floor; edge posts only) */
|
||||
{
|
||||
0,{0}, {0},{0},{-1},
|
||||
{{-1}},
|
||||
2,{0,12},
|
||||
60,30,500, 1.,18., 10
|
||||
},
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -5,25 +5,25 @@
|
||||
* 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: 11kHz settings
|
||||
last mod: $Id: psych_11.h,v 1.7 2008-02-02 15:53:58 richardash1981 Exp $
|
||||
function: 11kHz settings
|
||||
last mod: $Id: psych_11.h 16227 2009-07-08 06:58:46Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
static double _psy_lowpass_11[3]={4.5,5.5,30.,};
|
||||
static const double _psy_lowpass_11[3]={4.5,5.5,30.,};
|
||||
|
||||
static att3 _psy_tone_masteratt_11[3]={
|
||||
static const att3 _psy_tone_masteratt_11[3]={
|
||||
{{ 30, 25, 12}, 0, 0}, /* 0 */
|
||||
{{ 30, 25, 12}, 0, 0}, /* 0 */
|
||||
{{ 20, 0, -14}, 0, 0}, /* 0 */
|
||||
};
|
||||
|
||||
static vp_adjblock _vp_tonemask_adj_11[3]={
|
||||
static const vp_adjblock _vp_tonemask_adj_11[3]={
|
||||
/* adjust for mode zero */
|
||||
/* 63 125 250 500 1 2 4 8 16 */
|
||||
{{-20,-20,-20,-20,-20,-16,-10, 0, 0, 0, 0,10, 2, 0,99,99,99}}, /* 0 */
|
||||
@@ -32,7 +32,7 @@ static vp_adjblock _vp_tonemask_adj_11[3]={
|
||||
};
|
||||
|
||||
|
||||
static noise3 _psy_noisebias_11[3]={
|
||||
static const noise3 _psy_noisebias_11[3]={
|
||||
/* 63 125 250 500 1k 2k 4k 8k 16k*/
|
||||
{{{-10,-10,-10,-10, -5, -5, -5, 0, 4, 10, 10, 12, 12, 12, 99, 99, 99},
|
||||
{-15,-15,-15,-15,-10,-10, -5, 0, 0, 4, 4, 5, 5, 10, 99, 99, 99},
|
||||
@@ -47,5 +47,5 @@ static noise3 _psy_noisebias_11[3]={
|
||||
{-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24, 99, 99, 99}}},
|
||||
};
|
||||
|
||||
static double _noise_thresh_11[3]={ .3,.5,.5 };
|
||||
static const double _noise_thresh_11[3]={ .3,.5,.5 };
|
||||
|
||||
|
||||
@@ -5,18 +5,18 @@
|
||||
* 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: 16kHz settings
|
||||
last mod: $Id: psych_16.h,v 1.8 2008-02-02 15:53:58 richardash1981 Exp $
|
||||
function: 16kHz settings
|
||||
last mod: $Id: psych_16.h 16227 2009-07-08 06:58:46Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
/* stereo mode by base quality level */
|
||||
static adj_stereo _psy_stereo_modes_16[4]={
|
||||
static const adj_stereo _psy_stereo_modes_16[4]={
|
||||
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 */
|
||||
{{ 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
|
||||
{ 6, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
|
||||
@@ -36,16 +36,16 @@ static adj_stereo _psy_stereo_modes_16[4]={
|
||||
{ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
|
||||
};
|
||||
|
||||
static double _psy_lowpass_16[4]={6.5,8,30.,99.};
|
||||
static const double _psy_lowpass_16[4]={6.5,8,30.,99.};
|
||||
|
||||
static att3 _psy_tone_masteratt_16[4]={
|
||||
static const att3 _psy_tone_masteratt_16[4]={
|
||||
{{ 30, 25, 12}, 0, 0}, /* 0 */
|
||||
{{ 25, 22, 12}, 0, 0}, /* 0 */
|
||||
{{ 20, 12, 0}, 0, 0}, /* 0 */
|
||||
{{ 15, 0, -14}, 0, 0}, /* 0 */
|
||||
};
|
||||
|
||||
static vp_adjblock _vp_tonemask_adj_16[4]={
|
||||
static const vp_adjblock _vp_tonemask_adj_16[4]={
|
||||
/* adjust for mode zero */
|
||||
/* 63 125 250 500 1 2 4 8 16 */
|
||||
{{-20,-20,-20,-20,-20,-16,-10, 0, 0, 0, 0,10, 0, 0, 0, 0, 0}}, /* 0 */
|
||||
@@ -55,7 +55,7 @@ static vp_adjblock _vp_tonemask_adj_16[4]={
|
||||
};
|
||||
|
||||
|
||||
static noise3 _psy_noisebias_16_short[4]={
|
||||
static const noise3 _psy_noisebias_16_short[4]={
|
||||
/* 63 125 250 500 1k 2k 4k 8k 16k*/
|
||||
{{{-15,-15,-15,-15,-15,-10,-10,-5, 4, 10, 10, 10, 10, 12, 12, 14, 20},
|
||||
{-15,-15,-15,-15,-15,-10,-10, -5, 0, 0, 4, 5, 5, 6, 8, 8, 15},
|
||||
@@ -74,7 +74,7 @@ static noise3 _psy_noisebias_16_short[4]={
|
||||
{-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24,-20,-20,-20}}},
|
||||
};
|
||||
|
||||
static noise3 _psy_noisebias_16_impulse[4]={
|
||||
static const noise3 _psy_noisebias_16_impulse[4]={
|
||||
/* 63 125 250 500 1k 2k 4k 8k 16k*/
|
||||
{{{-15,-15,-15,-15,-15,-10,-10,-5, 4, 10, 10, 10, 10, 12, 12, 14, 20},
|
||||
{-15,-15,-15,-15,-15,-10,-10, -5, 0, 0, 4, 5, 5, 6, 8, 8, 15},
|
||||
@@ -93,7 +93,7 @@ static noise3 _psy_noisebias_16_impulse[4]={
|
||||
{-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24,-20,-20,-20}}},
|
||||
};
|
||||
|
||||
static noise3 _psy_noisebias_16[4]={
|
||||
static const noise3 _psy_noisebias_16[4]={
|
||||
/* 63 125 250 500 1k 2k 4k 8k 16k*/
|
||||
{{{-10,-10,-10,-10, -5, -5, -5, 0, 4, 6, 8, 8, 10, 10, 10, 14, 20},
|
||||
{-10,-10,-10,-10,-10, -5, -2, -2, 0, 0, 0, 4, 5, 6, 8, 8, 15},
|
||||
@@ -112,25 +112,22 @@ 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]={
|
||||
static const 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 const double _noise_thresh_16[4]={ .3,.5,.5,.5 };
|
||||
|
||||
static int _noise_start_16[3]={ 256,256,9999 };
|
||||
static int _noise_part_16[4]={ 8,8,8,8 };
|
||||
static const int _noise_start_16[3]={ 256,256,9999 };
|
||||
static const int _noise_part_16[4]={ 8,8,8,8 };
|
||||
|
||||
static int _psy_ath_floater_16[4]={
|
||||
static const int _psy_ath_floater_16[4]={
|
||||
-100,-100,-100,-105,
|
||||
};
|
||||
|
||||
static int _psy_ath_abs_16[4]={
|
||||
static const int _psy_ath_abs_16[4]={
|
||||
-130,-130,-130,-140,
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
@@ -5,23 +5,23 @@
|
||||
* 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: 8kHz psychoacoustic settings
|
||||
last mod: $Id: psych_8.h,v 1.8 2008-02-02 15:53:58 richardash1981 Exp $
|
||||
function: 8kHz psychoacoustic settings
|
||||
last mod: $Id: psych_8.h 16227 2009-07-08 06:58:46Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
static att3 _psy_tone_masteratt_8[3]={
|
||||
static const att3 _psy_tone_masteratt_8[3]={
|
||||
{{ 32, 25, 12}, 0, 0}, /* 0 */
|
||||
{{ 30, 25, 12}, 0, 0}, /* 0 */
|
||||
{{ 20, 0, -14}, 0, 0}, /* 0 */
|
||||
};
|
||||
|
||||
static vp_adjblock _vp_tonemask_adj_8[3]={
|
||||
static const vp_adjblock _vp_tonemask_adj_8[3]={
|
||||
/* adjust for mode zero */
|
||||
/* 63 125 250 500 1 2 4 8 16 */
|
||||
{{-15,-15,-15,-15,-10,-10, -6, 0, 0, 0, 0,10, 0, 0,99,99,99}}, /* 1 */
|
||||
@@ -30,7 +30,7 @@ static vp_adjblock _vp_tonemask_adj_8[3]={
|
||||
};
|
||||
|
||||
|
||||
static noise3 _psy_noisebias_8[3]={
|
||||
static const noise3 _psy_noisebias_8[3]={
|
||||
/* 63 125 250 500 1k 2k 4k 8k 16k*/
|
||||
{{{-10,-10,-10,-10, -5, -5, -5, 0, 4, 8, 8, 8, 10, 10, 99, 99, 99},
|
||||
{-10,-10,-10,-10, -5, -5, -5, 0, 0, 4, 4, 4, 4, 4, 99, 99, 99},
|
||||
@@ -46,7 +46,7 @@ static noise3 _psy_noisebias_8[3]={
|
||||
};
|
||||
|
||||
/* stereo mode by base quality level */
|
||||
static adj_stereo _psy_stereo_modes_8[3]={
|
||||
static const adj_stereo _psy_stereo_modes_8[3]={
|
||||
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 */
|
||||
{{ 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
|
||||
{ 6, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
|
||||
@@ -62,12 +62,12 @@ static adj_stereo _psy_stereo_modes_8[3]={
|
||||
{ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}},
|
||||
};
|
||||
|
||||
static noiseguard _psy_noiseguards_8[2]={
|
||||
static const noiseguard _psy_noiseguards_8[2]={
|
||||
{10,10,-1},
|
||||
{10,10,-1},
|
||||
};
|
||||
|
||||
static compandblock _psy_compand_8[2]={
|
||||
static const compandblock _psy_compand_8[2]={
|
||||
{{
|
||||
0, 1, 2, 3, 4, 5, 6, 7, /* 7dB */
|
||||
8, 8, 9, 9,10,10,11, 11, /* 15dB */
|
||||
@@ -84,19 +84,18 @@ static compandblock _psy_compand_8[2]={
|
||||
}},
|
||||
};
|
||||
|
||||
static double _psy_lowpass_8[3]={3.,4.,4.};
|
||||
static int _noise_start_8[2]={
|
||||
static const double _psy_lowpass_8[3]={3.,4.,4.};
|
||||
static const int _noise_start_8[2]={
|
||||
64,64,
|
||||
};
|
||||
static int _noise_part_8[2]={
|
||||
static const int _noise_part_8[2]={
|
||||
8,8,
|
||||
};
|
||||
|
||||
static int _psy_ath_floater_8[3]={
|
||||
static const int _psy_ath_floater_8[3]={
|
||||
-100,-100,-105,
|
||||
};
|
||||
|
||||
static int _psy_ath_abs_8[3]={
|
||||
static const int _psy_ath_abs_8[3]={
|
||||
-130,-130,-140,
|
||||
};
|
||||
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
/********************************************************************
|
||||
* *
|
||||
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
|
||||
* This FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
|
||||
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
|
||||
* 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: toplevel residue templates 16/22kHz
|
||||
last mod: $Id: residue_16.h,v 1.7 2008-02-02 15:53:58 richardash1981 Exp $
|
||||
last mod: $Id: residue_16.h 16962 2010-03-11 07:30:34Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
/***** residue backends *********************************************/
|
||||
|
||||
static static_bookblock _resbook_16s_0={
|
||||
static const static_bookblock _resbook_16s_0={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_16c0_s_p1_0},
|
||||
@@ -31,7 +31,7 @@ static static_bookblock _resbook_16s_0={
|
||||
{&_16c0_s_p9_0,&_16c0_s_p9_1,&_16c0_s_p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_16s_1={
|
||||
static const static_bookblock _resbook_16s_1={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_16c1_s_p1_0},
|
||||
@@ -45,7 +45,7 @@ static static_bookblock _resbook_16s_1={
|
||||
{&_16c1_s_p9_0,&_16c1_s_p9_1,&_16c1_s_p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_16s_2={
|
||||
static const static_bookblock _resbook_16s_2={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_16c2_s_p1_0},
|
||||
@@ -60,37 +60,37 @@ static static_bookblock _resbook_16s_2={
|
||||
}
|
||||
};
|
||||
|
||||
static vorbis_residue_template _res_16s_0[]={
|
||||
{2,0, &_residue_44_mid,
|
||||
static const vorbis_residue_template _res_16s_0[]={
|
||||
{2,0,32, &_residue_44_mid,
|
||||
&_huff_book__16c0_s_single,&_huff_book__16c0_s_single,
|
||||
&_resbook_16s_0,&_resbook_16s_0},
|
||||
};
|
||||
static vorbis_residue_template _res_16s_1[]={
|
||||
{2,0, &_residue_44_mid,
|
||||
static const vorbis_residue_template _res_16s_1[]={
|
||||
{2,0,32, &_residue_44_mid,
|
||||
&_huff_book__16c1_s_short,&_huff_book__16c1_s_short,
|
||||
&_resbook_16s_1,&_resbook_16s_1},
|
||||
|
||||
{2,0, &_residue_44_mid,
|
||||
|
||||
{2,0,32, &_residue_44_mid,
|
||||
&_huff_book__16c1_s_long,&_huff_book__16c1_s_long,
|
||||
&_resbook_16s_1,&_resbook_16s_1}
|
||||
};
|
||||
static vorbis_residue_template _res_16s_2[]={
|
||||
{2,0, &_residue_44_high,
|
||||
static const vorbis_residue_template _res_16s_2[]={
|
||||
{2,0,32, &_residue_44_high,
|
||||
&_huff_book__16c2_s_short,&_huff_book__16c2_s_short,
|
||||
&_resbook_16s_2,&_resbook_16s_2},
|
||||
|
||||
{2,0, &_residue_44_high,
|
||||
|
||||
{2,0,32, &_residue_44_high,
|
||||
&_huff_book__16c2_s_long,&_huff_book__16c2_s_long,
|
||||
&_resbook_16s_2,&_resbook_16s_2}
|
||||
};
|
||||
|
||||
static vorbis_mapping_template _mapres_template_16_stereo[3]={
|
||||
static const vorbis_mapping_template _mapres_template_16_stereo[3]={
|
||||
{ _map_nominal, _res_16s_0 }, /* 0 */
|
||||
{ _map_nominal, _res_16s_1 }, /* 1 */
|
||||
{ _map_nominal, _res_16s_2 }, /* 2 */
|
||||
};
|
||||
|
||||
static static_bookblock _resbook_16u_0={
|
||||
static const static_bookblock _resbook_16u_0={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_16u0__p1_0},
|
||||
@@ -102,7 +102,7 @@ static static_bookblock _resbook_16u_0={
|
||||
{&_16u0__p7_0,&_16u0__p7_1,&_16u0__p7_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_16u_1={
|
||||
static const static_bookblock _resbook_16u_1={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_16u1__p1_0},
|
||||
@@ -116,7 +116,7 @@ static static_bookblock _resbook_16u_1={
|
||||
{&_16u1__p9_0,&_16u1__p9_1,&_16u1__p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_16u_2={
|
||||
static const static_bookblock _resbook_16u_2={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_16u2_p1_0},
|
||||
@@ -131,32 +131,32 @@ static static_bookblock _resbook_16u_2={
|
||||
}
|
||||
};
|
||||
|
||||
static vorbis_residue_template _res_16u_0[]={
|
||||
{1,0, &_residue_44_low_un,
|
||||
static const vorbis_residue_template _res_16u_0[]={
|
||||
{1,0,32, &_residue_44_low_un,
|
||||
&_huff_book__16u0__single,&_huff_book__16u0__single,
|
||||
&_resbook_16u_0,&_resbook_16u_0},
|
||||
};
|
||||
static vorbis_residue_template _res_16u_1[]={
|
||||
{1,0, &_residue_44_mid_un,
|
||||
static const vorbis_residue_template _res_16u_1[]={
|
||||
{1,0,32, &_residue_44_mid_un,
|
||||
&_huff_book__16u1__short,&_huff_book__16u1__short,
|
||||
&_resbook_16u_1,&_resbook_16u_1},
|
||||
|
||||
{1,0, &_residue_44_mid_un,
|
||||
|
||||
{1,0,32, &_residue_44_mid_un,
|
||||
&_huff_book__16u1__long,&_huff_book__16u1__long,
|
||||
&_resbook_16u_1,&_resbook_16u_1}
|
||||
};
|
||||
static vorbis_residue_template _res_16u_2[]={
|
||||
{1,0, &_residue_44_hi_un,
|
||||
static const vorbis_residue_template _res_16u_2[]={
|
||||
{1,0,32, &_residue_44_hi_un,
|
||||
&_huff_book__16u2__short,&_huff_book__16u2__short,
|
||||
&_resbook_16u_2,&_resbook_16u_2},
|
||||
|
||||
{1,0, &_residue_44_hi_un,
|
||||
|
||||
{1,0,32, &_residue_44_hi_un,
|
||||
&_huff_book__16u2__long,&_huff_book__16u2__long,
|
||||
&_resbook_16u_2,&_resbook_16u_2}
|
||||
};
|
||||
|
||||
|
||||
static vorbis_mapping_template _mapres_template_16_uncoupled[3]={
|
||||
static const vorbis_mapping_template _mapres_template_16_uncoupled[3]={
|
||||
{ _map_nominal_u, _res_16u_0 }, /* 0 */
|
||||
{ _map_nominal_u, _res_16u_1 }, /* 1 */
|
||||
{ _map_nominal_u, _res_16u_2 }, /* 2 */
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
* 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: toplevel residue templates for 32/44.1/48kHz
|
||||
last mod: $Id: residue_44.h,v 1.7 2008-02-02 15:53:58 richardash1981 Exp $
|
||||
last mod: $Id: residue_44.h 16962 2010-03-11 07:30:34Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
@@ -21,34 +21,34 @@
|
||||
|
||||
/***** residue backends *********************************************/
|
||||
|
||||
static vorbis_info_residue0 _residue_44_low={
|
||||
0,-1, -1, 9,-1,
|
||||
/* 0 1 2 3 4 5 6 7 */
|
||||
static const vorbis_info_residue0 _residue_44_low={
|
||||
0,-1, -1, 9,-1,-1,
|
||||
/* 0 1 2 3 4 5 6 7 */
|
||||
{0},
|
||||
{-1},
|
||||
{ .5, 1.5, 2.5, 2.5, 4.5, 8.5, 16.5, 32.5},
|
||||
{ .5, .5, .5, 999., 4.5, 8.5, 16.5, 32.5},
|
||||
{ 0, 1, 2, 2, 4, 8, 16, 32},
|
||||
{ 0, 0, 0,999, 4, 8, 16, 32},
|
||||
};
|
||||
|
||||
static vorbis_info_residue0 _residue_44_mid={
|
||||
0,-1, -1, 10,-1,
|
||||
/* 0 1 2 3 4 5 6 7 8 */
|
||||
static const vorbis_info_residue0 _residue_44_mid={
|
||||
0,-1, -1, 10,-1,-1,
|
||||
/* 0 1 2 3 4 5 6 7 8 */
|
||||
{0},
|
||||
{-1},
|
||||
{ .5, 1.5, 1.5, 2.5, 2.5, 4.5, 8.5, 16.5, 32.5},
|
||||
{ .5, .5, 999., .5, 999., 4.5, 8.5, 16.5, 32.5},
|
||||
{ 0, 1, 1, 2, 2, 4, 8, 16, 32},
|
||||
{ 0, 0,999, 0,999, 4, 8, 16, 32},
|
||||
};
|
||||
|
||||
static vorbis_info_residue0 _residue_44_high={
|
||||
0,-1, -1, 10,-1,
|
||||
/* 0 1 2 3 4 5 6 7 8 */
|
||||
static const vorbis_info_residue0 _residue_44_high={
|
||||
0,-1, -1, 10,-1,-1,
|
||||
/* 0 1 2 3 4 5 6 7 8 */
|
||||
{0},
|
||||
{-1},
|
||||
{ .5, 1.5, 2.5, 4.5, 8.5, 16.5, 32.5, 71.5,157.5},
|
||||
{ .5, 1.5, 2.5, 3.5, 4.5, 8.5, 16.5, 71.5,157.5},
|
||||
{ 0, 1, 2, 4, 8, 16, 32, 71,157},
|
||||
{ 0, 1, 2, 3, 4, 8, 16, 71,157},
|
||||
};
|
||||
|
||||
static static_bookblock _resbook_44s_n1={
|
||||
static const static_bookblock _resbook_44s_n1={
|
||||
{
|
||||
{0},{0,0,&_44cn1_s_p1_0},{0,0,&_44cn1_s_p2_0},
|
||||
{0,0,&_44cn1_s_p3_0},{0,0,&_44cn1_s_p4_0},{0,0,&_44cn1_s_p5_0},
|
||||
@@ -56,7 +56,7 @@ static static_bookblock _resbook_44s_n1={
|
||||
{&_44cn1_s_p8_0,&_44cn1_s_p8_1,&_44cn1_s_p8_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44sm_n1={
|
||||
static const static_bookblock _resbook_44sm_n1={
|
||||
{
|
||||
{0},{0,0,&_44cn1_sm_p1_0},{0,0,&_44cn1_sm_p2_0},
|
||||
{0,0,&_44cn1_sm_p3_0},{0,0,&_44cn1_sm_p4_0},{0,0,&_44cn1_sm_p5_0},
|
||||
@@ -65,7 +65,7 @@ static static_bookblock _resbook_44sm_n1={
|
||||
}
|
||||
};
|
||||
|
||||
static static_bookblock _resbook_44s_0={
|
||||
static const static_bookblock _resbook_44s_0={
|
||||
{
|
||||
{0},{0,0,&_44c0_s_p1_0},{0,0,&_44c0_s_p2_0},
|
||||
{0,0,&_44c0_s_p3_0},{0,0,&_44c0_s_p4_0},{0,0,&_44c0_s_p5_0},
|
||||
@@ -73,7 +73,7 @@ static static_bookblock _resbook_44s_0={
|
||||
{&_44c0_s_p8_0,&_44c0_s_p8_1,&_44c0_s_p8_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44sm_0={
|
||||
static const static_bookblock _resbook_44sm_0={
|
||||
{
|
||||
{0},{0,0,&_44c0_sm_p1_0},{0,0,&_44c0_sm_p2_0},
|
||||
{0,0,&_44c0_sm_p3_0},{0,0,&_44c0_sm_p4_0},{0,0,&_44c0_sm_p5_0},
|
||||
@@ -82,7 +82,7 @@ static static_bookblock _resbook_44sm_0={
|
||||
}
|
||||
};
|
||||
|
||||
static static_bookblock _resbook_44s_1={
|
||||
static const static_bookblock _resbook_44s_1={
|
||||
{
|
||||
{0},{0,0,&_44c1_s_p1_0},{0,0,&_44c1_s_p2_0},
|
||||
{0,0,&_44c1_s_p3_0},{0,0,&_44c1_s_p4_0},{0,0,&_44c1_s_p5_0},
|
||||
@@ -90,7 +90,7 @@ static static_bookblock _resbook_44s_1={
|
||||
{&_44c1_s_p8_0,&_44c1_s_p8_1,&_44c1_s_p8_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44sm_1={
|
||||
static const static_bookblock _resbook_44sm_1={
|
||||
{
|
||||
{0},{0,0,&_44c1_sm_p1_0},{0,0,&_44c1_sm_p2_0},
|
||||
{0,0,&_44c1_sm_p3_0},{0,0,&_44c1_sm_p4_0},{0,0,&_44c1_sm_p5_0},
|
||||
@@ -99,7 +99,7 @@ static static_bookblock _resbook_44sm_1={
|
||||
}
|
||||
};
|
||||
|
||||
static static_bookblock _resbook_44s_2={
|
||||
static const static_bookblock _resbook_44s_2={
|
||||
{
|
||||
{0},{0,0,&_44c2_s_p1_0},{0,0,&_44c2_s_p2_0},{0,0,&_44c2_s_p3_0},
|
||||
{0,0,&_44c2_s_p4_0},{0,0,&_44c2_s_p5_0},{0,0,&_44c2_s_p6_0},
|
||||
@@ -107,7 +107,7 @@ static static_bookblock _resbook_44s_2={
|
||||
{&_44c2_s_p9_0,&_44c2_s_p9_1,&_44c2_s_p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44s_3={
|
||||
static const static_bookblock _resbook_44s_3={
|
||||
{
|
||||
{0},{0,0,&_44c3_s_p1_0},{0,0,&_44c3_s_p2_0},{0,0,&_44c3_s_p3_0},
|
||||
{0,0,&_44c3_s_p4_0},{0,0,&_44c3_s_p5_0},{0,0,&_44c3_s_p6_0},
|
||||
@@ -115,7 +115,7 @@ static static_bookblock _resbook_44s_3={
|
||||
{&_44c3_s_p9_0,&_44c3_s_p9_1,&_44c3_s_p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44s_4={
|
||||
static const static_bookblock _resbook_44s_4={
|
||||
{
|
||||
{0},{0,0,&_44c4_s_p1_0},{0,0,&_44c4_s_p2_0},{0,0,&_44c4_s_p3_0},
|
||||
{0,0,&_44c4_s_p4_0},{0,0,&_44c4_s_p5_0},{0,0,&_44c4_s_p6_0},
|
||||
@@ -123,7 +123,7 @@ static static_bookblock _resbook_44s_4={
|
||||
{&_44c4_s_p9_0,&_44c4_s_p9_1,&_44c4_s_p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44s_5={
|
||||
static const static_bookblock _resbook_44s_5={
|
||||
{
|
||||
{0},{0,0,&_44c5_s_p1_0},{0,0,&_44c5_s_p2_0},{0,0,&_44c5_s_p3_0},
|
||||
{0,0,&_44c5_s_p4_0},{0,0,&_44c5_s_p5_0},{0,0,&_44c5_s_p6_0},
|
||||
@@ -131,7 +131,7 @@ static static_bookblock _resbook_44s_5={
|
||||
{&_44c5_s_p9_0,&_44c5_s_p9_1,&_44c5_s_p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44s_6={
|
||||
static const static_bookblock _resbook_44s_6={
|
||||
{
|
||||
{0},{0,0,&_44c6_s_p1_0},{0,0,&_44c6_s_p2_0},{0,0,&_44c6_s_p3_0},
|
||||
{0,0,&_44c6_s_p4_0},
|
||||
@@ -142,7 +142,7 @@ static static_bookblock _resbook_44s_6={
|
||||
{&_44c6_s_p9_0,&_44c6_s_p9_1,&_44c6_s_p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44s_7={
|
||||
static const static_bookblock _resbook_44s_7={
|
||||
{
|
||||
{0},{0,0,&_44c7_s_p1_0},{0,0,&_44c7_s_p2_0},{0,0,&_44c7_s_p3_0},
|
||||
{0,0,&_44c7_s_p4_0},
|
||||
@@ -153,7 +153,7 @@ static static_bookblock _resbook_44s_7={
|
||||
{&_44c7_s_p9_0,&_44c7_s_p9_1,&_44c7_s_p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44s_8={
|
||||
static const static_bookblock _resbook_44s_8={
|
||||
{
|
||||
{0},{0,0,&_44c8_s_p1_0},{0,0,&_44c8_s_p2_0},{0,0,&_44c8_s_p3_0},
|
||||
{0,0,&_44c8_s_p4_0},
|
||||
@@ -164,7 +164,7 @@ static static_bookblock _resbook_44s_8={
|
||||
{&_44c8_s_p9_0,&_44c8_s_p9_1,&_44c8_s_p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44s_9={
|
||||
static const static_bookblock _resbook_44s_9={
|
||||
{
|
||||
{0},{0,0,&_44c9_s_p1_0},{0,0,&_44c9_s_p2_0},{0,0,&_44c9_s_p3_0},
|
||||
{0,0,&_44c9_s_p4_0},
|
||||
@@ -176,108 +176,108 @@ static static_bookblock _resbook_44s_9={
|
||||
}
|
||||
};
|
||||
|
||||
static vorbis_residue_template _res_44s_n1[]={
|
||||
{2,0, &_residue_44_low,
|
||||
static const vorbis_residue_template _res_44s_n1[]={
|
||||
{2,0,32, &_residue_44_low,
|
||||
&_huff_book__44cn1_s_short,&_huff_book__44cn1_sm_short,
|
||||
&_resbook_44s_n1,&_resbook_44sm_n1},
|
||||
|
||||
{2,0, &_residue_44_low,
|
||||
{2,0,32, &_residue_44_low,
|
||||
&_huff_book__44cn1_s_long,&_huff_book__44cn1_sm_long,
|
||||
&_resbook_44s_n1,&_resbook_44sm_n1}
|
||||
};
|
||||
static vorbis_residue_template _res_44s_0[]={
|
||||
{2,0, &_residue_44_low,
|
||||
static const vorbis_residue_template _res_44s_0[]={
|
||||
{2,0,16, &_residue_44_low,
|
||||
&_huff_book__44c0_s_short,&_huff_book__44c0_sm_short,
|
||||
&_resbook_44s_0,&_resbook_44sm_0},
|
||||
|
||||
{2,0, &_residue_44_low,
|
||||
{2,0,32, &_residue_44_low,
|
||||
&_huff_book__44c0_s_long,&_huff_book__44c0_sm_long,
|
||||
&_resbook_44s_0,&_resbook_44sm_0}
|
||||
};
|
||||
static vorbis_residue_template _res_44s_1[]={
|
||||
{2,0, &_residue_44_low,
|
||||
static const vorbis_residue_template _res_44s_1[]={
|
||||
{2,0,16, &_residue_44_low,
|
||||
&_huff_book__44c1_s_short,&_huff_book__44c1_sm_short,
|
||||
&_resbook_44s_1,&_resbook_44sm_1},
|
||||
|
||||
{2,0, &_residue_44_low,
|
||||
{2,0,32, &_residue_44_low,
|
||||
&_huff_book__44c1_s_long,&_huff_book__44c1_sm_long,
|
||||
&_resbook_44s_1,&_resbook_44sm_1}
|
||||
};
|
||||
|
||||
static vorbis_residue_template _res_44s_2[]={
|
||||
{2,0, &_residue_44_mid,
|
||||
static const vorbis_residue_template _res_44s_2[]={
|
||||
{2,0,16, &_residue_44_mid,
|
||||
&_huff_book__44c2_s_short,&_huff_book__44c2_s_short,
|
||||
&_resbook_44s_2,&_resbook_44s_2},
|
||||
|
||||
{2,0, &_residue_44_mid,
|
||||
{2,0,32, &_residue_44_mid,
|
||||
&_huff_book__44c2_s_long,&_huff_book__44c2_s_long,
|
||||
&_resbook_44s_2,&_resbook_44s_2}
|
||||
};
|
||||
static vorbis_residue_template _res_44s_3[]={
|
||||
{2,0, &_residue_44_mid,
|
||||
static const vorbis_residue_template _res_44s_3[]={
|
||||
{2,0,16, &_residue_44_mid,
|
||||
&_huff_book__44c3_s_short,&_huff_book__44c3_s_short,
|
||||
&_resbook_44s_3,&_resbook_44s_3},
|
||||
|
||||
{2,0, &_residue_44_mid,
|
||||
{2,0,32, &_residue_44_mid,
|
||||
&_huff_book__44c3_s_long,&_huff_book__44c3_s_long,
|
||||
&_resbook_44s_3,&_resbook_44s_3}
|
||||
};
|
||||
static vorbis_residue_template _res_44s_4[]={
|
||||
{2,0, &_residue_44_mid,
|
||||
static const vorbis_residue_template _res_44s_4[]={
|
||||
{2,0,16, &_residue_44_mid,
|
||||
&_huff_book__44c4_s_short,&_huff_book__44c4_s_short,
|
||||
&_resbook_44s_4,&_resbook_44s_4},
|
||||
|
||||
{2,0, &_residue_44_mid,
|
||||
{2,0,32, &_residue_44_mid,
|
||||
&_huff_book__44c4_s_long,&_huff_book__44c4_s_long,
|
||||
&_resbook_44s_4,&_resbook_44s_4}
|
||||
};
|
||||
static vorbis_residue_template _res_44s_5[]={
|
||||
{2,0, &_residue_44_mid,
|
||||
static const vorbis_residue_template _res_44s_5[]={
|
||||
{2,0,16, &_residue_44_mid,
|
||||
&_huff_book__44c5_s_short,&_huff_book__44c5_s_short,
|
||||
&_resbook_44s_5,&_resbook_44s_5},
|
||||
|
||||
{2,0, &_residue_44_mid,
|
||||
{2,0,32, &_residue_44_mid,
|
||||
&_huff_book__44c5_s_long,&_huff_book__44c5_s_long,
|
||||
&_resbook_44s_5,&_resbook_44s_5}
|
||||
};
|
||||
static vorbis_residue_template _res_44s_6[]={
|
||||
{2,0, &_residue_44_high,
|
||||
static const vorbis_residue_template _res_44s_6[]={
|
||||
{2,0,16, &_residue_44_high,
|
||||
&_huff_book__44c6_s_short,&_huff_book__44c6_s_short,
|
||||
&_resbook_44s_6,&_resbook_44s_6},
|
||||
|
||||
{2,0, &_residue_44_high,
|
||||
{2,0,32, &_residue_44_high,
|
||||
&_huff_book__44c6_s_long,&_huff_book__44c6_s_long,
|
||||
&_resbook_44s_6,&_resbook_44s_6}
|
||||
};
|
||||
static vorbis_residue_template _res_44s_7[]={
|
||||
{2,0, &_residue_44_high,
|
||||
static const vorbis_residue_template _res_44s_7[]={
|
||||
{2,0,16, &_residue_44_high,
|
||||
&_huff_book__44c7_s_short,&_huff_book__44c7_s_short,
|
||||
&_resbook_44s_7,&_resbook_44s_7},
|
||||
|
||||
{2,0, &_residue_44_high,
|
||||
{2,0,32, &_residue_44_high,
|
||||
&_huff_book__44c7_s_long,&_huff_book__44c7_s_long,
|
||||
&_resbook_44s_7,&_resbook_44s_7}
|
||||
};
|
||||
static vorbis_residue_template _res_44s_8[]={
|
||||
{2,0, &_residue_44_high,
|
||||
static const vorbis_residue_template _res_44s_8[]={
|
||||
{2,0,16, &_residue_44_high,
|
||||
&_huff_book__44c8_s_short,&_huff_book__44c8_s_short,
|
||||
&_resbook_44s_8,&_resbook_44s_8},
|
||||
|
||||
{2,0, &_residue_44_high,
|
||||
{2,0,32, &_residue_44_high,
|
||||
&_huff_book__44c8_s_long,&_huff_book__44c8_s_long,
|
||||
&_resbook_44s_8,&_resbook_44s_8}
|
||||
};
|
||||
static vorbis_residue_template _res_44s_9[]={
|
||||
{2,0, &_residue_44_high,
|
||||
static const vorbis_residue_template _res_44s_9[]={
|
||||
{2,0,16, &_residue_44_high,
|
||||
&_huff_book__44c9_s_short,&_huff_book__44c9_s_short,
|
||||
&_resbook_44s_9,&_resbook_44s_9},
|
||||
|
||||
{2,0, &_residue_44_high,
|
||||
{2,0,32, &_residue_44_high,
|
||||
&_huff_book__44c9_s_long,&_huff_book__44c9_s_long,
|
||||
&_resbook_44s_9,&_resbook_44s_9}
|
||||
};
|
||||
|
||||
static vorbis_mapping_template _mapres_template_44_stereo[]={
|
||||
static const vorbis_mapping_template _mapres_template_44_stereo[]={
|
||||
{ _map_nominal, _res_44s_n1 }, /* -1 */
|
||||
{ _map_nominal, _res_44s_0 }, /* 0 */
|
||||
{ _map_nominal, _res_44s_1 }, /* 1 */
|
||||
@@ -290,5 +290,3 @@ static vorbis_mapping_template _mapres_template_44_stereo[]={
|
||||
{ _map_nominal, _res_44s_8 }, /* 8 */
|
||||
{ _map_nominal, _res_44s_9 }, /* 9 */
|
||||
};
|
||||
|
||||
|
||||
|
||||
451
lib-src/libvorbis/lib/modes/residue_44p51.h
Normal file
451
lib-src/libvorbis/lib/modes/residue_44p51.h
Normal file
@@ -0,0 +1,451 @@
|
||||
/********************************************************************
|
||||
* *
|
||||
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
|
||||
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
|
||||
* 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-2010 *
|
||||
* by the Xiph.Org Foundation http://www.xiph.org/ *
|
||||
* *
|
||||
********************************************************************
|
||||
|
||||
function: toplevel residue templates for 32/44.1/48kHz uncoupled
|
||||
last mod: $Id$
|
||||
|
||||
********************************************************************/
|
||||
|
||||
#include "vorbis/codec.h"
|
||||
#include "backends.h"
|
||||
|
||||
#include "books/coupled/res_books_51.h"
|
||||
|
||||
/***** residue backends *********************************************/
|
||||
|
||||
static const vorbis_info_residue0 _residue_44p_lo={
|
||||
0,-1, -1, 7,-1,-1,
|
||||
/* 0 1 2 3 4 5 6 7 8 */
|
||||
{0},
|
||||
{-1},
|
||||
{ 0, 1, 2, 7, 17, 31},
|
||||
{ 0, 0, 99, 7, 17, 31},
|
||||
};
|
||||
|
||||
static const vorbis_info_residue0 _residue_44p={
|
||||
0,-1, -1, 8,-1,-1,
|
||||
/* 0 1 2 3 4 5 6 7 8 */
|
||||
{0},
|
||||
{-1},
|
||||
{ 0, 1, 1, 2, 7, 17, 31},
|
||||
{ 0, 0, 99, 99, 7, 17, 31},
|
||||
};
|
||||
|
||||
static const vorbis_info_residue0 _residue_44p_hi={
|
||||
0,-1, -1, 8,-1,-1,
|
||||
/* 0 1 2 3 4 5 6 7 8 */
|
||||
{0},
|
||||
{-1},
|
||||
{ 0, 1, 2, 4, 7, 17, 31},
|
||||
{ 0, 1, 2, 4, 7, 17, 31},
|
||||
};
|
||||
|
||||
static const vorbis_info_residue0 _residue_44p_lfe={
|
||||
0,-1, -1, 2,-1,-1,
|
||||
/* 0 1 2 3 4 5 6 7 8 */
|
||||
{0},
|
||||
{-1},
|
||||
{ 32},
|
||||
{ -1}
|
||||
};
|
||||
|
||||
static const static_bookblock _resbook_44p_n1={
|
||||
{
|
||||
{0},
|
||||
{0,&_44pn1_p1_0},
|
||||
|
||||
{&_44pn1_p2_0,&_44pn1_p2_1,0},
|
||||
{&_44pn1_p3_0,&_44pn1_p3_1,0},
|
||||
{&_44pn1_p4_0,&_44pn1_p4_1,0},
|
||||
|
||||
{&_44pn1_p5_0,&_44pn1_p5_1,&_44pn1_p4_1},
|
||||
{&_44pn1_p6_0,&_44pn1_p6_1,&_44pn1_p6_2},
|
||||
}
|
||||
};
|
||||
|
||||
static const static_bookblock _resbook_44p_0={
|
||||
{
|
||||
{0},
|
||||
{0,&_44p0_p1_0},
|
||||
|
||||
{&_44p0_p2_0,&_44p0_p2_1,0},
|
||||
{&_44p0_p3_0,&_44p0_p3_1,0},
|
||||
{&_44p0_p4_0,&_44p0_p4_1,0},
|
||||
|
||||
{&_44p0_p5_0,&_44p0_p5_1,&_44p0_p4_1},
|
||||
{&_44p0_p6_0,&_44p0_p6_1,&_44p0_p6_2},
|
||||
}
|
||||
};
|
||||
|
||||
static const static_bookblock _resbook_44p_1={
|
||||
{
|
||||
{0},
|
||||
{0,&_44p1_p1_0},
|
||||
|
||||
{&_44p1_p2_0,&_44p1_p2_1,0},
|
||||
{&_44p1_p3_0,&_44p1_p3_1,0},
|
||||
{&_44p1_p4_0,&_44p1_p4_1,0},
|
||||
|
||||
{&_44p1_p5_0,&_44p1_p5_1,&_44p1_p4_1},
|
||||
{&_44p1_p6_0,&_44p1_p6_1,&_44p1_p6_2},
|
||||
}
|
||||
};
|
||||
|
||||
static const static_bookblock _resbook_44p_2={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44p2_p1_0},
|
||||
{0,&_44p2_p2_0,0},
|
||||
|
||||
{&_44p2_p3_0,&_44p2_p3_1,0},
|
||||
{&_44p2_p4_0,&_44p2_p4_1,0},
|
||||
{&_44p2_p5_0,&_44p2_p5_1,0},
|
||||
|
||||
{&_44p2_p6_0,&_44p2_p6_1,&_44p2_p5_1},
|
||||
{&_44p2_p7_0,&_44p2_p7_1,&_44p2_p7_2,&_44p2_p7_3}
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_3={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44p3_p1_0},
|
||||
{0,&_44p3_p2_0,0},
|
||||
|
||||
{&_44p3_p3_0,&_44p3_p3_1,0},
|
||||
{&_44p3_p4_0,&_44p3_p4_1,0},
|
||||
{&_44p3_p5_0,&_44p3_p5_1,0},
|
||||
|
||||
{&_44p3_p6_0,&_44p3_p6_1,&_44p3_p5_1},
|
||||
{&_44p3_p7_0,&_44p3_p7_1,&_44p3_p7_2,&_44p3_p7_3}
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_4={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44p4_p1_0},
|
||||
{0,&_44p4_p2_0,0},
|
||||
|
||||
{&_44p4_p3_0,&_44p4_p3_1,0},
|
||||
{&_44p4_p4_0,&_44p4_p4_1,0},
|
||||
{&_44p4_p5_0,&_44p4_p5_1,0},
|
||||
|
||||
{&_44p4_p6_0,&_44p4_p6_1,&_44p4_p5_1},
|
||||
{&_44p4_p7_0,&_44p4_p7_1,&_44p4_p7_2,&_44p4_p7_3}
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_5={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44p5_p1_0},
|
||||
{0,&_44p5_p2_0,0},
|
||||
|
||||
{&_44p5_p3_0,&_44p5_p3_1,0},
|
||||
{&_44p5_p4_0,&_44p5_p4_1,0},
|
||||
{&_44p5_p5_0,&_44p5_p5_1,0},
|
||||
|
||||
{&_44p5_p6_0,&_44p5_p6_1,&_44p5_p5_1},
|
||||
{&_44p5_p7_0,&_44p5_p7_1,&_44p5_p7_2,&_44p5_p7_3}
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_6={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44p6_p1_0},
|
||||
{0,&_44p6_p2_0,0},
|
||||
|
||||
{&_44p6_p3_0,&_44p6_p3_1,0},
|
||||
{&_44p6_p4_0,&_44p6_p4_1,0},
|
||||
{&_44p6_p5_0,&_44p6_p5_1,0},
|
||||
|
||||
{&_44p6_p6_0,&_44p6_p6_1,&_44p6_p5_1},
|
||||
{&_44p6_p7_0,&_44p6_p7_1,&_44p6_p7_2,&_44p6_p7_3}
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_7={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44p7_p1_0},
|
||||
{0,&_44p7_p2_0,0},
|
||||
|
||||
{&_44p7_p3_0,&_44p7_p3_1,0},
|
||||
{&_44p7_p4_0,&_44p7_p4_1,0},
|
||||
{&_44p7_p5_0,&_44p7_p5_1,0},
|
||||
|
||||
{&_44p7_p6_0,&_44p7_p6_1,&_44p7_p5_1},
|
||||
{&_44p7_p7_0,&_44p7_p7_1,&_44p7_p7_2,&_44p7_p7_3}
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_8={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44p8_p1_0},
|
||||
{0,&_44p8_p2_0,0},
|
||||
|
||||
{&_44p8_p3_0,&_44p8_p3_1,0},
|
||||
{&_44p8_p4_0,&_44p8_p4_1,0},
|
||||
{&_44p8_p5_0,&_44p8_p5_1,0},
|
||||
|
||||
{&_44p8_p6_0,&_44p8_p6_1,&_44p8_p5_1},
|
||||
{&_44p8_p7_0,&_44p8_p7_1,&_44p8_p7_2,&_44p8_p7_3}
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_9={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44p9_p1_0},
|
||||
{0,&_44p9_p2_0,0},
|
||||
|
||||
{&_44p9_p3_0,&_44p9_p3_1,0},
|
||||
{&_44p9_p4_0,&_44p9_p4_1,0},
|
||||
{&_44p9_p5_0,&_44p9_p5_1,0},
|
||||
|
||||
{&_44p9_p6_0,&_44p9_p6_1,&_44p9_p5_1},
|
||||
{&_44p9_p7_0,&_44p9_p7_1,&_44p9_p7_2,&_44p9_p7_3}
|
||||
}
|
||||
};
|
||||
|
||||
static const static_bookblock _resbook_44p_ln1={
|
||||
{
|
||||
{&_44pn1_l0_0,&_44pn1_l0_1,0},
|
||||
{&_44pn1_l1_0,&_44pn1_p6_1,&_44pn1_p6_2},
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_l0={
|
||||
{
|
||||
{&_44p0_l0_0,&_44p0_l0_1,0},
|
||||
{&_44p0_l1_0,&_44p0_p6_1,&_44p0_p6_2},
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_l1={
|
||||
{
|
||||
{&_44p1_l0_0,&_44p1_l0_1,0},
|
||||
{&_44p1_l1_0,&_44p1_p6_1,&_44p1_p6_2},
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_l2={
|
||||
{
|
||||
{&_44p2_l0_0,&_44p2_l0_1,0},
|
||||
{&_44p2_l1_0,&_44p2_p7_2,&_44p2_p7_3},
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_l3={
|
||||
{
|
||||
{&_44p3_l0_0,&_44p3_l0_1,0},
|
||||
{&_44p3_l1_0,&_44p3_p7_2,&_44p3_p7_3},
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_l4={
|
||||
{
|
||||
{&_44p4_l0_0,&_44p4_l0_1,0},
|
||||
{&_44p4_l1_0,&_44p4_p7_2,&_44p4_p7_3},
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_l5={
|
||||
{
|
||||
{&_44p5_l0_0,&_44p5_l0_1,0},
|
||||
{&_44p5_l1_0,&_44p5_p7_2,&_44p5_p7_3},
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_l6={
|
||||
{
|
||||
{&_44p6_l0_0,&_44p6_l0_1,0},
|
||||
{&_44p6_l1_0,&_44p6_p7_2,&_44p6_p7_3},
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_l7={
|
||||
{
|
||||
{&_44p7_l0_0,&_44p7_l0_1,0},
|
||||
{&_44p7_l1_0,&_44p7_p7_2,&_44p7_p7_3},
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_l8={
|
||||
{
|
||||
{&_44p8_l0_0,&_44p8_l0_1,0},
|
||||
{&_44p8_l1_0,&_44p8_p7_2,&_44p8_p7_3},
|
||||
}
|
||||
};
|
||||
static const static_bookblock _resbook_44p_l9={
|
||||
{
|
||||
{&_44p9_l0_0,&_44p9_l0_1,0},
|
||||
{&_44p9_l1_0,&_44p9_p7_2,&_44p9_p7_3},
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
static const vorbis_info_mapping0 _map_nominal_51[2]={
|
||||
{2, {0,0,0,0,0,1}, {0,2}, {0,2}, 4,{0,3,0,0},{2,4,1,3}},
|
||||
{2, {0,0,0,0,0,1}, {1,2}, {1,2}, 4,{0,3,0,0},{2,4,1,3}}
|
||||
};
|
||||
static const vorbis_info_mapping0 _map_nominal_51u[2]={
|
||||
{2, {0,0,0,0,0,1}, {0,2}, {0,2}, 0,{0},{0}},
|
||||
{2, {0,0,0,0,0,1}, {1,2}, {1,2}, 0,{0},{0}}
|
||||
};
|
||||
|
||||
static const vorbis_residue_template _res_44p51_n1[]={
|
||||
{2,0,30, &_residue_44p_lo,
|
||||
&_huff_book__44pn1_short,&_huff_book__44pn1_short,
|
||||
&_resbook_44p_n1,&_resbook_44p_n1},
|
||||
|
||||
{2,0,30, &_residue_44p_lo,
|
||||
&_huff_book__44pn1_long,&_huff_book__44pn1_long,
|
||||
&_resbook_44p_n1,&_resbook_44p_n1},
|
||||
|
||||
{1,2,6, &_residue_44p_lfe,
|
||||
&_huff_book__44pn1_lfe,&_huff_book__44pn1_lfe,
|
||||
&_resbook_44p_ln1,&_resbook_44p_ln1}
|
||||
};
|
||||
static const vorbis_residue_template _res_44p51_0[]={
|
||||
{2,0,15, &_residue_44p_lo,
|
||||
&_huff_book__44p0_short,&_huff_book__44p0_short,
|
||||
&_resbook_44p_0,&_resbook_44p_0},
|
||||
|
||||
{2,0,30, &_residue_44p_lo,
|
||||
&_huff_book__44p0_long,&_huff_book__44p0_long,
|
||||
&_resbook_44p_0,&_resbook_44p_0},
|
||||
|
||||
{1,2,6, &_residue_44p_lfe,
|
||||
&_huff_book__44p0_lfe,&_huff_book__44p0_lfe,
|
||||
&_resbook_44p_l0,&_resbook_44p_l0}
|
||||
};
|
||||
static const vorbis_residue_template _res_44p51_1[]={
|
||||
{2,0,15, &_residue_44p_lo,
|
||||
&_huff_book__44p1_short,&_huff_book__44p1_short,
|
||||
&_resbook_44p_1,&_resbook_44p_1},
|
||||
|
||||
{2,0,30, &_residue_44p_lo,
|
||||
&_huff_book__44p1_long,&_huff_book__44p1_long,
|
||||
&_resbook_44p_1,&_resbook_44p_1},
|
||||
|
||||
{1,2,6, &_residue_44p_lfe,
|
||||
&_huff_book__44p1_lfe,&_huff_book__44p1_lfe,
|
||||
&_resbook_44p_l1,&_resbook_44p_l1}
|
||||
};
|
||||
static const vorbis_residue_template _res_44p51_2[]={
|
||||
{2,0,15, &_residue_44p,
|
||||
&_huff_book__44p2_short,&_huff_book__44p2_short,
|
||||
&_resbook_44p_2,&_resbook_44p_2},
|
||||
|
||||
{2,0,30, &_residue_44p,
|
||||
&_huff_book__44p2_long,&_huff_book__44p2_long,
|
||||
&_resbook_44p_2,&_resbook_44p_2},
|
||||
|
||||
{1,2,6, &_residue_44p_lfe,
|
||||
&_huff_book__44p2_lfe,&_huff_book__44p2_lfe,
|
||||
&_resbook_44p_l2,&_resbook_44p_l2}
|
||||
};
|
||||
static const vorbis_residue_template _res_44p51_3[]={
|
||||
{2,0,15, &_residue_44p,
|
||||
&_huff_book__44p3_short,&_huff_book__44p3_short,
|
||||
&_resbook_44p_3,&_resbook_44p_3},
|
||||
|
||||
{2,0,30, &_residue_44p,
|
||||
&_huff_book__44p3_long,&_huff_book__44p3_long,
|
||||
&_resbook_44p_3,&_resbook_44p_3},
|
||||
|
||||
{1,2,6, &_residue_44p_lfe,
|
||||
&_huff_book__44p3_lfe,&_huff_book__44p3_lfe,
|
||||
&_resbook_44p_l3,&_resbook_44p_l3}
|
||||
};
|
||||
static const vorbis_residue_template _res_44p51_4[]={
|
||||
{2,0,15, &_residue_44p,
|
||||
&_huff_book__44p4_short,&_huff_book__44p4_short,
|
||||
&_resbook_44p_4,&_resbook_44p_4},
|
||||
|
||||
{2,0,30, &_residue_44p,
|
||||
&_huff_book__44p4_long,&_huff_book__44p4_long,
|
||||
&_resbook_44p_4,&_resbook_44p_4},
|
||||
|
||||
{1,2,6, &_residue_44p_lfe,
|
||||
&_huff_book__44p4_lfe,&_huff_book__44p4_lfe,
|
||||
&_resbook_44p_l4,&_resbook_44p_l4}
|
||||
};
|
||||
static const vorbis_residue_template _res_44p51_5[]={
|
||||
{2,0,15, &_residue_44p_hi,
|
||||
&_huff_book__44p5_short,&_huff_book__44p5_short,
|
||||
&_resbook_44p_5,&_resbook_44p_5},
|
||||
|
||||
{2,0,30, &_residue_44p_hi,
|
||||
&_huff_book__44p5_long,&_huff_book__44p5_long,
|
||||
&_resbook_44p_5,&_resbook_44p_5},
|
||||
|
||||
{1,2,6, &_residue_44p_lfe,
|
||||
&_huff_book__44p5_lfe,&_huff_book__44p5_lfe,
|
||||
&_resbook_44p_l5,&_resbook_44p_l5}
|
||||
};
|
||||
static const vorbis_residue_template _res_44p51_6[]={
|
||||
{2,0,15, &_residue_44p_hi,
|
||||
&_huff_book__44p6_short,&_huff_book__44p6_short,
|
||||
&_resbook_44p_6,&_resbook_44p_6},
|
||||
|
||||
{2,0,30, &_residue_44p_hi,
|
||||
&_huff_book__44p6_long,&_huff_book__44p6_long,
|
||||
&_resbook_44p_6,&_resbook_44p_6},
|
||||
|
||||
{1,2,6, &_residue_44p_lfe,
|
||||
&_huff_book__44p6_lfe,&_huff_book__44p6_lfe,
|
||||
&_resbook_44p_l6,&_resbook_44p_l6}
|
||||
};
|
||||
|
||||
|
||||
static const vorbis_residue_template _res_44p51_7[]={
|
||||
{2,0,15, &_residue_44p_hi,
|
||||
&_huff_book__44p7_short,&_huff_book__44p7_short,
|
||||
&_resbook_44p_7,&_resbook_44p_7},
|
||||
|
||||
{2,0,30, &_residue_44p_hi,
|
||||
&_huff_book__44p7_long,&_huff_book__44p7_long,
|
||||
&_resbook_44p_7,&_resbook_44p_7},
|
||||
|
||||
{1,2,6, &_residue_44p_lfe,
|
||||
&_huff_book__44p6_lfe,&_huff_book__44p6_lfe,
|
||||
&_resbook_44p_l6,&_resbook_44p_l6}
|
||||
};
|
||||
static const vorbis_residue_template _res_44p51_8[]={
|
||||
{2,0,15, &_residue_44p_hi,
|
||||
&_huff_book__44p8_short,&_huff_book__44p8_short,
|
||||
&_resbook_44p_8,&_resbook_44p_8},
|
||||
|
||||
{2,0,30, &_residue_44p_hi,
|
||||
&_huff_book__44p8_long,&_huff_book__44p8_long,
|
||||
&_resbook_44p_8,&_resbook_44p_8},
|
||||
|
||||
{1,2,6, &_residue_44p_lfe,
|
||||
&_huff_book__44p6_lfe,&_huff_book__44p6_lfe,
|
||||
&_resbook_44p_l6,&_resbook_44p_l6}
|
||||
};
|
||||
static const vorbis_residue_template _res_44p51_9[]={
|
||||
{2,0,15, &_residue_44p_hi,
|
||||
&_huff_book__44p9_short,&_huff_book__44p9_short,
|
||||
&_resbook_44p_9,&_resbook_44p_9},
|
||||
|
||||
{2,0,30, &_residue_44p_hi,
|
||||
&_huff_book__44p9_long,&_huff_book__44p9_long,
|
||||
&_resbook_44p_9,&_resbook_44p_9},
|
||||
|
||||
{1,2,6, &_residue_44p_lfe,
|
||||
&_huff_book__44p6_lfe,&_huff_book__44p6_lfe,
|
||||
&_resbook_44p_l6,&_resbook_44p_l6}
|
||||
};
|
||||
|
||||
static const vorbis_mapping_template _mapres_template_44_51[]={
|
||||
{ _map_nominal_51, _res_44p51_n1 }, /* -1 */
|
||||
{ _map_nominal_51, _res_44p51_0 }, /* 0 */
|
||||
{ _map_nominal_51, _res_44p51_1 }, /* 1 */
|
||||
{ _map_nominal_51, _res_44p51_2 }, /* 2 */
|
||||
{ _map_nominal_51, _res_44p51_3 }, /* 3 */
|
||||
{ _map_nominal_51, _res_44p51_4 }, /* 4 */
|
||||
{ _map_nominal_51u, _res_44p51_5 }, /* 5 */
|
||||
{ _map_nominal_51u, _res_44p51_6 }, /* 6 */
|
||||
{ _map_nominal_51u, _res_44p51_7 }, /* 7 */
|
||||
{ _map_nominal_51u, _res_44p51_8 }, /* 8 */
|
||||
{ _map_nominal_51u, _res_44p51_9 }, /* 9 */
|
||||
};
|
||||
@@ -11,7 +11,7 @@
|
||||
********************************************************************
|
||||
|
||||
function: toplevel residue templates for 32/44.1/48kHz uncoupled
|
||||
last mod: $Id: residue_44u.h,v 1.7 2008-02-02 15:53:58 richardash1981 Exp $
|
||||
last mod: $Id: residue_44u.h 16962 2010-03-11 07:30:34Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
@@ -22,41 +22,41 @@
|
||||
/***** residue backends *********************************************/
|
||||
|
||||
|
||||
static vorbis_info_residue0 _residue_44_low_un={
|
||||
0,-1, -1, 8,-1,
|
||||
static const vorbis_info_residue0 _residue_44_low_un={
|
||||
0,-1, -1, 8,-1,-1,
|
||||
{0},
|
||||
{-1},
|
||||
{ .5, 1.5, 1.5, 2.5, 2.5, 4.5, 28.5},
|
||||
{ -1, 25, -1, 45, -1, -1, -1}
|
||||
{ 0, 1, 1, 2, 2, 4, 28},
|
||||
{ -1, 25, -1, 45, -1, -1, -1}
|
||||
};
|
||||
|
||||
static vorbis_info_residue0 _residue_44_mid_un={
|
||||
0,-1, -1, 10,-1,
|
||||
/* 0 1 2 3 4 5 6 7 8 9 */
|
||||
static const vorbis_info_residue0 _residue_44_mid_un={
|
||||
0,-1, -1, 10,-1,-1,
|
||||
/* 0 1 2 3 4 5 6 7 8 9 */
|
||||
{0},
|
||||
{-1},
|
||||
{ .5, 1.5, 1.5, 2.5, 2.5, 4.5, 4.5, 16.5, 60.5},
|
||||
{ -1, 30, -1, 50, -1, 80, -1, -1, -1}
|
||||
{ 0, 1, 1, 2, 2, 4, 4, 16, 60},
|
||||
{ -1, 30, -1, 50, -1, 80, -1, -1, -1}
|
||||
};
|
||||
|
||||
static vorbis_info_residue0 _residue_44_hi_un={
|
||||
0,-1, -1, 10,-1,
|
||||
/* 0 1 2 3 4 5 6 7 8 9 */
|
||||
static const vorbis_info_residue0 _residue_44_hi_un={
|
||||
0,-1, -1, 10,-1,-1,
|
||||
/* 0 1 2 3 4 5 6 7 8 9 */
|
||||
{0},
|
||||
{-1},
|
||||
{ .5, 1.5, 2.5, 4.5, 8.5, 16.5, 32.5, 71.5,157.5},
|
||||
{ -1, -1, -1, -1, -1, -1, -1, -1, -1}
|
||||
{ 0, 1, 2, 4, 8, 16, 32, 71,157},
|
||||
{ -1, -1, -1, -1, -1, -1, -1, -1, -1}
|
||||
};
|
||||
|
||||
/* mapping conventions:
|
||||
only one submap (this would change for efficient 5.1 support for example)*/
|
||||
/* Four psychoacoustic profiles are used, one for each blocktype */
|
||||
static vorbis_info_mapping0 _map_nominal_u[2]={
|
||||
{1, {0,0}, {0}, {0}, 0,{0},{0}},
|
||||
{1, {0,0}, {1}, {1}, 0,{0},{0}}
|
||||
static const vorbis_info_mapping0 _map_nominal_u[2]={
|
||||
{1, {0,0,0,0,0,0}, {0}, {0}, 0,{0},{0}},
|
||||
{1, {0,0,0,0,0,0}, {1}, {1}, 0,{0},{0}}
|
||||
};
|
||||
|
||||
static static_bookblock _resbook_44u_n1={
|
||||
static const static_bookblock _resbook_44u_n1={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44un1__p1_0},
|
||||
@@ -68,7 +68,7 @@ static static_bookblock _resbook_44u_n1={
|
||||
{&_44un1__p7_0,&_44un1__p7_1,&_44un1__p7_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44u_0={
|
||||
static const static_bookblock _resbook_44u_0={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44u0__p1_0},
|
||||
@@ -80,7 +80,7 @@ static static_bookblock _resbook_44u_0={
|
||||
{&_44u0__p7_0,&_44u0__p7_1,&_44u0__p7_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44u_1={
|
||||
static const static_bookblock _resbook_44u_1={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44u1__p1_0},
|
||||
@@ -92,7 +92,7 @@ static static_bookblock _resbook_44u_1={
|
||||
{&_44u1__p7_0,&_44u1__p7_1,&_44u1__p7_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44u_2={
|
||||
static const static_bookblock _resbook_44u_2={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44u2__p1_0},
|
||||
@@ -104,7 +104,7 @@ static static_bookblock _resbook_44u_2={
|
||||
{&_44u2__p7_0,&_44u2__p7_1,&_44u2__p7_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44u_3={
|
||||
static const static_bookblock _resbook_44u_3={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44u3__p1_0},
|
||||
@@ -116,7 +116,7 @@ static static_bookblock _resbook_44u_3={
|
||||
{&_44u3__p7_0,&_44u3__p7_1,&_44u3__p7_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44u_4={
|
||||
static const static_bookblock _resbook_44u_4={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44u4__p1_0},
|
||||
@@ -128,7 +128,7 @@ static static_bookblock _resbook_44u_4={
|
||||
{&_44u4__p7_0,&_44u4__p7_1,&_44u4__p7_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44u_5={
|
||||
static const static_bookblock _resbook_44u_5={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44u5__p1_0},
|
||||
@@ -142,7 +142,7 @@ static static_bookblock _resbook_44u_5={
|
||||
{&_44u5__p9_0,&_44u5__p9_1,&_44u5__p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44u_6={
|
||||
static const static_bookblock _resbook_44u_6={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44u6__p1_0},
|
||||
@@ -156,7 +156,7 @@ static static_bookblock _resbook_44u_6={
|
||||
{&_44u6__p9_0,&_44u6__p9_1,&_44u6__p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44u_7={
|
||||
static const static_bookblock _resbook_44u_7={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44u7__p1_0},
|
||||
@@ -170,7 +170,7 @@ static static_bookblock _resbook_44u_7={
|
||||
{&_44u7__p9_0,&_44u7__p9_1,&_44u7__p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44u_8={
|
||||
static const static_bookblock _resbook_44u_8={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44u8_p1_0},
|
||||
@@ -184,7 +184,7 @@ static static_bookblock _resbook_44u_8={
|
||||
{&_44u8_p9_0,&_44u8_p9_1,&_44u8_p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_44u_9={
|
||||
static const static_bookblock _resbook_44u_9={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_44u9_p1_0},
|
||||
@@ -199,111 +199,111 @@ static static_bookblock _resbook_44u_9={
|
||||
}
|
||||
};
|
||||
|
||||
static vorbis_residue_template _res_44u_n1[]={
|
||||
{1,0, &_residue_44_low_un,
|
||||
static const vorbis_residue_template _res_44u_n1[]={
|
||||
{1,0,32, &_residue_44_low_un,
|
||||
&_huff_book__44un1__short,&_huff_book__44un1__short,
|
||||
&_resbook_44u_n1,&_resbook_44u_n1},
|
||||
|
||||
{1,0, &_residue_44_low_un,
|
||||
{1,0,32, &_residue_44_low_un,
|
||||
&_huff_book__44un1__long,&_huff_book__44un1__long,
|
||||
&_resbook_44u_n1,&_resbook_44u_n1}
|
||||
};
|
||||
static vorbis_residue_template _res_44u_0[]={
|
||||
{1,0, &_residue_44_low_un,
|
||||
static const vorbis_residue_template _res_44u_0[]={
|
||||
{1,0,16, &_residue_44_low_un,
|
||||
&_huff_book__44u0__short,&_huff_book__44u0__short,
|
||||
&_resbook_44u_0,&_resbook_44u_0},
|
||||
|
||||
{1,0, &_residue_44_low_un,
|
||||
{1,0,32, &_residue_44_low_un,
|
||||
&_huff_book__44u0__long,&_huff_book__44u0__long,
|
||||
&_resbook_44u_0,&_resbook_44u_0}
|
||||
};
|
||||
static vorbis_residue_template _res_44u_1[]={
|
||||
{1,0, &_residue_44_low_un,
|
||||
static const vorbis_residue_template _res_44u_1[]={
|
||||
{1,0,16, &_residue_44_low_un,
|
||||
&_huff_book__44u1__short,&_huff_book__44u1__short,
|
||||
&_resbook_44u_1,&_resbook_44u_1},
|
||||
|
||||
{1,0, &_residue_44_low_un,
|
||||
{1,0,32, &_residue_44_low_un,
|
||||
&_huff_book__44u1__long,&_huff_book__44u1__long,
|
||||
&_resbook_44u_1,&_resbook_44u_1}
|
||||
};
|
||||
static vorbis_residue_template _res_44u_2[]={
|
||||
{1,0, &_residue_44_low_un,
|
||||
static const vorbis_residue_template _res_44u_2[]={
|
||||
{1,0,16, &_residue_44_low_un,
|
||||
&_huff_book__44u2__short,&_huff_book__44u2__short,
|
||||
&_resbook_44u_2,&_resbook_44u_2},
|
||||
|
||||
{1,0, &_residue_44_low_un,
|
||||
{1,0,32, &_residue_44_low_un,
|
||||
&_huff_book__44u2__long,&_huff_book__44u2__long,
|
||||
&_resbook_44u_2,&_resbook_44u_2}
|
||||
};
|
||||
static vorbis_residue_template _res_44u_3[]={
|
||||
{1,0, &_residue_44_low_un,
|
||||
static const vorbis_residue_template _res_44u_3[]={
|
||||
{1,0,16, &_residue_44_low_un,
|
||||
&_huff_book__44u3__short,&_huff_book__44u3__short,
|
||||
&_resbook_44u_3,&_resbook_44u_3},
|
||||
|
||||
{1,0, &_residue_44_low_un,
|
||||
{1,0,32, &_residue_44_low_un,
|
||||
&_huff_book__44u3__long,&_huff_book__44u3__long,
|
||||
&_resbook_44u_3,&_resbook_44u_3}
|
||||
};
|
||||
static vorbis_residue_template _res_44u_4[]={
|
||||
{1,0, &_residue_44_low_un,
|
||||
static const vorbis_residue_template _res_44u_4[]={
|
||||
{1,0,16, &_residue_44_low_un,
|
||||
&_huff_book__44u4__short,&_huff_book__44u4__short,
|
||||
&_resbook_44u_4,&_resbook_44u_4},
|
||||
|
||||
{1,0, &_residue_44_low_un,
|
||||
{1,0,32, &_residue_44_low_un,
|
||||
&_huff_book__44u4__long,&_huff_book__44u4__long,
|
||||
&_resbook_44u_4,&_resbook_44u_4}
|
||||
};
|
||||
|
||||
static vorbis_residue_template _res_44u_5[]={
|
||||
{1,0, &_residue_44_mid_un,
|
||||
static const vorbis_residue_template _res_44u_5[]={
|
||||
{1,0,16, &_residue_44_mid_un,
|
||||
&_huff_book__44u5__short,&_huff_book__44u5__short,
|
||||
&_resbook_44u_5,&_resbook_44u_5},
|
||||
|
||||
{1,0, &_residue_44_mid_un,
|
||||
{1,0,32, &_residue_44_mid_un,
|
||||
&_huff_book__44u5__long,&_huff_book__44u5__long,
|
||||
&_resbook_44u_5,&_resbook_44u_5}
|
||||
};
|
||||
|
||||
static vorbis_residue_template _res_44u_6[]={
|
||||
{1,0, &_residue_44_mid_un,
|
||||
static const vorbis_residue_template _res_44u_6[]={
|
||||
{1,0,16, &_residue_44_mid_un,
|
||||
&_huff_book__44u6__short,&_huff_book__44u6__short,
|
||||
&_resbook_44u_6,&_resbook_44u_6},
|
||||
|
||||
{1,0, &_residue_44_mid_un,
|
||||
{1,0,32, &_residue_44_mid_un,
|
||||
&_huff_book__44u6__long,&_huff_book__44u6__long,
|
||||
&_resbook_44u_6,&_resbook_44u_6}
|
||||
};
|
||||
|
||||
static vorbis_residue_template _res_44u_7[]={
|
||||
{1,0, &_residue_44_mid_un,
|
||||
static const vorbis_residue_template _res_44u_7[]={
|
||||
{1,0,16, &_residue_44_mid_un,
|
||||
&_huff_book__44u7__short,&_huff_book__44u7__short,
|
||||
&_resbook_44u_7,&_resbook_44u_7},
|
||||
|
||||
{1,0, &_residue_44_mid_un,
|
||||
{1,0,32, &_residue_44_mid_un,
|
||||
&_huff_book__44u7__long,&_huff_book__44u7__long,
|
||||
&_resbook_44u_7,&_resbook_44u_7}
|
||||
};
|
||||
|
||||
static vorbis_residue_template _res_44u_8[]={
|
||||
{1,0, &_residue_44_hi_un,
|
||||
static const vorbis_residue_template _res_44u_8[]={
|
||||
{1,0,16, &_residue_44_hi_un,
|
||||
&_huff_book__44u8__short,&_huff_book__44u8__short,
|
||||
&_resbook_44u_8,&_resbook_44u_8},
|
||||
|
||||
{1,0, &_residue_44_hi_un,
|
||||
{1,0,32, &_residue_44_hi_un,
|
||||
&_huff_book__44u8__long,&_huff_book__44u8__long,
|
||||
&_resbook_44u_8,&_resbook_44u_8}
|
||||
};
|
||||
static vorbis_residue_template _res_44u_9[]={
|
||||
{1,0, &_residue_44_hi_un,
|
||||
static const vorbis_residue_template _res_44u_9[]={
|
||||
{1,0,16, &_residue_44_hi_un,
|
||||
&_huff_book__44u9__short,&_huff_book__44u9__short,
|
||||
&_resbook_44u_9,&_resbook_44u_9},
|
||||
|
||||
{1,0, &_residue_44_hi_un,
|
||||
{1,0,32, &_residue_44_hi_un,
|
||||
&_huff_book__44u9__long,&_huff_book__44u9__long,
|
||||
&_resbook_44u_9,&_resbook_44u_9}
|
||||
};
|
||||
|
||||
static vorbis_mapping_template _mapres_template_44_uncoupled[]={
|
||||
static const vorbis_mapping_template _mapres_template_44_uncoupled[]={
|
||||
{ _map_nominal_u, _res_44u_n1 }, /* -1 */
|
||||
{ _map_nominal_u, _res_44u_0 }, /* 0 */
|
||||
{ _map_nominal_u, _res_44u_1 }, /* 1 */
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
********************************************************************
|
||||
|
||||
function: toplevel residue templates 8/11kHz
|
||||
last mod: $Id: residue_8.h,v 1.7 2008-02-02 15:53:58 richardash1981 Exp $
|
||||
last mod: $Id: residue_8.h 16962 2010-03-11 07:30:34Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
/***** residue backends *********************************************/
|
||||
|
||||
static static_bookblock _resbook_8s_0={
|
||||
static const static_bookblock _resbook_8s_0={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_8c0_s_p1_0},
|
||||
@@ -34,7 +34,7 @@ static static_bookblock _resbook_8s_0={
|
||||
{&_8c0_s_p9_0,&_8c0_s_p9_1,&_8c0_s_p9_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_8s_1={
|
||||
static const static_bookblock _resbook_8s_1={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_8c1_s_p1_0},
|
||||
@@ -49,23 +49,23 @@ static static_bookblock _resbook_8s_1={
|
||||
}
|
||||
};
|
||||
|
||||
static vorbis_residue_template _res_8s_0[]={
|
||||
{2,0, &_residue_44_mid,
|
||||
static const vorbis_residue_template _res_8s_0[]={
|
||||
{2,0,32, &_residue_44_mid,
|
||||
&_huff_book__8c0_s_single,&_huff_book__8c0_s_single,
|
||||
&_resbook_8s_0,&_resbook_8s_0},
|
||||
};
|
||||
static vorbis_residue_template _res_8s_1[]={
|
||||
{2,0, &_residue_44_mid,
|
||||
static const vorbis_residue_template _res_8s_1[]={
|
||||
{2,0,32, &_residue_44_mid,
|
||||
&_huff_book__8c1_s_single,&_huff_book__8c1_s_single,
|
||||
&_resbook_8s_1,&_resbook_8s_1},
|
||||
};
|
||||
|
||||
static vorbis_mapping_template _mapres_template_8_stereo[2]={
|
||||
static const vorbis_mapping_template _mapres_template_8_stereo[2]={
|
||||
{ _map_nominal, _res_8s_0 }, /* 0 */
|
||||
{ _map_nominal, _res_8s_1 }, /* 1 */
|
||||
};
|
||||
|
||||
static static_bookblock _resbook_8u_0={
|
||||
static const static_bookblock _resbook_8u_0={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_8u0__p1_0},
|
||||
@@ -77,7 +77,7 @@ static static_bookblock _resbook_8u_0={
|
||||
{&_8u0__p7_0,&_8u0__p7_1,&_8u0__p7_2}
|
||||
}
|
||||
};
|
||||
static static_bookblock _resbook_8u_1={
|
||||
static const static_bookblock _resbook_8u_1={
|
||||
{
|
||||
{0},
|
||||
{0,0,&_8u1__p1_0},
|
||||
@@ -92,18 +92,18 @@ static static_bookblock _resbook_8u_1={
|
||||
}
|
||||
};
|
||||
|
||||
static vorbis_residue_template _res_8u_0[]={
|
||||
{1,0, &_residue_44_low_un,
|
||||
static const vorbis_residue_template _res_8u_0[]={
|
||||
{1,0,32, &_residue_44_low_un,
|
||||
&_huff_book__8u0__single,&_huff_book__8u0__single,
|
||||
&_resbook_8u_0,&_resbook_8u_0},
|
||||
};
|
||||
static vorbis_residue_template _res_8u_1[]={
|
||||
{1,0, &_residue_44_mid_un,
|
||||
static const vorbis_residue_template _res_8u_1[]={
|
||||
{1,0,32, &_residue_44_mid_un,
|
||||
&_huff_book__8u1__single,&_huff_book__8u1__single,
|
||||
&_resbook_8u_1,&_resbook_8u_1},
|
||||
};
|
||||
|
||||
static vorbis_mapping_template _mapres_template_8_uncoupled[2]={
|
||||
static const vorbis_mapping_template _mapres_template_8_uncoupled[2]={
|
||||
{ _map_nominal_u, _res_8u_0 }, /* 0 */
|
||||
{ _map_nominal_u, _res_8u_1 }, /* 1 */
|
||||
};
|
||||
|
||||
@@ -5,46 +5,49 @@
|
||||
* 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: 11kHz settings
|
||||
last mod: $Id: setup_11.h,v 1.7 2008-02-02 15:53:58 richardash1981 Exp $
|
||||
function: 11kHz settings
|
||||
last mod: $Id: setup_11.h 16894 2010-02-12 20:32:12Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
#include "psych_11.h"
|
||||
|
||||
static int blocksize_11[2]={
|
||||
static const int blocksize_11[2]={
|
||||
512,512
|
||||
};
|
||||
|
||||
static int _floor_mapping_11[2]={
|
||||
6,6,
|
||||
static const int _floor_mapping_11a[]={
|
||||
6,6
|
||||
};
|
||||
static const int *_floor_mapping_11[]={
|
||||
_floor_mapping_11a
|
||||
};
|
||||
|
||||
static double rate_mapping_11[3]={
|
||||
static const double rate_mapping_11[3]={
|
||||
8000.,13000.,44000.,
|
||||
};
|
||||
|
||||
static double rate_mapping_11_uncoupled[3]={
|
||||
static const double rate_mapping_11_uncoupled[3]={
|
||||
12000.,20000.,50000.,
|
||||
};
|
||||
|
||||
static double quality_mapping_11[3]={
|
||||
static const double quality_mapping_11[3]={
|
||||
-.1,.0,1.
|
||||
};
|
||||
|
||||
ve_setup_data_template ve_setup_11_stereo={
|
||||
static const ve_setup_data_template ve_setup_11_stereo={
|
||||
2,
|
||||
rate_mapping_11,
|
||||
quality_mapping_11,
|
||||
2,
|
||||
9000,
|
||||
15000,
|
||||
|
||||
|
||||
blocksize_11,
|
||||
blocksize_11,
|
||||
|
||||
@@ -62,7 +65,7 @@ ve_setup_data_template ve_setup_11_stereo={
|
||||
NULL,
|
||||
NULL,
|
||||
_psy_noise_suppress,
|
||||
|
||||
|
||||
_psy_compand_8,
|
||||
_psy_compand_8_mapping,
|
||||
NULL,
|
||||
@@ -73,7 +76,7 @@ ve_setup_data_template ve_setup_11_stereo={
|
||||
|
||||
_psy_ath_floater_8,
|
||||
_psy_ath_abs_8,
|
||||
|
||||
|
||||
_psy_lowpass_11,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -82,20 +85,20 @@ ve_setup_data_template ve_setup_11_stereo={
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
1,
|
||||
_floor_mapping_11,
|
||||
NULL,
|
||||
|
||||
_mapres_template_8_stereo
|
||||
};
|
||||
|
||||
ve_setup_data_template ve_setup_11_uncoupled={
|
||||
static const ve_setup_data_template ve_setup_11_uncoupled={
|
||||
2,
|
||||
rate_mapping_11_uncoupled,
|
||||
quality_mapping_11,
|
||||
-1,
|
||||
9000,
|
||||
15000,
|
||||
|
||||
|
||||
blocksize_11,
|
||||
blocksize_11,
|
||||
|
||||
@@ -113,7 +116,7 @@ ve_setup_data_template ve_setup_11_uncoupled={
|
||||
NULL,
|
||||
NULL,
|
||||
_psy_noise_suppress,
|
||||
|
||||
|
||||
_psy_compand_8,
|
||||
_psy_compand_8_mapping,
|
||||
NULL,
|
||||
@@ -124,7 +127,7 @@ ve_setup_data_template ve_setup_11_uncoupled={
|
||||
|
||||
_psy_ath_floater_8,
|
||||
_psy_ath_abs_8,
|
||||
|
||||
|
||||
_psy_lowpass_11,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -133,9 +136,8 @@ ve_setup_data_template ve_setup_11_uncoupled={
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
1,
|
||||
_floor_mapping_11,
|
||||
NULL,
|
||||
|
||||
_mapres_template_8_uncoupled
|
||||
};
|
||||
|
||||
|
||||
@@ -5,55 +5,59 @@
|
||||
* 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: 16kHz settings
|
||||
last mod: $Id: setup_16.h,v 1.8 2008-02-02 15:53:58 richardash1981 Exp $
|
||||
function: 16kHz settings
|
||||
last mod: $Id: setup_16.h 16894 2010-02-12 20:32:12Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
#include "psych_16.h"
|
||||
#include "residue_16.h"
|
||||
|
||||
static int blocksize_16_short[3]={
|
||||
static const int blocksize_16_short[3]={
|
||||
1024,512,512
|
||||
};
|
||||
static int blocksize_16_long[3]={
|
||||
static const int blocksize_16_long[3]={
|
||||
1024,1024,1024
|
||||
};
|
||||
|
||||
static int _floor_mapping_16_short[3]={
|
||||
static const int _floor_mapping_16a[]={
|
||||
9,3,3
|
||||
};
|
||||
static int _floor_mapping_16[3]={
|
||||
static const int _floor_mapping_16b[]={
|
||||
9,9,9
|
||||
};
|
||||
static const int *_floor_mapping_16[]={
|
||||
_floor_mapping_16a,
|
||||
_floor_mapping_16b
|
||||
};
|
||||
|
||||
static double rate_mapping_16[4]={
|
||||
static const double rate_mapping_16[4]={
|
||||
12000.,20000.,44000.,86000.
|
||||
};
|
||||
|
||||
static double rate_mapping_16_uncoupled[4]={
|
||||
static const double rate_mapping_16_uncoupled[4]={
|
||||
16000.,28000.,64000.,100000.
|
||||
};
|
||||
|
||||
static double _global_mapping_16[4]={ 1., 2., 3., 4. };
|
||||
static const double _global_mapping_16[4]={ 1., 2., 3., 4. };
|
||||
|
||||
static double quality_mapping_16[4]={ -.1,.05,.5,1. };
|
||||
static const double quality_mapping_16[4]={ -.1,.05,.5,1. };
|
||||
|
||||
static double _psy_compand_16_mapping[4]={ 0., .8, 1., 1.};
|
||||
static const double _psy_compand_16_mapping[4]={ 0., .8, 1., 1.};
|
||||
|
||||
ve_setup_data_template ve_setup_16_stereo={
|
||||
static const ve_setup_data_template ve_setup_16_stereo={
|
||||
3,
|
||||
rate_mapping_16,
|
||||
quality_mapping_16,
|
||||
2,
|
||||
15000,
|
||||
19000,
|
||||
|
||||
|
||||
blocksize_16_short,
|
||||
blocksize_16_long,
|
||||
|
||||
@@ -71,7 +75,7 @@ ve_setup_data_template ve_setup_16_stereo={
|
||||
_psy_noisebias_16_short,
|
||||
_psy_noisebias_16,
|
||||
_psy_noise_suppress,
|
||||
|
||||
|
||||
_psy_compand_8,
|
||||
_psy_compand_16_mapping,
|
||||
_psy_compand_16_mapping,
|
||||
@@ -82,7 +86,7 @@ ve_setup_data_template ve_setup_16_stereo={
|
||||
|
||||
_psy_ath_floater_16,
|
||||
_psy_ath_abs_16,
|
||||
|
||||
|
||||
_psy_lowpass_16,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -91,20 +95,20 @@ ve_setup_data_template ve_setup_16_stereo={
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
_floor_mapping_16_short,
|
||||
2,
|
||||
_floor_mapping_16,
|
||||
|
||||
_mapres_template_16_stereo
|
||||
};
|
||||
|
||||
ve_setup_data_template ve_setup_16_uncoupled={
|
||||
static const ve_setup_data_template ve_setup_16_uncoupled={
|
||||
3,
|
||||
rate_mapping_16_uncoupled,
|
||||
quality_mapping_16,
|
||||
-1,
|
||||
15000,
|
||||
19000,
|
||||
|
||||
|
||||
blocksize_16_short,
|
||||
blocksize_16_long,
|
||||
|
||||
@@ -116,13 +120,13 @@ ve_setup_data_template ve_setup_16_uncoupled={
|
||||
_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,
|
||||
_psy_noisebias_16,
|
||||
_psy_noise_suppress,
|
||||
|
||||
|
||||
_psy_compand_8,
|
||||
_psy_compand_16_mapping,
|
||||
_psy_compand_16_mapping,
|
||||
@@ -133,7 +137,7 @@ ve_setup_data_template ve_setup_16_uncoupled={
|
||||
|
||||
_psy_ath_floater_16,
|
||||
_psy_ath_abs_16,
|
||||
|
||||
|
||||
_psy_lowpass_16,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -142,7 +146,7 @@ ve_setup_data_template ve_setup_16_uncoupled={
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
_floor_mapping_16_short,
|
||||
2,
|
||||
_floor_mapping_16,
|
||||
|
||||
_mapres_template_16_uncoupled
|
||||
|
||||
@@ -5,34 +5,34 @@
|
||||
* 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: 22kHz settings
|
||||
last mod: $Id: setup_22.h,v 1.7 2008-02-02 15:53:59 richardash1981 Exp $
|
||||
function: 22kHz settings
|
||||
last mod: $Id: setup_22.h 17026 2010-03-25 05:00:27Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
static double rate_mapping_22[4]={
|
||||
static const double rate_mapping_22[4]={
|
||||
15000.,20000.,44000.,86000.
|
||||
};
|
||||
|
||||
static double rate_mapping_22_uncoupled[4]={
|
||||
static const double rate_mapping_22_uncoupled[4]={
|
||||
16000.,28000.,50000.,90000.
|
||||
};
|
||||
|
||||
static double _psy_lowpass_22[4]={9.5,11.,30.,99.};
|
||||
static const double _psy_lowpass_22[4]={9.5,11.,30.,99.};
|
||||
|
||||
ve_setup_data_template ve_setup_22_stereo={
|
||||
static const ve_setup_data_template ve_setup_22_stereo={
|
||||
3,
|
||||
rate_mapping_22,
|
||||
quality_mapping_16,
|
||||
2,
|
||||
19000,
|
||||
26000,
|
||||
|
||||
|
||||
blocksize_16_short,
|
||||
blocksize_16_long,
|
||||
|
||||
@@ -50,10 +50,10 @@ ve_setup_data_template ve_setup_22_stereo={
|
||||
_psy_noisebias_16_short,
|
||||
_psy_noisebias_16,
|
||||
_psy_noise_suppress,
|
||||
|
||||
|
||||
_psy_compand_8,
|
||||
_psy_compand_8_mapping,
|
||||
_psy_compand_8_mapping,
|
||||
_psy_compand_16_mapping,
|
||||
_psy_compand_16_mapping,
|
||||
|
||||
{_noise_start_16,_noise_start_16},
|
||||
{ _noise_part_16, _noise_part_16},
|
||||
@@ -61,7 +61,7 @@ ve_setup_data_template ve_setup_22_stereo={
|
||||
|
||||
_psy_ath_floater_16,
|
||||
_psy_ath_abs_16,
|
||||
|
||||
|
||||
_psy_lowpass_22,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -70,20 +70,20 @@ ve_setup_data_template ve_setup_22_stereo={
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
_floor_mapping_16_short,
|
||||
2,
|
||||
_floor_mapping_16,
|
||||
|
||||
_mapres_template_16_stereo
|
||||
};
|
||||
|
||||
ve_setup_data_template ve_setup_22_uncoupled={
|
||||
static const ve_setup_data_template ve_setup_22_uncoupled={
|
||||
3,
|
||||
rate_mapping_22_uncoupled,
|
||||
quality_mapping_16,
|
||||
-1,
|
||||
19000,
|
||||
26000,
|
||||
|
||||
|
||||
blocksize_16_short,
|
||||
blocksize_16_long,
|
||||
|
||||
@@ -95,16 +95,16 @@ ve_setup_data_template ve_setup_22_uncoupled={
|
||||
_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,
|
||||
_psy_noisebias_16,
|
||||
_psy_noise_suppress,
|
||||
|
||||
|
||||
_psy_compand_8,
|
||||
_psy_compand_8_mapping,
|
||||
_psy_compand_8_mapping,
|
||||
_psy_compand_16_mapping,
|
||||
_psy_compand_16_mapping,
|
||||
|
||||
{_noise_start_16,_noise_start_16},
|
||||
{ _noise_part_16, _noise_part_16},
|
||||
@@ -112,7 +112,7 @@ ve_setup_data_template ve_setup_22_uncoupled={
|
||||
|
||||
_psy_ath_floater_16,
|
||||
_psy_ath_abs_16,
|
||||
|
||||
|
||||
_psy_lowpass_22,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -121,7 +121,7 @@ ve_setup_data_template ve_setup_22_uncoupled={
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
_floor_mapping_16_short,
|
||||
2,
|
||||
_floor_mapping_16,
|
||||
|
||||
_mapres_template_16_uncoupled
|
||||
|
||||
@@ -5,38 +5,38 @@
|
||||
* 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: toplevel settings for 32kHz
|
||||
last mod: $Id: setup_32.h,v 1.7 2008-02-02 15:53:59 richardash1981 Exp $
|
||||
last mod: $Id: setup_32.h 16894 2010-02-12 20:32:12Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
static double rate_mapping_32[12]={
|
||||
static const double rate_mapping_32[12]={
|
||||
18000.,28000.,35000.,45000.,56000.,60000.,
|
||||
75000.,90000.,100000.,115000.,150000.,190000.,
|
||||
};
|
||||
|
||||
static double rate_mapping_32_un[12]={
|
||||
static const double rate_mapping_32_un[12]={
|
||||
30000.,42000.,52000.,64000.,72000.,78000.,
|
||||
86000.,92000.,110000.,120000.,140000.,190000.,
|
||||
};
|
||||
|
||||
static double _psy_lowpass_32[12]={
|
||||
static const double _psy_lowpass_32[12]={
|
||||
12.3,13.,13.,14.,15.,99.,99.,99.,99.,99.,99.,99.
|
||||
};
|
||||
|
||||
ve_setup_data_template ve_setup_32_stereo={
|
||||
static const ve_setup_data_template ve_setup_32_stereo={
|
||||
11,
|
||||
rate_mapping_32,
|
||||
quality_mapping_44,
|
||||
2,
|
||||
26000,
|
||||
40000,
|
||||
|
||||
|
||||
blocksize_short_44,
|
||||
blocksize_long_44,
|
||||
|
||||
@@ -54,7 +54,7 @@ ve_setup_data_template ve_setup_32_stereo={
|
||||
_psy_noisebias_trans,
|
||||
_psy_noisebias_long,
|
||||
_psy_noise_suppress,
|
||||
|
||||
|
||||
_psy_compand_44,
|
||||
_psy_compand_short_mapping,
|
||||
_psy_compand_long_mapping,
|
||||
@@ -65,7 +65,7 @@ ve_setup_data_template ve_setup_32_stereo={
|
||||
|
||||
_psy_ath_floater,
|
||||
_psy_ath_abs,
|
||||
|
||||
|
||||
_psy_lowpass_32,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -74,20 +74,20 @@ ve_setup_data_template ve_setup_32_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_32_uncoupled={
|
||||
static const ve_setup_data_template ve_setup_32_uncoupled={
|
||||
11,
|
||||
rate_mapping_32_un,
|
||||
quality_mapping_44,
|
||||
-1,
|
||||
26000,
|
||||
40000,
|
||||
|
||||
|
||||
blocksize_short_44,
|
||||
blocksize_long_44,
|
||||
|
||||
@@ -105,7 +105,7 @@ ve_setup_data_template ve_setup_32_uncoupled={
|
||||
_psy_noisebias_trans,
|
||||
_psy_noisebias_long,
|
||||
_psy_noise_suppress,
|
||||
|
||||
|
||||
_psy_compand_44,
|
||||
_psy_compand_short_mapping,
|
||||
_psy_compand_long_mapping,
|
||||
@@ -116,7 +116,7 @@ ve_setup_data_template ve_setup_32_uncoupled={
|
||||
|
||||
_psy_ath_floater,
|
||||
_psy_ath_abs,
|
||||
|
||||
|
||||
_psy_lowpass_32,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -125,8 +125,8 @@ ve_setup_data_template ve_setup_32_uncoupled={
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
_floor_short_mapping_44,
|
||||
_floor_long_mapping_44,
|
||||
2,
|
||||
_floor_mapping_44,
|
||||
|
||||
_mapres_template_44_uncoupled
|
||||
};
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
* 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: toplevel settings for 44.1/48kHz
|
||||
last mod: $Id: setup_44.h,v 1.7 2008-02-02 15:53:59 richardash1981 Exp $
|
||||
last mod: $Id: setup_44.h 16962 2010-03-11 07:30:34Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
@@ -19,49 +19,60 @@
|
||||
#include "modes/residue_44.h"
|
||||
#include "modes/psych_44.h"
|
||||
|
||||
static double rate_mapping_44_stereo[12]={
|
||||
static const double rate_mapping_44_stereo[12]={
|
||||
22500.,32000.,40000.,48000.,56000.,64000.,
|
||||
80000.,96000.,112000.,128000.,160000.,250001.
|
||||
};
|
||||
|
||||
static double quality_mapping_44[12]={
|
||||
static const double quality_mapping_44[12]={
|
||||
-.1,.0,.1,.2,.3,.4,.5,.6,.7,.8,.9,1.0
|
||||
};
|
||||
|
||||
static int blocksize_short_44[11]={
|
||||
static const int blocksize_short_44[11]={
|
||||
512,256,256,256,256,256,256,256,256,256,256
|
||||
};
|
||||
static int blocksize_long_44[11]={
|
||||
static const int blocksize_long_44[11]={
|
||||
4096,2048,2048,2048,2048,2048,2048,2048,2048,2048,2048
|
||||
};
|
||||
|
||||
static double _psy_compand_short_mapping[12]={
|
||||
static const double _psy_compand_short_mapping[12]={
|
||||
0.5, 1., 1., 1.3, 1.6, 2., 2., 2., 2., 2., 2., 2.
|
||||
};
|
||||
static double _psy_compand_long_mapping[12]={
|
||||
static const double _psy_compand_long_mapping[12]={
|
||||
3.5, 4., 4., 4.3, 4.6, 5., 5., 5., 5., 5., 5., 5.
|
||||
};
|
||||
|
||||
static double _global_mapping_44[12]={
|
||||
static const double _global_mapping_44[12]={
|
||||
/* 1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.5, 4., 4. */
|
||||
0., 1., 1., 1.5, 2., 2., 2.5, 2.7, 3.0, 3.7, 4., 4.
|
||||
};
|
||||
|
||||
static int _floor_short_mapping_44[11]={
|
||||
static const int _floor_mapping_44a[11]={
|
||||
1,0,0,2,2,4,5,5,5,5,5
|
||||
};
|
||||
static int _floor_long_mapping_44[11]={
|
||||
|
||||
static const int _floor_mapping_44b[11]={
|
||||
8,7,7,7,7,7,7,7,7,7,7
|
||||
};
|
||||
|
||||
ve_setup_data_template ve_setup_44_stereo={
|
||||
static const int _floor_mapping_44c[11]={
|
||||
10,10,10,10,10,10,10,10,10,10,10
|
||||
};
|
||||
|
||||
static const int *_floor_mapping_44[]={
|
||||
_floor_mapping_44a,
|
||||
_floor_mapping_44b,
|
||||
_floor_mapping_44c,
|
||||
};
|
||||
|
||||
static const ve_setup_data_template ve_setup_44_stereo={
|
||||
11,
|
||||
rate_mapping_44_stereo,
|
||||
quality_mapping_44,
|
||||
2,
|
||||
40000,
|
||||
50000,
|
||||
|
||||
|
||||
blocksize_short_44,
|
||||
blocksize_long_44,
|
||||
|
||||
@@ -79,7 +90,7 @@ ve_setup_data_template ve_setup_44_stereo={
|
||||
_psy_noisebias_trans,
|
||||
_psy_noisebias_long,
|
||||
_psy_noise_suppress,
|
||||
|
||||
|
||||
_psy_compand_44,
|
||||
_psy_compand_short_mapping,
|
||||
_psy_compand_long_mapping,
|
||||
@@ -90,7 +101,7 @@ ve_setup_data_template ve_setup_44_stereo={
|
||||
|
||||
_psy_ath_floater,
|
||||
_psy_ath_abs,
|
||||
|
||||
|
||||
_psy_lowpass_44,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -99,9 +110,8 @@ ve_setup_data_template ve_setup_44_stereo={
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
_floor_short_mapping_44,
|
||||
_floor_long_mapping_44,
|
||||
2,
|
||||
_floor_mapping_44,
|
||||
|
||||
_mapres_template_44_stereo
|
||||
};
|
||||
|
||||
|
||||
74
lib-src/libvorbis/lib/modes/setup_44p51.h
Normal file
74
lib-src/libvorbis/lib/modes/setup_44p51.h
Normal file
@@ -0,0 +1,74 @@
|
||||
/********************************************************************
|
||||
* *
|
||||
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
|
||||
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
|
||||
* 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-2010 *
|
||||
* by the Xiph.Org Foundation http://www.xiph.org/ *
|
||||
* *
|
||||
********************************************************************
|
||||
|
||||
function: toplevel settings for 44.1/48kHz 5.1 surround modes
|
||||
last mod: $Id$
|
||||
|
||||
********************************************************************/
|
||||
|
||||
#include "modes/residue_44p51.h"
|
||||
|
||||
static const double rate_mapping_44p51[12]={
|
||||
14000.,20000.,28000.,38000.,46000.,54000.,
|
||||
75000.,96000.,120000.,140000.,180000.,240001.
|
||||
};
|
||||
|
||||
static const ve_setup_data_template ve_setup_44_51={
|
||||
11,
|
||||
rate_mapping_44p51,
|
||||
quality_mapping_44,
|
||||
6,
|
||||
40000,
|
||||
70000,
|
||||
|
||||
blocksize_short_44,
|
||||
blocksize_long_44,
|
||||
|
||||
_psy_tone_masteratt_44,
|
||||
_psy_tone_0dB,
|
||||
_psy_tone_suppress,
|
||||
|
||||
_vp_tonemask_adj_otherblock,
|
||||
_vp_tonemask_adj_longblock,
|
||||
_vp_tonemask_adj_otherblock,
|
||||
|
||||
_psy_noiseguards_44,
|
||||
_psy_noisebias_impulse,
|
||||
_psy_noisebias_padding,
|
||||
_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,
|
||||
|
||||
_psy_ath_floater,
|
||||
_psy_ath_abs,
|
||||
|
||||
_psy_lowpass_44,
|
||||
|
||||
_psy_global_44,
|
||||
_global_mapping_44,
|
||||
_psy_stereo_modes_44,
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
3,
|
||||
_floor_mapping_44,
|
||||
|
||||
_mapres_template_44_51
|
||||
};
|
||||
@@ -5,31 +5,31 @@
|
||||
* 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: toplevel settings for 44.1/48kHz uncoupled modes
|
||||
last mod: $Id: setup_44u.h,v 1.7 2008-02-02 15:53:59 richardash1981 Exp $
|
||||
last mod: $Id: setup_44u.h 16962 2010-03-11 07:30:34Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
#include "modes/residue_44u.h"
|
||||
|
||||
static double rate_mapping_44_un[12]={
|
||||
static const double rate_mapping_44_un[12]={
|
||||
32000.,48000.,60000.,70000.,80000.,86000.,
|
||||
96000.,110000.,120000.,140000.,160000.,240001.
|
||||
};
|
||||
|
||||
ve_setup_data_template ve_setup_44_uncoupled={
|
||||
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,
|
||||
|
||||
@@ -47,7 +47,7 @@ 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,
|
||||
@@ -58,17 +58,17 @@ ve_setup_data_template ve_setup_44_uncoupled={
|
||||
|
||||
_psy_ath_floater,
|
||||
_psy_ath_abs,
|
||||
|
||||
|
||||
_psy_lowpass_44,
|
||||
|
||||
_psy_global_44,
|
||||
_global_mapping_44,
|
||||
NULL,
|
||||
_psy_stereo_modes_44,
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
_floor_short_mapping_44,
|
||||
_floor_long_mapping_44,
|
||||
2,
|
||||
_floor_mapping_44,
|
||||
|
||||
_mapres_template_44_uncoupled
|
||||
};
|
||||
|
||||
@@ -5,51 +5,55 @@
|
||||
* 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: 8kHz settings
|
||||
last mod: $Id: setup_8.h,v 1.7 2008-02-02 15:53:59 richardash1981 Exp $
|
||||
function: 8kHz settings
|
||||
last mod: $Id: setup_8.h 16894 2010-02-12 20:32:12Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
#include "psych_8.h"
|
||||
#include "residue_8.h"
|
||||
|
||||
static int blocksize_8[2]={
|
||||
static const int blocksize_8[2]={
|
||||
512,512
|
||||
};
|
||||
|
||||
static int _floor_mapping_8[2]={
|
||||
6,6,
|
||||
static const int _floor_mapping_8a[]={
|
||||
6,6
|
||||
};
|
||||
|
||||
static double rate_mapping_8[3]={
|
||||
static const int *_floor_mapping_8[]={
|
||||
_floor_mapping_8a
|
||||
};
|
||||
|
||||
static const double rate_mapping_8[3]={
|
||||
6000.,9000.,32000.,
|
||||
};
|
||||
|
||||
static double rate_mapping_8_uncoupled[3]={
|
||||
static const double rate_mapping_8_uncoupled[3]={
|
||||
8000.,14000.,42000.,
|
||||
};
|
||||
|
||||
static double quality_mapping_8[3]={
|
||||
static const double quality_mapping_8[3]={
|
||||
-.1,.0,1.
|
||||
};
|
||||
|
||||
static double _psy_compand_8_mapping[3]={ 0., 1., 1.};
|
||||
static const double _psy_compand_8_mapping[3]={ 0., 1., 1.};
|
||||
|
||||
static double _global_mapping_8[3]={ 1., 2., 3. };
|
||||
static const double _global_mapping_8[3]={ 1., 2., 3. };
|
||||
|
||||
ve_setup_data_template ve_setup_8_stereo={
|
||||
static const ve_setup_data_template ve_setup_8_stereo={
|
||||
2,
|
||||
rate_mapping_8,
|
||||
quality_mapping_8,
|
||||
2,
|
||||
8000,
|
||||
9000,
|
||||
|
||||
|
||||
blocksize_8,
|
||||
blocksize_8,
|
||||
|
||||
@@ -67,7 +71,7 @@ ve_setup_data_template ve_setup_8_stereo={
|
||||
NULL,
|
||||
NULL,
|
||||
_psy_noise_suppress,
|
||||
|
||||
|
||||
_psy_compand_8,
|
||||
_psy_compand_8_mapping,
|
||||
NULL,
|
||||
@@ -78,7 +82,7 @@ ve_setup_data_template ve_setup_8_stereo={
|
||||
|
||||
_psy_ath_floater_8,
|
||||
_psy_ath_abs_8,
|
||||
|
||||
|
||||
_psy_lowpass_8,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -87,20 +91,20 @@ ve_setup_data_template ve_setup_8_stereo={
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
1,
|
||||
_floor_mapping_8,
|
||||
NULL,
|
||||
|
||||
_mapres_template_8_stereo
|
||||
};
|
||||
|
||||
ve_setup_data_template ve_setup_8_uncoupled={
|
||||
static const ve_setup_data_template ve_setup_8_uncoupled={
|
||||
2,
|
||||
rate_mapping_8_uncoupled,
|
||||
quality_mapping_8,
|
||||
-1,
|
||||
8000,
|
||||
9000,
|
||||
|
||||
|
||||
blocksize_8,
|
||||
blocksize_8,
|
||||
|
||||
@@ -118,7 +122,7 @@ ve_setup_data_template ve_setup_8_uncoupled={
|
||||
NULL,
|
||||
NULL,
|
||||
_psy_noise_suppress,
|
||||
|
||||
|
||||
_psy_compand_8,
|
||||
_psy_compand_8_mapping,
|
||||
NULL,
|
||||
@@ -129,7 +133,7 @@ ve_setup_data_template ve_setup_8_uncoupled={
|
||||
|
||||
_psy_ath_floater_8,
|
||||
_psy_ath_abs_8,
|
||||
|
||||
|
||||
_psy_lowpass_8,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -138,9 +142,8 @@ ve_setup_data_template ve_setup_8_uncoupled={
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
1,
|
||||
_floor_mapping_8,
|
||||
NULL,
|
||||
|
||||
_mapres_template_8_uncoupled
|
||||
};
|
||||
|
||||
|
||||
@@ -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-2007 *
|
||||
* 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.7 2008-02-02 15:53:59 richardash1981 Exp $
|
||||
last mod: $Id: setup_X.h 16894 2010-02-12 20:32:12Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
static double rate_mapping_X[12]={
|
||||
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={
|
||||
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={
|
||||
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,7 +96,7 @@ 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,
|
||||
@@ -107,7 +107,7 @@ ve_setup_data_template ve_setup_X_uncoupled={
|
||||
|
||||
_psy_ath_floater,
|
||||
_psy_ath_abs,
|
||||
|
||||
|
||||
_psy_lowpass_44,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -116,20 +116,20 @@ ve_setup_data_template ve_setup_X_uncoupled={
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
_floor_short_mapping_44,
|
||||
_floor_long_mapping_44,
|
||||
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,
|
||||
|
||||
@@ -147,7 +147,7 @@ ve_setup_data_template ve_setup_XX_stereo={
|
||||
NULL,
|
||||
NULL,
|
||||
_psy_noise_suppress,
|
||||
|
||||
|
||||
_psy_compand_8,
|
||||
_psy_compand_8_mapping,
|
||||
NULL,
|
||||
@@ -158,7 +158,7 @@ ve_setup_data_template ve_setup_XX_stereo={
|
||||
|
||||
_psy_ath_floater_8,
|
||||
_psy_ath_abs_8,
|
||||
|
||||
|
||||
_psy_lowpass_8,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -167,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,
|
||||
|
||||
@@ -198,7 +198,7 @@ ve_setup_data_template ve_setup_XX_uncoupled={
|
||||
NULL,
|
||||
NULL,
|
||||
_psy_noise_suppress,
|
||||
|
||||
|
||||
_psy_compand_8,
|
||||
_psy_compand_8_mapping,
|
||||
NULL,
|
||||
@@ -209,7 +209,7 @@ ve_setup_data_template ve_setup_XX_uncoupled={
|
||||
|
||||
_psy_ath_floater_8,
|
||||
_psy_ath_abs_8,
|
||||
|
||||
|
||||
_psy_lowpass_8,
|
||||
|
||||
_psy_global_44,
|
||||
@@ -218,9 +218,8 @@ ve_setup_data_template ve_setup_XX_uncoupled={
|
||||
|
||||
_floor_books,
|
||||
_floor,
|
||||
1,
|
||||
_floor_mapping_8,
|
||||
NULL,
|
||||
|
||||
_mapres_template_8_uncoupled
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user