diff options
Diffstat (limited to 'tremor/codebook.c')
| -rw-r--r-- | tremor/codebook.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/tremor/codebook.c b/tremor/codebook.c index 5da8957232..655746c68a 100644 --- a/tremor/codebook.c +++ b/tremor/codebook.c @@ -64,7 +64,7 @@ int vorbis_staticbook_unpack(oggpack_buffer *opb,static_codebook *s){ s->lengthlist[i]=num+1; } } - + break; case 1: /* ordered */ @@ -85,7 +85,7 @@ int vorbis_staticbook_unpack(oggpack_buffer *opb,static_codebook *s){ /* EOF */ return(-1); } - + /* Do we have a mapping to unpack? */ switch((s->maptype=oggpack_read(opb,4))){ case 0: @@ -110,12 +110,12 @@ int vorbis_staticbook_unpack(oggpack_buffer *opb,static_codebook *s){ quantvals=s->entries*s->dim; break; } - + /* quantized values */ s->quantlist=(long *)_ogg_malloc(sizeof(*s->quantlist)*quantvals); for(i=0;i<quantvals;i++) s->quantlist[i]=oggpack_read(opb,s->q_quant); - + if(quantvals&&s->quantlist[quantvals-1]==-1)goto _eofout; } break; @@ -125,11 +125,11 @@ int vorbis_staticbook_unpack(oggpack_buffer *opb,static_codebook *s){ /* all set */ return(0); - + _errout: _eofout: vorbis_staticbook_clear(s); - return(-1); + return(-1); } /* the 'eliminate the decode tree' optimization actually requires the @@ -148,12 +148,12 @@ static ogg_uint32_t bitreverse(ogg_uint32_t x){ return((x>> 1)&0x55555555) | ((x<< 1)&0xaaaaaaaa); } -static inline long decode_packed_entry_number(codebook *book, +static inline long decode_packed_entry_number(codebook *book, oggpack_buffer *b){ int read=book->dec_maxlength; long lo,hi; long lok = oggpack_look(b,book->dec_firsttablen); - + if (lok >= 0) { long entry = book->dec_firsttable[lok]; if(entry&0x80000000UL){ @@ -180,7 +180,7 @@ static inline long decode_packed_entry_number(codebook *book, while(hi-lo>1){ long p=(hi-lo)>>1; - long test=book->codelist[lo+p]>testword; + long test=book->codelist[lo+p]>testword; lo+=p&(test-1); hi-=p&(-test); } @@ -190,7 +190,7 @@ static inline long decode_packed_entry_number(codebook *book, return(lo); } } - + oggpack_adv(b, read); return(-1); } @@ -198,13 +198,13 @@ static inline long decode_packed_entry_number(codebook *book, /* Decode side is specced and easier, because we don't need to find matches using different criteria; we simply read and map. There are two things we need to do 'depending': - + We may need to support interleave. We don't really, but it's convenient to do it here rather than rebuild the vector later. Cascades may be additive or multiplicitive; this is not inherent in the codebook, but set in the code using the codebook. Like - interleaving, it's easiest to do it here. + interleaving, it's easiest to do it here. addmul==0 -> declarative (set the value) addmul==1 -> additive addmul==2 -> multiplicitive */ @@ -214,7 +214,7 @@ long vorbis_book_decode(codebook *book, oggpack_buffer *b){ long packed_entry=decode_packed_entry_number(book,b); if(packed_entry>=0) return(book->dec_index[packed_entry]); - + /* if there's no dec_index, the codebook unpacking isn't collapsed */ return(packed_entry); } @@ -255,7 +255,7 @@ long vorbis_book_decodev_add(codebook *book,ogg_int32_t *a, int i,j,entry; ogg_int32_t *t; int shift=point-book->binarypoint; - + if(shift>=0){ for(i=0;i<n;){ entry = decode_packed_entry_number(book,b); @@ -281,7 +281,7 @@ long vorbis_book_decodev_set(codebook *book,ogg_int32_t *a, int i,j,entry; ogg_int32_t *t; int shift=point-book->binarypoint; - + if(shift>=0){ for(i=0;i<n;){ @@ -312,9 +312,9 @@ long vorbis_book_decodevv_add(codebook *book,ogg_int32_t **a,\ long i,j,entry; int chptr=0; int shift=point-book->binarypoint; - + if(shift>=0){ - + for(i=offset;i<offset+n;){ entry = decode_packed_entry_number(book,b); if(entry==-1)return(-1); |