Commit e770ed19 authored by Adam Mills's avatar Adam Mills
Browse files

Fixing the binary hrtf files and the convertor so that they use the correct number of taps

parent 7a8335cc

apps/decoder.c

+2 −0
Original line number Diff line number Diff line
@@ -668,6 +668,7 @@ int main( 
        if ( ( error = load_fastconv_HRTF_from_binary( hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in loading HRTF binary file %s for FastConv \n\n", arg.hrtfCRendFileName );

            goto cleanup;

        }

        IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin = NULL;

        IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin );
@@ -675,6 +676,7 @@ int main( 
        if ( ( error = load_parambin_HRTF_from_binary( hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in loading HRTF binary file %s for parametric binauralizer \n\n", arg.hrtfCRendFileName );

            goto cleanup;

        }

    }

scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ 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)



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

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



set(SOURCE_FILES_C

  ${IVAS_REND_PATH}/ivas_rom_binauralRenderer.c

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+3 −3
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG 


        latency_s = FASTCONV_HOA3_latency_s;

        hrtf_channels = HRTF_SH_CHANNELS;

        num_taps = BINAURAL_NTAPS;

        num_taps = BINAURAL_NTAPS_SBA;

    }

    else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 )

    {
@@ -845,7 +845,7 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG 


        latency_s = FASTCONV_HOA2_latency_s;

        hrtf_channels = 9;

        num_taps = BINAURAL_NTAPS;

        num_taps = BINAURAL_NTAPS_SBA;

    }

    else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA )

    {
@@ -857,7 +857,7 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG 


        latency_s = FASTCONV_FOA_latency_s;

        hrtf_channels = 4;

        num_taps = BINAURAL_NTAPS;

        num_taps = BINAURAL_NTAPS_SBA;

    }

    else

    {