Commit cd1e7c52 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 1158-rendering-using-fastconv-to-binaural_room_reverb-uses-brir-convolution
parents 91aa6d7c f3dbf5db

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -435,6 +435,8 @@ check-compatibility-with-basop-reference-branch: 
    - make -j -C ivas-basop

    - cp ivas-basop/IVAS_cod ./IVAS_cod_ref

    - cp ivas-basop/IVAS_dec ./IVAS_dec_ref

    - cp ivas-basop/IVAS_cod ./IVAS_cod # Not used but needed to launch the pytest

    - cp ivas-basop/IVAS_dec ./IVAS_dec # Not used but needed to launch the pytest

    - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm

    - python3 tests/create_short_testvectors.py

    - exit_code1=0

lib_rend/lib_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -3977,7 +3977,7 @@ ivas_error IVAS_REND_GetDelay( 
        if ( hIvasRend->inputsSba[i].base.inConfig != IVAS_AUDIO_CONFIG_INVALID )

        {

#ifdef FIX_1135_EXT_RENDERER_HANDLES

            if ( hIvasRend->splitRendWrapper->hBinHrSplitPreRend != NULL )

            if ( hIvasRend->splitRendWrapper != NULL && hIvasRend->splitRendWrapper->hBinHrSplitPreRend != NULL )

#else

            if ( hIvasRend->splitRendWrapper.hBinHrSplitPreRend != NULL )

#endif