Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Housekeeping for libwmapro. Define some multiple used constants, use more precise value for cos(pi/4).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27644 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2010-07-31 21:07:17 +00:00
parent 8be79a22fd
commit f971deed6d
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
apps/codecs/libwmapro/wmaprodec.c
View file

@ -124,6 +124,11 @@
#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) #define FFMIN(a,b) ((a) > (b) ? (b) : (a))
#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) #define FFMAX(a,b) ((a) > (b) ? (a) : (b))
/* Define some multiple used constants */
#define SQRT2_FRACT24 0x016A09E6 /* 0x016A09E6 = (sqrt(2)*(1<<24)) */
#define COS_PI4_FRACT16 0x0000B505 /* 0x0000B505 = (cos(pi/4)<<16) */
#define ONE_FRACT16 0x00010000 /* 0x00010000 = (1<<16) */
/* Enable multichannel for large-memory targets only */ /* Enable multichannel for large-memory targets only */
#if (MEMORYSIZE > 2) #if (MEMORYSIZE > 2)
#define WMAPRO_MAX_CHANNELS 8 ///< max number of handled channels #define WMAPRO_MAX_CHANNELS 8 ///< max number of handled channels
@ -646,9 +651,9 @@ static void decode_decorrelation_matrix(WMAProDecodeCtx *s,
get_bits1(&s->gb) ? 1.0 : -1.0; get_bits1(&s->gb) ? 1.0 : -1.0;
if(chgroup->decorrelation_matrix[chgroup->num_channels * i + i] > 0) if(chgroup->decorrelation_matrix[chgroup->num_channels * i + i] > 0)
chgroup->fixdecorrelation_matrix[chgroup->num_channels * i + i] = 0x10000; chgroup->fixdecorrelation_matrix[chgroup->num_channels * i + i] = ONE_FRACT16;
else else
chgroup->fixdecorrelation_matrix[chgroup->num_channels * i + i] = -0x10000; chgroup->fixdecorrelation_matrix[chgroup->num_channels * i + i] = -ONE_FRACT16;
} }
for (i = 1; i < chgroup->num_channels; i++) { for (i = 1; i < chgroup->num_channels; i++) {
@ -754,16 +759,16 @@ static int decode_channel_transform(WMAProDecodeCtx* s)
} else { } else {
chgroup->transform = 1; chgroup->transform = 1;
if (s->num_channels == 2) { if (s->num_channels == 2) {
chgroup->fixdecorrelation_matrix[0] = 0x10000; chgroup->fixdecorrelation_matrix[0] = ONE_FRACT16;
chgroup->fixdecorrelation_matrix[1] = -0x10000; chgroup->fixdecorrelation_matrix[1] = -ONE_FRACT16;
chgroup->fixdecorrelation_matrix[2] = 0x10000; chgroup->fixdecorrelation_matrix[2] = ONE_FRACT16;
chgroup->fixdecorrelation_matrix[3] = 0x10000; chgroup->fixdecorrelation_matrix[3] = ONE_FRACT16;
} else { } else {
/** cos(pi/4) */ /** cos(pi/4) */
chgroup->fixdecorrelation_matrix[0] = 0xB500; chgroup->fixdecorrelation_matrix[0] = COS_PI4_FRACT16;
chgroup->fixdecorrelation_matrix[1] = -0xB500; chgroup->fixdecorrelation_matrix[1] = -COS_PI4_FRACT16;
chgroup->fixdecorrelation_matrix[2] = 0xB500; chgroup->fixdecorrelation_matrix[2] = COS_PI4_FRACT16;
chgroup->fixdecorrelation_matrix[3] = 0xB500; chgroup->fixdecorrelation_matrix[3] = COS_PI4_FRACT16;
} }
} }
} else if (chgroup->num_channels > 2) { } else if (chgroup->num_channels > 2) {
@ -858,19 +863,19 @@ static int decode_coeffs(WMAProDecodeCtx *s, int c)
v1 = get_vlc2(&s->gb, vec1_vlc.table, VLCBITS, VEC1MAXDEPTH); v1 = get_vlc2(&s->gb, vec1_vlc.table, VLCBITS, VEC1MAXDEPTH);
if (v1 == HUFF_VEC1_SIZE - 1) if (v1 == HUFF_VEC1_SIZE - 1)
v1 += ff_wma_get_large_val(&s->gb); v1 += ff_wma_get_large_val(&s->gb);
vals[i] = v0; vals[i ] = v0;
vals[i+1] = v1; vals[i+1] = v1;
} else { } else {
vals[i] = symbol_to_vec2[idx] >> 4; vals[i ] = symbol_to_vec2[idx] >> 4;
vals[i+1] = symbol_to_vec2[idx] & 0xF; vals[i+1] = symbol_to_vec2[idx] & 0xF;
} }
} }
} else { } else {
vals[0] = symbol_to_vec4[idx] >> 12; vals[0] = (symbol_to_vec4[idx] >> 12);
vals[1] = (symbol_to_vec4[idx] >> 8) & 0xF; vals[1] = (symbol_to_vec4[idx] >> 8) & 0xF;
vals[2] = (symbol_to_vec4[idx] >> 4) & 0xF; vals[2] = (symbol_to_vec4[idx] >> 4) & 0xF;
vals[3] = symbol_to_vec4[idx] & 0xF; vals[3] = (symbol_to_vec4[idx] ) & 0xF;
} }
/** decode sign */ /** decode sign */
@ -1042,14 +1047,14 @@ static void inverse_channel_transform(WMAProDecodeCtx *s)
} }
} else if (s->num_channels == 2) { } else if (s->num_channels == 2) {
/* Scale with sqrt(2). 0x016A09E6 = (sqrt(2)*(1<<24)) */ /* Scale with sqrt(2) */
int len = FFMIN(sfb[1], s->subframe_len) - sfb[0]; int len = FFMIN(sfb[1], s->subframe_len) - sfb[0];
vector_fixmul_scalar(ch_data[0] + sfb[0], vector_fixmul_scalar(ch_data[0] + sfb[0],
ch_data[0] + sfb[0], ch_data[0] + sfb[0],
0x016A09E6, len); SQRT2_FRACT24, len);
vector_fixmul_scalar(ch_data[1] + sfb[0], vector_fixmul_scalar(ch_data[1] + sfb[0],
ch_data[1] + sfb[0], ch_data[1] + sfb[0],
0x016A09E6, len); SQRT2_FRACT24, len);
} }
} }