Applying iface changes from ITABase

parent bfd393eb
......@@ -118,7 +118,7 @@ int main( int, char** )
cout << timeToString(sw.stop()) << endl << endl; //stop timing
*/
ITADSP::CIIRCoefficients oYuleCoeffs;
ITADSP::CFilterCoefficients oYuleCoeffs;
ITADSP::IIRFilterGenerator::Yulewalk( oIR2, oYuleCoeffs );
......@@ -171,7 +171,7 @@ void Burg_Time_Test() {
for( i = 0; i < max_runs; i++ ) { //loop over repeated trials to average over
ITADSP::CIIRCoefficients oBurgCoeffs( j, false );
ITADSP::CFilterCoefficients oBurgCoeffs( j, false );
ITAStopWatch sw;
......@@ -224,16 +224,16 @@ void VDLIIRTest()
unsigned int uiNumberOfFrames = ( unsigned int ) std::ceil( dSamplerate * fSimulateSeconds / ( float ) uiBlocklength );
int iCursor0 = pSIMOVDL->AddCursor(); //create read cursors for the vdl
pSIMOVDL->SetDelaySamples( iCursor0, .0f ); //set how many samples the cursor is delayed by from the write cursor
pSIMOVDL->SetDelaySamples( iCursor0, 0 ); //set how many samples the cursor is delayed by from the write cursor
int iCursor1 = pSIMOVDL->AddCursor();
pSIMOVDL->SetDelaySamples( iCursor1, 11.0f );
pSIMOVDL->SetDelaySamples( iCursor1, 11 );
int iCursor2 = pSIMOVDL->AddCursor();
pSIMOVDL->SetDelaySamples( iCursor2, float( uiBlocklength * 2 ) );
pSIMOVDL->SetDelaySamples( iCursor2, int( uiBlocklength * 2 ) );
int iCursor3 = pSIMOVDL->AddCursor();
pSIMOVDL->SetDelaySamples( iCursor3, float( uiBlocklength * 3 ) );
pSIMOVDL->SetDelaySamples( iCursor3, int( uiBlocklength * 3 ) );
ITAAudiofileProperties props_in;
props_in.iChannels = 1;
......@@ -286,22 +286,22 @@ void VDLIIRTest()
CITAIIRFilterEngine oIIRFilterEngine1( filter_order ); //create an IIR filter
ITADSP::CIIRCoefficients oFilterCoeffs1( filter_order, false );
ITADSP::CFilterCoefficients oFilterCoeffs1( filter_order, false );
ITADSP::IIRFilterGenerator::Burg( oIR1, oFilterCoeffs1 );
oIIRFilterEngine1.SetCoefficients( oFilterCoeffs1 ); //set filter coefficients to those calculated with Burg
CITAIIRFilterEngine oIIRFilterEngine2( filter_order ); //create an IIR filter
ITADSP::CIIRCoefficients oFilterCoeffs2( filter_order, false );
ITADSP::CFilterCoefficients oFilterCoeffs2( filter_order, false );
ITADSP::IIRFilterGenerator::Burg( oIR2, oFilterCoeffs2 );
oIIRFilterEngine2.SetCoefficients( oFilterCoeffs2 ); //set filter coefficients to those calculated with Burg
CITAIIRFilterEngine oIIRFilterEngine3( filter_order ); //create an IIR filter
ITADSP::CIIRCoefficients oFilterCoeffs3( filter_order, false );
ITADSP::CFilterCoefficients oFilterCoeffs3( filter_order, false );
ITADSP::IIRFilterGenerator::Burg( oIR3, oFilterCoeffs3 );
oIIRFilterEngine3.SetCoefficients( oFilterCoeffs3 ); //set filter coefficients to those calculated with Burg
CITAIIRFilterEngine oIIRFilterEngine4( filter_order ); //create an IIR filter
ITADSP::CIIRCoefficients oFilterCoeffs4( filter_order, false );
ITADSP::CFilterCoefficients oFilterCoeffs4( filter_order, false );
ITADSP::IIRFilterGenerator::Burg( oIR4, oFilterCoeffs4 );
oIIRFilterEngine4.SetCoefficients( oFilterCoeffs4 ); //set filter coefficients to those calculated with Burg
......
......@@ -44,11 +44,11 @@ int main( int, char** )
float* pfOut = sbOutput.GetData();
ITADSP::CIIRCoefficients oCoeffs;
ITADSP::CFilterCoefficients oCoeffs;
oCoeffs.uiOrder = 2;
oCoeffs.vfNumerator = { 1, 2, 1 };
oCoeffs.vfDenominator = { 1, 0.56f, 0.78f };
oCoeffs.is_ARMA = true;
oCoeffs.bIsARMA = true;
#ifdef WITH_JSON_SUPPORT
ITADSP::ExportIIRCoefficientsToJSON( "ITADSPIIRFilterTest_coeffs.json", oCoeffs );
#endif
......
......@@ -10,6 +10,6 @@
"a2" : 0.56,
"a3" : 0.78
},
"design_algorithm" : -858993460,
"design_algorithm" : 0,
"is_ARMA" : true
}
\ No newline at end of file
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment