Commit 1c1837f9 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Fix csv and met for OMASA test cases using other than 48 kHz input.

parent 71ccfa7e
Loading
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
../IVAS_dec -Tracefile tracefile_dec -VOIP STEREO 32 netsimoutput testv/ltv48_OMASA_3ISM_1TC.wav_STEREO_sw_48-32_JBM5.tst

// OMASA 1Dir2TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.2 out, JBM Prof 5
../IVAS_cod -ism_masa 3 2 testv/ltv32_OMASA_3ISM_2TC_ISM1.csv testv/ltv32_OMASA_3ISM_2TC_ISM2.csv testv/ltv32_OMASA_3ISM_2TC_ISM3.csv testv/ltv32_OMASA_3ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/ltv32_OMASA_3ISM_2TC.wav bit
../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_3ISM_2TC_ISM1.csv testv/ltv48_OMASA_3ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/ltv32_OMASA_3ISM_2TC.wav bit
networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
../IVAS_dec -Tracefile tracefile_dec -VOIP 5_1_2 48 netsimoutput testv/ltv32_OMASA_3ISM_2TC.wav_5_1_2_sw_32-48_JBM5.tst

@@ -1352,12 +1352,12 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
../IVAS_dec EXT 48 bit testv/ltv48_OMASA_1ISM_2TC.wav_EXT_128000_48-48.tst

// OMASA 2Dir1TC 1ISM at 512 kbps, 32kHz in, 48kHz out, 7.1.4 out, FEC at 5%
../IVAS_cod -ism_masa 1 1 testv/ltv32_OMASA_1ISM_1TC_ISM1.csv testv/ltv32_OMASA_1ISM_1TC.met 512000 32 testv/ltv32_OMASA_1ISM_1TC.wav bit
../IVAS_cod -ism_masa 1 1 testv/ltv48_OMASA_1ISM_1TC_ISM1.csv testv/ltv48_OMASA_1ISM_1TC.met 512000 32 testv/ltv32_OMASA_1ISM_1TC.wav bit
../IVAS_dec -fec 5 7_1_4 48 bit testv/ltv32_OMASA_1ISM_1TC.wav_7_1_4_512000_32-48.tst


// OMASA 1Dir1TC 2ISM at 16.4 kbps, 16kHz in, 48kHz out, 5.1 out
../IVAS_cod -ism_masa 2 1 testv/ltv16_OMASA_2ISM_1TC_ISM1.csv testv/ltv16_OMASA_2ISM_1TC_ISM2.csv testv/ltv16_OMASA_2ISM_1TC.met 16400 16 testv/ltv16_OMASA_2ISM_1TC.wav bit
../IVAS_cod -ism_masa 2 1 testv/ltv48_OMASA_2ISM_1TC_ISM1.csv testv/ltv48_OMASA_2ISM_1TC_ISM2.csv testv/ltv48_OMASA_2ISM_1TC.met 16400 16 testv/ltv16_OMASA_2ISM_1TC.wav bit
../IVAS_dec 5_1 48 bit testv/ltv16_OMASA_2ISM_1TC.wav_5_1_16400_16-48.tst

// OMASA 2Dir2TC 2ISM at 32 kbps, 48kHz in, 48kHz out, STEREO out, FEC at 5%
@@ -1386,11 +1386,11 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
../IVAS_dec MONO 48 bit testv/ltv48_OMASA_3ISM_2TC.wav_MONO_48000_48-48.tst

// OMASA 1Dir1TC 3ISM at 64 kbps, 32kHz in, 32kHz out, BINAURAL out
../IVAS_cod -ism_masa 3 1 testv/ltv32_OMASA_3ISM_1TC_ISM1.csv testv/ltv32_OMASA_3ISM_1TC_ISM2.csv testv/ltv32_OMASA_3ISM_1TC_ISM3.csv testv/ltv32_OMASA_3ISM_1TC.met 64000 32 testv/ltv32_OMASA_3ISM_1TC.wav bit
../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_3ISM_1TC_ISM1.csv testv/ltv48_OMASA_3ISM_1TC_ISM2.csv testv/ltv48_OMASA_3ISM_1TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met 64000 32 testv/ltv32_OMASA_3ISM_1TC.wav bit
../IVAS_dec BINAURAL 32 bit testv/ltv32_OMASA_3ISM_1TC.wav_BINAURAL_64000_32-32.tst

// OMASA 2Dir2TC 3ISM at 80 kbps, 32kHz in, 16kHz out, 5.1.4 out
../IVAS_cod -ism_masa 3 2 testv/ltv32_OMASA_3ISM_2TC_ISM1.csv testv/ltv32_OMASA_3ISM_2TC_ISM2.csv testv/ltv32_OMASA_3ISM_2TC_ISM3.csv testv/ltv32_OMASA_3ISM_2TC.met 80000 32 testv/ltv32_OMASA_3ISM_2TC.wav bit
../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_3ISM_2TC_ISM1.csv testv/ltv48_OMASA_3ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met 80000 32 testv/ltv32_OMASA_3ISM_2TC.wav bit
../IVAS_dec 5_1_4 16 bit testv/ltv32_OMASA_3ISM_2TC.wav_5_1_4_80000_32-16.tst

// OMASA 2Dir1TC 3ISM at 96 kbps, 48kHz in, 48kHz out, MONO out
@@ -1398,7 +1398,7 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
../IVAS_dec MONO 48 bit testv/ltv48_OMASA_3ISM_1TC.wav_MONO_96000_48-48.tst

// OMASA 1Dir2TC 3ISM at 160 kbps, 16kHz in, 32kHz out, HOA3 out
../IVAS_cod -ism_masa 3 2 testv/ltv16_OMASA_3ISM_2TC_ISM1.csv testv/ltv16_OMASA_3ISM_2TC_ISM2.csv testv/ltv16_OMASA_3ISM_2TC_ISM3.csv testv/ltv16_OMASA_3ISM_2TC.met 160000 16 testv/ltv16_OMASA_3ISM_2TC.wav bit
../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_3ISM_2TC_ISM1.csv testv/ltv48_OMASA_3ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met 160000 16 testv/ltv16_OMASA_3ISM_2TC.wav bit
../IVAS_dec HOA3 32 bit testv/ltv16_OMASA_3ISM_2TC.wav_HOA3_160000_16-32.tst


@@ -1445,7 +1445,7 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
../IVAS_dec -fec 10 STEREO 32 bit testv/ltv48_OMASA_3ISM_1TC.wav_STEREO_sw_48-32.tst

// OMASA 1Dir2TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.4 out
../IVAS_cod -ism_masa 3 2 testv/ltv32_OMASA_3ISM_2TC_ISM1.csv testv/ltv32_OMASA_3ISM_2TC_ISM2.csv testv/ltv32_OMASA_3ISM_2TC_ISM3.csv testv/ltv32_OMASA_3ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/ltv32_OMASA_3ISM_2TC.wav bit
../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_3ISM_2TC_ISM1.csv testv/ltv48_OMASA_3ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/ltv32_OMASA_3ISM_2TC.wav bit
../IVAS_dec 5_1_4 48 bit testv/ltv32_OMASA_3ISM_2TC.wav_5_1_4_sw_32-48.tst

// OMASA 1Dir1TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out, FEC at 5%