diff options
| author | Monty <xiphmont@xiph.org> | 2000-01-22 13:28:37 +0000 |
|---|---|---|
| committer | Monty <xiphmont@xiph.org> | 2000-01-22 13:28:37 +0000 |
| commit | cab466d0585827812b4e562eb41a752dd56f1e53 (patch) | |
| tree | 6b89be13bf6d9c298b1e59bef43d11f8b6ffd423 /lib/analysis.c | |
| parent | 0f361eca4e8a093e0781034e331e4d1446645130 (diff) | |
| download | libvorbis-git-cab466d0585827812b4e562eb41a752dd56f1e53.tar.gz | |
It's all coming back together slowly. Incremental update.
Monty
svn path=/trunk/vorbis/; revision=240
Diffstat (limited to 'lib/analysis.c')
| -rw-r--r-- | lib/analysis.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/analysis.c b/lib/analysis.c index c65967d6..faceac34 100644 --- a/lib/analysis.c +++ b/lib/analysis.c @@ -12,7 +12,7 @@ ******************************************************************** function: single-block PCM analysis mode dispatch - last mod: $Id: analysis.c,v 1.21 2000/01/20 04:42:51 xiphmont Exp $ + last mod: $Id: analysis.c,v 1.22 2000/01/22 13:28:14 xiphmont Exp $ ********************************************************************/ @@ -43,11 +43,16 @@ int vorbis_analysis(vorbis_block *vb,ogg_packet *op){ /* currently lazy. Short block dispatches to 0, long to 1. */ if(vb->W &&vi->modes>1)mode=1; - type=vi->mappingtypes[mode]; + type=vi->map_type[vi->mode_param[mode]->mapping]; - /* Encode frame mode and dispatch */ + /* Encode frame mode, pre,post windowsize, then dispatch */ _oggpack_write(&vb->opb,mode,vd->modebits); - if(vorbis_map_analysis_P[type](vb,vi->modelist[mode],op)) + if(vb->W){ + _oggpack_write(&vb->opb,vb->lW,1); + _oggpack_write(&vb->opb,vb->nW,1); + } + + if(_mapping_P[type]->forward(vb,vd->mode[mode])) return(-1); /* set up the packet wrapper */ |