summaryrefslogtreecommitdiffstats
path: root/media/libvorbis/lib
diff options
context:
space:
mode:
authorMonty Montgomery <monty@xiph.org>2018-03-15 18:12:05 -0400
committerwolfbeast <mcwerewolf@gmail.com>2018-04-19 11:21:28 +0200
commitcfc10b6a6e2f7d2f7153f957bdb59a94be103a03 (patch)
treee3636faa0b0eae73595fe44cf9a3739a6edfe77e /media/libvorbis/lib
parentf141ce6db7c7b4bd61c6efffb4dcbcdeb57f7ae1 (diff)
downloadUXP-cfc10b6a6e2f7d2f7153f957bdb59a94be103a03.tar
UXP-cfc10b6a6e2f7d2f7153f957bdb59a94be103a03.tar.gz
UXP-cfc10b6a6e2f7d2f7153f957bdb59a94be103a03.tar.lz
UXP-cfc10b6a6e2f7d2f7153f957bdb59a94be103a03.tar.xz
UXP-cfc10b6a6e2f7d2f7153f957bdb59a94be103a03.zip
Bug 1446062 - Vorbis fix. r=jmspeex, a=lizzard
--HG-- extra : source : 6b4e98424f0dcc024fcad48608ada351e4075e59 extra : intermediate-source : 3db9e3d52b17563efca181ccbb50deb8660c59ae
Diffstat (limited to 'media/libvorbis/lib')
-rw-r--r--media/libvorbis/lib/vorbis_codebook.c48
1 files changed, 10 insertions, 38 deletions
diff --git a/media/libvorbis/lib/vorbis_codebook.c b/media/libvorbis/lib/vorbis_codebook.c
index 72f8a17a3..49b7b09b2 100644
--- a/media/libvorbis/lib/vorbis_codebook.c
+++ b/media/libvorbis/lib/vorbis_codebook.c
@@ -387,7 +387,7 @@ long vorbis_book_decodevs_add(codebook *book,float *a,oggpack_buffer *b,int n){
t[i] = book->valuelist+entry[i]*book->dim;
}
for(i=0,o=0;i<book->dim;i++,o+=step)
- for (j=0;j<step;j++)
+ for (j=0;o+j<n && j<step;j++)
a[o+j]+=t[j][i];
}
return(0);
@@ -399,41 +399,12 @@ long vorbis_book_decodev_add(codebook *book,float *a,oggpack_buffer *b,int n){
int i,j,entry;
float *t;
- if(book->dim>8){
- for(i=0;i<n;){
- entry = decode_packed_entry_number(book,b);
- if(entry==-1)return(-1);
- t = book->valuelist+entry*book->dim;
- for (j=0;j<book->dim;)
- a[i++]+=t[j++];
- }
- }else{
- for(i=0;i<n;){
- entry = decode_packed_entry_number(book,b);
- if(entry==-1)return(-1);
- t = book->valuelist+entry*book->dim;
- j=0;
- switch((int)book->dim){
- case 8:
- a[i++]+=t[j++];
- case 7:
- a[i++]+=t[j++];
- case 6:
- a[i++]+=t[j++];
- case 5:
- a[i++]+=t[j++];
- case 4:
- a[i++]+=t[j++];
- case 3:
- a[i++]+=t[j++];
- case 2:
- a[i++]+=t[j++];
- case 1:
- a[i++]+=t[j++];
- case 0:
- break;
- }
- }
+ for(i=0;i<n;){
+ entry = decode_packed_entry_number(book,b);
+ if(entry==-1)return(-1);
+ t = book->valuelist+entry*book->dim;
+ for(j=0;i<n && j<book->dim;)
+ a[i++]+=t[j++];
}
}
return(0);
@@ -471,12 +442,13 @@ long vorbis_book_decodevv_add(codebook *book,float **a,long offset,int ch,
long i,j,entry;
int chptr=0;
if(book->used_entries>0){
- for(i=offset/ch;i<(offset+n)/ch;){
+ int m=(offset+n)/ch;
+ for(i=offset/ch;i<m;){
entry = decode_packed_entry_number(book,b);
if(entry==-1)return(-1);
{
const float *t = book->valuelist+entry*book->dim;
- for (j=0;j<book->dim;j++){
+ for (j=0;i<m && j<book->dim;j++){
a[chptr++][i]+=t[j];
if(chptr==ch){
chptr=0;