Commit 74cc87af authored by Adam Mills's avatar Adam Mills
Browse files

Merge branch '669-Loading-the-HRTF-binary-files-provided-in-repo-fail-for-FASTCONV' into 'main' 

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

See merge request !917
parents 15e51883 b01b3e76

apps/decoder.c

+2 −0
Original line number Diff line number Diff line
@@ -705,6 +705,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 );
@@ -712,6 +713,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/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

    {