Commit 9f4f151f authored by Jan Kiene's avatar Jan Kiene
Browse files

fix some filenames and output formats

parent 9260de47

scripts/config/self_test_basop_encoder.prm

+13 −13
Original line number Diff line number Diff line
@@ -390,11 +390,11 @@ 


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

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

../IVAS_dec EXT 48 bit testv/stvOSBA_2ISM_3OA48c.wav_EXT56000_48-48.tst

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



// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, HOA2 out

// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, EXT out

../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 32 testv/stvOSBA_2ISM_3OA32c.wav bit

../IVAS_dec HOA2 32 bit testv/stvOSBA_2ISM_3OA32c.wav_HOA2_256000_32-32.tst

../IVAS_dec EXT 32 bit testv/stvOSBA_2ISM_3OA32c.wav_EXT_256000_32-32.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
@@ -428,9 +428,9 @@ 
../IVAS_cod -ism_sba 2 2 testv/stvISM1.csv testv/stvISM2.csv 48000 48 testv/stvOSBA_2ISM_2OA48c.wav bit

../IVAS_dec EXT 48 bit testv/stvOSBA_2ISM_2OA48c.wav_EXT_48000_48-48.tst



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

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

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

../IVAS_dec HOA2 48 bit testv/stvOSBA_1ISM_2OA48c.wav_HOA2_24400_48-48.tst

../IVAS_dec EXT 48 bit testv/stvOSBA_1ISM_2OA48c.wav_EXT_24400_48-48.tst



// OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL out

../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
@@ -882,9 +882,9 @@ 


// 4 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, EXT out

../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stv4ISM48s.wav bit

../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_64000_48-48_EXT_room.tst

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



// 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, EXT

// 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, EXT out

../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stv4ISM48s.wav bit

../IVAS_dec EXT 48 bit testv/stv4ISM48s.wav_512000_48-48_EXT.tst
@@ -942,7 +942,7 @@ 


// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, EXT out

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

../IVAS_dec EXT 48 bit testv/stv3ISM48s.wav_192000_48-48_EXTfile.tst

../IVAS_dec EXT 48 bit testv/stv3ISM48s.wav_192000_48-48_EXT.tst



// 3 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, EXT out

../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stv3ISM48s.wav bit
@@ -954,7 +954,7 @@ 


// 2 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, EXT out

../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stv2ISM48s.wav bit

../IVAS_dec EXT 48 bit testv/stv2ISM48s.wav_64000_48-48_EXT_room.tst

../IVAS_dec EXT 48 bit testv/stv2ISM48s.wav_64000_48-48_EXT.tst



// 2 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out

../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stv2ISM48s.wav bit
@@ -974,7 +974,7 @@ 


// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, EXT out

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

../IVAS_dec EXT 32 bit testv/stv2ISM48s.wav_128000_48-32_EXT_file_TDHR.tst

../IVAS_dec EXT 32 bit testv/stv2ISM48s.wav_128000_48-32_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

../IVAS_cod -dtx -ism 1 testv/stvISM1.csv ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/stv32c.wav bit
@@ -986,11 +986,11 @@ 


// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, EXT out

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

../IVAS_dec EXT 16 bit testv/stv1ISM48s.wav_80000_48-16_EXT_file_TDHR.tst

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



// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out, HR

../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit

../IVAS_dec EXT 48 bit testv/stv1ISM48s.wav_64000_48-48_EXT_room_HR.tst

../IVAS_dec EXT 48 bit testv/stv1ISM48s.wav_64000_48-48_EXT.tst



// 1 ISM with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, EXT out

../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 32000 32 testv/stv32n.wav bit
@@ -998,7 +998,7 @@ 


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

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

../IVAS_dec EXT 48 bit testv/stv1ISM48s.wav_16400_48-48_EXT_room.tst

../IVAS_dec EXT 48 bit testv/stv1ISM48s.wav_16400_48-48_EXT.tst



// 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, EXT out

../IVAS_cod -ism 1 testv/stvISM1.csv 13200 48 testv/stv1ISM48s.wav bit

scripts/config/self_test_ltv_basop_encoder.prm

+14 −14
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ 


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

../IVAS_cod -ism_sba 4 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv testv/ltv48_OSBA_4ISM_HOA3_ISM4.csv 256000 48 testv/ltv48_OSBA_4ISM_FOA.wav bit

../IVAS_dec EXT 48 bit testv/ltv48_OSBA_4ISM_FOA.wav_EXT56000_48-48.tst

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



// OSBA FOA 3ISM at 128 kbps, 48kHz in, 48kHz out, EXT out

../IVAS_cod -ism_sba 3 1 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv testv/ltv48_OSBA_3ISM_HOA3_ISM3.csv 128000 48 testv/ltv48_OSBA_3ISM_FOA.wav bit
@@ -392,9 +392,9 @@ 
../IVAS_cod -ism_sba 2 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv 256000 48 testv/ltv48_OSBA_2ISM_HOA3.wav bit

../IVAS_dec EXT 48 bit testv/ltv48_OSBA_2ISM_HOA3.wav_EXT56000_48-48.tst



// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, HOA2 out

// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, EXT out

