X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=lib%2Fpsytune.c;h=6952136c6b976ac727db257f38e1d6736003ad97;hb=4d963fe0b4ba3bdb45233de4b959ce2f36963f7a;hp=4f2e59c918212cad46ba1795749392ec224e8b50;hpb=d59cea578a9f2b9961218e1440026715371836d8;p=platform%2Fupstream%2Flibvorbis.git

diff --git a/lib/psytune.c b/lib/psytune.c
index 4f2e59c..6952136 100644
--- a/lib/psytune.c
+++ b/lib/psytune.c
@@ -5,17 +5,19 @@
  * 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-2007             *
+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ *                                                                  *
  ********************************************************************
 
  function: simple utility that runs audio through the psychoacoustics
            without encoding
- last mod: $Id: psytune.c,v 1.16 2001/08/13 01:36:57 xiphmont Exp $
 
  ********************************************************************/
 
+/* NB: this is dead code, retained purely for doc and reference value
+       don't try to compile it */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -24,6 +26,7 @@
 #include "vorbis/codec.h"
 #include "codec_internal.h"
 #include "os.h"
+#include "misc.h"
 #include "psy.h"
 #include "mdct.h"
 #include "smallft.h"
@@ -37,11 +40,11 @@
 static vorbis_info_psy_global _psy_set0G={
   0,   /* decaydBpms */
   8,   /* lines per eighth octave */
-  
+
   /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
   256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
-  -6.f, 
-  
+  -6.f,
+
   0,
 
   0.,
@@ -51,7 +54,7 @@ static vorbis_info_psy_global _psy_set0G={
 static vp_part _vp_part0[]={
   {    1,9e10f, 9e10f,       1.f,9999.f},
   { 9999,  .75f, 9e10f,       .5f,9999.f},
-  //{ 9999, 1.5f, 9e10f,       .5f,9999.f},
+/*{ 9999, 1.5f, 9e10f,       .5f,9999.f},*/
   {   18,9e10f, 9e10f,       .5f,  30.f},
   { 9999,9e10f, 9e10f,       .5f,  30.f}
 };
@@ -64,7 +67,7 @@ static vp_couple _vp_couple0[]={
 
 static vorbis_info_psy _psy_set0={
   ATH_Bark_dB_lineaggressive,
-  
+
   -100.f,
   -140.f,
   6.f, /* floor master att */
@@ -144,7 +147,7 @@ static vorbis_info_psy _psy_set0={
    .900f, 0.f, /*11500*/
    .900f, 1.f, /*16000*/
   },
- 
+
   95.f,  /* even decade + 5 is important; saves an rint() later in a
             tight loop) */
   -44.,
@@ -154,43 +157,43 @@ static vorbis_info_psy _psy_set0={
 };
 
 static vorbis_info_floor1 _floor_set0={1,
-					{0},
-					
-					{32},
-					{0},
-					{0},
-					{{-1}},
-
-					2,
-					{0,1024,
-
-					 88,31,243,
-
-					 14,54,143,460,
-					 
-					 6,3,10, 22,18,26, 41,36,47, 
-					 69,61,78, 112,99,126, 185,162,211,  
-					 329,282,387, 672,553,825
-					 },
-					
-					60,30,400,
-					20,8,1,18.,
-					20,600,
-					960};
+                                        {0},
+
+                                        {32},
+                                        {0},
+                                        {0},
+                                        {{-1}},
+
+                                        2,
+                                        {0,1024,
+
+                                         88,31,243,
+
+                                         14,54,143,460,
+
+                                         6,3,10, 22,18,26, 41,36,47,
+                                         69,61,78, 112,99,126, 185,162,211,
+                                         329,282,387, 672,553,825
+                                         },
+
+                                        60,30,400,
+                                        20,8,1,18.,
+                                        20,600,
+                                        960};
 
 
 static vorbis_info_mapping0 mapping_info={1,{0,1},{0},{0},{0},0, 1, {0},{1}};
-static codec_setup_info codec_setup0={ {0,0}, 
-				       1,1,1,1,1,0,1,	
-				       {NULL},
-				       {0},{&mapping_info},
-				       {0},{NULL},
-				       {1},{&_floor_set0},
-				       {2},{NULL},
-				       {NULL},
-				       {&_psy_set0},
-				       &_psy_set0G};
-				       
+static codec_setup_info codec_setup0={ {0,0},
+                                       1,1,1,1,1,0,1,
+                                       {NULL},
+                                       {0},{&mapping_info},
+                                       {0},{NULL},
+                                       {1},{&_floor_set0},
+                                       {2},{NULL},
+                                       {NULL},
+                                       {&_psy_set0},
+                                       &_psy_set0G};
+
 static int noisy=0;
 void analysis(char *base,int i,float *v,int n,int bark,int dB){
   if(noisy){
@@ -202,18 +205,18 @@ void analysis(char *base,int i,float *v,int n,int bark,int dB){
 
     for(j=0;j<n;j++){
       if(dB && v[j]==0)
-	  fprintf(of,"\n\n");
+          fprintf(of,"\n\n");
       else{
-	if(bark)
-	  fprintf(of,"%g ",toBARK(22050.f*j/n));
-	else
-	  fprintf(of,"%g ",(float)j);
-      
-	if(dB){
-	  fprintf(of,"%g\n",todB(v+j));
-	}else{
-	  fprintf(of,"%g\n",v[j]);
-	}
+        if(bark)
+          fprintf(of,"%g ",toBARK(22050.f*j/n));
+        else
+          fprintf(of,"%g ",(float)j);
+
+        if(dB){
+          fprintf(of,"%g\n",todB(v+j));
+        }else{
+          fprintf(of,"%g\n",v[j]);
+        }
       }
     }
     fclose(of);
@@ -253,19 +256,19 @@ int main(int argc,char *argv[]){
     if(*argv[0]=='-'){
       /* option */
       if(argv[0][1]=='v'){
-	noisy=0;
+        noisy=0;
       }
     }else
       if(*argv[0]=='+'){
-	/* option */
-	if(argv[0][1]=='v'){
-	  noisy=1;
-	}
+        /* option */
+        if(argv[0][1]=='v'){
+          noisy=1;
+        }
       }else
-	framesize=atoi(argv[0]);
+        framesize=atoi(argv[0]);
     argv++;
   }
-  
+
   vi.channels=2;
   vi.codec_setup=&codec_setup0;
 
@@ -279,7 +282,7 @@ int main(int argc,char *argv[]){
   flr[1]=_ogg_calloc(framesize/2,sizeof(float));
   buffer=_ogg_malloc(framesize*4);
   buffer2=buffer+framesize*2;
-  window=_vorbis_window(0,framesize,framesize/2,framesize/2);
+  window=_vorbis_window_create(0,framesize,framesize/2,framesize/2);
   mdct_init(&m_look,framesize);
   drft_init(&f_look,framesize);
   _vp_psy_init(&p_look,&_psy_set0,&_psy_set0G,framesize/2,44100);
@@ -288,7 +291,7 @@ int main(int argc,char *argv[]){
 
   /* we cheat on the WAV header; we just bypass 44 bytes and never
      verify that it matches 16bit/stereo/44.1kHz. */
-  
+
   fread(buffer,1,44,stdin);
   fwrite(buffer,1,44,stdout);
   memset(buffer,0,framesize*2);
@@ -298,10 +301,10 @@ int main(int argc,char *argv[]){
   fprintf(stderr,"Processing for frame size %d...\n",framesize);
 
   while(!eos){
-    long bytes=fread(buffer2,1,framesize*2,stdin); 
+    long bytes=fread(buffer2,1,framesize*2,stdin);
     if(bytes<framesize*2)
       memset(buffer2+bytes,0,framesize*2-bytes);
-    
+
     if(bytes!=0){
       int nonzero[2];
 
@@ -310,203 +313,203 @@ int main(int argc,char *argv[]){
         pcm[0][i]=((buffer[i*4+1]<<8)|
                       (0x00ff&(int)buffer[i*4]))/32768.f;
         pcm[1][i]=((buffer[i*4+3]<<8)|
-		   (0x00ff&(int)buffer[i*4+2]))/32768.f;
+                   (0x00ff&(int)buffer[i*4+2]))/32768.f;
       }
-      
+
       {
-	float secs=framesize/44100.;
-	
-	ampmax+=secs*ampmax_att_per_sec;
-	if(ampmax<-9999)ampmax=-9999;
+        float secs=framesize/44100.;
+
+        ampmax+=secs*ampmax_att_per_sec;
+        if(ampmax<-9999)ampmax=-9999;
       }
 
       for(i=0;i<2;i++){
-	float scale=4.f/framesize;
-	float *fft=work[i];
-	float *mdct=pcm[i];
-	float *logmdct=mdct+framesize/2;
-
-	analysis("pre",frameno+i,pcm[i],framesize,0,0);
-	
-	/* fft and mdct transforms  */
-	for(j=0;j<framesize;j++)
-	  fft[j]=pcm[i][j]*=window[j];
-	
-	drft_forward(&f_look,fft);
-
-	local_ampmax[i]=-9999.f;
-	fft[0]*=scale;
-	fft[0]=todB(fft);
-	for(j=1;j<framesize-1;j+=2){
-	  float temp=scale*FAST_HYPOT(fft[j],fft[j+1]);
-	  temp=fft[(j+1)>>1]=todB(&temp);
-	  if(temp>local_ampmax[i])local_ampmax[i]=temp;
-	}
-	if(local_ampmax[i]>ampmax)ampmax=local_ampmax[i];
-	
-	mdct_forward(&m_look,pcm[i],mdct);
-	for(j=0;j<framesize/2;j++)
-	  logmdct[j]=todB(mdct+j);
-
-	analysis("mdct",frameno+i,logmdct,framesize/2,1,0);
-	analysis("fft",frameno+i,fft,framesize/2,1,0);
+        float scale=4.f/framesize;
+        float *fft=work[i];
+        float *mdct=pcm[i];
+        float *logmdct=mdct+framesize/2;
+
+        analysis("pre",frameno+i,pcm[i],framesize,0,0);
+
+        /* fft and mdct transforms  */
+        for(j=0;j<framesize;j++)
+          fft[j]=pcm[i][j]*=window[j];
+
+        drft_forward(&f_look,fft);
+
+        local_ampmax[i]=-9999.f;
+        fft[0]*=scale;
+        fft[0]=todB(fft);
+        for(j=1;j<framesize-1;j+=2){
+          float temp=scale*FAST_HYPOT(fft[j],fft[j+1]);
+          temp=fft[(j+1)>>1]=todB(&temp);
+          if(temp>local_ampmax[i])local_ampmax[i]=temp;
+        }
+        if(local_ampmax[i]>ampmax)ampmax=local_ampmax[i];
+
+        mdct_forward(&m_look,pcm[i],mdct);
+        for(j=0;j<framesize/2;j++)
+          logmdct[j]=todB(mdct+j);
+
+        analysis("mdct",frameno+i,logmdct,framesize/2,1,0);
+        analysis("fft",frameno+i,fft,framesize/2,1,0);
       }
 
       for(i=0;i<2;i++){
-	float amp;
-	float *fft=work[i];
-	float *logmax=fft;
-	float *mdct=pcm[i];
-	float *logmdct=mdct+framesize/2;
-	float *mask=fft+framesize/2;
-
-	/* floor psychoacoustics */
-	_vp_compute_mask(&p_look,
-			 pg_look,
-			 i,
-			 fft,
-			 logmdct,
-			 mask,
-			 ampmax,
-			 local_ampmax[i],
-			 framesize/2);
-
-	analysis("mask",frameno+i,mask,framesize/2,1,0);
-
-	{
-	  vorbis_block vb;
-	  vorbis_dsp_state vd;
-	  memset(&vd,0,sizeof(vd));
-	  vd.vi=&vi;
-	  vb.vd=&vd;
-	  vb.pcmend=framesize;
-
-	  /* floor quantization/application */
-	  nonzero[i]=_floor_P[1]->forward(&vb,floor_look,
-					  mdct,
-					  logmdct,
-					  mask,
-					  logmax,
-					  
-					  flr[i]);
-	}
-
-	_vp_remove_floor(&p_look,
-			 pg_look,
-			 logmdct,
-			 mdct,
-			 flr[i],
-			 pcm[i],
-			 local_ampmax[i]);
-
-	for(j=0;j<framesize/2;j++)
-	  if(fabs(pcm[i][j])>1500)
-	    fprintf(stderr,"%ld ",frameno+i);
-	
-	analysis("res",frameno+i,pcm[i],framesize/2,1,0);
-	analysis("codedflr",frameno+i,flr[i],framesize/2,1,1);
+        float amp;
+        float *fft=work[i];
+        float *logmax=fft;
+        float *mdct=pcm[i];
+        float *logmdct=mdct+framesize/2;
+        float *mask=fft+framesize/2;
+
+        /* floor psychoacoustics */
+        _vp_compute_mask(&p_look,
+                         pg_look,
+                         i,
+                         fft,
+                         logmdct,
+                         mask,
+                         ampmax,
+                         local_ampmax[i],
+                         framesize/2);
+
+        analysis("mask",frameno+i,mask,framesize/2,1,0);
+
+        {
+          vorbis_block vb;
+          vorbis_dsp_state vd;
+          memset(&vd,0,sizeof(vd));
+          vd.vi=&vi;
+          vb.vd=&vd;
+          vb.pcmend=framesize;
+
+          /* floor quantization/application */
+          nonzero[i]=_floor_P[1]->forward(&vb,floor_look,
+                                          mdct,
+                                          logmdct,
+                                          mask,
+                                          logmax,
+
+                                          flr[i]);
+        }
+
+        _vp_remove_floor(&p_look,
+                         pg_look,
+                         logmdct,
+                         mdct,
+                         flr[i],
+                         pcm[i],
+                         local_ampmax[i]);
+
+        for(j=0;j<framesize/2;j++)
+          if(fabs(pcm[i][j])>1500)
+            fprintf(stderr,"%ld ",frameno+i);
+
+        analysis("res",frameno+i,pcm[i],framesize/2,1,0);
+        analysis("codedflr",frameno+i,flr[i],framesize/2,1,1);
       }
 
       /* residue prequantization */
       _vp_partition_prequant(&p_look,
-			     &vi,
-			     pcm,
-			     nonzero);
-	
+                             &vi,
+                             pcm,
+                             nonzero);
+
       for(i=0;i<2;i++)
-	analysis("quant",frameno+i,pcm[i],framesize/2,1,0);
+        analysis("quant",frameno+i,pcm[i],framesize/2,1,0);
 
       /* channel coupling / stereo quantization */
 
       _vp_couple(&p_look,
-		 &mapping_info,
-		 pcm,
-		 nonzero);
-  
+                 &mapping_info,
+                 pcm,
+                 nonzero);
+
       for(i=0;i<2;i++)
-	analysis("coupled",frameno+i,pcm[i],framesize/2,1,0);
+        analysis("coupled",frameno+i,pcm[i],framesize/2,1,0);
 
       /* decoupling */
       for(i=mapping_info.coupling_steps-1;i>=0;i--){
-	float *pcmM=pcm[mapping_info.coupling_mag[i]];
-	float *pcmA=pcm[mapping_info.coupling_ang[i]];
-	
-	for(j=0;j<framesize/2;j++){
-	  float mag=pcmM[j];
-	  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;
-	    }
-	  else
-	    if(ang>0){
-	      pcmM[j]=mag;
-	      pcmA[j]=mag+ang;
-	    }else{
-	      pcmA[j]=mag;
-	      pcmM[j]=mag-ang;
-	    }
-	}
+        float *pcmM=pcm[mapping_info.coupling_mag[i]];
+        float *pcmA=pcm[mapping_info.coupling_ang[i]];
+
+        for(j=0;j<framesize/2;j++){
+          float mag=pcmM[j];
+          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;
+            }
+          else
+            if(ang>0){
+              pcmM[j]=mag;
+              pcmA[j]=mag+ang;
+            }else{
+              pcmA[j]=mag;
+              pcmM[j]=mag-ang;
+            }
+        }
       }
-    
+
       for(i=0;i<2;i++)
-	analysis("decoupled",frameno+i,pcm[i],framesize/2,1,0);
+        analysis("decoupled",frameno+i,pcm[i],framesize/2,1,0);
 
       for(i=0;i<2;i++){
-	float amp;
+        float amp;
 
-	for(j=0;j<framesize/2;j++)
-	  pcm[i][j]*=flr[i][j];
+        for(j=0;j<framesize/2;j++)
+          pcm[i][j]*=flr[i][j];
 
-	analysis("final",frameno+i,pcm[i],framesize/2,1,1);
+        analysis("final",frameno+i,pcm[i],framesize/2,1,1);
 
-	/* take it back to time */
-	mdct_backward(&m_look,pcm[i],pcm[i]);
+        /* take it back to time */
+        mdct_backward(&m_look,pcm[i],pcm[i]);
 
-	for(j=0;j<framesize/2;j++)
-	  out[i][j]+=pcm[i][j]*window[j];
+        for(j=0;j<framesize/2;j++)
+          out[i][j]+=pcm[i][j]*window[j];
 
-	analysis("out",frameno+i,out[i],framesize/2,0,0);
+        analysis("out",frameno+i,out[i],framesize/2,0,0);
 
 
       }
-           
+
       /* write data.  Use the part of buffer we're about to shift out */
       for(i=0;i<2;i++){
-	char  *ptr=buffer+i*2;
-	float *mono=out[i];
-	int flag=0;
-	for(j=0;j<framesize/2;j++){
-	  int val=mono[j]*32767.;
-	  /* might as well guard against clipping */
-	  if(val>32767){
-	    if(!flag)fprintf(stderr,"clipping in frame %ld ",frameno+i);
-	    flag=1;
-	    val=32767;
-	  }
-	  if(val<-32768){
-	    if(!flag)fprintf(stderr,"clipping in frame %ld ",frameno+i);
-	    flag=1;
-	    val=-32768;
-	  }
-	  ptr[0]=val&0xff;
-	  ptr[1]=(val>>8)&0xff;
-	  ptr+=4;
-	}
+        char  *ptr=buffer+i*2;
+        float *mono=out[i];
+        int flag=0;
+        for(j=0;j<framesize/2;j++){
+          int val=mono[j]*32767.;
+          /* might as well guard against clipping */
+          if(val>32767){
+            if(!flag)fprintf(stderr,"clipping in frame %ld ",frameno+i);
+            flag=1;
+            val=32767;
+          }
+          if(val<-32768){
+            if(!flag)fprintf(stderr,"clipping in frame %ld ",frameno+i);
+            flag=1;
+            val=-32768;
+          }
+          ptr[0]=val&0xff;
+          ptr[1]=(val>>8)&0xff;
+          ptr+=4;
+        }
       }
- 
+
       fprintf(stderr,"*");
       fwrite(buffer,1,framesize*2,stdout);
       memmove(buffer,buffer2,framesize*2);
 
       for(i=0;i<2;i++){
-	for(j=0,k=framesize/2;j<framesize/2;j++,k++)
-	  out[i][j]=pcm[i][k]*window[k];
+        for(j=0,k=framesize/2;j<framesize/2;j++,k++)
+          out[i][j]=pcm[i][k]*window[k];
       }
       frameno+=2;
     }else
@@ -514,7 +517,7 @@ int main(int argc,char *argv[]){
   }
   fprintf(stderr,"average raw bits of entropy: %.03g/sample\n",acc/tot);
   fprintf(stderr,"average nonzero samples: %.03g/%d\n",nonz/tot*framesize/2,
-	  framesize/2);
+          framesize/2);
   fprintf(stderr,"Done\n\n");
   return 0;
 }