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

fix multi-EVS FOA output to MASA to BINAURAL conversion

parent 55afb266

experiments/selection/P800-8/config/P800-8.yml

+10 −10
Original line number Diff line number Diff line
@@ -178,16 +178,16 @@ conditions_to_generate: 
    #     tx:

    #         type: "FER"

    #         error_rate: 5

    # c22:

    #     type: evs

    #     bitrates:

    #         - 32000

    #     cod:

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

    #     dec:

        # tx:

        #     type: "FER"

        #     error_rate: 5

    c22:

        type: evs

        bitrates:

            - 32000

        cod:

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

        dec:

        tx:

            type: "FER"

            error_rate: 5



    # ### IVAS condition ###############################

    # c23:

ivas_processing_scripts/audiotools/convert/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ def convert_file( 
        output.audio = empty((1, num_tcs))



        # fabricate metadata file name

        output.metadata_file = Path(out_file).with_suffix(".met")

        output.metadata_file = Path(out_file).parent / ( Path(out_file).name + ".met" )

    if isinstance(output, audio.ObjectBasedAudio):

        try:

            output.object_pos = input.object_pos

ivas_processing_scripts/processing/chains.py

+1 −0
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ def get_processing_chain( 
                    }

                )

            )

            tmp_in_fmt = fmt_out



    chain["processes"].append(

        Postprocessing(

ivas_processing_scripts/processing/ivas.py

+3 −2
Original line number Diff line number Diff line
@@ -140,9 +140,10 @@ class IVAS(Processing): 
        # Only resample and convert if wav, otherwise supposed pcm to be sampled at self.in_fs

        metadata_files = []



        # for MASA suppose that metadata file as same basename and location as input file

        # for MASA suppose that metadata file has same basename and location as input file

        if isinstance(self.in_fmt, audio.MetadataAssistedSpatialAudio):

            metadata_files.append(in_file.with_suffix(".met"))

            md_file = in_file.parent / (in_file.name + ".met")

            metadata_files.append(md_file)



        if isinstance(self.in_fmt, audio.ObjectBasedAudio):

            if in_meta is None: