summaryrefslogtreecommitdiff
path: root/apps/codecs/Tremor/mapping0.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/codecs/Tremor/mapping0.c')
-rw-r--r--apps/codecs/Tremor/mapping0.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/codecs/Tremor/mapping0.c b/apps/codecs/Tremor/mapping0.c
index c53383de8f..6154f5de6b 100644
--- a/apps/codecs/Tremor/mapping0.c
+++ b/apps/codecs/Tremor/mapping0.c
@@ -202,10 +202,6 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){
202 int nonzero[CHANNELS]; 202 int nonzero[CHANNELS];
203 void *floormemo[CHANNELS]; 203 void *floormemo[CHANNELS];
204 204
205 /* test for too many channels;
206 (maybe this is can be checked at the stream level?) */
207 if (vi->channels > CHANNELS) return (-1);
208
209 /* time domain information decode (note that applying the 205 /* time domain information decode (note that applying the
210 information would have to happen later; we'll probably add a 206 information would have to happen later; we'll probably add a
211 function entry to the harness for that later */ 207 function entry to the harness for that later */
@@ -286,13 +282,14 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){
286 //_analysis_output("residue",seq+j,vb->pcm[j],-8,n/2,0,0); 282 //_analysis_output("residue",seq+j,vb->pcm[j],-8,n/2,0,0);
287 283
288 /* compute and apply spectral envelope */ 284 /* compute and apply spectral envelope */
285#if 0
289 for(i=0;i<vi->channels;i++){ 286 for(i=0;i<vi->channels;i++){
290 ogg_int32_t *pcm=vb->pcm[i]; 287 ogg_int32_t *pcm=vb->pcm[i];
291 int submap=info->chmuxlist[i]; 288 int submap=info->chmuxlist[i];
292 look->floor_func[submap]-> 289 look->floor_func[submap]->
293 inverse2(vb,look->floor_look[submap],floormemo[i],pcm); 290 inverse2(vb,look->floor_look[submap],floormemo[i],pcm);
294 } 291 }
295 292#endif
296 //for(j=0;j<vi->channels;j++) 293 //for(j=0;j<vi->channels;j++)
297 //_analysis_output("mdct",seq+j,vb->pcm[j],-24,n/2,0,1); 294 //_analysis_output("mdct",seq+j,vb->pcm[j],-24,n/2,0,1);
298 295
@@ -301,8 +298,11 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){
301 298
302 for(i=0;i<vi->channels;i++){ 299 for(i=0;i<vi->channels;i++){
303 ogg_int32_t *pcm=vb->pcm[i]; 300 ogg_int32_t *pcm=vb->pcm[i];
301 int submap=info->chmuxlist[i];
304 302
305 if(nonzero[i]) { 303 if(nonzero[i]) {
304 look->floor_func[submap]->
305 inverse2(vb,look->floor_look[submap],floormemo[i],pcm);
306 mdct_backward(n, pcm, pcm); 306 mdct_backward(n, pcm, pcm);
307 /* window the data */ 307 /* window the data */
308 _vorbis_apply_window(pcm,b->window,ci->blocksizes,vb->lW,vb->W,vb->nW); 308 _vorbis_apply_window(pcm,b->window,ci->blocksizes,vb->lW,vb->W,vb->nW);