diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-09 12:04:58 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-09 12:04:58 +0000 |
| commit | 4653d3752289d9dba430634311fcdb88fb74f864 (patch) | |
| tree | 34f403f5ab28098c2eb375c19f7d7a658ebcdec3 | |
| parent | 41a1506e8b980d2e2c4c2182de976946bcdd3820 (diff) | |
| parent | 9a27fefcf33a8929c18db2bcbb99fb7000588eb9 (diff) | |
| download | tremolo-android-mainline-12.0.0_r62.tar.gz | |
Snap for 7809532 from 9a27fefcf33a8929c18db2bcbb99fb7000588eb9 to mainline-media-releaseandroid-mainline-12.0.0_r62android-mainline-12.0.0_r46android-mainline-12.0.0_r29
Change-Id: Iae59f360eedd5a29f726f32d1afc1fb53ef0d48d
| -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 8e7d4eb..5a57a71 100644 --- a/Tremolo/codebook.c +++ b/Tremolo/codebook.c @@ -848,6 +848,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){ @@ -868,6 +869,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){ @@ -887,6 +889,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 17ba4cf..11452c5 100644 --- a/Tremolo/floor0.c +++ b/Tremolo/floor0.c @@ -436,10 +436,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]; } |