diff options
author | Magnus Holmgren <magnushol@gmail.com> | 2006-09-05 17:47:48 +0000 |
---|---|---|
committer | Magnus Holmgren <magnushol@gmail.com> | 2006-09-05 17:47:48 +0000 |
commit | 93e41276be1fd7f7c345c4f5686b1b2f46de695b (patch) | |
tree | 38750b63eeeab1cb2f1458d0812b034f11dd21eb | |
parent | 9eba0d7173cc8f169331966e898fe4ae24a82492 (diff) | |
download | rockbox-93e41276be1fd7f7c345c4f5686b1b2f46de695b.tar.gz rockbox-93e41276be1fd7f7c345c4f5686b1b2f46de695b.zip |
Recude iram usage for the Vorbis decoder a little. Makes it possible to build with gcc 4.0.3.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10891 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs/Tremor/block.c | 1 | ||||
-rw-r--r-- | apps/codecs/Tremor/codebook.c | 1 | ||||
-rw-r--r-- | apps/codecs/Tremor/mapping0.c | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/apps/codecs/Tremor/block.c b/apps/codecs/Tremor/block.c index 17b15e5d83..ac19f3a317 100644 --- a/apps/codecs/Tremor/block.c +++ b/apps/codecs/Tremor/block.c | |||
@@ -459,6 +459,7 @@ int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb){ | |||
459 | } | 459 | } |
460 | 460 | ||
461 | /* pcm==NULL indicates we just want the pending samples, no more */ | 461 | /* pcm==NULL indicates we just want the pending samples, no more */ |
462 | int vorbis_synthesis_pcmout(vorbis_dsp_state *v,ogg_int32_t ***pcm) ICODE_ATTR; | ||
462 | int vorbis_synthesis_pcmout(vorbis_dsp_state *v,ogg_int32_t ***pcm){ | 463 | int vorbis_synthesis_pcmout(vorbis_dsp_state *v,ogg_int32_t ***pcm){ |
463 | vorbis_info *vi=v->vi; | 464 | vorbis_info *vi=v->vi; |
464 | if(v->pcm_returned>-1 && v->pcm_returned<v->pcm_current){ | 465 | if(v->pcm_returned>-1 && v->pcm_returned<v->pcm_current){ |
diff --git a/apps/codecs/Tremor/codebook.c b/apps/codecs/Tremor/codebook.c index 288800eaaa..f03b5efb04 100644 --- a/apps/codecs/Tremor/codebook.c +++ b/apps/codecs/Tremor/codebook.c | |||
@@ -210,7 +210,6 @@ static inline long decode_packed_entry_number(codebook *book, | |||
210 | addmul==2 -> multiplicitive */ | 210 | addmul==2 -> multiplicitive */ |
211 | 211 | ||
212 | /* returns the [original, not compacted] entry number or -1 on eof *********/ | 212 | /* returns the [original, not compacted] entry number or -1 on eof *********/ |
213 | long vorbis_book_decode(codebook *book, oggpack_buffer *b) ICODE_ATTR; | ||
214 | long vorbis_book_decode(codebook *book, oggpack_buffer *b){ | 213 | long vorbis_book_decode(codebook *book, oggpack_buffer *b){ |
215 | long packed_entry=decode_packed_entry_number(book,b); | 214 | long packed_entry=decode_packed_entry_number(book,b); |
216 | if(packed_entry>=0) | 215 | if(packed_entry>=0) |
diff --git a/apps/codecs/Tremor/mapping0.c b/apps/codecs/Tremor/mapping0.c index b5b306fa34..dde3088f29 100644 --- a/apps/codecs/Tremor/mapping0.c +++ b/apps/codecs/Tremor/mapping0.c | |||
@@ -184,7 +184,6 @@ static int seq = 0; | |||
184 | 184 | ||
185 | #define CHANNELS 2 /* max 2 channels on the ihp-1xx (stereo) */ | 185 | #define CHANNELS 2 /* max 2 channels on the ihp-1xx (stereo) */ |
186 | 186 | ||
187 | static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l) ICODE_ATTR; | ||
188 | static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){ | 187 | static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){ |
189 | vorbis_dsp_state *vd=vb->vd; | 188 | vorbis_dsp_state *vd=vb->vd; |
190 | vorbis_info *vi=vd->vi; | 189 | vorbis_info *vi=vd->vi; |