Commit dd9ae534 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into individual_input_folders_per_lab

parents 543f5769 a2b69678

.gitlab-ci.yml

+6 −0
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ stages: 
  - make -j

  - cd $dir



.get-codec-testvectors: &get-codec-testvectors

  - to_dir=$(pwd)/tests/data/testv

  - mkdir -p $to_dir

  - from_dir=$CODEC_DIR/scripts/testv

  - cp $from_dir/*.wav $to_dir/



# ------------------------------------

# check pre-conditions are met
@@ -82,6 +87,7 @@ experiments: 
  script:

    - *print-common-info

    - *get-codec-binaries

    - *get-codec-testvectors

    - python3 -m pytest tests/test_experiments.py::test_generate_test_items -n auto | tee log.txt

  artifacts:

    paths:

experiments/selection/P800-2/config/item_gen_P800-2_b.yml

+7 −7
Original line number Diff line number Diff line
@@ -107,49 +107,49 @@ scenes: 
        name: "cat1/a1s01.wav"

        description: "Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["f1s01.wav", "m1s01.wav"]

        IR: ["Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

        

    cat1_2: 

        name: "cat1/a1s02.wav"

        description: "Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["m2s01.wav", "f2s01.wav"]

        IR: ["Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

        

    cat1_3: 

        name: "cat1/a1s03.wav"

        description: "Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["f3s01.wav", "m3s01.wav"]

        IR: ["Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

        

    cat1_4: 

        name: "cat1/a1s04.wav"

        description: "Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["m1s02.wav", "f1s02.wav"]

        IR: ["Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

        

    cat1_5: 

        name: "cat1/a1s05.wav"

        description: "Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["f2s02.wav", "m2s02.wav"]

        IR: ["Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

        

    cat1_6: 

        name: "cat1/a1s06.wav"

        description: "Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["m3s02.wav", "f3s02.wav"]

        IR: ["Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

         

    cat1_7: 

        name: "cat1/a1s07.wav"

        description: "Preliminary: Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["f1s13.wav", "m1s13.wav"]

        IR: ["Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

         

    cat2_1:

experiments/selection/P800-2/config/item_gen_P800-2_d.yml

+14 −14
Original line number Diff line number Diff line
@@ -107,98 +107,98 @@ scenes: 
        name: "cat1/a1s01.wav"

        description: "Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["f1s01.wav", "m1s01.wav"]

        IR: ["Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

        

    cat1_2: 

        name: "cat1/a1s02.wav"

        description: "Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["m2s01.wav", "f2s01.wav"]

        IR: ["Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

        

    cat1_3: 

        name: "cat1/a1s03.wav"

        description: "Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["f3s01.wav", "m3s01.wav"]

        IR: ["Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

        

    cat1_4: 

        name: "cat1/a1s04.wav"

        description: "Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["m1s02.wav", "f1s02.wav"]

        IR: ["Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

        

    cat1_5: 

        name: "cat1/a1s05.wav"

        description: "Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["f2s02.wav", "m2s02.wav"]

        IR: ["Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos4_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

        

    cat1_6: 

        name: "cat1/a1s06.wav"

        description: "Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["m3s02.wav", "f3s02.wav"]

        IR: ["Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos3_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos2_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

         

    cat1_7: 

        name: "cat1/a1s07.wav"

        description: "Preliminary: Car with AB microphone pickup, no overlap between the talkers, car noise."

        source: ["f1s13.wav", "m1s13.wav"]

        IR: ["Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"]

        IR: ["Nokia_Car_TalkPos5_Stereo_M5_SinSweep_2chn.wav", "Nokia_Car_TalkPos1_Stereo_M5_SinSweep_2chn.wav"]

        overlap: -1.0

         

    cat2_1: 

        name: "cat2/a2s01.wav"

        description: "Car with AB microphone pickup, no overlap between the talkers, street noise."

        source: ["m3s03.wav", "f3s03.wav"]

        IR: ["FreeField_IR_Python_AB_20cm_Pos1.wav", "FreeField_IR_Python_AB_20cm_Pos4.wav"]

        IR: ["Nokia_FreefieldFloor_0deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_-60deg_M5_ORTF_MLS_2chn.wav"]

        overlap: -1.0

        

    cat2_2: 

        name: "cat2/a2s02.wav"

        description: "Street conversation with AB microphone pickup, no overlap between the talkers, street noise."

        source: ["f1s03.wav", "m1s03.wav"]

        IR: ["FreeField_IR_Python_AB_20cm_Pos0.wav", "FreeField_IR_Python_AB_20cm_Pos1.wav"]

        IR: ["Nokia_FreefieldFloor_60deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_30deg_M5_ORTF_MLS_2chn.wav"]

        overlap: -1.0

        

    cat2_3: 

        name: "cat2/a2s03.wav"

        description: "Street conversation with AB microphone pickup, no overlap between the talkers, street noise."

        source: ["m2s03.wav", "f2s03.wav"]

        IR: ["FreeField_IR_Python_AB_20cm_Pos2.wav", "FreeField_IR_Python_AB_20cm_Pos0.wav"]

        IR: ["Nokia_FreefieldFloor_-135deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_135deg_M5_ORTF_MLS_2chn.wav"]

        overlap: -1.0

        

    cat2_4: 

        name: "cat2/a2s04.wav"

        description: "Street conversation with AB microphone pickup, no overlap between the talkers, street noise."

        source: ["f3s04.wav", "m3s04.wav"]

        IR: ["FreeField_IR_Python_AB_20cm_Pos1.wav", "FreeField_IR_Python_AB_20cm_Pos3.wav"]

        IR: ["Nokia_FreefieldFloor_30deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_-30deg_M5_ORTF_MLS_2chn.wav"]

        overlap: -1.0

        

    cat2_5: 

        name: "cat2/a2s05.wav"

        description: "Street conversation with AB microphone pickup, no overlap between the talkers, street noise."

        source: ["m1s04.wav", "f1s04.wav"]

        IR: ["FreeField_IR_Python_AB_20cm_Pos4.wav", "FreeField_IR_Python_AB_20cm_Pos2.wav"]

        IR: ["Nokia_FreefieldFloor_-30deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_0deg_M5_ORTF_MLS_2chn.wav"]

        overlap: -1.0

        

    cat2_6: 

        name: "cat2/a2s06.wav"

        description: "Street conversation with AB microphone pickup, no overlap between the talkers, street noise."

        source: ["f2s04.wav", "m2s04.wav"]

        IR: ["FreeField_IR_Python_AB_20cm_Pos3.wav", "FreeField_IR_Python_AB_20cm_Pos0.wav"]

        IR: ["Nokia_FreefieldFloor_90deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_-90deg_M5_ORTF_MLS_2chn.wav"]

        overlap: -1.0

 

    cat2_7: 

        name: "cat2/a2s07.wav"

        description: "Preliminary: Street conversation with AB microphone pickup, no overlap between the talkers, street noise."

        source: ["m2s13.wav", "f2s13.wav"]

        IR: ["FreeField_IR_Python_AB_20cm_Pos0.wav", "FreeField_IR_Python_AB_20cm_Pos1.wav"]

        IR: ["Nokia_FreefieldFloor_60deg_M5_ORTF_MLS_2chn.wav", "Nokia_FreefieldFloor_-60deg_M5_ORTF_MLS_2chn.wav"]

        overlap: -1.0

 

    cat3_1:

generate_test.py

+8 −3
Original line number Diff line number Diff line
@@ -114,6 +114,11 @@ def create_experiment_setup(experiment, lab) -> list[Path]: 
        suffix = cat + f"-lab_{lab}"

        input_path = base_path.joinpath(f"proc_input_{lab}").joinpath(cat)

        output_path = base_path.joinpath(f"proc_output_{lab}").joinpath(suffix)

        if experiment == "P800-2":

            bg_noise_path = base_path.joinpath("background_noise").joinpath(

                f"background_noise_{suffix}.wav"

            )

        else:

            bg_noise_path = base_path.joinpath("background_noise").joinpath(

                f"background_noise_{cat}.wav"

            )

ivas_processing_scripts/__init__.py

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ def main(args): 
                sleep(0.1)

            progressbar_update(count, count, width)

            print("\n", flush=True, file=sys.stdout)

            results.get()



            p.close()

            p.join()