Commit fdf3c7d3 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch 'new-osba-baseline' of forge.3gpp.org:ivas-codec-pc/ivas-codec... 

Merge branch 'new-osba-baseline' of forge.3gpp.org:ivas-codec-pc/ivas-codec into new-osba-paseline_pc
parents 12d742de bf2ee6cf

lib_enc/ivas_osba_enc.c

+2 −1
Original line number Diff line number Diff line
@@ -192,7 +192,8 @@ ivas_error ivas_osba_enc_reconfig( 
)

{



    int16_t n, nSCE_old, nCPE_old, nchan_transport_old, old_ism_mode;

    int16_t n, nSCE_old, nCPE_old, nchan_transport_old;

    ISM_MODE old_ism_mode;

    int32_t ivas_total_brate;

    ivas_error error;

    ENCODER_CONFIG_HANDLE hEncoderConfig;

scripts/config/self_test.prm

+52 −0
Original line number Diff line number Diff line
@@ -1365,3 +1365,55 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit 
../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit

../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_ROOM_REVERB_sw_48-48.tst





// OSBA FOA 1ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out

../IVAS_cod -ism_sba 1 1 testv/stvISM1.csv 32000 48 testv/stvOSBA_1ISM_FOA48c.wav bit

../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

../IVAS_cod -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

../IVAS_cod -ism_sba 3 1 testv/stvISM1.csv testv/stvISM1.csv testv/stvISM3.csv 128000 48 testv/stvOSBA_3ISM_FOA48c.wav bit

../IVAS_dec 7_1_4 48 bit testv/stvOSBA_3ISM_FOA48c.wav_7_1_4_128000_48-48.tst



// OSBA FOA 4ISM at 256 kbps, 48kHz in, 48kHz out, EXT out

../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM1.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stvOSBA_4ISM_FOA48c.wav bit

../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_FOA48c.wav_EXT_256000_48-48.tst



// OSBA FOA 4ISM at 512 kbps, 48kHz in, 48kHz out, BINAURAL out

../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM1.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_FOA48c.wav bit

../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_FOA48c.wav_BINAURAL_512000_48-48.tst



// OSBA 2OA 1ISM at 24.4 kbps, 48kHz in, 48kHz out, FOA out

../IVAS_cod -ism_sba 1 2 testv/stvISM1.csv 24400 48 testv/stvOSBA_1ISM_2OA48c.wav bit

../IVAS_dec FOA 48 bit testv/stvOSBA_1ISM_2OA48c.wav_FOA_24400_48-48.tst



// OSBA 2OA 2ISM at 48 kbps, 48kHz in, 48kHz out, MONO out

../IVAS_cod -ism_sba 2 2 testv/stvISM1.csv testv/stvISM2.csv 48000 48 testv/stvOSBA_2ISM_2OA48c.wav bit

../IVAS_dec MONO 48 bit testv/stvOSBA_2ISM_2OA48c.wav_MONO_48000_48-48.tst



// OSBA 2OA 3ISM at 96 kbps, 48kHz in, 48kHz out, STEREO out

../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 96000 48 testv/stvOSBA_3ISM_2OA48c.wav bit

../IVAS_dec STEREO 48 bit testv/stvOSBA_3ISM_2OA48c.wav_STEREO_96000_48-48.tst



// OSBA 2OA 4ISM at 384 kbps, 48kHz in, 48kHz out, BINAURAL out

../IVAS_cod -ism_sba 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 384000 48 testv/stvOSBA_4ISM_2OA48c.wav bit

../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_2OA48c.wav_BINAURAL_384000_48-48.tst



// OSBA 3OA 1ISM at 512 kbps, 48kHz in, 48kHz out, EXT out

../IVAS_cod -ism_sba 1 3 testv/stvISM1.csv 512000 48 testv/stvOSBA_1ISM_3OA48c.wav bit

../IVAS_dec EXT 48 bit testv/stvOSBA_1ISM_3OA48c.wav_EXT_512000_48-48.tst



// OSBA 3OA 2ISM at 256 kbps, 48kHz in, 48kHz out, 7_1 out

../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 48 testv/stvOSBA_2ISM_3OA48c.wav bit

../IVAS_dec 7_1 48 bit testv/stvOSBA_2ISM_3OA48c.wav_7_1_256000_48-48.tst



// OSBA 3OA 3ISM at 128 kbps, 48kHz in, 48kHz out, BINAURAL out

../IVAS_cod -ism_sba 3 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stvOSBA_3ISM_3OA48c.wav bit

../IVAS_dec BINAURAL 48 bit testv/stvOSBA_3ISM_3OA48c.wav_BINAURAL_128000_48-48.tst



// OSBA 3OA 4ISM at 16.4 kbps, 48kHz in, 48kHz out, 5_1 out

../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 16400 48 testv/stvOSBA_4ISM_3OA48c.wav bit

../IVAS_dec 5_1 48 bit testv/stvOSBA_4ISM_3OA48c.wav_5_1_16400_48-48.tst