diff options
author | Monty <xiphmont@xiph.org> | 2002-06-28 22:19:56 +0000 |
---|---|---|
committer | Monty <xiphmont@xiph.org> | 2002-06-28 22:19:56 +0000 |
commit | 0facd6654018ff525ab09290cd417ada62df3eae (patch) | |
tree | 1416f0631db0399a3e7fa3ee02639c8c2126c238 /lib/synthesis.c | |
parent | 53eb6a7cb991759d6f33f193489d6eedc2ad2b68 (diff) | |
download | libvorbis-git-0facd6654018ff525ab09290cd417ada62df3eae.tar.gz |
The 'Grand Simplification' officially becomes the mainline toward rc4.
Currently, only 44/48kHz stereo is supported.
svn path=/trunk/vorbis/; revision=3437
Diffstat (limited to 'lib/synthesis.c')
-rw-r--r-- | lib/synthesis.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/synthesis.c b/lib/synthesis.c index 6a032d32..6d2ee4c6 100644 --- a/lib/synthesis.c +++ b/lib/synthesis.c @@ -11,7 +11,7 @@ ******************************************************************** function: single-block PCM synthesis - last mod: $Id: synthesis.c,v 1.26 2002/02/28 04:12:48 xiphmont Exp $ + last mod: $Id: synthesis.c,v 1.27 2002/06/28 22:19:37 xiphmont Exp $ ********************************************************************/ @@ -48,6 +48,9 @@ int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){ vb->mode=mode; vb->W=ci->mode_param[mode]->blockflag; if(vb->W){ + + /* this doesn;t get mapped through mode selection as it's used + only for window selection */ vb->lW=oggpack_read(opb,1); vb->nW=oggpack_read(opb,1); if(vb->nW==-1) return(OV_EBADPACKET); @@ -70,7 +73,8 @@ int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){ /* unpack_header enforces range checking */ type=ci->map_type[ci->mode_param[mode]->mapping]; - return(_mapping_P[type]->inverse(vb,b->mode[mode])); + return(_mapping_P[type]->inverse(vb,ci->map_param[ci->mode_param[mode]-> + mapping])); } /* used to track pcm position without actually performing decode. |