Commit 9f8be23a authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[fix] CMake Build

parent 5c69af8f

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ add_library(lib_util ${libUtilSrcs} ${libUtilHeaders}) 
file(GLOB libCRendSrcs "scripts/ivas_pytests/tests/unit_tests/crend/*.c")

file(GLOB libCRendHeaders "scripts/ivas_pytests/tests/unit_tests/crend/*.h")

add_executable(IVAS_crend_unit_test ${libCRendSrcs} ${libCRendHeaders})

target_link_libraries(IVAS_crend_unit_test lib_dec lib_rend lib_util lib_com lib_debug)

target_link_libraries(IVAS_crend_unit_test lib_rend lib_dec lib_util lib_com lib_debug)



add_executable(IVAS_cod apps/encoder.c)

target_link_libraries(IVAS_cod lib_enc lib_util)

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

+8 −8
Original line number Diff line number Diff line
@@ -200,14 +200,14 @@ static ivas_result_t ivas_crend_reverb_test( ivas_crend_io_params_t *pIo_params 
#else

    AudioFileWriter_close( &pIo_params->fOut );

    AudioFileReader *fOut;

    AudioFileReader_open( &fOut , pIo_params->out_path, pIo_params->sample_rate);

    AudioFileReader_open( &fOut , pIo_params->out_path, &pIo_params->sample_rate);

    int16_t numRead;

    /* Compare */

    if ( pIo_params->fRef )

    {

        AudioFileReader_close( &pIo_params->fRef );

        AudioFileReader *fRef;

        AudioFileReader_open( &fRef, pIo_params->ref_path, pIo_params->sample_rate );

        AudioFileReader_open( &fRef, pIo_params->ref_path, &pIo_params->sample_rate );



        if ( test != FAIL )

        {
@@ -337,8 +337,8 @@ static ivas_result_t ivas_crend_proximity_test( ivas_crend_io_params_t *pIo_para 
        AudioFileReader_close( &pIo_params->fRef );

        AudioFileWriter_close( &pIo_params->fOut );

        AudioFileReader *fRef, *fOut;

        AudioFileReader_open( &fOut, pIo_params->out_path, pIo_params->sample_rate );

        AudioFileReader_open( &fRef, pIo_params->ref_path, pIo_params->sample_rate );

        AudioFileReader_open( &fOut, pIo_params->out_path, &pIo_params->sample_rate );

        AudioFileReader_open( &fRef, pIo_params->ref_path, &pIo_params->sample_rate );

        while ( 1 )

        {

            acc_0f = 0.0f;
@@ -500,8 +500,8 @@ static ivas_result_t ivas_crend_binaural_test( ivas_crend_io_params_t *pIo_param 
        AudioFileReader_close( &pIo_params->fRef );

        AudioFileWriter_close( &pIo_params->fOut );

        AudioFileReader *fRef, *fOut;

        AudioFileReader_open( &fOut, pIo_params->out_path, pIo_params->sample_rate );

        AudioFileReader_open( &fRef, pIo_params->ref_path, pIo_params->sample_rate );

        AudioFileReader_open( &fOut, pIo_params->out_path, &pIo_params->sample_rate );

        AudioFileReader_open( &fRef, pIo_params->ref_path, &pIo_params->sample_rate );



        skip_samples = (int32_t) ( pIo_params->latency_s * pIo_params->sample_rate );

        /* skip intial samples based on latency */
@@ -630,8 +630,8 @@ static ivas_result_t ivas_crend_no_diegetic_test( ivas_crend_io_params_t *pIo_pa 
    AudioFileReader_close( &pIo_params->fRef );

    AudioFileWriter_close( &pIo_params->fOut );

    AudioFileReader *fRef, *fOut;

    AudioFileReader_open( &fOut, pIo_params->out_path, pIo_params->sample_rate );

    AudioFileReader_open( &fRef, pIo_params->ref_path, pIo_params->sample_rate );

    AudioFileReader_open( &fOut, pIo_params->out_path, &pIo_params->sample_rate );

    AudioFileReader_open( &fRef, pIo_params->ref_path, &pIo_params->sample_rate );



    if ( fRef )

    {

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

+2 −2
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ void ivas_open_files_crend( ivas_crend_io_params_t *pIo_params ) 
#ifdef USE_PCM_OUT

    if ( ( pIo_params->fIn[0] = fopen( pIo_params->in_path, "rb" ) ) == NULL )

#else

    if ( AudioFileReader_open( &pIo_params->fIn[0] , pIo_params->in_path, pIo_params->sample_rate ) != IVAS_ERR_OK )

    if ( AudioFileReader_open( &pIo_params->fIn[0] , pIo_params->in_path, &pIo_params->sample_rate ) != IVAS_ERR_OK )

#endif

    {

        fprintf( stderr, "Error: Input audio file %s could not be opened\n\n", pIo_params->in_path );
@@ -464,7 +464,7 @@ void ivas_open_files_crend( ivas_crend_io_params_t *pIo_params ) 
#ifdef USE_PCM_OUT

    if ( ( strlen( pIo_params->ref_path ) > 0 ) && ( ( pIo_params->fRef = fopen( pIo_params->ref_path, "rb" ) ) == NULL ) )

#else

    if ( ( strlen( pIo_params->ref_path ) > 0 ) && ( AudioFileReader_open( &pIo_params->fRef, pIo_params->ref_path, pIo_params->sample_rate ) != IVAS_ERR_OK ) )

    if ( ( strlen( pIo_params->ref_path ) > 0 ) && ( AudioFileReader_open( &pIo_params->fRef, pIo_params->ref_path, &pIo_params->sample_rate ) != IVAS_ERR_OK ) )

#endif

    {

        fprintf( stderr, "Error: Reference audio file %s could not be opened\n\n", pIo_params->ref_path );