Commit 1168f452 authored by Vinit Veera's avatar Vinit Veera
Browse files

Made chanegs to resolve merge conflicts.

parent 4da7e05b
Loading
Loading
Loading
Loading
Loading
+36 −22
Original line number Diff line number Diff line
@@ -16,17 +16,15 @@
# delete_tmp: true
### Master seed for random processes like bitstream error pattern generation; default = 0
# master_seed: 5
### Additional seed to specify number of preruns; default = 0
# prerun_seed: 2

### Any relative paths will be interpreted relative to the working directory the script is called from!
### Usage of absolute paths is recommended.
### Do not use file names with dots "." in them! This is not supported, use "_" instead
### For Windows user: please use double back slash '\\' in paths and add '.exe' to executable definitions
### REQUIRED: Input path or file
input_path: "~/ivas/items/HOA3"
input_path: ".../ivas/items/HOA3"
### REQUIRED: Output path or file
output_path: "./tmp_output"
output_path: ".../tmp_output"
### Metadata path or file(s)
### If input format is ISM{1-4} a path for the metadata files can be specified;
### default = null (for ISM search for item_name.{wav, raw, pcm}.{0-3}.csv in input folder, otherise ignored)
@@ -49,19 +47,6 @@ output_path: "./tmp_output"
# input_select:
#  - "48kHz"

### Horizontally concatenate input items into one long file; default = false
# concatenate_input: true
### Specify the concatenation order in a list of strings. If not specified, the concatenation order would be
### as per the filesystem on the users' device
### Should only be used if concatenate_input = true
### Specify the filename with extension.
### For example, concatenation_order: ["file3.wav", "file1.wav", "file4.wav", "file2.wav"]
# concatenation_order: []
### Specify preamble duration in ms; default = 0
# preamble: 40
### Flag wheter to use noise (amplitude +-4) for the preamble or silence; default = false (silence)
# pad_noise_preamble: true

################################################
### Input configuration
################################################
@@ -72,7 +57,7 @@ input:
    # fs: 32000

################################################
### Pre-processing
### Pre-processing on individual items
################################################
### Pre-processing step performed prior to core processing for all conditions
### If not defined, preprocessing step is skipped
@@ -99,6 +84,33 @@ input:
    ### Length of window used at start/end of signal (ms); default = 0
    # window: 100
    
################################################
### Pre-processing on whole signal(s)
################################################
# preprocessing_2:
    ### Options for processing of the concatenated item (concatenate_input: true) or
    ### the individual items (concatenate_input: false) after previous pre-processing step
    ### Horizontally concatenate input items into one long file; default = false
    # concatenate_input: true
    ### Specify the concatenation order in a list of strings. If not specified, the concatenation order would be
    ### as per the filesystem on the users' device
    ### Should only be used if concatenate_input = true
    ### Specify the filename with extension.
    ### For example, concatenation_order: ["file3.wav", "file1.wav", "file4.wav", "file2.wav"]
    # concatenation_order: []
    ### Specify preamble duration in ms; default = 0
    # preamble: 10000
    ### Flag wheter to use noise (amplitude +-4) for the preamble or silence; default = false (silence)
    # preamble_noise: true
    ### Additive background noise
    # background_noise:
        ### REQUIRED: SNR for background noise in dB
        # snr: 10
        ### REQUIRED: Path to background noise
        # background_noise_path: ".../noise.wav"
        ### Seed for delay offest; default = 0
        # seed_delay: 10

#################################################
### Bitstream processing
#################################################
@@ -124,6 +136,8 @@ input:
    # error_pattern: "path/pattern.192"
    ### Error rate in percent
    # error_rate: 5
    ### Additional seed to specify number of preruns; default = 0
    # prerun_seed: 2
    
################################################
### Configuration for conditions under test
@@ -211,7 +225,7 @@ conditions_to_generate:
          ### Path to decoder binary; default search for IVAS_dec in bin folder (primary) and PATH (secondary)
          bin: ~/git/ivas-codec/IVAS_dec
          ### Decoder output format; default = postprocessing fmt
          fmt: "CICP19"
          fmt: "7_1_4"
          ### Decoder output sampling rate; default = null (same as input)
          # fs: 48000
          ### Additional commandline options; default = null
@@ -246,8 +260,8 @@ conditions_to_generate:
postprocessing:
    ### REQUIRED: Target format for output
    fmt: "BINAURAL"
    ### Target sampling rate in Hz for resampling; default = null (no resampling)
    # fs: 16000
    ### REQUIRED: Target sampling rate in Hz for resampling
    fs: 48000
    ### Low-pass cut-off frequency in Hz; default = null (no filtering)
    # lp_cutoff: 24000
    ### Target loudness in LKFS; default = null (no loudness change applied)
+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ from typing import Callable, Iterable, Optional, Union

import yaml

ALLOWED_INPUT_EXT = (".wav", ".pcm", ".txt")
ALLOWED_INPUT_EXT = (".wav", ".pcm", ".txt", ".raw")
BIN_DIR = Path(__file__).parent.joinpath("bin")