Commit 1032af64 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'add-linear-gain-scaling' into 'main' 

Add option for linear gain factor in audiotools and processing scripts

See merge request !162
parents 4b5defdf dd4349de

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -33,3 +33,4 @@ tests/temp_output_* 
tests/cut

tests/ref

tests/concatenation_folder

tests/data/testv

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ check_for_binaries: 
# ------------------------------------



# test the format conversion only

test_audiotools_convert:

test-audiotools-convert:

  stage: test

  tags:

    - linux
@@ -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:

test-experiments:

  stage: test

  tags:

    - linux
@@ -97,7 +97,7 @@ test_audiotools_convert: 
    expire_in: 1 week



# run some test configs for item creation

test_processing:

test-processing:

  stage: test

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

examples/TEMPLATE.yml

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ input: 
### Pre-processing step performed prior to core processing for all conditions

### If not defined, preprocessing step is skipped

# preprocessing:

    ### Linear gain factor to be applied before any other processing

    # gain: 3.1622776602

    ### Target format used in rendering from input format; default = null (no rendering)

    # fmt: "7_1_4"

    ### Define mask (HP50 or 20KBP) for input signal filtering; default = null
@@ -319,6 +321,8 @@ postprocessing: 
    fmt: "BINAURAL"

    ### REQUIRED: Target sampling rate in Hz for resampling

    fs: 48000

    ### Linear gain factor to be applied before any other processing

    # gain: 0.316227766

    ### Low-pass cut-off frequency in Hz; default = null (no filtering)

    # lp_cutoff: 24000

    ### Target loudness in LKFS; default = null (no loudness change applied)

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

+7 −7
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ conditions_to_generate: 
        bitrates:

            - 32000

        cod:

            fmt: "MASA2"

            fmt: "MASA2DIR1"

            opts: ["-max_band", "FB"]

        dec:

    c06:
@@ -81,7 +81,7 @@ conditions_to_generate: 
        bitrates:

            - 48000

        cod:

            fmt: "MASA2"

            fmt: "MASA2DIR1"

            opts: ["-max_band", "FB"]

        dec:
@@ -91,22 +91,22 @@ conditions_to_generate: 
        bitrates:

            - 96000

        cod:

            fmt: "MASA2"

            fmt: "MASA2DIR1"

        dec:

            fmt: "MASA2"

            fmt: "MASA2DIR1"

    c08:

        type: ivas

        bitrates:

            - 128000

        cod:

            fmt: "MASA2"

            fmt: "MASA2DIR1"

        dec:

            fmt: "MASA2"

            fmt: "MASA2DIR1"



################################################

### Post-processing

################################################

postprocessing:

    fmt: ["MASA2", "BINAURAL"]

    fmt: ["MASA2DIR1", "BINAURAL"]

    fs: 48000

    loudness: -26

experiments/selection/BS1534-7b/config/BS1534-7b.yml

+7 −7
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ conditions_to_generate: 
        bitrates:

            - 64000

        cod:

            fmt: "MASA2"

            fmt: "MASA2DIR1"

            opts: ["-max_band", "FB"]

        dec:

    c06:
@@ -81,7 +81,7 @@ conditions_to_generate: 
        bitrates:

            - 96000

        cod:

            fmt: "MASA2"

            fmt: "MASA2DIR1"

            opts: ["-max_band", "FB"]

        dec:
@@ -91,22 +91,22 @@ conditions_to_generate: 
        bitrates:

            - 192000

        cod:

            fmt: "MASA2"

            fmt: "MASA2DIR1"

        dec:

            fmt: "MASA2"

            fmt: "MASA2DIR1"

    c08:

        type: ivas

        bitrates:

            - 256000

        cod:

            fmt: "MASA2"

            fmt: "MASA2DIR1"

        dec:

            fmt: "MASA2"

            fmt: "MASA2DIR1"



################################################

### Post-processing

################################################

postprocessing:

    fmt: ["MASA2", "BINAURAL"]

    fmt: ["MASA2DIR1", "BINAURAL"]

    fs: 48000

    loudness: -26