comparison Plugins/Input/wma/iir.c @ 300:e35b0290f77c trunk

[svn] Squash 3 warnings by compiling as C99 code. Remove round_trick kludge.

299:0235eaed75fe

 */

/* IIR filter coefficients */
#include "iir.h"
#include <math.h>
#include <tgmath.h>

/* History for two filters */
static sXYData data_history[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned));
static sXYData data_history2[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned));

    { (5.4697667908e-01), (2.2651166046e-01), (1.0153238114e+00) },    /*  6000.0 Hz */
    { (3.1023210589e-01), (3.4488394706e-01), (-1.8142472036e-01) },    /* 12000.0 Hz */
    { (2.6718639778e-01), (3.6640680111e-01), (-5.2117742267e-01) },    /* 14000.0 Hz */
    { (2.4201241845e-01), (3.7899379077e-01), (-8.0847117831e-01) },    /* 16000.0 Hz */
};

int round_trick(float floatvalue_to_round);

/* Round function provided by Frank Klemm which saves around 100K
 * CPU cycles in my PIII for each call to the IIR function
 */
__inline__ int round_trick(float floatvalue_to_round)
{
	float    floattmp ;
	int  rounded_value ;
                                                                                
        floattmp      = (int) 0x00FD8000L + (floatvalue_to_round);
        rounded_value = *(int*)(&floattmp) - (int)0x4B7D8000L;
                                                                                
        if ( rounded_value != (short) rounded_value )
            rounded_value = ( rounded_value >> 31 ) ^ 0x7FFF;
		return rounded_value;
}

/* Init the filter */
void init_iir()
{
	iir_cf = iir_cforiginal10;

			 */

			out[channel] += (data[index+channel]>>2);

			/* Round and convert to integer */
#ifdef __i386__
                        tempgint = round_trick(out[channel]);
#else
			tempgint = (int)lroundf(out[channel]);
#endif

			/* Limit the output */
			if (tempgint < -32768)
				data[index+channel] = -32768;
			else if (tempgint > 32767)

		
	}/* For each pair of samples */

	return length;
}

300:e35b0290f77c

 */

/* IIR filter coefficients */
#include "iir.h"
#include <math.h>
#include <strings.h>

/* History for two filters */
static sXYData data_history[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned));
static sXYData data_history2[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned));

    { (5.4697667908e-01), (2.2651166046e-01), (1.0153238114e+00) },    /*  6000.0 Hz */
    { (3.1023210589e-01), (3.4488394706e-01), (-1.8142472036e-01) },    /* 12000.0 Hz */
    { (2.6718639778e-01), (3.6640680111e-01), (-5.2117742267e-01) },    /* 14000.0 Hz */
    { (2.4201241845e-01), (3.7899379077e-01), (-8.0847117831e-01) },    /* 16000.0 Hz */
};

/* Init the filter */
void init_iir()
{
	iir_cf = iir_cforiginal10;

			 */

			out[channel] += (data[index+channel]>>2);

			/* Round and convert to integer */
			tempgint = (int)lroundf(out[channel]);

			/* Limit the output */
			if (tempgint < -32768)
				data[index+channel] = -32768;
			else if (tempgint > 32767)

		
	}/* For each pair of samples */

	return length;
}