Commit 33bb409c authored by Jan Kiene's avatar Jan Kiene
Browse files

fix other usages of cmp_pcm

parent ef9c6f98

tests/cmp_pcm.py

+2 −2
Original line number Diff line number Diff line
@@ -283,5 +283,5 @@ if __name__ == "__main__": 
    args["nchannels"] = out_config_2_nchannels(args.pop("out_config"))



    result, msg = cmp_pcm(**args)

    print(msg)

    sys.exit(result)
 
    print(msg[0])

    sys.exit(result[0])

tests/conftest.py

+2 −0
Original line number Diff line number Diff line
@@ -1249,6 +1249,8 @@ def compare_dmx_signals(ref_dmx_files, dut_dmx_files, fs) -> dict: 
                get_ssnr=True,

                quiet=True,

            )

            dmx_differs = dmx_differs[0]

            reason = reason[0]



            dmx_props = [DMX_DIFF, DMX_MLD, DMX_SSNR]

            prop_results = parse_properties(reason, dmx_differs, dmx_props)

tests/renderer/utils.py

+44 −37
Original line number Diff line number Diff line
@@ -389,6 +389,8 @@ def run_renderer( 
            odg_ref=odg_ref,

            scalefac=test_info.config.option.scalefac,

        )

        output_differs = output_differs[0]

        reason = reason[0]



        props = parse_properties(reason, output_differs, props_to_record)

        for k, v in props.items():
@@ -455,7 +457,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 +523,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 +659,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):

tests/test_26444.py

+2 −0
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ def test_evs_26444( 
                get_ssnr=get_ssnr,

                get_odg=get_odg,

            )

            output_differs = output_differs[0]

            reason = reason[0]



            props = parse_properties(reason, output_differs, props_to_record)

            for k, v in props.items():