Commit 775f0b98 authored by vaclav's avatar vaclav
Browse files

fix

parent d720a79b

lib_dec/ivas_binRenderer_internal.c

+9 −0
Original line number Diff line number Diff line
@@ -1144,6 +1144,15 @@ ivas_error ivas_binRenderer_open( 
        hBinRenderer->render_lfe = 1;

    }



#ifdef FIX_HRTF_LOAD

    if ( ( st_ivas->hHrtfFastConv == NULL ) && st_ivas->hDecoderConfig->Opt_HRTF_binary &&

         ( st_ivas->ivas_format != SBA_ISM_FORMAT ) // ToDo: temporary hack to avoid ASAN errors -> see issue #1202

    )

    {

        return IVAS_ERROR( IVAS_ERR_INTERNAL, "HRTF binary file present but not used in TD renderer" );

    }

#endif



    /* Load HRTF tables */

    if ( ( error = ivas_binaural_hrtf_open( &st_ivas->hHrtfFastConv, st_ivas->hIntSetup.output_config, st_ivas->renderer_type ) ) != IVAS_ERR_OK )

    {

lib_util/hrtf_file_reader.c

+2 −1
Original line number Diff line number Diff line
@@ -1943,7 +1943,8 @@ ivas_error load_fastconv_HRTF_from_binary( 
        if ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV &&

               ( ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 && intern_audio_config == IVAS_AUDIO_CONFIG_HOA3 ) ||

                 ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 && intern_audio_config == IVAS_AUDIO_CONFIG_HOA2 ) ||

                 ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA && intern_audio_config == IVAS_AUDIO_CONFIG_FOA ) ) ) ||

                 ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA && intern_audio_config == IVAS_AUDIO_CONFIG_FOA ) ||

                 ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED && intern_audio_config == IVAS_AUDIO_CONFIG_7_1_4 ) ) ) ||

             ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV || hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM ) && room_reverb_flag == 1 ) ||

             ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV || hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM ) && intern_audio_config == IVAS_AUDIO_CONFIG_INVALID ) )

#else