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

Merge branch 'main' into 62-don-t-run-wine32-on-wsl

parents 562e941a 08e7afc9

.gitignore

+6 −3
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ venv/ 
.idea/

.DS_Store

!tests/data/**/*.wav

*.wav

*.pcm

*.bs

*.192
@@ -17,12 +18,14 @@ experiments/selection/*/proc_input*/cat*/*.pcm 
experiments/selection/*/proc_input*/FOA*/*.wav

experiments/selection/*/proc_input*/HOA2*/*.wav

experiments/selection/*/background_noise/*.wav

experiments/selection/*/background_noise/*.txt

experiments/selection/*/proc_input*/*.wav

experiments/selection/*/proc_input*/*.pcm

experiments/selection/*/proc_input*/*.csv

experiments/selection/*/proc_input*/*.log

experiments/selection/*/proc_input*/*.yml

experiments/selection/*/proc_output*/

experiments/selection/*/config/*cat*-lab_*.yml

experiments/selection/*/config/*FOA*-lab_*.yml

experiments/selection/*/config/*HOA2*-lab_*.yml

experiments/selection/*/config/*-lab_*.yml

experiments/selection/*/gen_input/IRs/*.wav

experiments/selection/*/gen_input/items_mono/*.wav

*~

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ test_audiotools_convert: 
    - python3 -m pytest -n auto tests/test_audiotools_convert.py



# run the test configs for the selection experiments

experiments:

.experiments:

  stage: test

  tags:

    - linux

README.md

+5 −0
Original line number Diff line number Diff line
@@ -554,6 +554,11 @@ The configuration of the IVAS condition is similar to the EVS condition. However 
In addition to that, the encoder and decoder take some additional arguments defined by the key `opts`.

For the decoder an output format can be set. If this argument is not defined the format specified in postprocessing is used.



### IVAS External Renderer



The key `ivas_rend` can be added in each condition to apply the IVAS_rend external renderer after the condition (e.g. after encoding and decoding for `ivas`) but previous to the 

postprocessing.



---



## Supported audio formats

examples/TEMPLATE.yml

+24 −2
Original line number Diff line number Diff line
@@ -139,13 +139,19 @@ input: 
    # type: "JBM"

    

    ### JBM

    ### REQUIRED: either error_pattern or error_profile

    ### REQUIRED: either error_pattern (and errpatt_late_loss_rate or errpatt_delay) or error_profile

    ### delay error profile file

    # error_pattern: ".../dly_error_profile.dat"

    ### Index of one of the existing delay error profile files to use (1-11)

    ### Late loss rate in precent or EVS

    # errpatt_late_loss_rate: 1

    ### Constant JBM delay in milliseconds for EVS

    # errpatt_delay: 200

    ### Index of one of the existing delay error profile files to use (1-10)

    # error_profile: 5

    ## nFramesPerPacket parameter for the network simulator; default = 1

    # n_frames_per_packet: 2

    ### Seed for error pattern shift in JBM; default = 0 or determined by profile number

    # errpatt_seed: 0

    

    ### FER

    ### REQUIRED: either error_pattern or error_rate
@@ -175,6 +181,14 @@ conditions_to_generate: 
      type: ref

      ### optional low-pass cut-off frequency in Hz; default = null

      # out_fc: 22500

      ### optional use of IVAS_rend (can be used in all conditions)

      # ivas_rend:

        ### Path to renderer binary; default search for IVAS_rend in bin folder (primary) and PATH (secondary)

        # bin: ~/git/ivas-codec/IVAS_rend

        ### Additional commandline options; default = null

        # opts: []

        ### Renderer output format; default = postprocessing fmt

        # fmt: "BINAURAL"

  c02:

      ### REQUIRED: type of condition

      type: lp3k5
@@ -218,6 +232,14 @@ conditions_to_generate: 
          # fs: 48000

          ### Additional commandline options; default = null

          # opts: ["-q", "-no_delay_cmp"]

      ### optional use of IVAS_rend (can be used in all conditions)

      # ivas_rend:

        ### Path to renderer binary; default search for IVAS_rend in bin folder (primary) and PATH (secondary)

        # bin: ~/git/ivas-codec/IVAS_rend

        ### Additional commandline options; default = null

        # opts: []

        ### Renderer output format; default = postprocessing fmt

        # fmt: "BINAURAL"

      ### Bitstream options

      # tx:

          ### For possible arguments see overall bitstream modification

experiments/selection/BS1534-1a/config/BS1534-1a.yml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
################################################



name: BS1534-1a

master_seed: 5

master_seed: 25

prerun_seed: 2



input_path: "experiments/selection/BS1534-1a/proc_input"