1
0
Fork 0
forked from len0rd/rockbox

Remove unused 2kB buffer and some dead code.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27458 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2010-07-17 08:49:21 +00:00
parent d6446d0b08
commit f2a1d92030
2 changed files with 1 additions and 6 deletions

View file

@ -147,7 +147,6 @@ typedef struct WMADecodeContext
fixed32 noise_mult; /* XXX: suppress that and integrate it in the noise array */ fixed32 noise_mult; /* XXX: suppress that and integrate it in the noise array */
/* lsp_to_curve tables */ /* lsp_to_curve tables */
fixed32 lsp_cos_table[BLOCK_MAX_SIZE]; fixed32 lsp_cos_table[BLOCK_MAX_SIZE];
fixed64 lsp_pow_e_table[256];
fixed32 lsp_pow_m_table1[(1 << LSP_POW_BITS)]; fixed32 lsp_pow_m_table1[(1 << LSP_POW_BITS)];
fixed32 lsp_pow_m_table2[(1 << LSP_POW_BITS)]; fixed32 lsp_pow_m_table2[(1 << LSP_POW_BITS)];

View file

@ -170,7 +170,7 @@ static void init_coef_vlc(VLC *vlc,
int wma_decode_init(WMADecodeContext* s, asf_waveformatex_t *wfx) int wma_decode_init(WMADecodeContext* s, asf_waveformatex_t *wfx)
{ {
int i, flags1, flags2; int i, flags2;
fixed32 *window; fixed32 *window;
uint8_t *extradata; uint8_t *extradata;
fixed64 bps1; fixed64 bps1;
@ -206,15 +206,11 @@ int wma_decode_init(WMADecodeContext* s, asf_waveformatex_t *wfx)
} }
/* extract flag infos */ /* extract flag infos */
flags1 = 0;
flags2 = 0; flags2 = 0;
extradata = wfx->data; extradata = wfx->data;
if (s->version == 1 && wfx->datalen >= 4) { if (s->version == 1 && wfx->datalen >= 4) {
flags1 = extradata[0] | (extradata[1] << 8);
flags2 = extradata[2] | (extradata[3] << 8); flags2 = extradata[2] | (extradata[3] << 8);
}else if (s->version == 2 && wfx->datalen >= 6){ }else if (s->version == 2 && wfx->datalen >= 6){
flags1 = extradata[0] | (extradata[1] << 8) |
(extradata[2] << 16) | (extradata[3] << 24);
flags2 = extradata[4] | (extradata[5] << 8); flags2 = extradata[4] | (extradata[5] << 8);
} }
s->use_exp_vlc = flags2 & 0x0001; s->use_exp_vlc = flags2 & 0x0001;