diff options
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/libtremor/mapping0.c | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/apps/codecs/libtremor/mapping0.c b/apps/codecs/libtremor/mapping0.c index 8b2343c56f..ecee6db0c7 100644 --- a/apps/codecs/libtremor/mapping0.c +++ b/apps/codecs/libtremor/mapping0.c | |||
@@ -179,8 +179,7 @@ static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb) | |||
179 | return(NULL); | 179 | return(NULL); |
180 | } | 180 | } |
181 | 181 | ||
182 | 182 | // static int seq = 0; | |
183 | static int seq = 0; | ||
184 | 183 | ||
185 | static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){ | 184 | static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){ |
186 | vorbis_dsp_state *vd=vb->vd; | 185 | vorbis_dsp_state *vd=vb->vd; |
@@ -275,19 +274,9 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){ | |||
275 | } | 274 | } |
276 | } | 275 | } |
277 | 276 | ||
278 | |||
279 | //for(j=0;j<vi->channels;j++) | 277 | //for(j=0;j<vi->channels;j++) |
280 | //_analysis_output("residue",seq+j,vb->pcm[j],-8,n/2,0,0); | 278 | //_analysis_output("residue",seq+j,vb->pcm[j],-8,n/2,0,0); |
281 | 279 | ||
282 | /* compute and apply spectral envelope */ | ||
283 | #if 0 | ||
284 | for(i=0;i<vi->channels;i++){ | ||
285 | ogg_int32_t *pcm=vb->pcm[i]; | ||
286 | int submap=info->chmuxlist[i]; | ||
287 | look->floor_func[submap]-> | ||
288 | inverse2(vb,look->floor_look[submap],floormemo[i],pcm); | ||
289 | } | ||
290 | #endif | ||
291 | //for(j=0;j<vi->channels;j++) | 280 | //for(j=0;j<vi->channels;j++) |
292 | //_analysis_output("mdct",seq+j,vb->pcm[j],-24,n/2,0,1); | 281 | //_analysis_output("mdct",seq+j,vb->pcm[j],-24,n/2,0,1); |
293 | 282 | ||
@@ -299,15 +288,16 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){ | |||
299 | int submap=info->chmuxlist[i]; | 288 | int submap=info->chmuxlist[i]; |
300 | 289 | ||
301 | if(nonzero[i]) { | 290 | if(nonzero[i]) { |
302 | look->floor_func[submap]-> | 291 | /* compute and apply spectral envelope */ |
303 | inverse2(vb,look->floor_look[submap],floormemo[i],pcm); | 292 | look->floor_func[submap]-> |
304 | mdct_backward(n, (int32_t*) pcm, (int32_t*) pcm); | 293 | inverse2(vb,look->floor_look[submap],floormemo[i],pcm); |
305 | /* window the data */ | 294 | mdct_backward(n, (int32_t*) pcm, (int32_t*) pcm); |
306 | _vorbis_apply_window(pcm,b->window,ci->blocksizes,vb->lW,vb->W,vb->nW); | 295 | /* window the data */ |
307 | } | 296 | _vorbis_apply_window(pcm,b->window,ci->blocksizes,vb->lW,vb->W,vb->nW); |
308 | else | 297 | } |
309 | memset(pcm, 0, sizeof(ogg_int32_t)*n); | 298 | else |
310 | } | 299 | memset(pcm, 0, sizeof(ogg_int32_t)*n); |
300 | } | ||
311 | 301 | ||
312 | //for(j=0;j<vi->channels;j++) | 302 | //for(j=0;j<vi->channels;j++) |
313 | //_analysis_output("imdct",seq+j,vb->pcm[j],-24,n,0,0); | 303 | //_analysis_output("imdct",seq+j,vb->pcm[j],-24,n,0,0); |
@@ -315,7 +305,7 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){ | |||
315 | //for(j=0;j<vi->channels;j++) | 305 | //for(j=0;j<vi->channels;j++) |
316 | //_analysis_output("window",seq+j,vb->pcm[j],-24,n,0,0); | 306 | //_analysis_output("window",seq+j,vb->pcm[j],-24,n,0,0); |
317 | 307 | ||
318 | seq+=vi->channels; | 308 | //seq+=vi->channels; |
319 | /* all done! */ | 309 | /* all done! */ |
320 | return(0); | 310 | return(0); |
321 | } | 311 | } |