me/portaudio
Watch
1
0
Fork
You've already forked portaudio
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed warnings that broke build.

Browse source 
Fixed bug added to paqa_latency.c that caused a failed test to appear to succeed. Error result was not passed up to main.
This commit is contained in:
philburk 2012-06-22 21:02:36 +00:00
commit 39f9a22d28
1 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

35
qa/paqa_latency.c
View file

@ -253,8 +253,8 @@ static int paqaCheckMultipleSuggested( PaDeviceIndex deviceIndex, int isInput )
if( (highLatency - lowLatency) < 0.001 ) if( (highLatency - lowLatency) < 0.001 )
{ {
numLoops = 1; numLoops = 1;
} }
for( i=0; i<numLoops; i++ ) for( i=0; i<numLoops; i++ )
{ {
@ -291,17 +291,19 @@ static int paqaCheckMultipleSuggested( PaDeviceIndex deviceIndex, int isInput )
printf(" finalLatency = %6.4f\n", finalLatency ); printf(" finalLatency = %6.4f\n", finalLatency );
/* For the default low & high latency values, expect quite close; for other requested /* For the default low & high latency values, expect quite close; for other requested
* values, at worst the next power-of-2 may result (eg 513 -> 1024) */ * values, at worst the next power-of-2 may result (eg 513 -> 1024) */
if( i == 0 | i == ( numLoops - 1 )) toleranceRatio = ( (i == 0) || (i == ( numLoops - 1 )) ) ? 0.1 : 1.0;
toleranceRatio = 0.1;
else
toleranceRatio = 1.0;
QA_ASSERT_CLOSE( "final latency should be close to suggested latency", QA_ASSERT_CLOSE( "final latency should be close to suggested latency",
streamParameters.suggestedLatency, finalLatency, (streamParameters.suggestedLatency * toleranceRatio) ); streamParameters.suggestedLatency, finalLatency, (streamParameters.suggestedLatency * toleranceRatio) );
if( i == 0 ) if( i == 0 )
{
previousLatency = finalLatency; previousLatency = finalLatency;
}
} }
if( numLoops > 1 ) if( numLoops > 1 )
{
QA_ASSERT_TRUE( " final latency should increase with suggested latency", (finalLatency > previousLatency) ); QA_ASSERT_TRUE( " final latency should increase with suggested latency", (finalLatency > previousLatency) );
}
return 0; return 0;
error: error:
@ -323,18 +325,22 @@ static int paqaVerifySuggestedLatency( void )
printf("\nUsing device #%d: '%s' (%s)\n", id, pdi->name, Pa_GetHostApiInfo(pdi->hostApi)->name); printf("\nUsing device #%d: '%s' (%s)\n", id, pdi->name, Pa_GetHostApiInfo(pdi->hostApi)->name);
if( pdi->maxOutputChannels > 0 ) if( pdi->maxOutputChannels > 0 )
{ {
if( (result = paqaCheckMultipleSuggested( id, 0 )) != 0 ) if( paqaCheckMultipleSuggested( id, 0 ) < 0 )
{
printf("OUTPUT CHECK FAILED !!! #%d: '%s'\n", id, pdi->name); printf("OUTPUT CHECK FAILED !!! #%d: '%s'\n", id, pdi->name);
result -= 1;
}
} }
if( pdi->maxInputChannels > 0 ) if( pdi->maxInputChannels > 0 )
{ {
if( (result = paqaCheckMultipleSuggested( id, 1 )) != 0 ) if( paqaCheckMultipleSuggested( id, 1 ) < 0 )
{
printf("INPUT CHECK FAILED !!! #%d: '%s'\n", id, pdi->name); printf("INPUT CHECK FAILED !!! #%d: '%s'\n", id, pdi->name);
result -= 1;
}
} }
} }
return 0; return result;
error:
return -1;
} }
/*******************************************************************/ /*******************************************************************/
@ -463,14 +469,13 @@ int main(void)
err = paqaCheckLatency( &outputParameters, &data, sampleRate, paFramesPerBufferUnspecified ); err = paqaCheckLatency( &outputParameters, &data, sampleRate, paFramesPerBufferUnspecified );
if( err != paNoError ) goto error; if( err != paNoError ) goto error;
Pa_Terminate(); Pa_Terminate();
printf("Test finished.\n"); printf("SUCCESS - test finished.\n");
return err; return err;
error: error:
Pa_Terminate(); Pa_Terminate();
fprintf( stderr, "An error occured while using the portaudio stream\n" ); fprintf( stderr, "ERROR - test failed.\n" );
fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error number: %d\n", err );
fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
return err; return err;