Commit 4fb2209d authored by vaclav's avatar vaclav
Browse files

fix external renderer set-up

parent 59a3eba6

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ int main( 


#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM_SIMPLIFY

            if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, args.outConfig.audioConfig, IVAS_AUDIO_CONFIG_EXTERNAL, hrtfFileReader ) ) != IVAS_ERR_OK )

            if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, args.outConfig.audioConfig, args.inConfig.ambisonicsBuses->audioConfig, hrtfFileReader ) ) != IVAS_ERR_OK )

#else

            if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, IVAS_AUDIO_CONFIG_EXTERNAL, hrtfFileReader ) ) != IVAS_ERR_OK )

#endif

lib_rend/lib_rend.c

+3 −0
Original line number Diff line number Diff line
@@ -7652,6 +7652,9 @@ void IVAS_REND_Close( 
    for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i )

    {

        clearInputSba( &hIvasRend->inputsSba[i] );

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM_2

        hIvasRend->hHrtfs.hHrtfFastConv = NULL;

#endif

    }

    for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )

    {

lib_util/hrtf_file_reader.c

+2 −3
Original line number Diff line number Diff line
@@ -2091,13 +2091,12 @@ ivas_error load_fastconv_HRTF_from_binary( 
        if ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV && /* HRIRs */

               ( OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL || OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) ||

             ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM && /* BRIRs */

               OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )

               OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) ||

             ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV && ( OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) )

        {

            load = ( (BINAURAL_INPUT_AUDIO_CONFIG) hrtf_header.input_cfg == hrtf_set_binaural_cfg ) ? true : false;

        }



        /* TBD: condition for external renderer */



        if ( load )

#else

        if ( ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV ) &&