Commit 51566c37 authored by Jan Kiene's avatar Jan Kiene
Browse files

remove sba_fmt from EVS processing code

parent 0df1c434

ivas_processing_scripts/processing/chains.py

+1 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ from warnings import warn 


from ivas_processing_scripts.processing.config import TestConfig

from ivas_processing_scripts.processing.evs import EVS

from ivas_processing_scripts.processing.ivas import IVAS, validate_sba_fmt

from ivas_processing_scripts.processing.ivas import IVAS

from ivas_processing_scripts.processing.postprocessing import Postprocessing

from ivas_processing_scripts.processing.preprocessing import Preprocessing

from ivas_processing_scripts.processing.preprocessing_2 import Preprocessing2
@@ -334,14 +334,12 @@ def get_processing_chain( 
                    "tx": tx_cfg,

                    "preamble": preamble,

                    "evs_lfe_9k6bps_nb": evs_lfe_9k6bps_nb,

                    "sba_fmt": cond_cfg.get("sba_fmt", tmp_in_fmt),

                    "use_windows_codec_binaries": cfg.use_windows_codec_binaries,

                }

            )

        )

        # update values to reflect decoder output

        tmp_in_fs = dec_cfg.get("fs", tmp_in_fs)

        tmp_in_fmt = cond_cfg.get("sba_fmt", tmp_in_fmt)



    elif cond_cfg["type"] == "ivas":

        cod_cfg = cond_cfg["cod"]

ivas_processing_scripts/processing/evs.py

+5 −17
Original line number Diff line number Diff line
@@ -173,31 +173,19 @@ class EVS(Processing): 
        if not self.out_fs:

            self.out_fs = self.in_fs



        # consider SBA format for condition

        condition_fmt = audio.fromtype(self.sba_fmt)

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

            if not isinstance(condition_fmt, audio.SceneBasedAudio) or (

                condition_fmt.num_channels > self.in_fmt.num_channels

            ):

                raise ValueError(

                    "SBA format for EVS condition has to be SBA with lower or equal order than input signal"

                )

            is_planar = condition_fmt.is_planar

        else:

            if self.in_fmt.name != condition_fmt.name:

                raise ValueError("Cannot specify SBA format for non SBA input formats")

            is_planar = False

        # flag for zeroing of channels for planar SBA formats

        is_planar = isinstance(self.in_fmt, audio.SceneBasedAudio) and self.in_fmt.is_planar



        # Split the channels to prepare for multi-mono coding

        split_chan_files = [

            out_file.with_suffix(f".{i}.pcm") for i in range(condition_fmt.num_channels)

            out_file.with_suffix(f".{i}.pcm") for i in range(self.in_fmt.num_channels)

        ]



        split_channels(

            in_file,

            split_chan_files,

            in_nchans=self.in_fmt.num_channels,

            out_nchans=condition_fmt.num_channels,

            out_nchans=self.in_fmt.num_channels,

            in_fs=self.in_fs,

            is_planar=is_planar,

        )
@@ -252,7 +240,7 @@ class EVS(Processing): 
                    )

                    copyfile(in_meta[idx], out_file_meta)

            # copy MASA metadata for MASA pass-through

            if isinstance(condition_fmt, audio.MetadataAssistedSpatialAudio):

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

                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)