X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=lib%2Ffloor0.c;h=adc2bcffba99260f77a85706e1d1afb6ef5f18ec;hb=baa60cc70e72d398bcff8d26ac00825ce8f16be9;hp=5b0d68e32c7a2c29f56e5e7dc98322892a6b7ca6;hpb=da7929059833423002c2dd2190fea4a4b484acde;p=platform%2Fupstream%2Flibvorbis.git diff --git a/lib/floor0.c b/lib/floor0.c index 5b0d68e..adc2bcf 100644 --- a/lib/floor0.c +++ b/lib/floor0.c @@ -5,13 +5,13 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002 * - * by the XIPHOPHORUS Company http://www.xiph.org/ * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 * + * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: floor backend 0 implementation - last mod: $Id: floor0.c,v 1.53 2002/07/17 21:34:31 xiphmont Exp $ + last mod: $Id$ ********************************************************************/ @@ -39,8 +39,6 @@ typedef struct { int n[2]; vorbis_info_floor0 *vi; - lpc_lookup lpclook; - float *lsp_look; long bits; long frames; @@ -68,8 +66,6 @@ static void floor0_free_look(vorbis_look_floor *i){ _ogg_free(look->linearmap); } - if(look->lsp_look)_ogg_free(look->lsp_look); - lpc_clear(&look->lpclook); memset(look,0,sizeof(*look)); _ogg_free(look); } @@ -86,12 +82,12 @@ static vorbis_info_floor *floor0_unpack (vorbis_info *vi,oggpack_buffer *opb){ info->ampbits=oggpack_read(opb,6); info->ampdB=oggpack_read(opb,8); info->numbooks=oggpack_read(opb,4)+1; - + if(info->order<1)goto err_out; if(info->rate<1)goto err_out; if(info->barkmap<1)goto err_out; if(info->numbooks<1)goto err_out; - + for(j=0;jnumbooks;j++){ info->books[j]=oggpack_read(opb,8); if(info->books[j]<0 || info->books[j]>=ci->books)goto err_out; @@ -112,8 +108,8 @@ static vorbis_info_floor *floor0_unpack (vorbis_info *vi,oggpack_buffer *opb){ linear block and mapping sizes */ static void floor0_map_lazy_init(vorbis_block *vb, - vorbis_info_floor *infoX, - vorbis_look_floor0 *look){ + vorbis_info_floor *infoX, + vorbis_look_floor0 *look){ if(!look->linearmap[vb->W]){ vorbis_dsp_state *vd=vb->vd; vorbis_info *vi=vd->vi; @@ -126,7 +122,7 @@ static void floor0_map_lazy_init(vorbis_block *vb, floor(bark(rate/2-1)*C)=mapped-1 floor(bark(rate/2)*C)=mapped */ float scale=look->ln/toBARK(info->rate/2.f); - + /* the mapping from a linear scale to a smaller bark scale is straightforward. We do *not* make sure that the linear mapping does not skip bark-scale bins; the decoder simply skips them and @@ -135,8 +131,8 @@ static void floor0_map_lazy_init(vorbis_block *vb, accurate */ look->linearmap[W]=_ogg_malloc((n+1)*sizeof(**look->linearmap)); for(j=0;jrate/2.f)/n*j) - *scale); /* bark numbers represent band edges */ + int val=floor( toBARK((info->rate/2.f)/n*j) + *scale); /* bark numbers represent band edges */ if(val>=look->ln)val=look->ln-1; /* guard against the approximation */ look->linearmap[W][j]=val; } @@ -146,23 +142,15 @@ static void floor0_map_lazy_init(vorbis_block *vb, } static vorbis_look_floor *floor0_look(vorbis_dsp_state *vd, - vorbis_info_floor *i){ - int j; + vorbis_info_floor *i){ vorbis_info_floor0 *info=(vorbis_info_floor0 *)i; vorbis_look_floor0 *look=_ogg_calloc(1,sizeof(*look)); look->m=info->order; look->ln=info->barkmap; look->vi=info; - if(vd->analysisp) - lpc_init(&look->lpclook,look->ln,look->m); - look->linearmap=_ogg_calloc(2,sizeof(*look->linearmap)); - look->lsp_look=_ogg_malloc(look->ln*sizeof(*look->lsp_look)); - for(j=0;jln;j++) - look->lsp_look[j]=2*cos(M_PI/look->ln*j); - return look; } @@ -176,7 +164,7 @@ static void *floor0_inverse1(vorbis_block *vb,vorbis_look_floor *i){ long maxval=(1<ampbits)-1; float amp=(float)ampraw/maxval*info->ampdB; int booknum=oggpack_read(&vb->opb,_ilog(info->numbooks)); - + if(booknum!=-1 && booknumnumbooks){ /* be paranoid */ codec_setup_info *ci=vb->vd->vi->codec_setup; codebook *b=ci->fullbooks+info->books[booknum]; @@ -186,14 +174,14 @@ static void *floor0_inverse1(vorbis_block *vb,vorbis_look_floor *i){ smash; b->dim is provably more than we can overflow the vector */ float *lsp=_vorbis_block_alloc(vb,sizeof(*lsp)*(look->m+b->dim+1)); - + for(j=0;jm;j+=b->dim) - if(vorbis_book_decodev_set(b,lsp+j,&vb->opb,b->dim)==-1)goto eop; + if(vorbis_book_decodev_set(b,lsp+j,&vb->opb,b->dim)==-1)goto eop; for(j=0;jm;){ - for(k=0;kdim;k++,j++)lsp[j]+=last; - last=lsp[j-1]; + for(k=0;kdim;k++,j++)lsp[j]+=last; + last=lsp[j-1]; } - + lsp[look->m]=amp; return(lsp); } @@ -203,10 +191,10 @@ static void *floor0_inverse1(vorbis_block *vb,vorbis_look_floor *i){ } static int floor0_inverse2(vorbis_block *vb,vorbis_look_floor *i, - void *memo,float *out){ + void *memo,float *out){ vorbis_look_floor0 *look=(vorbis_look_floor0 *)i; vorbis_info_floor0 *info=look->vi; - + floor0_map_lazy_init(vb,info,look); if(memo){ @@ -215,10 +203,10 @@ static int floor0_inverse2(vorbis_block *vb,vorbis_look_floor *i, /* take the coefficients back to a spectral envelope curve */ vorbis_lsp_to_curve(out, - look->linearmap[vb->W], - look->n[vb->W], - look->ln, - lsp,look->m,amp,(float)info->ampdB); + look->linearmap[vb->W], + look->n[vb->W], + look->ln, + lsp,look->m,amp,(float)info->ampdB); return(1); } memset(out,0,sizeof(*out)*look->n[vb->W]); @@ -226,10 +214,7 @@ static int floor0_inverse2(vorbis_block *vb,vorbis_look_floor *i, } /* export hooks */ -vorbis_func_floor floor0_exportbundle={ +const vorbis_func_floor floor0_exportbundle={ NULL,&floor0_unpack,&floor0_look,&floor0_free_info, &floor0_free_look,&floor0_inverse1,&floor0_inverse2 }; - - -