Commit 3fa14411 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'ci/fix-ref-cut-signal-order-in-cmp-pcm-args' into 'main' 

[CI] fix ref/cut signal order in cmp_pcm calls

See merge request !2065
parents a19291a5 c86d51b9

tests/codec_be_on_mr_nonselection/test_sba.py

+1 −1
Original line number Diff line number Diff line
@@ -1252,8 +1252,8 @@ def sba_dec( 


        sampling_rate_Hz = int(sampling_rate) * 1000

        cmp_result, reason = cmp_pcm(

            dut_out_file,

            ref_out_file,

            dut_out_file,

            output_config,

            sampling_rate_Hz,

            get_mld=get_mld,

tests/renderer/utils.py

+43 −38
Original line number Diff line number Diff line
@@ -374,8 +374,8 @@ def run_renderer( 
        # see constants.py

        ref_fs = int(cmd[10]) * 1000

        output_differs, reason = cmp_pcm(

            out_file,

            out_file_ref,

            out_file,

            out_fmt,

            ref_fs,

            get_mld=get_mld,
@@ -455,7 +455,6 @@ def binauralize_input_and_output( 
    in_sr,

    out_sr,

):



    # Use current folder as location for temporary directory, since scene description does not handle spaces in path

    with tempfile.TemporaryDirectory(dir=".") as tmp_dir:

        tmp_dir = Path(tmp_dir)
@@ -522,7 +521,9 @@ def binauralize_input_and_output( 


        if "OSBA" in output_config or "OMASA" in output_config:

            if "OSBA" in output_config:

                output_config = output_config[:-1] + '3' # Temporary fix to handle than IVAS_dec produces HOA3 for all OSBA configs. Needs to be removed when this fix is ported to BASOP.

                output_config = (

                    output_config[:-1] + "3"

                )  # Temporary fix to handle than IVAS_dec produces HOA3 for all OSBA configs. Needs to be removed when this fix is ported to BASOP.

            scene_description_file(

                output_config, scene_dut, n_obj, dut_output_file, out_meta_files

            )
@@ -656,7 +657,11 @@ def binauralize_input_and_output( 
            )

        else:

            ref_input_file_binaural = input_file

        return (ref_input_file_binaural, dut_output_file_binaural, ref_output_file_binaural)

        return (

            ref_input_file_binaural,

            dut_output_file_binaural,

            ref_output_file_binaural,

        )





def findstr(exp, s, one_element=True):