diff options
Diffstat (limited to 'apps/codecs/Tremor/floor1.c')
-rw-r--r-- | apps/codecs/Tremor/floor1.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/codecs/Tremor/floor1.c b/apps/codecs/Tremor/floor1.c index 9bfec7e803..7f54aa76ea 100644 --- a/apps/codecs/Tremor/floor1.c +++ b/apps/codecs/Tremor/floor1.c | |||
@@ -124,7 +124,7 @@ static int icomp(const void *a,const void *b){ | |||
124 | static vorbis_look_floor *floor1_look(vorbis_dsp_state *vd,vorbis_info_mode *mi, | 124 | static vorbis_look_floor *floor1_look(vorbis_dsp_state *vd,vorbis_info_mode *mi, |
125 | vorbis_info_floor *in){ | 125 | vorbis_info_floor *in){ |
126 | 126 | ||
127 | int *sortpointer[VIF_POSIT+2]; | 127 | static int *sortpointer[VIF_POSIT+2] IDATA_ATTR; |
128 | vorbis_info_floor1 *info=(vorbis_info_floor1 *)in; | 128 | vorbis_info_floor1 *info=(vorbis_info_floor1 *)in; |
129 | vorbis_look_floor1 *look=(vorbis_look_floor1 *)_ogg_calloc(1,sizeof(*look)); | 129 | vorbis_look_floor1 *look=(vorbis_look_floor1 *)_ogg_calloc(1,sizeof(*look)); |
130 | int i,j,n=0; | 130 | int i,j,n=0; |
@@ -216,7 +216,7 @@ static int render_point(int x0,int x1,int y0,int y1,int x){ | |||
216 | # define XdB(n) (n) | 216 | # define XdB(n) (n) |
217 | #endif | 217 | #endif |
218 | 218 | ||
219 | static const ogg_int32_t FLOOR_fromdB_LOOKUP[256]={ | 219 | static ogg_int32_t FLOOR_fromdB_LOOKUP[256] IDATA_ATTR ={ |
220 | XdB(0x000000e5), XdB(0x000000f4), XdB(0x00000103), XdB(0x00000114), | 220 | XdB(0x000000e5), XdB(0x000000f4), XdB(0x00000103), XdB(0x00000114), |
221 | XdB(0x00000126), XdB(0x00000139), XdB(0x0000014e), XdB(0x00000163), | 221 | XdB(0x00000126), XdB(0x00000139), XdB(0x0000014e), XdB(0x00000163), |
222 | XdB(0x0000017a), XdB(0x00000193), XdB(0x000001ad), XdB(0x000001c9), | 222 | XdB(0x0000017a), XdB(0x00000193), XdB(0x000001ad), XdB(0x000001c9), |
@@ -283,14 +283,14 @@ static const ogg_int32_t FLOOR_fromdB_LOOKUP[256]={ | |||
283 | XdB(0x69f80e9a), XdB(0x70dafda8), XdB(0x78307d76), XdB(0x7fffffff), | 283 | XdB(0x69f80e9a), XdB(0x70dafda8), XdB(0x78307d76), XdB(0x7fffffff), |
284 | }; | 284 | }; |
285 | 285 | ||
286 | static void render_line(int x0,int x1,int y0,int y1,ogg_int32_t *d){ | 286 | static void render_line(int x0,register int x1,int y0,int y1,ogg_int32_t *d){ |
287 | int dy=y1-y0; | 287 | int dy=y1-y0; |
288 | int adx=x1-x0; | 288 | register int x=x0; |
289 | int ady=abs(dy); | 289 | register int y=y0; |
290 | int base=dy/adx; | 290 | register int adx=x1-x0; |
291 | int sy=(dy<0?base-1:base+1); | 291 | register int ady=abs(dy); |
292 | int x=x0; | 292 | register int base=dy/adx; |
293 | int y=y0; | 293 | register int sy=(dy<0?base-1:base+1); |
294 | int err=0; | 294 | int err=0; |
295 | 295 | ||
296 | ady-=abs(base*adx); | 296 | ady-=abs(base*adx); |
@@ -433,7 +433,7 @@ static int floor1_inverse2(vorbis_block *vb,vorbis_look_floor *in,void *memo, | |||
433 | } | 433 | } |
434 | 434 | ||
435 | /* export hooks */ | 435 | /* export hooks */ |
436 | vorbis_func_floor floor1_exportbundle={ | 436 | vorbis_func_floor floor1_exportbundle = { |
437 | &floor1_unpack,&floor1_look,&floor1_free_info, | 437 | &floor1_unpack,&floor1_look,&floor1_free_info, |
438 | &floor1_free_look,&floor1_inverse1,&floor1_inverse2 | 438 | &floor1_free_look,&floor1_inverse1,&floor1_inverse2 |
439 | }; | 439 | }; |