comparison libao2/pl_resample.c @ 4725:534ef9323eca

MMX part rewritten and 16 tap filter added for better sound qualty

4724:798fdbcef121

#define min(a,b)   (((a) < (b)) ? (a) : (b))
#define max(a,b)   (((a) > (b)) ? (a) : (b))

/* Below definition selects the length of each poly phase component.
   Valid definitions are L4 and L8, where the number denotes the
   length of the filter. This definition affects the computational
   complexity (see play()), the performance (see filter.h) and the
   memory usage. For now the filterlenght is choosen to 4 and without
   assembly optimization if no SSE is present.
*/

// #ifdef HAVE_SSE
#define L8    	1	// Filter bank type
#define W 	W8	// Filter bank parameters
#define L   	8	// Filter length
// #else	
// #define L4	1
// #define W 	W4
// #define L   	4
// #endif

#define CH  6	// Max number of channels
#define UP  128  /* Up sampling factor. Increasing this value will
                    improve frequency accuracy. Think about the L1
                    cashing of filter parameters - how big can it be? */

    register int16_t*	out   = pl_resample.data+ci;
    int16_t* 		end   = in+ao_plugin_data.len/2; // Block loop end

    wi = pwi; xi = pxi;

    LOAD_QUE(x);
    while(in < end){
      register uint16_t	i = inc;
      if(wi<level) i++;

      UPDATE_QUE(in);
      in+=nch;
      
      while(i--){
	// Run the FIR filter
	FIR((&x[xi]),(&w[wi*L]),out);
	len++; out+=nch;
	// Update wi to point at the correct polyphase component
	wi=(wi+dn)%up;
      }
    }
    SAVE_QUE(x);
  }

  // Save values that needs to be kept for next time
  pwi = wi;
  pxi = xi;

    register int16_t*	out   = pl_resample.data+ci;
    // Block loop end
    register int16_t* 	end   = in+ao_plugin_data.len/2;
    i = pi; wi = pwi; xi = pxi;

    LOAD_QUE(x);
    while(in < end){

      UPDATE_QUE(in);
      in+=nch;
      
      if(!--i){
	// Run the FIR filter
	FIR((&x[xi]),(&pl_resample.w[wi*L]),out);

	// Insert i number of new samples in queue
	i = inc;
	if(wi<level) i++;
      }
    }
    SAVE_QUE(x);
  }
  // Save values that needs to be kept for next time
  pwi = wi;
  pxi = xi;
  pi = i;

4725:534ef9323eca

#define min(a,b)   (((a) < (b)) ? (a) : (b))
#define max(a,b)   (((a) > (b)) ? (a) : (b))

/* Below definition selects the length of each poly phase component.
   Valid definitions are L8 and L16, where the number denotes the
   length of the filter. This definition affects the computational
   complexity (see play()), the performance (see filter.h) and the
   memory usage. The filterlenght is choosen to 8 if the machine is
   slow and to 16 if the machine is fast and has MMX.  
*/

#if !defined(HAVE_SSE) && !defined(HAVE_3DNOW) //This machine is slow
#define L8    	1	// Filter bank type
#define W 	W8	// Filter bank parameters
#define L   	8	// Filter length
#else	// Fat machine
#define L16	1
#define W 	W16
#define L   	16
#endif

#define CH  6	// Max number of channels
#define UP  128  /* Up sampling factor. Increasing this value will
                    improve frequency accuracy. Think about the L1
                    cashing of filter parameters - how big can it be? */

    register int16_t*	out   = pl_resample.data+ci;
    int16_t* 		end   = in+ao_plugin_data.len/2; // Block loop end

    wi = pwi; xi = pxi;

    while(in < end){
      register uint16_t	i = inc;
      if(wi<level) i++;

      UPDATE_QUE(in,x,xi);
      in+=nch;
      while(i--){
	// Run the FIR filter
	FIR((&x[xi]),(&w[wi*L]),out);
	len++; out+=nch;
	// Update wi to point at the correct polyphase component
	wi=(wi+dn)%up;
      }
    }
  }

  // Save values that needs to be kept for next time
  pwi = wi;
  pxi = xi;

    register int16_t*	out   = pl_resample.data+ci;
    // Block loop end
    register int16_t* 	end   = in+ao_plugin_data.len/2;
    i = pi; wi = pwi; xi = pxi;

    while(in < end){

      UPDATE_QUE(in,x,xi);
      in+=nch;
      
      if(!--i){
	// Run the FIR filter
	FIR((&x[xi]),(&pl_resample.w[wi*L]),out);

	// Insert i number of new samples in queue
	i = inc;
	if(wi<level) i++;
      }
    }
  }
  // Save values that needs to be kept for next time
  pwi = wi;
  pxi = xi;
  pi = i;