Commit b9e07fd5 authored by norvell's avatar norvell
Browse files

Merge branch 'main' into ci/ivas-conformance-stv

parents b9c80512 7b01eae7

apps/decoder.c

+17 −0
Original line number Diff line number Diff line
@@ -1704,6 +1704,15 @@ static bool parseCmdlIVAS_dec( 
            usage_dec();

            return false;

        }



#ifdef FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK

        if ( arg->outputMdFilename != NULL && arg->outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

        {

            fprintf( stderr, "Error: Output split rendering metadata file is supported for BINAURAL_SPLIT_PCM output config. only\n\n" );

            usage_dec();

            return false;

        }

#endif

    }

    else

    {
@@ -1990,6 +1999,14 @@ static ivas_error initOnFirstGoodFrame( 
        }

        else

        {

#ifdef FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK

            if ( arg.outputMdFilename == NULL )

            {

                fprintf( stderr, "\nOutput split rendering metadata file not specified\n" );

                return IVAS_ERR_INVALID_SPLIT_REND_CONFIG;

            }

#endif



            if ( ( error = split_rend_writer_open( splitRendWriter, arg.outputMdFilename, delayNumSamples_temp[0], delayTimeScale_temp, splitRendCodec, poseCorrection, splitRendCodecFrameSizeMs ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nUnable to open output split rendering metadata file %s\n", arg.outputWavFilename );

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ 


#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */



#define FIX_1077_MEMORY_TEST_MISSING                    /* orange: issue 1077 : add missing memory test*/

#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK        /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */



/* #################### End BE switches ################################## */

lib_util/hrtf_file_reader.c

+4 −0
Original line number Diff line number Diff line
@@ -1860,7 +1860,11 @@ ivas_error destroy_hrtf_statistics( 
    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics /* i/o: HRTF statistics handle  */

)

{

#ifdef FIX_1077_MEMORY_TEST_MISSING

    if ( ( hHrtfStatistics != NULL ) && ( *hHrtfStatistics != NULL ) && ( ( *hHrtfStatistics )->fromROM == FALSE ) )

#else

    if ( hHrtfStatistics != NULL && ( *hHrtfStatistics )->fromROM == FALSE )

#endif

    {

        free( ( *hHrtfStatistics )->average_energy_l );

        free( ( *hHrtfStatistics )->average_energy_r );

scripts/binauralRenderer_interface/CMakeLists.txt

+7 −2
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ set(IVAS_TRUNK_DEC_PATH ${IVAS_TRUNK_PATH}/lib_dec) 
set(IVAS_TRUNK_REND_PATH ${IVAS_TRUNK_PATH}/lib_rend)

set(IVAS_TRUNK_ENC_PATH ${IVAS_TRUNK_PATH}/lib_enc)

set(IVAS_TRUNK_COM_PATH ${IVAS_TRUNK_PATH}/lib_com)

set(IVAS_TRUNK_ISAR_PATH ${IVAS_TRUNK_PATH}/lib_isar)

set(IVAS_TRUNK_LC3_PATH ${IVAS_TRUNK_PATH}/lib_lc3plus)

set(IVAS_TRUNK_DEBUG_PATH ${IVAS_TRUNK_PATH}/lib_debug)



option(USE_MATLAB_ENG "Use matlab engine" OFF) # allows to use sofa file as input to the exe, but on windows requires to register matlab as a com server type in matlab "comserver('register')""
@@ -27,7 +29,8 @@ message("Matlab_MX_LIBRARY = ${Matlab_MX_LIBRARY}") 
message("Matlab_MEX_LIBRARY = ${Matlab_MEX_LIBRARY}")

message("Matlab_ENGINE_LIBRARY = ${Matlab_ENGINE_LIBRARY}")

message("Matlab_DATAARRAY_LIBRARY = ${Matlab_DATAARRAY_LIBRARY}")

include_directories(${Matlab_INCLUDE_DIRS} ${IVAS_TRUNK_UTIL_PATH} ${IVAS_TRUNK_ENC_PATH} ${IVAS_TRUNK_DEC_PATH} ${IVAS_TRUNK_REND_PATH} ${IVAS_TRUNK_COM_PATH} ${IVAS_TRUNK_DEBUG_PATH})

include_directories(${Matlab_INCLUDE_DIRS} ${IVAS_TRUNK_UTIL_PATH} ${IVAS_TRUNK_ENC_PATH} ${IVAS_TRUNK_DEC_PATH} ${IVAS_TRUNK_REND_PATH} ${IVAS_TRUNK_COM_PATH} ${IVAS_TRUNK_ISAR_PATH} ${IVAS_TRUNK_LC3_PATH} ${IVAS_TRUNK_DEBUG_PATH})



if(USE_MATLAB_ENG)

    string(REPLACE "mex" "eng" Matlab_ENG_LIBRARY ${Matlab_MEX_LIBRARY})

    add_definitions(-DUSE_MATLAB_ENG)
@@ -71,9 +74,11 @@ add_library(${PROJECT_NAME}_lib STATIC ${SOURCE_FILES_C} ${SOURCE_FILES_H}) 
add_executable(${PROJECT_NAME} generate_crend_ivas_tables_from_sofa.c)



target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib ${Matlab_MAT_LIBRARY} ${Matlab_MX_LIBRARY})



if(UNIX AND NOT APPLE)

    target_link_libraries(${PROJECT_NAME} libstdc++.so.6 -lm -ldl)

endif()



if(USE_MATLAB_ENG)

    target_link_libraries(${PROJECT_NAME} ${Matlab_ENG_LIBRARY})

endif()

scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ set(IVAS_ENC_PATH ${IVAS_PATH}/lib_enc) 
set(IVAS_COM_PATH ${IVAS_PATH}/lib_com)

set(IVAS_REND_PATH ${IVAS_PATH}/lib_rend)

set(IVAS_DEBUG_PATH ${IVAS_PATH}/lib_debug)

set(IVAS_LC3PLUS_PATH ${IVAS_PATH}/lc3plus)

set(IVAS_LC3PLUS_PATH ${IVAS_PATH}/lib_lc3plus)

set(IVAS_ISAR_PATH ${IVAS_PATH}/lib_isar)



include_directories(${IVAS_UTIL_PATH} ${IVAS_ENC_PATH} ${IVAS_DEC_PATH} ${IVAS_COM_PATH} ${IVAS_REND_PATH} ${IVAS_DEBUG_PATH} ${IVAS_LC3PLUS_PATH})

include_directories(${IVAS_UTIL_PATH} ${IVAS_ENC_PATH} ${IVAS_DEC_PATH} ${IVAS_COM_PATH} ${IVAS_REND_PATH} ${IVAS_DEBUG_PATH} ${IVAS_LC3PLUS_PATH} ${IVAS_ISAR_PATH})



set(SOURCE_FILES_C

  ${IVAS_REND_PATH}/ivas_rom_binauralRenderer.c
@@ -40,4 +41,3 @@ add_executable(${PROJECT_NAME} generate_tables_from_rom_to_bin.c) 
target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib)



add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:${PROJECT_NAME}>" "${CMAKE_CURRENT_SOURCE_DIR}/")