Commit b7ce0dd4 authored by norvell's avatar norvell
Browse files

Resolve gcc compiler warnings in ivas_crend_utest_utils.c

parent 30575623

scripts/ivas_pytests/tests/unit_tests/crend/ivas_crend_utest_utils.c

+20 −18
Original line number Diff line number Diff line
@@ -82,35 +82,37 @@ static int32_t ivas_check_rounding( float binaural_latencys_s[3], int16_t use_ro 
    *err_lfe = 0;

    *err_dec = 0;



    for ( int ind1 = 0; ind1 < sizeof( sampleRates ) / sizeof( float ); ind1++ )

    // for ( int ind1 = 0; ind1 < sizeof( sampleRates ) / sizeof( float ); ind1++ ) // gcc complains it cannot resolve the number of array elements this way -- changed to hard-coded loop below

    for ( int ind1 = 0; ind1 < 3; ind1++ ) 

    {

        if ( verbose )

            printf( "\nsample rate = %f", sampleRates[ind1] );

        for ( int ind2 = 0; ind2 < sizeof( binaural_latencys_s ) / sizeof( float ); ind2++ )

        // for ( int ind2 = 0; ind2 < sizeof( binaural_latencys_s ) / sizeof( float ); ind2++ ) // gcc complains it cannot resolve the number of array elements this way -- changed to hard-coded loop below

        for ( int ind2 = 0; ind2 < 3; ind2++ )

        {

            wanted = (int32_t) roundf( binaural_latencys_s[ind2] * sampleRates[ind1] );

            if ( verbose )

                printf( "\nbinaural_latencys_s = %f wanted = %ld", binaural_latencys_s[ind2], wanted );

                printf( "\nbinaural_latencys_s = %f wanted = %d", binaural_latencys_s[ind2], wanted );

            if ( use_round_latency )

                delay_ns[ind2] = (int32_t) roundf( binaural_latencys_s[ind2] * 1000000000.f );

            else

                delay_ns[ind2] = (int32_t) ( binaural_latencys_s[ind2] * 1000000000.f );

            if ( verbose )

                printf( "\n delay_ns[%d] = %ld \n", ind2, delay_ns[ind2] );

                printf( "\n delay_ns[%d] = %d \n", ind2, delay_ns[ind2] );



            if ( use_round_for_lfe )

                delay_lfe[ind1][ind2] = (int32_t) roundf( delay_ns[ind2] * sampleRates[ind1] / 1000000000.f );

            else

                delay_lfe[ind1][ind2] = (int32_t) NS2SA( sampleRates[ind1], delay_ns[ind2] );

            if ( verbose )

                printf( "\ndelay_lfe[%d][%d] = %ld\n", ind1, ind2, delay_lfe[ind1][ind2] );

                printf( "\ndelay_lfe[%d][%d] = %d\n", ind1, ind2, delay_lfe[ind1][ind2] );

            *err_lfe += abs( delay_lfe[ind1][ind2] - wanted );



            delay_dec[ind1][ind2] = NS2SA( sampleRates[ind1], (float) delay_ns[ind2] + 0.5f );

            //         delay_dec[ind1][ind2] = NS2SA( sampleRates[ind1], (float) delay_ns[ind2] );



            if ( verbose )

                printf( "\ndelay_dec[%d][%d] = %ld \n", ind1, ind2, delay_dec[ind1][ind2] );

                printf( "\ndelay_dec[%d][%d] = %d \n", ind1, ind2, delay_dec[ind1][ind2] );

            *err_dec += abs( delay_dec[ind1][ind2] - wanted );

        }

    }
@@ -1151,32 +1153,32 @@ ivas_result_t ivas_common_mixer_renderer( ivas_crend_io_params_t *pIo_params, fl 


    int32_t err = 0, err_lfe = 0, err_dec = 0;

    err = ivas_check_rounding( binaural_latencys_fastconv_s, 0, 0, &err_lfe, &err_dec, 0 );

    printf( "\nerr_lfe = %ld err_dec = %ld", err_lfe, err_dec );

    printf( "\nerr_lfe = %d err_dec = %d", err_lfe, err_dec );

    err += ivas_check_rounding( binaural_latencys_crend_s, 0, 0, &err_lfe, &err_dec, 0 );

    printf( "\nerr_lfe = %ld err_dec = %ld", err_lfe, err_dec );

    printf( "\nerr_lfe = %d err_dec = %d", err_lfe, err_dec );

    err += ivas_check_rounding( binaural_latencys_td_s, 0, 0, &err_lfe, &err_dec, 0 );

    printf( "\n\nerr = %ld err_lfe = %ld err_dec = %ld\n\n", err, err_lfe, err_dec );

    printf( "\n\nerr = %d err_lfe = %d err_dec = %d\n\n", err, err_lfe, err_dec );



    err = ivas_check_rounding( binaural_latencys_fastconv_s, 0, 1, &err_lfe, &err_dec, 0 );

    printf( "\nerr_lfe = %ld err_dec = %ld", err_lfe, err_dec );

    printf( "\nerr_lfe = %d err_dec = %d", err_lfe, err_dec );

    err += ivas_check_rounding( binaural_latencys_crend_s, 0, 1, &err_lfe, &err_dec, 0 );

    printf( "\nerr_lfe = %ld err_dec = %ld", err_lfe, err_dec );

    printf( "\nerr_lfe = %d err_dec = %d", err_lfe, err_dec );

    err += ivas_check_rounding( binaural_latencys_td_s, 0, 1, &err_lfe, &err_dec, 0 );

    printf( "\n\nerr = %ld err_lfe = %ld err_dec = %ld\n\n", err, err_lfe, err_dec );

    printf( "\n\nerr = %d err_lfe = %d err_dec = %d\n\n", err, err_lfe, err_dec );



    err = ivas_check_rounding( binaural_latencys_fastconv_s, 1, 0, &err_lfe, &err_dec, 0 );

    printf( "\nerr_lfe = %ld err_dec = %ld", err_lfe, err_dec );

    printf( "\nerr_lfe = %d err_dec = %d", err_lfe, err_dec );

    err += ivas_check_rounding( binaural_latencys_crend_s, 1, 0, &err_lfe, &err_dec, 0 );

    printf( "\nerr_lfe = %ld err_dec = %ld", err_lfe, err_dec );

    printf( "\nerr_lfe = %d err_dec = %d", err_lfe, err_dec );

    err += ivas_check_rounding( binaural_latencys_td_s, 1, 0, &err_lfe, &err_dec, 0 );

    printf( "\n\nerr = %ld err_lfe = %ld err_dec = %ld\n\n", err, err_lfe, err_dec );

    printf( "\n\nerr = %d err_lfe = %d err_dec = %d\n\n", err, err_lfe, err_dec );



    err = ivas_check_rounding( binaural_latencys_fastconv_s, 1, 1, &err_lfe, &err_dec, 0 );

    printf( "\nerr_lfe = %ld err_dec = %ld", err_lfe, err_dec );

    printf( "\nerr_lfe = %d err_dec = %d", err_lfe, err_dec );

    err += ivas_check_rounding( binaural_latencys_crend_s, 1, 1, &err_lfe, &err_dec, 0 );

    printf( "\nerr_lfe = %ld err_dec = %ld", err_lfe, err_dec );

    printf( "\nerr_lfe = %d err_dec = %d", err_lfe, err_dec );

    err += ivas_check_rounding( binaural_latencys_td_s, 1, 1, &err_lfe, &err_dec, 0 );

    printf( "\n\nerr = %ld err_lfe = %ld err_dec = %ld\n\n", err, err_lfe, err_dec );

    printf( "\n\nerr = %d err_lfe = %d err_dec = %d\n\n", err, err_lfe, err_dec );





    ivas_render_config_open( &st_ivas.hRenderConfig );