summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2010-12-12 17:18:19 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2010-12-12 17:18:19 +0000
commitb655f5840659c382aa4a1ee8bc3aa9282d959a5f (patch)
tree7a0e6f26d76d5019b62d2887b6362e476c029ab4
parent1617d8f97eae773fce55b43f3b20fb0501af6ec1 (diff)
downloadrockbox-b655f5840659c382aa4a1ee8bc3aa9282d959a5f.tar.gz
rockbox-b655f5840659c382aa4a1ee8bc3aa9282d959a5f.zip
Tab police.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28817 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/libtremor/codebook.c22
-rw-r--r--apps/codecs/libtremor/floor0.c2
-rw-r--r--apps/codecs/libtremor/floor1.c4
-rw-r--r--apps/codecs/libtremor/res012.c8
-rw-r--r--apps/codecs/libtremor/vorbisfile.c4
5 files changed, 20 insertions, 20 deletions
diff --git a/apps/codecs/libtremor/codebook.c b/apps/codecs/libtremor/codebook.c
index 9413257e2a..2bc4b63875 100644
--- a/apps/codecs/libtremor/codebook.c
+++ b/apps/codecs/libtremor/codebook.c
@@ -82,15 +82,15 @@ static_codebook *vorbis_staticbook_unpack(oggpack_buffer *opb){
82 s->lengthlist=(long *)_ogg_malloc(sizeof(*s->lengthlist)*s->entries); 82 s->lengthlist=(long *)_ogg_malloc(sizeof(*s->lengthlist)*s->entries);
83 83
84 for(i=0;i<s->entries;){ 84 for(i=0;i<s->entries;){
85 long num=oggpack_read(opb,_ilog(s->entries-i)); 85 long num=oggpack_read(opb,_ilog(s->entries-i));
86 if(num==-1)goto _eofout; 86 if(num==-1)goto _eofout;
87 if(length>32 || num>s->entries-i || 87 if(length>32 || num>s->entries-i ||
88 (num>0 && (num-1)>>(length>>1)>>((length+1)>>1))>0){ 88 (num>0 && (num-1)>>(length>>1)>>((length+1)>>1))>0){
89 goto _errout; 89 goto _errout;
90 } 90 }
91 for(j=0;j<num;j++,i++) 91 for(j=0;j<num;j++,i++)
92 s->lengthlist[i]=length; 92 s->lengthlist[i]=length;
93 length++; 93 length++;
94 } 94 }
95 } 95 }
96 break; 96 break;
@@ -459,7 +459,7 @@ long vorbis_book_decodev_set(codebook *book,ogg_int32_t *a,
459 entry = decode_packed_entry_number(book,b); 459 entry = decode_packed_entry_number(book,b);
460 if(entry==-1)return(-1); 460 if(entry==-1)return(-1);
461 t = book->valuelist+entry*book->dim; 461 t = book->valuelist+entry*book->dim;
462 for (j=0;i<n && j<book->dim;){ 462 for (j=0;i<n && j<book->dim;){
463 a[i++]=t[j++]>>shift; 463 a[i++]=t[j++]>>shift;
464 } 464 }
465 } 465 }
@@ -469,7 +469,7 @@ long vorbis_book_decodev_set(codebook *book,ogg_int32_t *a,
469 entry = decode_packed_entry_number(book,b); 469 entry = decode_packed_entry_number(book,b);
470 if(entry==-1)return(-1); 470 if(entry==-1)return(-1);
471 t = book->valuelist+entry*book->dim; 471 t = book->valuelist+entry*book->dim;
472 for (j=0;i<n && j<book->dim;){ 472 for (j=0;i<n && j<book->dim;){
473 a[i++]=t[j++]<<shift; 473 a[i++]=t[j++]<<shift;
474 } 474 }
475 } 475 }
diff --git a/apps/codecs/libtremor/floor0.c b/apps/codecs/libtremor/floor0.c
index cd0a9f89f6..76d02ace1a 100644
--- a/apps/codecs/libtremor/floor0.c
+++ b/apps/codecs/libtremor/floor0.c
@@ -404,7 +404,7 @@ static void *floor0_inverse1(vorbis_block *vb,vorbis_look_floor *i){
404 404
405 if(vorbis_book_decodev_set(b,lsp,&vb->opb,look->m,-24)==-1)goto eop; 405 if(vorbis_book_decodev_set(b,lsp,&vb->opb,look->m,-24)==-1)goto eop;
406 for(j=0;j<look->m;){ 406 for(j=0;j<look->m;){
407 for(k=0;j<look->m && k<b->dim;k++,j++)lsp[j]+=last; 407 for(k=0;j<look->m && k<b->dim;k++,j++)lsp[j]+=last;
408 last=lsp[j-1]; 408 last=lsp[j-1];
409 } 409 }
410 410
diff --git a/apps/codecs/libtremor/floor1.c b/apps/codecs/libtremor/floor1.c
index 65286399d0..8cc20d00d0 100644
--- a/apps/codecs/libtremor/floor1.c
+++ b/apps/codecs/libtremor/floor1.c
@@ -361,7 +361,7 @@ static void *floor1_inverse1(vorbis_block *vb,vorbis_look_floor *in){
361 } 361 }
362 } 362 }
363 363
364 fit_value[i]=(val+predicted)&0x7fff;; 364 fit_value[i]=(val+predicted)&0x7fff;;
365 fit_value[look->loneighbor[i-2]]&=0x7fff; 365 fit_value[look->loneighbor[i-2]]&=0x7fff;
366 fit_value[look->hineighbor[i-2]]&=0x7fff; 366 fit_value[look->hineighbor[i-2]]&=0x7fff;
367 367
@@ -401,7 +401,7 @@ static int floor1_inverse2(vorbis_block *vb,vorbis_look_floor *in,void *memo,
401 int hy=fit_value[current]&0x7fff; 401 int hy=fit_value[current]&0x7fff;
402 if(hy==fit_value[current]){ 402 if(hy==fit_value[current]){
403 403
404 hx=info->postlist[current]; 404 hx=info->postlist[current];
405 hy*=info->mult; 405 hy*=info->mult;
406 /* guard lookup against out-of-range values */ 406 /* guard lookup against out-of-range values */
407 hy=(hy<0?0:hy>255?255:hy); 407 hy=(hy<0?0:hy>255?255:hy);
diff --git a/apps/codecs/libtremor/res012.c b/apps/codecs/libtremor/res012.c
index 79e3c23e15..3bd3eaaf04 100644
--- a/apps/codecs/libtremor/res012.c
+++ b/apps/codecs/libtremor/res012.c
@@ -238,8 +238,8 @@ static int _01inverse(vorbis_block *vb,vorbis_look_residue *vl,
238 /* fetch the partition word for each channel */ 238 /* fetch the partition word for each channel */
239 for(j=0;j<ch;j++){ 239 for(j=0;j<ch;j++){
240 int temp=vorbis_book_decode(look->phrasebook,&vb->opb); 240 int temp=vorbis_book_decode(look->phrasebook,&vb->opb);
241 if(temp==-1 || temp>=info->partvals)goto eopbreak; 241 if(temp==-1 || temp>=info->partvals)goto eopbreak;
242 partword[j][l]=look->decodemap[temp]; 242 partword[j][l]=look->decodemap[temp];
243 if(partword[j][l]==NULL)goto errout; 243 if(partword[j][l]==NULL)goto errout;
244 } 244 }
245 } 245 }
@@ -323,8 +323,8 @@ int res2_inverse(vorbis_block *vb,vorbis_look_residue *vl,
323 if(s==0){ 323 if(s==0){
324 /* fetch the partition word */ 324 /* fetch the partition word */
325 int temp=vorbis_book_decode(look->phrasebook,&vb->opb); 325 int temp=vorbis_book_decode(look->phrasebook,&vb->opb);
326 if(temp==-1 || temp>=info->partvals)goto eopbreak; 326 if(temp==-1 || temp>=info->partvals)goto eopbreak;
327 partword[l]=look->decodemap[temp]; 327 partword[l]=look->decodemap[temp];
328 if(partword[l]==NULL)goto errout; 328 if(partword[l]==NULL)goto errout;
329 } 329 }
330 330
diff --git a/apps/codecs/libtremor/vorbisfile.c b/apps/codecs/libtremor/vorbisfile.c
index 5721178b67..9ade4f1fa9 100644
--- a/apps/codecs/libtremor/vorbisfile.c
+++ b/apps/codecs/libtremor/vorbisfile.c
@@ -1276,8 +1276,8 @@ int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos){
1276 }else{ 1276 }else{
1277 /* take a (pretty decent) guess. */ 1277 /* take a (pretty decent) guess. */
1278 bisect=begin + rescale64(target-begintime, 1278 bisect=begin + rescale64(target-begintime,
1279 endtime-begintime, 1279 endtime-begintime,
1280 end-begin) - CHUNKSIZE; 1280 end-begin) - CHUNKSIZE;
1281 if(bisect<begin+CHUNKSIZE) 1281 if(bisect<begin+CHUNKSIZE)
1282 bisect=begin; 1282 bisect=begin;
1283 } 1283 }