Commit f3260f5d authored by norvell's avatar norvell
Browse files

Merge branch 'main' into ci/update-basop-ci-branch

parents c7c270e5 70ff4fea

apps/decoder.c

+4 −0
Original line number Diff line number Diff line
@@ -298,7 +298,11 @@ int main( 
    if ( arg.hrtfReaderEnabled )

    {

        /* sanity check */

#ifdef NONBE_1293_SR_HRTF

        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#else

        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

        {

            arg.hrtfReaderEnabled = false;

            fprintf( stderr, "\nError: HRTF binary file cannot be used in this output configuration.\n\n" );

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ 
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_1300_TDREND_LARGE_ITD                     /* Eri: issue 1300: There was a bug feeding 1.25 ms frames to the TD renderer, causing out-of-buffer access. This was resolved. However, it is still possible that modeled HRTF with large ITDs could trigger out-of-buffer access. This adds a check to prevent this.*/

#define NONBE_1293_SR_HRTF                              /* VA: issue 1293: add support of external HRTFs in split rendering */



/* ##################### End NON-BE switches ########################### */

scripts/pyaudio3dtools/audioarray.py

+2 −2
Original line number Diff line number Diff line
@@ -379,8 +379,8 @@ def compare( 
                wavfile.write(str(tmpfile_test), 48000, test_tmp)

                del test_tmp

            else:

                wavfile.write(str(tmpfile_ref), 48000, ref)

                wavfile.write(str(tmpfile_test), 48000, test)

                wavfile.write(str(tmpfile_ref), 48000, ref.astype(np.int16))

                wavfile.write(str(tmpfile_test), 48000, test.astype(np.int16))



            cmd = [

                str(wdiff),