Commit 981a2034 authored by Anika Treffehn's avatar Anika Treffehn
Browse files

fixed small bug and masa naming in test

parent bfc48ce1

ivas_processing_scripts/audiotools/wrappers/bs1770.py

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ def get_loudness( 
            input, audio.MetadataAssistedSpatialAudio

        ):

            loudness_format = "7_1_4"

        elif isinstance(input, audio.ObjectBasedAudio) or isinstance(audio.OMASAAudio) or isinstance(audio.OSBAAudio):

        elif isinstance(input, audio.ObjectBasedAudio) or isinstance(input, audio.OMASAAudio) or isinstance(input, audio.OSBAAudio):

            loudness_format = "BINAURAL"

        elif hasattr(input, "layout_file"):

            loudness_format = input.layout_file

ivas_processing_scripts/processing/processing.py

+2 −1
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ def process_item( 
    tmp_file_meta = []

    if in_meta:

        for im in in_meta:

            if im is not None:

                tmp_file_meta.append(tmp_dir.joinpath(Path(im).name))



    # assemble a list of files to be used during the processing chain

tests/data/test_MASA.yml

+6 −6
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ conditions_to_generate: 
          # - 32000

      ### Encoder options

      cod:

          fmt: "MASA2"

          fmt: "MASA2DIR1"

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

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

          ### Encoder input sampling rate in Hz (resampling performed in case of mismatch); default = null (no resampling)
@@ -196,7 +196,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: "MASA2"

          fmt: "MASA2DIR1"

          ### Decoder output sampling rate; default = null (same as input)

          # fs: 48000

          ### Additional commandline options; default = null
@@ -215,7 +215,7 @@ conditions_to_generate: 
          # - 32000

      ### Encoder options

      cod:

          fmt: "MASA2"

          fmt: "MASA2DIR1"

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

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

          ### Encoder input sampling rate in Hz (resampling performed in case of mismatch); default = null (no resampling)
@@ -250,13 +250,13 @@ conditions_to_generate: 
          # - 9600

          - [13200, 13200, 8000, 13200, 9600]

      cod:

          fmt: "MASA2"

          fmt: "MASA2DIR1"

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

          #bin: EVS_cod

          ### Encoder input sampling rate in Hz (resampling performed in case of mismatch); default = null (no resampling)

          # fs: 32000

      dec:

          fmt: "MASA2"

          fmt: "MASA2DIR1"

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

          #bin: EVS_dec

          ### Decoder output sampling rate; default = null (same as input)
@@ -274,7 +274,7 @@ conditions_to_generate: 
### Post-processing is required and can not be omitted

postprocessing:

    ### REQUIRED: Target format for output

    fmt: ["MASA2", "BINAURAL"]

    fmt: ["MASA2DIR1", "BINAURAL"]

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

    fs: 48000

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