X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=lib%2Fmapping0.c;h=efa0fbcd93bb26e931aaa2a105b018f44d73974f;hb=4ba8efed8797016a85e57bc3cc7975bb31d65db5;hp=ec2cc085694219d0f7fd1f74f2efdbfd53e98926;hpb=7bb3989426d7fc08bc9ea85b59d02e44f846ddac;p=platform%2Fupstream%2Flibvorbis.git diff --git a/lib/mapping0.c b/lib/mapping0.c index ec2cc08..efa0fbc 100644 --- a/lib/mapping0.c +++ b/lib/mapping0.c @@ -5,13 +5,12 @@ * 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-2001 * - * by the XIPHOPHORUS Company http://www.xiph.org/ * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2010 * + * by the Xiph.Org Foundation https://xiph.org/ * * * ******************************************************************** function: channel mapping 0 implementation - last mod: $Id: mapping0.c,v 1.36 2001/09/11 05:06:57 xiphmont Exp $ ********************************************************************/ @@ -23,7 +22,7 @@ #include "vorbis/codec.h" #include "codec_internal.h" #include "codebook.h" -#include "bitbuffer.h" +#include "window.h" #include "registry.h" #include "psy.h" #include "misc.h" @@ -37,148 +36,16 @@ blocksize is set by the mode, and low backend lookups may require parameters from other areas of the mode/mapping */ -extern int analysis_noisy; - -typedef struct { - drft_lookup fft_look; - vorbis_info_mode *mode; - vorbis_info_mapping0 *map; - - vorbis_look_time **time_look; - vorbis_look_floor **floor_look; - - vorbis_look_residue **residue_look; - vorbis_look_psy *psy_look[2]; - - vorbis_func_time **time_func; - vorbis_func_floor **floor_func; - vorbis_func_residue **residue_func; - - int ch; - long lastframe; /* if a different mode is called, we need to - invalidate decay */ -} vorbis_look_mapping0; - -static vorbis_info_mapping *mapping0_copy_info(vorbis_info_mapping *vm){ - vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)vm; - vorbis_info_mapping0 *ret=_ogg_malloc(sizeof(vorbis_info_mapping0)); - memcpy(ret,info,sizeof(vorbis_info_mapping0)); - return(ret); -} - static void mapping0_free_info(vorbis_info_mapping *i){ - if(i){ - memset(i,0,sizeof(vorbis_info_mapping0)); - _ogg_free(i); - } -} - -static void mapping0_free_look(vorbis_look_mapping *look){ - int i; - vorbis_look_mapping0 *l=(vorbis_look_mapping0 *)look; - if(l){ - drft_clear(&l->fft_look); - - for(i=0;imap->submaps;i++){ - l->time_func[i]->free_look(l->time_look[i]); - l->floor_func[i]->free_look(l->floor_look[i]); - l->residue_func[i]->free_look(l->residue_look[i]); - } - if(l->psy_look[1] && l->psy_look[1]!=l->psy_look[0]){ - _vp_psy_clear(l->psy_look[1]); - _ogg_free(l->psy_look[1]); - } - if(l->psy_look[0]){ - _vp_psy_clear(l->psy_look[0]); - _ogg_free(l->psy_look[0]); - } - _ogg_free(l->time_func); - _ogg_free(l->floor_func); - _ogg_free(l->residue_func); - _ogg_free(l->time_look); - _ogg_free(l->floor_look); - _ogg_free(l->residue_look); - memset(l,0,sizeof(vorbis_look_mapping0)); - _ogg_free(l); + vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)i; + if(info){ + memset(info,0,sizeof(*info)); + _ogg_free(info); } } -static vorbis_look_mapping *mapping0_look(vorbis_dsp_state *vd,vorbis_info_mode *vm, - vorbis_info_mapping *m){ - int i; - vorbis_info *vi=vd->vi; - codec_setup_info *ci=vi->codec_setup; - vorbis_look_mapping0 *look=_ogg_calloc(1,sizeof(vorbis_look_mapping0)); - vorbis_info_mapping0 *info=look->map=(vorbis_info_mapping0 *)m; - look->mode=vm; - - look->time_look=_ogg_calloc(info->submaps,sizeof(vorbis_look_time *)); - look->floor_look=_ogg_calloc(info->submaps,sizeof(vorbis_look_floor *)); - - look->residue_look=_ogg_calloc(info->submaps,sizeof(vorbis_look_residue *)); - - look->time_func=_ogg_calloc(info->submaps,sizeof(vorbis_func_time *)); - look->floor_func=_ogg_calloc(info->submaps,sizeof(vorbis_func_floor *)); - look->residue_func=_ogg_calloc(info->submaps,sizeof(vorbis_func_residue *)); - - for(i=0;isubmaps;i++){ - int timenum=info->timesubmap[i]; - int floornum=info->floorsubmap[i]; - int resnum=info->residuesubmap[i]; - - look->time_func[i]=_time_P[ci->time_type[timenum]]; - look->time_look[i]=look->time_func[i]-> - look(vd,vm,ci->time_param[timenum]); - look->floor_func[i]=_floor_P[ci->floor_type[floornum]]; - look->floor_look[i]=look->floor_func[i]-> - look(vd,vm,ci->floor_param[floornum]); - look->residue_func[i]=_residue_P[ci->residue_type[resnum]]; - look->residue_look[i]=look->residue_func[i]-> - look(vd,vm,ci->residue_param[resnum]); - - } - if(ci->psys && vd->analysisp){ - if(info->psy[0] != info->psy[1]){ - - int psynum=info->psy[0]; - look->psy_look[0]=_ogg_calloc(1,sizeof(vorbis_look_psy)); - _vp_psy_init(look->psy_look[0],ci->psy_param[psynum], - ci->psy_g_param, - ci->blocksizes[vm->blockflag]/2,vi->rate); - - psynum=info->psy[1]; - look->psy_look[1]=_ogg_calloc(1,sizeof(vorbis_look_psy)); - _vp_psy_init(look->psy_look[1],ci->psy_param[psynum], - ci->psy_g_param, - ci->blocksizes[vm->blockflag]/2,vi->rate); - }else{ - - int psynum=info->psy[0]; - look->psy_look[0]=_ogg_calloc(1,sizeof(vorbis_look_psy)); - look->psy_look[1]=look->psy_look[0]; - _vp_psy_init(look->psy_look[0],ci->psy_param[psynum], - ci->psy_g_param, - ci->blocksizes[vm->blockflag]/2,vi->rate); - - } - } - - look->ch=vi->channels; - - if(vd->analysisp)drft_init(&look->fft_look,ci->blocksizes[vm->blockflag]); - return(look); -} - -static int ilog2(unsigned int v){ - int ret=0; - while(v>1){ - ret++; - v>>=1; - } - return(ret); -} - -static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm,oggpack_buffer *opb){ +static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm, + oggpack_buffer *opb){ int i; vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)vm; @@ -198,14 +65,14 @@ static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm,oggpack_buffer if(info->coupling_steps>0){ oggpack_write(opb,1,1); oggpack_write(opb,info->coupling_steps-1,8); - + for(i=0;icoupling_steps;i++){ - oggpack_write(opb,info->coupling_mag[i],ilog2(vi->channels)); - oggpack_write(opb,info->coupling_ang[i],ilog2(vi->channels)); + oggpack_write(opb,info->coupling_mag[i],ov_ilog(vi->channels-1)); + oggpack_write(opb,info->coupling_ang[i],ov_ilog(vi->channels-1)); } }else oggpack_write(opb,0,1); - + oggpack_write(opb,0,2); /* 2,3:reserved */ /* we don't write the channel submappings if we only have one... */ @@ -214,7 +81,7 @@ static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm,oggpack_buffer oggpack_write(opb,info->chmuxlist[i],4); } for(i=0;isubmaps;i++){ - oggpack_write(opb,info->timesubmap[i],8); + oggpack_write(opb,0,8); /* time submap unused */ oggpack_write(opb,info->floorsubmap[i],8); oggpack_write(opb,info->residuesubmap[i],8); } @@ -222,47 +89,54 @@ static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm,oggpack_buffer /* also responsible for range checking */ static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb){ - int i; - vorbis_info_mapping0 *info=_ogg_calloc(1,sizeof(vorbis_info_mapping0)); + int i,b; + vorbis_info_mapping0 *info=_ogg_calloc(1,sizeof(*info)); codec_setup_info *ci=vi->codec_setup; - memset(info,0,sizeof(vorbis_info_mapping0)); + if(vi->channels<=0)goto err_out; - if(oggpack_read(opb,1)) + b=oggpack_read(opb,1); + if(b<0)goto err_out; + if(b){ info->submaps=oggpack_read(opb,4)+1; - else + if(info->submaps<=0)goto err_out; + }else info->submaps=1; - if(oggpack_read(opb,1)){ + b=oggpack_read(opb,1); + if(b<0)goto err_out; + if(b){ info->coupling_steps=oggpack_read(opb,8)+1; - + if(info->coupling_steps<=0)goto err_out; for(i=0;icoupling_steps;i++){ - int testM=info->coupling_mag[i]=oggpack_read(opb,ilog2(vi->channels)); - int testA=info->coupling_ang[i]=oggpack_read(opb,ilog2(vi->channels)); - - if(testM<0 || - testA<0 || - testM==testA || - testM>=vi->channels || - testA>=vi->channels) goto err_out; + /* vi->channels > 0 is enforced in the caller */ + int testM=info->coupling_mag[i]= + oggpack_read(opb,ov_ilog(vi->channels-1)); + int testA=info->coupling_ang[i]= + oggpack_read(opb,ov_ilog(vi->channels-1)); + + if(testM<0 || + testA<0 || + testM==testA || + testM>=vi->channels || + testA>=vi->channels) goto err_out; } } - if(oggpack_read(opb,2)>0)goto err_out; /* 2,3:reserved */ - + if(oggpack_read(opb,2)!=0)goto err_out; /* 2,3:reserved */ + if(info->submaps>1){ for(i=0;ichannels;i++){ info->chmuxlist[i]=oggpack_read(opb,4); - if(info->chmuxlist[i]>=info->submaps)goto err_out; + if(info->chmuxlist[i]>=info->submaps || info->chmuxlist[i]<0)goto err_out; } } for(i=0;isubmaps;i++){ - info->timesubmap[i]=oggpack_read(opb,8); - if(info->timesubmap[i]>=ci->times)goto err_out; + oggpack_read(opb,8); /* time submap unused */ info->floorsubmap[i]=oggpack_read(opb,8); - if(info->floorsubmap[i]>=ci->floors)goto err_out; + if(info->floorsubmap[i]>=ci->floors || info->floorsubmap[i]<0)goto err_out; info->residuesubmap[i]=oggpack_read(opb,8); - if(info->residuesubmap[i]>=ci->residues)goto err_out; + if(info->residuesubmap[i]>=ci->residues || info->residuesubmap[i]<0)goto err_out; } return info; @@ -280,341 +154,581 @@ static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb) #include "psy.h" #include "scales.h" -/* no time mapping implementation for now */ +#if 0 static long seq=0; -static int mapping0_forward(vorbis_block *vb,vorbis_look_mapping *l){ +static ogg_int64_t total=0; +static float FLOOR1_fromdB_LOOKUP[256]={ + 1.0649863e-07F, 1.1341951e-07F, 1.2079015e-07F, 1.2863978e-07F, + 1.3699951e-07F, 1.4590251e-07F, 1.5538408e-07F, 1.6548181e-07F, + 1.7623575e-07F, 1.8768855e-07F, 1.9988561e-07F, 2.128753e-07F, + 2.2670913e-07F, 2.4144197e-07F, 2.5713223e-07F, 2.7384213e-07F, + 2.9163793e-07F, 3.1059021e-07F, 3.3077411e-07F, 3.5226968e-07F, + 3.7516214e-07F, 3.9954229e-07F, 4.2550680e-07F, 4.5315863e-07F, + 4.8260743e-07F, 5.1396998e-07F, 5.4737065e-07F, 5.8294187e-07F, + 6.2082472e-07F, 6.6116941e-07F, 7.0413592e-07F, 7.4989464e-07F, + 7.9862701e-07F, 8.5052630e-07F, 9.0579828e-07F, 9.6466216e-07F, + 1.0273513e-06F, 1.0941144e-06F, 1.1652161e-06F, 1.2409384e-06F, + 1.3215816e-06F, 1.4074654e-06F, 1.4989305e-06F, 1.5963394e-06F, + 1.7000785e-06F, 1.8105592e-06F, 1.9282195e-06F, 2.0535261e-06F, + 2.1869758e-06F, 2.3290978e-06F, 2.4804557e-06F, 2.6416497e-06F, + 2.8133190e-06F, 2.9961443e-06F, 3.1908506e-06F, 3.3982101e-06F, + 3.6190449e-06F, 3.8542308e-06F, 4.1047004e-06F, 4.3714470e-06F, + 4.6555282e-06F, 4.9580707e-06F, 5.2802740e-06F, 5.6234160e-06F, + 5.9888572e-06F, 6.3780469e-06F, 6.7925283e-06F, 7.2339451e-06F, + 7.7040476e-06F, 8.2047000e-06F, 8.7378876e-06F, 9.3057248e-06F, + 9.9104632e-06F, 1.0554501e-05F, 1.1240392e-05F, 1.1970856e-05F, + 1.2748789e-05F, 1.3577278e-05F, 1.4459606e-05F, 1.5399272e-05F, + 1.6400004e-05F, 1.7465768e-05F, 1.8600792e-05F, 1.9809576e-05F, + 2.1096914e-05F, 2.2467911e-05F, 2.3928002e-05F, 2.5482978e-05F, + 2.7139006e-05F, 2.8902651e-05F, 3.0780908e-05F, 3.2781225e-05F, + 3.4911534e-05F, 3.7180282e-05F, 3.9596466e-05F, 4.2169667e-05F, + 4.4910090e-05F, 4.7828601e-05F, 5.0936773e-05F, 5.4246931e-05F, + 5.7772202e-05F, 6.1526565e-05F, 6.5524908e-05F, 6.9783085e-05F, + 7.4317983e-05F, 7.9147585e-05F, 8.4291040e-05F, 8.9768747e-05F, + 9.5602426e-05F, 0.00010181521F, 0.00010843174F, 0.00011547824F, + 0.00012298267F, 0.00013097477F, 0.00013948625F, 0.00014855085F, + 0.00015820453F, 0.00016848555F, 0.00017943469F, 0.00019109536F, + 0.00020351382F, 0.00021673929F, 0.00023082423F, 0.00024582449F, + 0.00026179955F, 0.00027881276F, 0.00029693158F, 0.00031622787F, + 0.00033677814F, 0.00035866388F, 0.00038197188F, 0.00040679456F, + 0.00043323036F, 0.00046138411F, 0.00049136745F, 0.00052329927F, + 0.00055730621F, 0.00059352311F, 0.00063209358F, 0.00067317058F, + 0.00071691700F, 0.00076350630F, 0.00081312324F, 0.00086596457F, + 0.00092223983F, 0.00098217216F, 0.0010459992F, 0.0011139742F, + 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, + 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, + 0.0019632195F, 0.0020908006F, 0.0022266726F, 0.0023713743F, + 0.0025254795F, 0.0026895994F, 0.0028643847F, 0.0030505286F, + 0.0032487691F, 0.0034598925F, 0.0036847358F, 0.0039241906F, + 0.0041792066F, 0.0044507950F, 0.0047400328F, 0.0050480668F, + 0.0053761186F, 0.0057254891F, 0.0060975636F, 0.0064938176F, + 0.0069158225F, 0.0073652516F, 0.0078438871F, 0.0083536271F, + 0.0088964928F, 0.009474637F, 0.010090352F, 0.010746080F, + 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, + 0.014722068F, 0.015678791F, 0.016697687F, 0.017782797F, + 0.018938423F, 0.020169149F, 0.021479854F, 0.022875735F, + 0.024362330F, 0.025945531F, 0.027631618F, 0.029427276F, + 0.031339626F, 0.033376252F, 0.035545228F, 0.037855157F, + 0.040315199F, 0.042935108F, 0.045725273F, 0.048696758F, + 0.051861348F, 0.055231591F, 0.058820850F, 0.062643361F, + 0.066714279F, 0.071049749F, 0.075666962F, 0.080584227F, + 0.085821044F, 0.091398179F, 0.097337747F, 0.10366330F, + 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, + 0.14201813F, 0.15124727F, 0.16107617F, 0.17154380F, + 0.18269168F, 0.19456402F, 0.20720788F, 0.22067342F, + 0.23501402F, 0.25028656F, 0.26655159F, 0.28387361F, + 0.30232132F, 0.32196786F, 0.34289114F, 0.36517414F, + 0.38890521F, 0.41417847F, 0.44109412F, 0.46975890F, + 0.50028648F, 0.53279791F, 0.56742212F, 0.60429640F, + 0.64356699F, 0.68538959F, 0.72993007F, 0.77736504F, + 0.82788260F, 0.88168307F, 0.9389798F, 1.F, +}; + +#endif + + +static int mapping0_forward(vorbis_block *vb){ vorbis_dsp_state *vd=vb->vd; vorbis_info *vi=vd->vi; codec_setup_info *ci=vi->codec_setup; - backend_lookup_state *b=vb->vd->backend_state; - vorbis_look_mapping0 *look=(vorbis_look_mapping0 *)l; - vorbis_info_mapping0 *info=look->map; - vorbis_info_mode *mode=look->mode; + private_state *b=vb->vd->backend_state; vorbis_block_internal *vbi=(vorbis_block_internal *)vb->internal; int n=vb->pcmend; - int i,j; - float *window=b->window[vb->W][vb->lW][vb->nW][mode->windowtype]; - int *nonzero=alloca(sizeof(int)*vi->channels); + int i,j,k; - float *work=_vorbis_block_alloc(vb,n*sizeof(float)); + int *nonzero = alloca(sizeof(*nonzero)*vi->channels); + float **gmdct = _vorbis_block_alloc(vb,vi->channels*sizeof(*gmdct)); + int **iwork = _vorbis_block_alloc(vb,vi->channels*sizeof(*iwork)); + int ***floor_posts = _vorbis_block_alloc(vb,vi->channels*sizeof(*floor_posts)); float global_ampmax=vbi->ampmax; - float *local_ampmax=alloca(sizeof(float)*vi->channels); - int blocktype; - - /* we differentiate between short and long block types to help the - masking engine; the window shapes also matter. - impulse block (a short block in which an impulse occurs) - padding block (a short block that pads between a transitional - long block and an impulse block, or vice versa) - transition block (the wqeird one; a long block with the transition - window; affects bass/midrange response and that must be - accounted for in masking) - long block (run of the mill long block) - */ + float *local_ampmax=alloca(sizeof(*local_ampmax)*vi->channels); + int blocktype=vbi->blocktype; - if(vb->W){ - if(!vb->lW || !vb->nW) - blocktype=BLOCKTYPE_TRANSITION; - else - blocktype=BLOCKTYPE_LONG; - }else{ - /* right now we're missing the infrastructure to distingush the - two short types */ - blocktype=BLOCKTYPE_IMPULSE; - } + int modenumber=vb->W; + vorbis_info_mapping0 *info=ci->map_param[modenumber]; + vorbis_look_psy *psy_look=b->psy+blocktype+(vb->W?2:0); + + vb->mode=modenumber; for(i=0;ichannels;i++){ float scale=4.f/n; + float scale_dB; + + float *pcm =vb->pcm[i]; + float *logfft =pcm; + + iwork[i]=_vorbis_block_alloc(vb,n/2*sizeof(**iwork)); + gmdct[i]=_vorbis_block_alloc(vb,n/2*sizeof(**gmdct)); + + scale_dB=todB(&scale) + .345; /* + .345 is a hack; the original + todB estimation used on IEEE 754 + compliant machines had a bug that + returned dB values about a third + of a decibel too high. The bug + was harmless because tunings + implicitly took that into + account. However, fixing the bug + in the estimator requires + changing all the tunings as well. + For now, it's easier to sync + things back up here, and + recalibrate the tunings in the + next major model upgrade. */ + +#if 0 + if(vi->channels==2){ + if(i==0) + _analysis_output("pcmL",seq,pcm,n,0,0,total-n/2); + else + _analysis_output("pcmR",seq,pcm,n,0,0,total-n/2); + }else{ + _analysis_output("pcm",seq,pcm,n,0,0,total-n/2); + } +#endif - /* the following makes things clearer to *me* anyway */ - float *pcm =vb->pcm[i]; - float *fft =work; - float *logfft =pcm+n/2; + /* window the PCM data */ + _vorbis_apply_window(pcm,b->window,ci->blocksizes,vb->lW,vb->W,vb->nW); - /*float *res =pcm; - float *mdct =pcm; - float *codedflr=pcm+n/2; - float *logmax =work; - float *logmask =work+n/2;*/ +#if 0 + if(vi->channels==2){ + if(i==0) + _analysis_output("windowedL",seq,pcm,n,0,0,total-n/2); + else + _analysis_output("windowedR",seq,pcm,n,0,0,total-n/2); + }else{ + _analysis_output("windowed",seq,pcm,n,0,0,total-n/2); + } +#endif - /* window the PCM data */ - for(j=0;jtransform[vb->W][0],pcm,pcm); - + mdct_forward(b->transform[vb->W][0],pcm,gmdct[i]); + /* FFT yields more accurate tonal estimation (not phase sensitive) */ - drft_forward(&look->fft_look,fft); - fft[0]*=scale; - logfft[0]=todB(fft); + drft_forward(&b->fft_look[vb->W],pcm); + logfft[0]=scale_dB+todB(pcm) + .345; /* + .345 is a hack; the + original todB estimation used on + IEEE 754 compliant machines had a + bug that returned dB values about + a third of a decibel too high. + The bug was harmless because + tunings implicitly took that into + account. However, fixing the bug + in the estimator requires + changing all the tunings as well. + For now, it's easier to sync + things back up here, and + recalibrate the tunings in the + next major model upgrade. */ local_ampmax[i]=logfft[0]; for(j=1;j>1]=todB(&temp); + float temp=pcm[j]*pcm[j]+pcm[j+1]*pcm[j+1]; + temp=logfft[(j+1)>>1]=scale_dB+.5f*todB(&temp) + .345; /* + + .345 is a hack; the original todB + estimation used on IEEE 754 + compliant machines had a bug that + returned dB values about a third + of a decibel too high. The bug + was harmless because tunings + implicitly took that into + account. However, fixing the bug + in the estimator requires + changing all the tunings as well. + For now, it's easier to sync + things back up here, and + recalibrate the tunings in the + next major model upgrade. */ if(temp>local_ampmax[i])local_ampmax[i]=temp; } + + if(local_ampmax[i]>0.f)local_ampmax[i]=0.f; if(local_ampmax[i]>global_ampmax)global_ampmax=local_ampmax[i]; - _analysis_output("fft",seq+i,logfft,n/2,1,0); +#if 0 + if(vi->channels==2){ + if(i==0){ + _analysis_output("fftL",seq,logfft,n/2,1,0,0); + }else{ + _analysis_output("fftR",seq,logfft,n/2,1,0,0); + } + }else{ + _analysis_output("fft",seq,logfft,n/2,1,0,0); + } +#endif + } - for(i=0;ichannels;i++){ - int submap=info->chmuxlist[i]; + { + float *noise = _vorbis_block_alloc(vb,n/2*sizeof(*noise)); + float *tone = _vorbis_block_alloc(vb,n/2*sizeof(*tone)); - /* the following makes things clearer to *me* anyway */ - float *mdct =vb->pcm[i]; - float *res =mdct; - float *codedflr=mdct+n/2; - float *logfft =mdct+n/2; - - float *logmdct =work; - float *logmax =mdct+n/2; - float *logmask =work+n/2; - - for(j=0;jpsy_look[blocktype], - b->psy_g_look, - i, - logfft, /* -> logmax */ - logmdct, - logmask, - global_ampmax, - local_ampmax[i], - ci->blocksizes[vb->lW]/2); - - _analysis_output("mask",seq+i,logmask,n/2,1,0); - /* perform floor encoding */ - nonzero[i]=look->floor_func[submap]-> - forward(vb,look->floor_look[submap], - mdct, - logmdct, - logmask, - logmax, - - codedflr); - - - _analysis_output("mdct2",seq+i,mdct,n/2,1,1); - _vp_remove_floor(look->psy_look[blocktype], - b->psy_g_look, - logmdct, - mdct, - codedflr, - res, - local_ampmax[i]); - - /*for(j=0;j1200){ - analysis_noisy=1; - fprintf(stderr,"%ld ",seq+i); - }*/ - - _analysis_output("res",seq+i,res,n/2,1,0); - _analysis_output("codedflr",seq+i,codedflr,n/2,1,1); - - } + for(i=0;ichannels;i++){ + /* the encoder setup assumes that all the modes used by any + specific bitrate tweaking use the same floor */ + + int submap=info->chmuxlist[i]; + + /* the following makes things clearer to *me* anyway */ + float *mdct =gmdct[i]; + float *logfft =vb->pcm[i]; + + float *logmdct =logfft+n/2; + float *logmask =logfft; + + vb->mode=modenumber; + + floor_posts[i]=_vorbis_block_alloc(vb,PACKETBLOBS*sizeof(**floor_posts)); + memset(floor_posts[i],0,sizeof(**floor_posts)*PACKETBLOBS); + + for(j=0;jchannels==2){ + if(i==0) + _analysis_output("mdctL",seq,logmdct,n/2,1,0,0); + else + _analysis_output("mdctR",seq,logmdct,n/2,1,0,0); + }else{ + _analysis_output("mdct",seq,logmdct,n/2,1,0,0); + } +#endif + + /* first step; noise masking. Not only does 'noise masking' + give us curves from which we can decide how much resolution + to give noise parts of the spectrum, it also implicitly hands + us a tonality estimate (the larger the value in the + 'noise_depth' vector, the more tonal that area is) */ + + _vp_noisemask(psy_look, + logmdct, + noise); /* noise does not have by-frequency offset + bias applied yet */ +#if 0 + if(vi->channels==2){ + if(i==0) + _analysis_output("noiseL",seq,noise,n/2,1,0,0); + else + _analysis_output("noiseR",seq,noise,n/2,1,0,0); + }else{ + _analysis_output("noise",seq,noise,n/2,1,0,0); + } +#endif + + /* second step: 'all the other crap'; all the stuff that isn't + computed/fit for bitrate management goes in the second psy + vector. This includes tone masking, peak limiting and ATH */ + + _vp_tonemask(psy_look, + logfft, + tone, + global_ampmax, + local_ampmax[i]); + +#if 0 + if(vi->channels==2){ + if(i==0) + _analysis_output("toneL",seq,tone,n/2,1,0,0); + else + _analysis_output("toneR",seq,tone,n/2,1,0,0); + }else{ + _analysis_output("tone",seq,tone,n/2,1,0,0); + } +#endif + + /* third step; we offset the noise vectors, overlay tone + masking. We then do a floor1-specific line fit. If we're + performing bitrate management, the line fit is performed + multiple times for up/down tweakage on demand. */ + +#if 0 + { + float aotuv[psy_look->n]; +#endif + + _vp_offset_and_mix(psy_look, + noise, + tone, + 1, + logmask, + mdct, + logmdct); + +#if 0 + if(vi->channels==2){ + if(i==0) + _analysis_output("aotuvM1_L",seq,aotuv,psy_look->n,1,1,0); + else + _analysis_output("aotuvM1_R",seq,aotuv,psy_look->n,1,1,0); + }else{ + _analysis_output("aotuvM1",seq,aotuv,psy_look->n,1,1,0); + } + } +#endif - vbi->ampmax=global_ampmax; - /* partition based prequantization and channel coupling */ - /* Steps in prequant and coupling: - - down-couple/down-quantize from perfect residue -> quantized vector - classify by this first quantized vector - - do{ - encode quantized vector; add encoded values to 'so-far' vector - more? [not yet at bitrate/not yet at target] - yes{ - down-couple/down-quantize from perfect-'so-far' -> - quantized vector; when subtracting coupling, - account for +/- out-of-phase component - }no{ - break - } - } - done. +#if 0 + if(vi->channels==2){ + if(i==0) + _analysis_output("mask1L",seq,logmask,n/2,1,0,0); + else + _analysis_output("mask1R",seq,logmask,n/2,1,0,0); + }else{ + _analysis_output("mask1",seq,logmask,n/2,1,0,0); + } +#endif + + /* this algorithm is hardwired to floor 1 for now; abort out if + we're *not* floor1. This won't happen unless someone has + broken the encode setup lib. Guard it anyway. */ + if(ci->floor_type[info->floorsubmap[submap]]!=1)return(-1); + + floor_posts[i][PACKETBLOBS/2]= + floor1_fit(vb,b->flr[info->floorsubmap[submap]], + logmdct, + logmask); + + /* are we managing bitrate? If so, perform two more fits for + later rate tweaking (fits represent hi/lo) */ + if(vorbis_bitrate_managed(vb) && floor_posts[i][PACKETBLOBS/2]){ + /* higher rate by way of lower noise curve */ + + _vp_offset_and_mix(psy_look, + noise, + tone, + 2, + logmask, + mdct, + logmdct); + +#if 0 + if(vi->channels==2){ + if(i==0) + _analysis_output("mask2L",seq,logmask,n/2,1,0,0); + else + _analysis_output("mask2R",seq,logmask,n/2,1,0,0); + }else{ + _analysis_output("mask2",seq,logmask,n/2,1,0,0); + } +#endif + + floor_posts[i][PACKETBLOBS-1]= + floor1_fit(vb,b->flr[info->floorsubmap[submap]], + logmdct, + logmask); + + /* lower rate by way of higher noise curve */ + _vp_offset_and_mix(psy_look, + noise, + tone, + 0, + logmask, + mdct, + logmdct); + +#if 0 + if(vi->channels==2){ + if(i==0) + _analysis_output("mask0L",seq,logmask,n/2,1,0,0); + else + _analysis_output("mask0R",seq,logmask,n/2,1,0,0); + }else{ + _analysis_output("mask0",seq,logmask,n/2,1,0,0); + } +#endif + + floor_posts[i][0]= + floor1_fit(vb,b->flr[info->floorsubmap[submap]], + logmdct, + logmask); + + /* we also interpolate a range of intermediate curves for + intermediate rates */ + for(k=1;kflr[info->floorsubmap[submap]], + floor_posts[i][0], + floor_posts[i][PACKETBLOBS/2], + k*65536/(PACKETBLOBS/2)); + for(k=PACKETBLOBS/2+1;kflr[info->floorsubmap[submap]], + floor_posts[i][PACKETBLOBS/2], + floor_posts[i][PACKETBLOBS-1], + (k-PACKETBLOBS/2)*65536/(PACKETBLOBS/2)); + } + } + } + vbi->ampmax=global_ampmax; - quantization in each iteration is done (after circular normalization - in coupling) using a by-iteration quantization granule value. - */ - - { - float **pcm=vb->pcm; - float **quantized=alloca(sizeof(float*)*vi->channels); - float **sofar=alloca(sizeof(float*)*vi->channels); + /* + the next phases are performed once for vbr-only and PACKETBLOB + times for bitrate managed modes. - long ***classifications=alloca(sizeof(long**)*info->submaps); - float ***pcmbundle=alloca(sizeof(float **)*info->submaps); - float ***sobundle=alloca(sizeof(float **)*info->submaps); - int **zerobundle=alloca(sizeof(int *)*info->submaps); - int *chbundle=alloca(sizeof(int)*info->submaps); - int chcounter=0; + 1) encode actual mode being used + 2) encode the floor for each channel, compute coded mask curve/res + 3) normalize and couple. + 4) encode residue + 5) save packet bytes to the packetblob vector - /* play a little loose with this abstraction */ - int quant_passes=look->psy_look[blocktype]->vi->coupling_passes; - int stopflag=0; + */ - for(i=0;ichannels;i++){ - quantized[i]=pcm[i]+n/2; - sofar[i]=_vorbis_block_alloc(vb,n/2*sizeof(float)); - memset(sofar[i],0,sizeof(float)*n/2); - } + /* iterate over the many masking curve fits we've created */ - pcmbundle[0]=alloca(sizeof(float *)*vi->channels); - sobundle[0]=alloca(sizeof(float *)*vi->channels); - zerobundle[0]=alloca(sizeof(int)*vi->channels); + { + int **couple_bundle=alloca(sizeof(*couple_bundle)*vi->channels); + int *zerobundle=alloca(sizeof(*zerobundle)*vi->channels); + + for(k=(vorbis_bitrate_managed(vb)?0:PACKETBLOBS/2); + k<=(vorbis_bitrate_managed(vb)?PACKETBLOBS-1:PACKETBLOBS/2); + k++){ + oggpack_buffer *opb=vbi->packetblob[k]; + + /* start out our new packet blob with packet type and mode */ + /* Encode the packet type */ + oggpack_write(opb,0,1); + /* Encode the modenumber */ + /* Encode frame mode, pre,post windowsize, then dispatch */ + oggpack_write(opb,modenumber,b->modebits); + if(vb->W){ + oggpack_write(opb,vb->lW,1); + oggpack_write(opb,vb->nW,1); + } - /* initial down-quantized coupling */ - - if(info->coupling_steps==0){ - /* this assumes all or nothing coupling right now. it should pass - through any channels left uncoupled, but it doesn't do that now */ + /* encode floor, compute masking curve, sep out residue */ for(i=0;ichannels;i++){ - float *lpcm=pcm[i]; - float *lqua=quantized[i]; - for(j=0;jchmuxlist[i]; + int *ilogmask=iwork[i]; + + nonzero[i]=floor1_encode(opb,vb,b->flr[info->floorsubmap[submap]], + floor_posts[i][k], + ilogmask); +#if 0 + { + char buf[80]; + sprintf(buf,"maskI%c%d",i?'R':'L',k); + float work[n/2]; + for(j=0;jpsy_look[blocktype], - info, - pcm, - sofar, - quantized, - nonzero, - 0); - } - for(i=0;ichannels;i++) - _analysis_output("quant",seq+i,quantized[i],n/2,1,0); - - - /* classify, by submap */ - - for(i=0;isubmaps;i++){ - int ch_in_bundle=0; - pcmbundle[i]=pcmbundle[0]+chcounter; - sobundle[i]=sobundle[0]+chcounter; - zerobundle[i]=zerobundle[0]+chcounter; - - for(j=0;jchannels;j++){ - if(info->chmuxlist[j]==i){ - if(nonzero[j]) - zerobundle[i][ch_in_bundle]=1; - else - zerobundle[i][ch_in_bundle]=0; - pcmbundle[i][ch_in_bundle]=quantized[j]; - sobundle[i][ch_in_bundle++]=sofar[j]; - } + /* our iteration is now based on masking curve, not prequant and + coupling. Only one prequant/coupling step */ + + /* quantize/couple */ + /* incomplete implementation that assumes the tree is all depth + one, or no tree at all */ + _vp_couple_quantize_normalize(k, + &ci->psy_g_param, + psy_look, + info, + gmdct, + iwork, + nonzero, + ci->psy_g_param.sliding_lowpass[vb->W][k], + vi->channels); + +#if 0 + for(i=0;ichannels;i++){ + char buf[80]; + sprintf(buf,"res%c%d",i?'R':'L',k); + float work[n/2]; + for(j=0;jsubmaps;i++){ + int ch_in_bundle=0; + long **classifications; + int resnum=info->residuesubmap[i]; + + for(j=0;jchannels;j++){ + if(info->chmuxlist[j]==i){ + zerobundle[ch_in_bundle]=0; + if(nonzero[j])zerobundle[ch_in_bundle]=1; + couple_bundle[ch_in_bundle++]=iwork[j]; + } + } - classifications[i]=look->residue_func[i]-> - class(vb,look->residue_look[i],pcmbundle[i],zerobundle[i],chbundle[i]); - } + classifications=_residue_P[ci->residue_type[resnum]]-> + class(vb,b->residue[resnum],couple_bundle,zerobundle,ch_in_bundle); + + ch_in_bundle=0; + for(j=0;jchannels;j++) + if(info->chmuxlist[j]==i) + couple_bundle[ch_in_bundle++]=iwork[j]; - /* actual encoding loop */ - for(i=0;!stopflag;){ - - /* perform residue encoding of this pass's quantized residue - vector, according residue mapping */ - - for(j=0;jsubmaps;j++) - look->residue_func[j]-> - forward(vb,look->residue_look[j], - pcmbundle[j],sobundle[j],zerobundle[j],chbundle[j], - i,classifications[j]); - i++; - - /* bitrate management decision hook; the following if() is where - we tell progressive encoding to halt, right now it just - avoids falling off the edge */ - if(i>=quant_passes /* || yadda yadda */)stopflag=1; - - if(!stopflag){ - /* down-couple/down-quantize from perfect-'so-far' -> - new quantized vector */ - if(info->coupling_steps==0){ - /* this assumes all or nothing coupling right now. it should pass - through any channels left uncoupled, but it doesn't do that now */ - for(i=0;ichannels;i++){ - float *lpcm=pcm[i]; - float *lsof=sofar[i]; - float *lqua=quantized[i]; - for(j=0;jpsy_look[blocktype], - info, - pcm, - sofar, - quantized, - nonzero, - i); - } + _residue_P[ci->residue_type[resnum]]-> + forward(opb,vb,b->residue[resnum], + couple_bundle,zerobundle,ch_in_bundle,classifications,i); } - /* steady as she goes */ + + /* ok, done encoding. Next protopacket. */ } - seq+=vi->channels; + } - - look->lastframe=vb->sequence; + +#if 0 + seq++; + total+=ci->blocksizes[vb->W]/4+ci->blocksizes[vb->nW]/4; +#endif return(0); } -static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){ +static int mapping0_inverse(vorbis_block *vb,vorbis_info_mapping *l){ vorbis_dsp_state *vd=vb->vd; vorbis_info *vi=vd->vi; codec_setup_info *ci=vi->codec_setup; - backend_lookup_state *b=vd->backend_state; - vorbis_look_mapping0 *look=(vorbis_look_mapping0 *)l; - vorbis_info_mapping0 *info=look->map; - vorbis_info_mode *mode=look->mode; + private_state *b=vd->backend_state; + vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)l; + int i,j; long n=vb->pcmend=ci->blocksizes[vb->W]; - float *window=b->window[vb->W][vb->lW][vb->nW][mode->windowtype]; - float **pcmbundle=alloca(sizeof(float *)*vi->channels); - int *zerobundle=alloca(sizeof(int)*vi->channels); + float **pcmbundle=alloca(sizeof(*pcmbundle)*vi->channels); + int *zerobundle=alloca(sizeof(*zerobundle)*vi->channels); - int *nonzero =alloca(sizeof(int)*vi->channels); - void **floormemo=alloca(sizeof(void *)*vi->channels); - - /* time domain information decode (note that applying the - information would have to happen later; we'll probably add a - function entry to the harness for that later */ - /* NOT IMPLEMENTED */ + int *nonzero =alloca(sizeof(*nonzero)*vi->channels); + void **floormemo=alloca(sizeof(*floormemo)*vi->channels); /* recover the spectral envelope; store it in the PCM vector for now */ for(i=0;ichannels;i++){ int submap=info->chmuxlist[i]; - floormemo[i]=look->floor_func[submap]-> - inverse1(vb,look->floor_look[submap]); + floormemo[i]=_floor_P[ci->floor_type[info->floorsubmap[submap]]]-> + inverse1(vb,b->flr[info->floorsubmap[submap]]); if(floormemo[i]) nonzero[i]=1; else - nonzero[i]=0; - memset(vb->pcm[i],0,sizeof(float)*n/2); + nonzero[i]=0; + memset(vb->pcm[i],0,sizeof(*vb->pcm[i])*n/2); } /* channel coupling can 'dirty' the nonzero listing */ for(i=0;icoupling_steps;i++){ if(nonzero[info->coupling_mag[i]] || nonzero[info->coupling_ang[i]]){ - nonzero[info->coupling_mag[i]]=1; - nonzero[info->coupling_ang[i]]=1; + nonzero[info->coupling_mag[i]]=1; + nonzero[info->coupling_ang[i]]=1; } } @@ -623,16 +737,17 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){ int ch_in_bundle=0; for(j=0;jchannels;j++){ if(info->chmuxlist[j]==i){ - if(nonzero[j]) - zerobundle[ch_in_bundle]=1; - else - zerobundle[ch_in_bundle]=0; - pcmbundle[ch_in_bundle++]=vb->pcm[j]; + if(nonzero[j]) + zerobundle[ch_in_bundle]=1; + else + zerobundle[ch_in_bundle]=0; + pcmbundle[ch_in_bundle++]=vb->pcm[j]; } } - - look->residue_func[i]->inverse(vb,look->residue_look[i], - pcmbundle,zerobundle,ch_in_bundle); + + _residue_P[ci->residue_type[info->residuesubmap[i]]]-> + inverse(vb,b->residue[info->residuesubmap[i]], + pcmbundle,zerobundle,ch_in_bundle); } /* channel coupling */ @@ -645,21 +760,21 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){ float ang=pcmA[j]; if(mag>0) - if(ang>0){ - pcmM[j]=mag; - pcmA[j]=mag-ang; - }else{ - pcmA[j]=mag; - pcmM[j]=mag+ang; - } + if(ang>0){ + pcmM[j]=mag; + pcmA[j]=mag-ang; + }else{ + pcmA[j]=mag; + pcmM[j]=mag+ang; + } else - if(ang>0){ - pcmM[j]=mag; - pcmA[j]=mag+ang; - }else{ - pcmA[j]=mag; - pcmM[j]=mag-ang; - } + if(ang>0){ + pcmM[j]=mag; + pcmA[j]=mag+ang; + }else{ + pcmA[j]=mag; + pcmM[j]=mag-ang; + } } } @@ -667,46 +782,27 @@ static int mapping0_inverse(vorbis_block *vb,vorbis_look_mapping *l){ for(i=0;ichannels;i++){ float *pcm=vb->pcm[i]; int submap=info->chmuxlist[i]; - look->floor_func[submap]-> - inverse2(vb,look->floor_look[submap],floormemo[i],pcm); + _floor_P[ci->floor_type[info->floorsubmap[submap]]]-> + inverse2(vb,b->flr[info->floorsubmap[submap]], + floormemo[i],pcm); } /* transform the PCM data; takes PCM vector, vb; modifies PCM vector */ /* only MDCT right now.... */ for(i=0;ichannels;i++){ float *pcm=vb->pcm[i]; - _analysis_output("out",seq+i,pcm,n/2,1,1); - _analysis_output("lout",seq+i,pcm,n/2,0,0); mdct_backward(b->transform[vb->W][0],pcm,pcm); } - /* window the data */ - for(i=0;ichannels;i++){ - float *pcm=vb->pcm[i]; - if(nonzero[i]) - for(j=0;j