Commit 07ee6f4d authored by Anika Treffehn's avatar Anika Treffehn
Browse files

Merge branch 'main' of... 

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts into 70-omasa-and-osba-support-missing
parents a5d163a1 08e7afc9

.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

ivas_processing_scripts/audiotools/binaural_datasets/binaural_dataset.py

+4 −0
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ def load_ir( 
    dataset_suffix = None



    if out_fmt.startswith("BINAURAL") and "ROOM" in out_fmt:



        if "_IR" in out_fmt or "_REVERB" in out_fmt:

            warn("For reference rendering _IR and _REVERB extensions of BINAURAL_ROOM are ignored")



        dataset_prefix = "BRIR"

        if dataset is None:

            dataset = "IISofficialMPEG222UC"

ivas_processing_scripts/audiotools/constants.py

+7 −1
Original line number Diff line number Diff line
@@ -36,7 +36,13 @@ BINAURAL_AUDIO_FORMATS = { 
    "BINAURAL": {

        "num_channels": 2,

    },

    "BINAURAL_ROOM": {

    "BINAURAL_ROOM": {  # for reference rendering

        "num_channels": 2,

    },

    "BINAURAL_ROOM_IR": {  # for IVAS_dec and IVAS_rend

        "num_channels": 2,

    },

    "BINAURAL_ROOM_REVERB": {  # for IVAS_dec and IVAS_rend

        "num_channels": 2,

    },

}