devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Simplify special case function, speedup of about 0.2MHz on both coldfire and pp decoding the files in the test set

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25977 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2010-05-12 22:41:17 +00:00
parent e5d6d7a47e
commit 85f0873682
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
apps/codecs/libtremor/codebook.c
View file

@ -464,48 +464,49 @@ long vorbis_book_decodev_set(codebook *book,ogg_int32_t *a,
static long vorbis_book_decodevv_add_2ch_even(codebook *book,ogg_int32_t **a, static long vorbis_book_decodevv_add_2ch_even(codebook *book,ogg_int32_t **a,
long offset,oggpack_buffer *b, long offset,oggpack_buffer *b,
int n,int point){ unsigned int n,int point){
long i,k,chunk,read; long k,chunk,read;
int shift=point-book->binarypoint; int shift=point-book->binarypoint;
long entries[32]; long entries[32];
ogg_int32_t *p0 = &(a[0][offset]); ogg_int32_t *p0 = &(a[0][offset]);
ogg_int32_t *p1 = &(a[1][offset]); ogg_int32_t *p1 = &(a[1][offset]);
const unsigned long dim = book->dim;
const ogg_int32_t * const vlist = book->valuelist;
if(shift>=0){ if(shift>=0){
while(n>0){
for(i=0;i<n;){
chunk=32; chunk=32;
if (chunk*book->dim>(n-i)*2) if (16*dim>n)
chunk=((n-i)*2+book->dim-1)/book->dim; chunk=(n*2-1)/dim + 1;
read = decode_packed_block(book,b,entries,chunk); read = decode_packed_block(book,b,entries,chunk);
for(k=0;k<read;k++){ for(k=0;k<read;k++){
const ogg_int32_t *t = book->valuelist+entries[k]*book->dim; const ogg_int32_t *t = vlist+entries[k]*dim;
const ogg_int32_t *u = t+book->dim; const ogg_int32_t *u = t+dim;
do{ do{
*p0++ += *t++>>shift; *p0++ += *t++>>shift;
*p1++ += *t++>>shift; *p1++ += *t++>>shift;
}while(t<u); }while(t<u);
} }
if (read<chunk)return-1; if (read<chunk)return-1;
i += read*book->dim/2; n -= read*dim/2;
} }
}else{ }else{
shift = -shift; shift = -shift;
for(i=0;i<n;){ while(n>0){
chunk=32; chunk=32;
if (chunk*book->dim>(n-i)*2) if (16*dim>n)
chunk=((n-i)*2+book->dim-1)/book->dim; chunk=(n*2-1)/dim + 1;
read = decode_packed_block(book,b,entries,chunk); read = decode_packed_block(book,b,entries,chunk);
for(k=0;k<read;k++){ for(k=0;k<read;k++){
const ogg_int32_t *t = book->valuelist+entries[k]*book->dim; const ogg_int32_t *t = vlist+entries[k]*dim;
const ogg_int32_t *u = t+book->dim; const ogg_int32_t *u = t+dim;
do{ do{
*p0++ += *t++<<shift; *p0++ += *t++<<shift;
*p1++ += *t++<<shift; *p1++ += *t++<<shift;
}while(t<u); }while(t<u);
} }
if (read<chunk)return-1; if (read<chunk)return-1;
i += read*book->dim/2; n -= read*dim/2;
} }
} }
return(0); return(0);