diff options
Diffstat (limited to 'tremor/res012.c')
| -rw-r--r-- | tremor/res012.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tremor/res012.c b/tremor/res012.c index e5d87e9568..e334d5672f 100644 --- a/tremor/res012.c +++ b/tremor/res012.c @@ -30,7 +30,7 @@ typedef struct { vorbis_info_residue0 *info; int map; - + int parts; int stages; codebook *fullbooks; @@ -177,7 +177,7 @@ vorbis_look_residue *res0_look(vorbis_dsp_state *vd,vorbis_info_mode *vm, /* a truncated packet here just means 'stop working'; it's not an error */ static int _01inverse(vorbis_block *vb,vorbis_look_residue *vl, ogg_int32_t **in,int ch, - long (*decodepart)(codebook *, ogg_int32_t *, + long (*decodepart)(codebook *, ogg_int32_t *, oggpack_buffer *,int,int)){ long i,j,k,l,s; @@ -188,7 +188,7 @@ static int _01inverse(vorbis_block *vb,vorbis_look_residue *vl, int samples_per_partition=info->grouping; int partitions_per_word=look->phrasebook->dim; int n=info->end-info->begin; - + int partvals=n/samples_per_partition; int partwords=(partvals+partitions_per_word-1)/partitions_per_word; int ***partword=(int ***)alloca(ch*sizeof(*partword)); @@ -198,7 +198,7 @@ static int _01inverse(vorbis_block *vb,vorbis_look_residue *vl, for(s=0;s<look->stages;s++){ - /* each loop decodes on partition codeword containing + /* each loop decodes on partition codeword containing partitions_pre_word partitions */ for(i=0,l=0;i<partvals;l++){ if(s==0){ @@ -210,7 +210,7 @@ static int _01inverse(vorbis_block *vb,vorbis_look_residue *vl, if(partword[j][l]==NULL)goto errout; } } - + /* now we decode residual values for the partitions */ for(k=0;k<partitions_per_word && i<partvals;k++,i++) for(j=0;j<ch;j++){ @@ -223,9 +223,9 @@ static int _01inverse(vorbis_block *vb,vorbis_look_residue *vl, } } } - } + } } - + errout: eopbreak: return(0); @@ -292,7 +292,7 @@ int res2_inverse(vorbis_block *vb,vorbis_look_residue *vl, for(k=0;k<partitions_per_word && i<partvals;k++,i++) if(info->secondstages[partword[l][k]]&(1<<s)){ codebook *stagebook=look->partbooks[partword[l][k]][s]; - + if(stagebook){ if(vorbis_book_decodevv_add(stagebook,in, i*samples_per_partition+beginoff,ch, @@ -301,9 +301,9 @@ int res2_inverse(vorbis_block *vb,vorbis_look_residue *vl, goto eopbreak; } } - } + } } - + errout: eopbreak: return(0); |