diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2021-10-04 21:59:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-04 21:59:17 +0000 |
| commit | 124f27e347d076344d92175e2bac4636452cf82f (patch) | |
| tree | 1d74eed4528eed575575e507d4309899530e1e8f | |
| parent | 37c168ff369e758d10fe934481eb5ffedf16fb87 (diff) | |
| parent | 9ebbd186a87d077a29eba28e64c10479c360772e (diff) | |
| download | tremolo-124f27e347d076344d92175e2bac4636452cf82f.tar.gz | |
handle cases where order isn't a multiple of dimension am: 42aa2b936a am: 9ebbd186a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/tremolo/+/15871375
Change-Id: I5fefd571d3e12971174f4f88a0a71cb551d58d70
| -rw-r--r-- | Tremolo/codebook.c | 5 | ||||
| -rw-r--r-- | Tremolo/floor0.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Tremolo/codebook.c b/Tremolo/codebook.c index 8948cf3..d62aefa 100644 --- a/Tremolo/codebook.c +++ b/Tremolo/codebook.c @@ -847,6 +847,7 @@ static int decode_map(codebook *s, oggpack_buffer *b, ogg_int32_t *v, int point) #endif /* returns 0 on OK or -1 on eof *************************************/ +/* decode vector / dim granularity gaurding is done in the upper layer */ long vorbis_book_decodevs_add(codebook *book,ogg_int32_t *a, oggpack_buffer *b,int n,int point){ if(book->used_entries>0){ @@ -864,6 +865,7 @@ long vorbis_book_decodevs_add(codebook *book,ogg_int32_t *a, return 0; } +/* decode vector / dim granularity gaurding is done in the upper layer */ long vorbis_book_decodev_add(codebook *book,ogg_int32_t *a, oggpack_buffer *b,int n,int point){ if(book->used_entries>0){ @@ -880,6 +882,9 @@ long vorbis_book_decodev_add(codebook *book,ogg_int32_t *a, return 0; } +/* unlike the others, we guard against n not being an integer number + of <dim> internally rather than in the upper layer (called only by + floor0) */ long vorbis_book_decodev_set(codebook *book,ogg_int32_t *a, oggpack_buffer *b,int n,int point){ if(book->used_entries>0){ diff --git a/Tremolo/floor0.c b/Tremolo/floor0.c index b6ece29..812c720 100644 --- a/Tremolo/floor0.c +++ b/Tremolo/floor0.c @@ -419,10 +419,9 @@ ogg_int32_t *floor0_inverse1(vorbis_dsp_state *vd,vorbis_info_floor *i, } ogg_int32_t last=0; - for(j=0;j<info->order;j+=b->dim) - if(vorbis_book_decodev_set(b,lsp+j,&vd->opb,b->dim,-24)==-1)goto eop; + if(vorbis_book_decodev_set(b,lsp,&vd->opb,info->order,-24)==-1)goto eop; for(j=0;j<info->order;){ - for(k=0;k<b->dim;k++,j++)lsp[j]+=last; + for(k=0;k<b->dim && j<info->order;k++,j++)lsp[j]+=last; last=lsp[j-1]; } |