../IVAS_cod -ism_sba 2 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv 256000 32 testv/ltv32_OSBA_2ISM_HOA3.wav bit

../IVAS_dec HOA2 32 bit testv/ltv32_OSBA_2ISM_HOA3.wav_HOA2_256000_32-32.tst

../IVAS_dec EXT 32 bit testv/ltv32_OSBA_2ISM_HOA3.wav_EXT_256000_32-32.tst



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

../IVAS_cod -ism_sba 1 3 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 512000 48 testv/ltv48_OSBA_1ISM_HOA3.wav bit
@@ -428,9 +428,9 @@ 
../IVAS_cod -ism_sba 2 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv testv/ltv48_OSBA_2ISM_HOA3_ISM2.csv 48000 48 testv/ltv48_OSBA_2ISM_HOA2.wav bit

../IVAS_dec EXT 48 bit testv/ltv48_OSBA_2ISM_HOA2.wav_EXT_48000_48-48.tst



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

../IVAS_cod -ism_sba 1 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 24400 48 testv/ltv48_OSBA_1ISM_HOA2.wav bit

../IVAS_dec HOA2 48 bit testv/ltv48_OSBA_1ISM_HOA2.wav_HOA2_24400_48-48.tst

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

../IVAS_cod -ism_sba 1 2 testv/ltv48_OSBA_1ISM_HOA3_ISM1.csv 24400 48 testv/ltv48_OSBA_1ISM_EXT.wav bit

../IVAS_dec EXT 48 bit testv/ltv48_OSBA_1ISM_EXT.wav_EXT_24400_48-48.tst



// OMASA 2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL out

../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_2TC.wav bit
@@ -844,7 +844,7 @@ 
../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/ltv48_4ISM.wav bit

../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_brate_sw_48-48_EXT.tst



// 4 ISM with metadata at 96 kbps, 48 kHz in, 48 kHz out

// 4 ISM with metadata at 96 kbps, 48 kHz in, 48 kHz out, EXT out

../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 96000 48 testv/ltv48_4ISM.wav bit

../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_96000_48-48_EXT.tst
@@ -854,9 +854,9 @@ 


// 4 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, EXT out

../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 64000 48 testv/ltv48_4ISM.wav bit

../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_64000_48-48_EXT_room.tst

../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_64000_48-48_EXT.tst



// 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, EXT

// 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, EXT out

../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 512000 48 testv/ltv48_4ISM.wav bit

../IVAS_dec EXT 48 bit testv/ltv48_4ISM.wav_512000_48-48_EXT.tst
@@ -914,7 +914,7 @@ 


// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, EXT out

../IVAS_cod -ism 3 testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 192000 48 testv/ltv48_3ISM.wav bit

../IVAS_dec EXT 48 bit testv/ltv48_3ISM.wav_192000_48-48_EXTfile.tst

../IVAS_dec EXT 48 bit testv/ltv48_3ISM.wav_192000_48-48_EXT.tst



// 3 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, EXT out

../IVAS_cod -ism 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv 128000 48 testv/ltv48_3ISM.wav bit
@@ -946,7 +946,7 @@ 


// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, EXT out

../IVAS_cod -ism 2 testv/ltvISM1.csv testv/ltvISM2.csv 128000 48 testv/ltv48_2ISM.wav bit

../IVAS_dec EXT 32 bit testv/ltv48_2ISM.wav_128000_48-32_EXT_file_TDHR.tst

../IVAS_dec EXT 32 bit testv/ltv48_2ISM.wav_128000_48-32_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

../IVAS_cod -dtx -ism 1 testv/ltvISM1.csv ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/ltv32_MONO.wav bit
@@ -958,11 +958,11 @@ 


// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, EXT out

../IVAS_cod -ism 1 testv/ltvISM1.csv 80000 48 testv/ltv48_1ISM.wav bit

../IVAS_dec EXT 16 bit testv/ltv48_1ISM.wav_80000_48-16_EXT_file_TDHR.tst

../IVAS_dec EXT 16 bit testv/ltv48_1ISM.wav_80000_48-16_EXT.tst



// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, EXT out, HR

../IVAS_cod -ism 1 testv/ltvISM1.csv 48000 48 testv/ltv48_1ISM.wav bit

../IVAS_dec EXT 48 bit testv/ltv48_1ISM.wav_64000_48-48_EXT_room_HR.tst

../IVAS_dec EXT 48 bit testv/ltv48_1ISM.wav_64000_48-48_EXT.tst



// 1 ISM with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, EXT out

../IVAS_cod -dtx -ism 1 testv/ltvISM1.csv 32000 32 testv/ltv32_MONO.wav bit
@@ -970,7 +970,7 @@ 


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

../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -ism 1 testv/ltvISM1.csv 16400 48 testv/ltv48_1ISM.wav bit

../IVAS_dec EXT 48 bit testv/ltv48_1ISM.wav_16400_48-48_EXT_room.tst

../IVAS_dec EXT 48 bit testv/ltv48_1ISM.wav_16400_48-48_EXT.tst



// 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, EXT out

../IVAS_cod -ism 1 testv/ltvISM1.csv 13200 48 testv/ltv48_1ISM.wav bit