Commit 2aec9930 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/add-bw-switching-testcases

parents 1f445b22 0f77ad0e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ 
#define NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING                 /* Dlb: issue 907: fix for band mapping at VLBR */

#define NONBE_FIX_869_MASA_PREREND_MERGE                      /* Nokia: issue: #869: MASA pre-rend not updating energy */

#define NONBE_FIX_931_IGF_STEREO_DEC_NOISE	                  /* FhG: issue #931: fix noise substitution in the stereo IGF decoder      */

#define NONBE_FIX_943_RECONFIG_IGF_AFTER_SETTING_BW           /* FhG: issue 943: fix crash in BW switchin from WB in MDCT-Stereo core encoder */



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

lib_enc/ivas_cpe_enc.c

+18 −0
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ ivas_error ivas_cpe_enc( 
     * Core codec configuration

     *----------------------------------------------------------------*/



#ifndef NONBE_FIX_943_RECONFIG_IGF_AFTER_SETTING_BW

    /* IGF reconfiguration */

    for ( n = 0; n < n_CoreChannels; n++ )

    {
@@ -533,6 +534,7 @@ ivas_error ivas_cpe_enc( 
        }

    }



#endif

    if ( hCPE->element_mode == IVAS_CPE_MDCT && st_ivas->hMCT == NULL )

    {

        /* set coded BW for MDCT stereo */
@@ -554,6 +556,22 @@ ivas_error ivas_cpe_enc( 
        }

    }



#ifdef NONBE_FIX_943_RECONFIG_IGF_AFTER_SETTING_BW

    /* IGF reconfiguration */

    for ( n = 0; n < n_CoreChannels; n++ )

    {

        if ( ( hCPE->last_element_brate != hCPE->element_brate || hCPE->element_mode != hCPE->last_element_mode || ( hCPE->element_mode == IVAS_CPE_TD && sts[0]->bits_frame_nominal != last_bits_frame_nominal ) || sts[n]->last_bwidth != sts[n]->bwidth ) && ( n == 0 || hCPE->element_mode == IVAS_CPE_MDCT ) )

        {

            int16_t igf;

            igf = getIgfPresent( sts[n]->element_mode, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, sts[n]->max_bwidth, sts[n]->rf_mode );

            if ( ( error = IGF_Reconfig( &sts[n]->hIGFEnc, igf, 0, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, sts[n]->max_bwidth, sts[n]->element_mode, sts[n]->rf_mode ) ) != IVAS_ERR_OK )

            {

                return error;

            }

        }

    }

#endif



    /* set ACELP@12k8 / ACELP@16k flag for flexible ACELP core */

    for ( n = 0; n < n_CoreChannels; n++ )

    {

scripts/config/self_test.prm

+25 −25
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec STEREO 32 bit testv/stvST32n.wav_stereo_13200_32-32_DTX.tst



// stereo at 13.2 kbps, 32kHz in, 32kHz out, DTX on, random FER at 5%, bandwidth switching

../IVAS_cod -max_band scripts/testv/ivas_bws_20fr_start_WB.txt -stereo -dtx 13200 32 testv/stvST32n.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_WB.txt -stereo -dtx 13200 32 testv/stvST32n.wav bit

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec STEREO 32 bit_error testv/stvST32n.wav_stereo_13200_32-32_DTX_FER5.tst
@@ -188,7 +188,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec STEREO 32 bit_error testv/stvST48c.wav_stereo_32000_48-32_FER5.tst



// stereo at 32 kbps, 48kHz in, 48kHz out, DTX on, random FER at 5%, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_WB.txt -stereo -dtx 32000 48 testv/stvST48n.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_WB.txt -stereo -dtx 32000 48 testv/stvST48n.wav bit

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec STEREO 48 bit_error testv/stvST48n.wav_stereo_32000_48-48_DTX_FER5.tst
@@ -226,7 +226,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec STEREO 32 bit_error testv/stvST32c.wav_stereo_48000_32-32_FER5.tst



// stereo at 64 kbps, 32kHz in, 32kHz out, bandwidth switching

../IVAS_co -max_band ivas_bws_20fr_start_FB.txtd -stereo 64000 32 testv/stvST32c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_FB.txt -stereo 64000 32 testv/stvST32c.wav bit

../IVAS_dec STEREO 32 bit testv/stvST32c.wav_stereo_64000_32-32.tst



// stereo at 96 kbps, 32kHz in, 32kHz out, random FER at 5%
@@ -247,7 +247,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec MONO 48 bit testv/stvST48c.wav_stereo_128000_48-48_MONO.tst



// stereo at 48 kbps, 48 kHz in, 48 kHz out, DTX on, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_SWB.txt -stereo -dtx 48000 48 testv/stvST48n.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_SWB.txt -stereo -dtx 48000 48 testv/stvST48n.wav bit

../IVAS_dec STEREO 48 bit testv/stvST48n.wav_stereo_48000_48-48_DTX.tst



// stereo at 48 kbps, 32 kHz in, 32 kHz out, DTX on
@@ -296,7 +296,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec BINAURAL 48 bit_error testv/stv48n.wav_1ISM_13200_48-48_DTX_FER5_BINAURAL.tst



// 1 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_WB.txt -ism 1 testv/stvISM1.csv 16400 48 testv/stv1ISM48s.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_WB.txt -ism 1 testv/stvISM1.csv 16400 48 testv/stv1ISM48s.wav bit

../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv1ISM48s.wav_16400_48-48_binaural_room.tst



// 1 ISM with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, MONO out
@@ -329,7 +329,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/stv1ISM48s.wav_80000_48-16_FER5_binaural_file_TDHR_EXOF.tst



// 1 ISM with metadata at 96 kbps, 48 kHz in, 16 kHz out, EXT out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_FB.txt  -ism 1 testv/stvISM1.csv 96000 48 testv/stv1ISM48s.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_FB.txt  -ism 1 testv/stvISM1.csv 96000 48 testv/stv1ISM48s.wav bit

../IVAS_dec EXT 16 bit testv/stv1ISM48s.wav_96000_48-16_EXT.tst



// 1 ISM with metadata bitrate switching from 13.2 kbps to 128 kbps, 32 kHz in, 32 kHz out, EXT out, DTX on
@@ -436,7 +436,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec FOA 48 bit testv/stv4ISM48s.wav_32000_48-48_FOA.tst



// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, STEREO out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_WB.txt -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_WB.txt -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit

../IVAS_dec STEREO 48 bit testv/stv4ISM48s.wav_32000_48-48_STEREO.tst



// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out
@@ -478,7 +478,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_96000_48-48_EXT.tst



// 4 ISM with metadata at 128 kbps, 48 kHz in, 48 kHz out, EXT out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_SWB.txt -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 128000 48 testv/stv4ISM48s.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_SWB.txt -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 128000 48 testv/stv4ISM48s.wav bit

../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_128000_48-48_EXT.tst



// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, EXT out
@@ -541,7 +541,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 




// SBA at 13.2 kbps, 32kHz in, 32kHz out, HOA3 out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_WB.txt -sba 3 13200 32 testv/stv3OA32c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_WB.txt -sba 3 13200 32 testv/stv3OA32c.wav bit

../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_SBA_13200_32-32_HOA3.tst



// SBA at 13.2 kbps, 32kHz in, 32kHz out, STEREO out
@@ -612,7 +612,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/stvFOA32c.wav_SBA_32000_32-32_BINAURAL_ROOM.tst



// SBA at 32 kbps, 48kHz in, 48kHz out, MONO out, DTX,bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_FB.txt -dtx -sba 1 32000 48 testv/stvFOA48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_FB.txt -dtx -sba 1 32000 48 testv/stvFOA48c.wav bit

../IVAS_dec MONO 48 bit testv/stvFOA48c.wav_SBA_32000_48-48_DTX_MONO.tst



// SBA at 48 kbps, 32kHz in, 32kHz out, MONO out, random FER at 5%
@@ -787,11 +787,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec 7_1 48 bit_error testv/stvFOA48c.wav_SBA_256000_48-48_7_1_FER5.tst



// SBA 2OA at 384 kbps, 32kHz in, 32kHz out, STEREO out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_WB.txt -sba 2 384000 32 testv/stv2OA32c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_WB.txt -sba 2 384000 32 testv/stv2OA32c.wav bit

../IVAS_dec STEREO 32 bit testv/stv2OA32c.wav_SBA_384000_32-32_stereo.tst



// SBA 3OA at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_SWB.txt -sba 3 512000 48 testv/stv3OA48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_SWB.txt -sba 3 512000 48 testv/stv3OA48c.wav bit

../IVAS_dec BINAURAL 48 bit testv/stv3OA48c.wav_SBA_512000_48-48_binaural.tst



// SBA 3OA at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, external orientation
@@ -844,7 +844,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 




// MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_SWB.txt -masa 1 testv/stv1MASA1TC48c.met 13200 48 testv/stv1MASA1TC48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_SWB.txt -masa 1 testv/stv1MASA1TC48c.met 13200 48 testv/stv1MASA1TC48c.wav bit

../IVAS_dec BINAURAL 48 bit testv/stv1MASA1TC48c.wav_13200_48-48_BINAURAL.tst



// MASA 1dir 1TC at 16.4 kbps, 48kHz in, 48kHz out, HOA3 out, random FER at 5%
@@ -899,7 +899,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv2MASA1TC48c.wav_128000_48-48_BINAURAL_Headrot_EXOF.tst



// MASA 1dir 2TC at 13.2 kbps, 48kHz in, 48kHz out, 5_1 out, random FER at 5%, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_WB.txt -masa 2 testv/stv1MASA2TC48c.met 13200 48 testv/stv1MASA2TC48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_WB.txt -masa 2 testv/stv1MASA2TC48c.met 13200 48 testv/stv1MASA2TC48c.wav bit

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 5_1 48 bit_error testv/stv1MASA2TC48c.wav_13200_48-48_5_1_FER5.tst
@@ -954,7 +954,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec 5_1 48 bit testv/stv1MASA2TC48c.wav_256000_48-48_5_1.tst



// MASA 2dir 2TC at 48 kbps, 48kHz in, 48kHz out, 5_1 out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_FB.txt -masa 2 testv/stv2MASA2TC48c.met 48000 48 testv/stv2MASA2TC48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_FB.txt -masa 2 testv/stv2MASA2TC48c.met 48000 48 testv/stv2MASA2TC48c.wav bit

../IVAS_dec 5_1 48 bit testv/stv2MASA2TC48c.wav_48000_48-48_5_1.tst



// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, EXTERNAL out, random FER at 5%
@@ -984,7 +984,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv2MASA2TC48c.wav_384000_48-48_BinauralRoom.tst



// MASA 2dir 2TC at 384 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_WB.txt -masa 2 testv/stv2MASA2TC48c.met 384000 48 testv/stv2MASA2TC48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_WB.txt -masa 2 testv/stv2MASA2TC48c.met 384000 48 testv/stv2MASA2TC48c.wav bit

../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv2MASA2TC48c.wav_384000_48-48_BinauralRoom_Subframe.tst



// MASA 2dir 2TC at 512 kbps, 48kHz in, 48kHz out, 5_1 out
@@ -1060,7 +1060,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec BINAURAL 48 bit_error testv/stv51MC48c.wav_MC51_24400_48-48_Binaural_FER5.tst



// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_WB.txt -mc 5_1 24400 48 testv/stv51MC48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_WB.txt -mc 5_1 24400 48 testv/stv51MC48c.wav bit

../IVAS_dec BINAURAL 48 bit testv/stv51MC48c.wav_MC51_24400_48-48_Binaural_Subframe.tst



// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation
@@ -1097,7 +1097,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_Binaural_room_Headrot_EXOF.tst



// Multi-channel 5_1 at 96 kbps, 48kHz in, 48kHz out, random FER at 5%, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_FB.txt -mc 5_1 96000 48 testv/stv51MC48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_FB.txt -mc 5_1 96000 48 testv/stv51MC48c.wav bit

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 5_1 48 bit_error testv/stv51MC48c.wav_MC51_96000_48-48_5_1_FER5.tst
@@ -1163,7 +1163,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec MONO 48 bit testv/stv51MC48c.wav_MC51_24400_48-48_MONO.tst



// Multi-channel 7_1_4 at 48 kbps, 48kHz in, 48kHz out, MONO out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_SWB.txt -mc 7_1_4 48000 48 testv/stv714MC48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_SWB.txt -mc 7_1_4 48000 48 testv/stv714MC48c.wav bit

../IVAS_dec MONO 48 bit testv/stv714MC48c.wav_MC714_48000_48-48_Mono.tst



// Multi-channel 7_1_4 at 64 kbps, 48kHz in, 48kHz out, MONO out, random FER at 5%
@@ -1185,7 +1185,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec 5_1 48 bit_error testv/stv714MC48c.wav_MC714_96000_48-48_5_1_FER5.tst



// Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48kHz out, BINAURAL out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_WB.txt -mc 7_1_4 160000 48 testv/stv714MC48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_WB.txt -mc 7_1_4 160000 48 testv/stv714MC48c.wav bit

../IVAS_dec BINAURAL 48 bit testv/stv714MC48c.wav_MC714_160000_48-48_MC_binaural.tst



// Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48kHz out, 7_1_4 out
@@ -1234,7 +1234,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv512MC48c.wav_MC512_512000_48-48_MC_Config_renderer.tst



// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config renderer, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_SWB.txt -mc 5_1_4 512000 48 testv/stv514MC48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_SWB.txt -mc 5_1_4 512000 48 testv/stv514MC48c.wav bit

../IVAS_dec -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv514MC48c.wav_MC514_512000_48-48_MC_Config_renderer.tst



// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config renderer
@@ -1262,7 +1262,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec 7_1_4 48 bit testv/stv51MC48c.wav_sw_48-48_7_1_4.tst



// Multi-channel 5_1 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 10%, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_WB.txt -mc 5_1 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv51MC48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_WB.txt -mc 5_1 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv51MC48c.wav bit

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g192 bit_error

../IVAS_dec BINAURAL 48 bit_error testv/stv51MC48c.wav_sw_48-48_binaural_FER10.tst
@@ -1425,7 +1425,7 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit 
../IVAS_dec BINAURAL 48 bit testv/stvOMASA_1ISM_2MASA2TC48c.wav_BINAURAL_13200_48-48.tst



// OMASA 1Dir2TC 1ISM at 128 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_SWB.txt -ism_masa 1 2 testv/stvISM1.csv testv/stv1MASA2TC48c.met 128000 48 testv/stvOMASA_1ISM_1MASA2TC48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_SWB.txt -ism_masa 1 2 testv/stvISM1.csv testv/stv1MASA2TC48c.met 128000 48 testv/stvOMASA_1ISM_1MASA2TC48c.wav bit

../IVAS_dec EXT 48 bit testv/stvOMASA_1ISM_1MASA2TC48c.wav_EXT_128000_48-48.tst



// OMASA 2Dir1TC 1ISM at 512 kbps, 32kHz in, 48kHz out, 7.1.4 out, FER at 5%
@@ -1549,7 +1549,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec BINAURAL 48 bit testv/stvOSBA_1ISM_FOA48c.wav_BINAURAL_32000_48-48.tst



// OSBA FOA 2ISM at 64 kbps, 48kHz in, 48kHz out, HOA3 out, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_WB.txt -ism_sba 2 1 testv/stvISM1.csv testv/stvISM2.csv 64000 48 testv/stvOSBA_2ISM_FOA48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_WB.txt -ism_sba 2 1 testv/stvISM1.csv testv/stvISM2.csv 64000 48 testv/stvOSBA_2ISM_FOA48c.wav bit

../IVAS_dec HOA3 48 bit testv/stvOSBA_2ISM_FOA48c.wav_HOA3_64000_48-48.tst



// OSBA FOA 3ISM at 128 kbps, 48kHz in, 48kHz out, 7_1_4 out
@@ -1617,7 +1617,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA32c.wav_EXT_sw_13k2_512k_32-48.tst



// OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 5%, bandwidth switching

../IVAS_cod -max_band ivas_bws_20fr_start_FB.txt -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_4ISM_FOA48c.wav bit

../IVAS_cod -max_band ../scripts/testv/ivas_bws_20fr_start_FB.txt -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_4ISM_FOA48c.wav bit

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec BINAURAL 48 bit_error testv/stvOSBA_4ISM_FOA48c.wav_BINAURAL_sw_48-48_FER5.tst

scripts/testv/ivas_bws_20fr_start_FB.txt

0 → 100644
+300 −0
Original line number Diff line number Diff line 
20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

scripts/testv/ivas_bws_20fr_start_SWB.txt

0 → 100644
+300 −0
Original line number Diff line number Diff line 
20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB

20 SWB

20 WB

20 FB

20 SWB

20 FB

20 WB