Commit d090e9de authored by janssontoftg's avatar janssontoftg
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 310-rendering-add-latency_s-value-to-td-object-renderer-tables
parents 50f356de c3d2fff6

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1409,7 +1409,11 @@ typedef enum 
#define SFX_SPAT_BIN_NUM_SUBSAMPLES             64

#define ITD_MEM_LEN                             (MAX_ITD + SFX_SPAT_BIN_SINC_M)

#define L_SUBFRAME5MS_48k                       (L_FRAME48k/4)

#ifdef FIX_337_TDREND_INTP

#define MAX_ANGULAR_STEP                        (1.0f)

#else

#define MAX_ANGULAR_STEP                        (15.0f)

#endif

#define MAX_ANGULAR_STEP_INV                    ( 1.0f / MAX_ANGULAR_STEP )

#define MAX_INTERPOLATION_STEPS                 12

#ifndef FIX_310_TD_REND_DELAY

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -150,8 +150,8 @@ 
#define HRTF_BINARY_FILE                                /* HRTF filters' binary file used for binaural rendering. */



#define FIX_197_CREND_INTERFACE 

#define FIX_FOR_TEST                                    /* allows tests to pass using old TD binary file, to be removed after merge*/

#define FIX_301_PLC                                     /* FhG: issue 301 - fix bug of missing update of overlap buffer for DFT-stereo PLC*/

#define FIX_337_TDREND_INTP                             /* Issue 337: TD renderer interpolation threshold set too low */



#define FIX_310_TD_REND_DELAY                           /* Adding HRTF delay being read from ROM/Binary file, fix rounding for delay compensation in renderer */

lib_util/hrtf_file_reader.c

+0 −27
Original line number Diff line number Diff line
@@ -457,34 +457,7 @@ static ivas_error TDREND_MIX_LoadHRTF( 


    if ( ( header_check_result = read_and_check_hrtf_binary_file_header( &hrtfs_file_header, f_hrtf ) ) != IVAS_ERR_OK )

    {

#ifdef FIX_FOR_TEST

        fseek( f_hrtf, 0, SEEK_SET );

        if ( fread( &tmp, 1, sizeof( int16_t ), f_hrtf ) == 0 )

        {

            return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" );

        }



        HrFiltSet_p->FilterMethod = (TDREND_HRFILT_Method_t) tmp;



        if ( HrFiltSet_p->FilterMethod != TDREND_HRFILT_Method_BSplineModel )

        {

            error = IVAS_ERROR( IVAS_ERR_INVALID_HRTF, "The HR filter set file is not a supported type." );

        }

        else

        {

            error = LoadBSplineBinary( HrFiltSet_p, f_hrtf );

        }

        if ( error != IVAS_ERR_OK )

        {

            return header_check_result;

        }

        else

        {

            return error;

        }

#else

        return header_check_result;

#endif

    }



    is_tdrend = FALSE;

scripts/config/self_test.prm

+22 −5
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ 


// 1 ISm with metadata at 96 kbps, 48 kHz in, 16 kHz out, TD BINAURAL out (Model from file)

../IVAS_cod -ism 1 testv/stvISM1.csv 96000 48 testv/stv1ISM48s.pcm bit

../IVAS_dec -hrtf ../scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.pcm_96000_48-16_TD_binaural.tst

../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.pcm_96000_48-16_TD_binaural.tst



// 2 ISm with metadata at 160 kbps, 48 kHz in, 32 kHz out, TD BINAURAL out

../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 160000 48 testv/stv2ISM48s.pcm bit
@@ -377,7 +377,7 @@ 


// 3 ISm with metadata at 192 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out (Model from file)

../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.pcm bit

../IVAS_dec -hrtf ../scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_48kHz.bin BINAURAL 48 bit testv/stv3ISM48s.pcm_192000_48-48_TD_binaural.tst

../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv3ISM48s.pcm_192000_48-48_TD_binaural.tst



// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out

../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.pcm bit
@@ -385,11 +385,11 @@ 


// 1 ISm with metadata at 80 kbps, 48 kHz in, 16 kHz out, TD BINAURAL out (Model from file), head rotation, random FEC at 5%

../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.pcm bit

../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.pcm_80000_48-16_TDHR_FEC5.tst

../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.pcm_80000_48-16_TDHR_FEC5.tst



// 2 ISm with metadata at 128 kbps, 48 kHz in, 32 kHz out, TD BINAURAL out (Model from file), head rotation

../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 128000 48 testv/stv2ISM48s.pcm bit

../IVAS_dec -t testv/headrot_case01_3000_q.csv -hrtf ../scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.pcm_128000_48-32_TDHR.tst

../IVAS_dec -t testv/headrot_case01_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.pcm_128000_48-32_TDHR.tst



// 3 ISm with metadata at 192 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation, random FEC at 5%

../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.pcm bit
@@ -913,6 +913,23 @@ 
../IVAS_dec -FEC 5 STEREO 32 bit testv/stv714MC48c.pcm_sw_48-32_stereo.tst





// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 16kHz out, BINAURAL_ROOM out (Model from file)

../IVAS_cod -mc 5_1_4 512000 48 testv/stv514MC48c.pcm bit

../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL_ROOM 16 bit testv/stv51MC48c.pcm_MC51_512000_48-16_MC_binaural_room.tst



// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 32kHz out, BINAURAL out (Model from file)

../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.pcm bit

../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv714MC48c.pcm_MC714_512000_48-32_MC_binaural.tst



// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL out (Model from file)

../IVAS_cod -mc 5_1_4 512000 48 testv/stv514MC48c.pcm bit

../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv51MC48c.pcm_MC51_512000_48-48_MC_binaural.tst



// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out (Model from file)

../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.pcm bit

../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL_ROOM 48 bit testv/stv714MC48c.pcm_MC714_512000_48-48_MC_binaural_room.tst





// Stereo downmix to bit-exact EVS at 13200 kbps, 32kHz in, 32kHz out

../IVAS_cod -stereo_dmx_evs 13200 32 testv/stvST32c.pcm bit

../IVAS_dec 32 bit testv/stvST32c.pcm_StereoDmxEVS_13200_32-32.tst