summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNedeljko Babic <nbabic@mips.com>2012-02-25 11:00:32 +0100
committerNedeljko Babic <nbabic@mips.com>2012-04-03 14:52:21 +0200
commit43cd9d211af39bd216dcf3a945cb49b85293dcf0 (patch)
tree0693da47ad4176cd70434b7b647929d7dc2b2107
parentc7d9d26f14aa5f0ac9f0e52fa602e0314f0cf317 (diff)
downloadtremor-43cd9d211af39bd216dcf3a945cb49b85293dcf0.tar.gz
Add ifdefs for conditional compilation of code (regarding MIPS optimization)
-rw-r--r--floor1.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/floor1.c b/floor1.c
index f469ada..92ea27e 100644
--- a/floor1.c
+++ b/floor1.c
@@ -122,7 +122,7 @@ vorbis_info_floor *floor1_info_unpack (vorbis_info *vi,oggpack_buffer *opb){
rangebits=oggpack_read(opb,4);
for(j=0,k=0;j<info->partitions;j++)
- count+=info->class[(int)info->partitionclass[j]].class_dim;
+ count+=info->class[(int)info->partitionclass[j]].class_dim;
info->postlist=
(ogg_uint16_t *)_ogg_malloc((count+2)*sizeof(*info->postlist));
info->forward_index=
@@ -134,7 +134,7 @@ vorbis_info_floor *floor1_info_unpack (vorbis_info *vi,oggpack_buffer *opb){
count=0;
for(j=0,k=0;j<info->partitions;j++){
- count+=info->class[(int)info->partitionclass[j]].class_dim;
+ count+=info->class[(int)info->partitionclass[j]].class_dim;
for(;k<count;k++){
int t=info->postlist[k+2]=(ogg_uint16_t)oggpack_read(opb,rangebits);
if(t>=(1<<rangebits))goto err_out;
@@ -202,6 +202,7 @@ void render_line_arm_low(int n, ogg_int32_t *d,const ogg_int32_t *floor,
int base, int err, int adx, int ady);
#endif
+#ifndef MIPS_DSP
static void render_line(int n,int x0,int x1,int y0,int y1,ogg_int32_t *d){
int dy;
int adx;
@@ -258,6 +259,7 @@ static void render_line(int n,int x0,int x1,int y0,int y1,ogg_int32_t *d){
} while(n>0);
#endif
}
+#endif //MIPS_DSP
int floor1_memosize(vorbis_info_floor *i){
vorbis_info_floor1 *info=(vorbis_info_floor1 *)i;
@@ -352,6 +354,7 @@ ogg_int32_t *floor1_inverse1(vorbis_dsp_state *vd,vorbis_info_floor *in,
return(NULL);
}
+#ifndef MIPS_DSP
int floor1_inverse2(vorbis_dsp_state *vd,vorbis_info_floor *in,
ogg_int32_t *fit_value,ogg_int32_t *out){
vorbis_info_floor1 *info=(vorbis_info_floor1 *)in;
@@ -385,3 +388,4 @@ int floor1_inverse2(vorbis_dsp_state *vd,vorbis_info_floor *in,
memset(out,0,sizeof(*out)*n);
return(0);
}
+#endif //MIPS_DSP