Commit b43fc7d1 authored by emerit's avatar emerit
Browse files

Merge branch '744-fix-sofa-to-rom-tables-and-binaural-binary-files' of... 

Merge branch '744-fix-sofa-to-rom-tables-and-binaural-binary-files' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 744-fix-sofa-to-rom-tables-and-binaural-binary-files
parents 19d2f3b3 5759fa50

lib_rend/lib_rend.c

+3 −3
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ static ivas_error setRendInputActiveIsm( 
    {

        inputIsm->splitTdRendWrappers[i] = defaultTdRendWrapper();

#ifdef FIX_BINARY_BINAURAL_READING

        inputIsm->splitTdRendWrappers[i].hHrtfTD = hTD;

        inputIsm->splitTdRendWrappers[i].hHrtfTD = hrtfs.hHrtfTD;

#endif

    }

#endif
@@ -3025,7 +3025,7 @@ static ivas_error setRendInputActiveSba( 
        initRotGains( inputSba->rot_gains_prev[pos_idx] );

    }

#ifdef FIX_BINARY_BINAURAL_READING

    inputSba->cldfbRendWrapper.hHrtfFastConv = hFastConv;

    inputSba->cldfbRendWrapper.hHrtfFastConv = hrtfs.hHrtfFastConv;

#endif

#else

        inputSba->crendWrapper = NULL;

tests/conftest.py

+5 −0
Original line number Diff line number Diff line
@@ -408,6 +408,11 @@ class DecoderFrontend: 
        if add_option_list is not None:

            command.extend(add_option_list)



        # add to fix test failed to be removed after merge             

        if self._type == "REF":

            if '-hrtf' in command:

                command[command.index('-hrtf') + 1] = command[command.index('-hrtf') + 1] + "old" 



        # add mandatory parameters

        # output_config is mandatory for IVAS; EVS does not have this parameter, indicated by ""

        if output_config != "":