Commit 40192caa authored by Anika Treffehn's avatar Anika Treffehn
Browse files

restructured masa metadata processing

parent 97331089

ivas_processing_scripts/audiotools/convert/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ def format_conversion( 
        raise NotImplementedError(

            "ISM is not supported as an output for rendering! Only usable as pass-through"

        )

    if (isinstance(output, audio.OMASAAudio) and not isinstance(input, audio.OSBAAudio)) or (isinstance(output, audio.OSBAAudio) and not isinstance(input, audio.OMASAAudio)):

    if (isinstance(output, audio.OMASAAudio) and not isinstance(input, audio.OSBAAudio)) or (isinstance(output, audio.OSBAAudio) and not isinstance(input, audio.OMASAAudio)) and not input.name == output.name:

        raise NotImplementedError(

            "OMASA and OSBA only possible as output if input is OMASA or OSBA"

        )

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):

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

            loudness_format = "BINAURAL"

        elif hasattr(input, "layout_file"):

            loudness_format = input.layout_file

ivas_processing_scripts/audiotools/wrappers/p50fbmnru.py

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#  the United Nations Convention on Contracts on the International Sales of Goods.

#



from copy import copy

from copy import deepcopy

from pathlib import Path

from tempfile import TemporaryDirectory

from warnings import warn
@@ -73,7 +73,7 @@ def p50fbmnru( 
    else:

        binary = find_binary("p50fbmnru")



    tmp_audio_obj = copy(input)

    tmp_audio_obj = deepcopy(input)



    # resample signal to 48kHz

    if input.fs != 48000:

ivas_processing_scripts/processing/evs.py

+1 −2
Original line number Diff line number Diff line
@@ -283,8 +283,7 @@ class EVS(Processing): 
                        copyfile(in_meta[idx], out_file_meta_unprocessed)



            # copy MASA metadata for MASA pass-through

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

                # TODO treffehn: add OMASA

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

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

                md_file_out = out_file.parent / (out_file.name + ".met")

                copyfile(md_file_in, md_file_out)

ivas_processing_scripts/processing/ivas.py

+5 −3
Original line number Diff line number Diff line
@@ -155,10 +155,12 @@ class IVAS(Processing): 
        elif isinstance(self.in_fmt, audio.ObjectBasedAudio) or isinstance(self.in_fmt, audio.OSBAAudio):

            metadata_files = in_meta

        elif isinstance(self.in_fmt, audio.OMASAAudio):

            # TODO treffehn: check and maybe change here and for masa

            metadata_files = in_meta

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

            metadata_files.append(md_file)

            # TODO treffehn: check and maybe change here and for masa

            # if len(metadata_files) != number of ism channels plus one

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

            # metadata_files.append(md_file)

            pass



        # Support input file wav, pcm and txt (metadata iis)

        if in_file.suffix == ".wav":