Loading ivas_processing_scripts/processing/chains.py +2 −1 Original line number Diff line number Diff line Loading @@ -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 from ivas_processing_scripts.processing.ivas import IVAS, validate_sba_fmt 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 Loading Loading @@ -335,6 +335,7 @@ def get_processing_chain( dec_cfg = cond_cfg["dec"] if cond_cfg.get("sba_fmt"): validate_sba_fmt(tmp_in_fmt, cond_cfg.get("sba_fmt")) chain["processes"].append( Postprocessing( { Loading ivas_processing_scripts/processing/evs.py +1 −1 Original line number Diff line number Diff line Loading @@ -174,7 +174,7 @@ class EVS(Processing): condition_fmt.num_channels > self.in_fmt.num_channels ): raise ValueError( "SBA format has to be SBA with lower or equal order than input signal" "SBA format for EVS condition has to be SBA with lower or equal order than input signal" ) is_planar = condition_fmt.is_planar else: Loading ivas_processing_scripts/processing/ivas.py +14 −0 Original line number Diff line number Diff line Loading @@ -338,6 +338,20 @@ class IVAS(Processing): raise ValueError(f"IVAS: Invalid input config: {fmt.name}.") def validate_sba_fmt(in_fmt, sba_fmt): in_audio = audio.fromtype(in_fmt) sba_audio = audio.fromtype(sba_fmt) if isinstance(in_audio, audio.SceneBasedAudio): if not isinstance(sba_audio, audio.SceneBasedAudio) or (sba_audio.num_channels > in_audio.num_channels): raise ValueError( "SBA format for IVAS condition has to be SBA with lower or equal order than input signal" ) else: if in_audio.name != sba_audio.name: raise ValueError("Cannot specify SBA format for non SBA input formats") return class IVAS_rend(Processing): def __init__(self, attrs): super().__init__(attrs) Loading Loading
ivas_processing_scripts/processing/chains.py +2 −1 Original line number Diff line number Diff line Loading @@ -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 from ivas_processing_scripts.processing.ivas import IVAS, validate_sba_fmt 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 Loading Loading @@ -335,6 +335,7 @@ def get_processing_chain( dec_cfg = cond_cfg["dec"] if cond_cfg.get("sba_fmt"): validate_sba_fmt(tmp_in_fmt, cond_cfg.get("sba_fmt")) chain["processes"].append( Postprocessing( { Loading
ivas_processing_scripts/processing/evs.py +1 −1 Original line number Diff line number Diff line Loading @@ -174,7 +174,7 @@ class EVS(Processing): condition_fmt.num_channels > self.in_fmt.num_channels ): raise ValueError( "SBA format has to be SBA with lower or equal order than input signal" "SBA format for EVS condition has to be SBA with lower or equal order than input signal" ) is_planar = condition_fmt.is_planar else: Loading
ivas_processing_scripts/processing/ivas.py +14 −0 Original line number Diff line number Diff line Loading @@ -338,6 +338,20 @@ class IVAS(Processing): raise ValueError(f"IVAS: Invalid input config: {fmt.name}.") def validate_sba_fmt(in_fmt, sba_fmt): in_audio = audio.fromtype(in_fmt) sba_audio = audio.fromtype(sba_fmt) if isinstance(in_audio, audio.SceneBasedAudio): if not isinstance(sba_audio, audio.SceneBasedAudio) or (sba_audio.num_channels > in_audio.num_channels): raise ValueError( "SBA format for IVAS condition has to be SBA with lower or equal order than input signal" ) else: if in_audio.name != sba_audio.name: raise ValueError("Cannot specify SBA format for non SBA input formats") return class IVAS_rend(Processing): def __init__(self, attrs): super().__init__(attrs) Loading