Commit ecbb6d81 authored by Anika Treffehn's avatar Anika Treffehn
Browse files

Merge branch 'small_fixes' into 'main' 

Small fixes

See merge request !79
parents 0a6f67d7 47d1bb73

.gitignore

+3 −3
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ venv/ 
*.bs

*.192

mc.double

proc_input/*.wav

proc_input/*.pcm

proc_output/

experiments/selection/*/proc_input/*.wav

experiments/selection/*/proc_input/*.pcm

experiments/selection/*/proc_output/

*~

tests/tmp_output_*

tests/cut

ivas_processing_scripts/audiotools/convert/scenebased.py

+6 −3
Original line number Diff line number Diff line
@@ -167,17 +167,20 @@ def render_sba_to_sba( 
    """



    if sba_out.ambi_order > sba_in.ambi_order:

        # order increases

        sba_out.audio = np.pad(

            sba_in.audio, [[0, 0], [0, sba_out.num_channels - sba_in.num_channels]]

        )

    elif sba_out.ambi_order < sba_in.ambi_order:

        # order decreases

        sba_out.audio = sba_in.audio[:, : sba_out.num_channels]

    else:

        # order stays the same

        sba_out.audio = sba_in.audio



    if sba_out.is_planar:

        sba_out.audio = sba_in.audio

        # set vertical channels to zero if output is planar

        zero_vert_channels(sba_out)

    elif sba_in.is_planar:

        sba_out.audio = sba_in.audio





def rotate_sba(

ivas_processing_scripts/audiotools/wrappers/bs1770.py

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ def loudness_norm( 
    )



    # repeat until convergence of loudness

    while np.abs(measured_loudness - target_loudness) > 0.5 and num_iter < 10:

    while np.abs(measured_loudness - target_loudness) > 0.5 and num_iter <= 10:

        # scale input

        scaled_input.audio *= scale_factor_new

ivas_processing_scripts/processing/chains.py

+2 −1
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

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
@@ -326,6 +326,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(

                    {

ivas_processing_scripts/processing/evs.py

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,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: