diff options
| author | Thom Johansen <thomj@rockbox.org> | 2007-11-22 01:29:14 +0000 |
|---|---|---|
| committer | Thom Johansen <thomj@rockbox.org> | 2007-11-22 01:29:14 +0000 |
| commit | 57a27c69a9f3b9b69aff9360c09f7298ffd7b670 (patch) | |
| tree | 252dcf43c2ed5058047d1aac98c00ff24e97f067 /apps/codecs/libspeex/modes_wb.c | |
| parent | 14ac7cafc81940f5f389515cb5134e6c52f37813 (diff) | |
| download | rockbox-57a27c69a9f3b9b69aff9360c09f7298ffd7b670.tar.gz rockbox-57a27c69a9f3b9b69aff9360c09f7298ffd7b670.zip | |
Sync Speex to SVN.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15750 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libspeex/modes_wb.c')
| -rw-r--r-- | apps/codecs/libspeex/modes_wb.c | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/apps/codecs/libspeex/modes_wb.c b/apps/codecs/libspeex/modes_wb.c index 8e351db60d..7fac15b852 100644 --- a/apps/codecs/libspeex/modes_wb.c +++ b/apps/codecs/libspeex/modes_wb.c @@ -236,17 +236,15 @@ static const SpeexSBMode sb_wb_mode = { 0.9, 0.6, /* gamma1, gamma2 */ #endif QCONST16(.0002,15), /*lpc_floor*/ - QCONST16(0.9f,15), - {NULL, &wb_submode1, &wb_submode2, &wb_submode3, &wb_submode4, NULL, NULL, NULL}, - 3, - {1, 8, 2, 3, 4, 5, 5, 6, 6, 7, 7}, - {1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 4}, -#ifndef SPEEX_DISABLE_ENCODER - vbr_hb_thresh, -#else - NULL, + QCONST16(0.9f,15), + {NULL, &wb_submode1, &wb_submode2, &wb_submode3, &wb_submode4, NULL, NULL, NULL}, + 3, + {1, 8, 2, 3, 4, 5, 5, 6, 6, 7, 7}, + {1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 4}, +#ifndef DISABLE_VBR + vbr_hb_thresh, #endif - 5 + 5 }; @@ -296,17 +294,15 @@ static const SpeexSBMode sb_uwb_mode = { 0.9, 0.6, /* gamma1, gamma2 */ #endif QCONST16(.0002,15), /*lpc_floor*/ - QCONST16(0.7f,15), - {NULL, &wb_submode1, NULL, NULL, NULL, NULL, NULL, NULL}, - 1, - {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, - {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, -#ifndef SPEEX_DISABLE_ENCODER - vbr_uhb_thresh, -#else - NULL, + QCONST16(0.7f,15), + {NULL, &wb_submode1, NULL, NULL, NULL, NULL, NULL, NULL}, + 1, + {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, + {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, +#ifndef DISABLE_VBR + vbr_uhb_thresh, #endif - 2 + 2 }; #endif |