Commit ef9c6f98 authored by Jan Kiene's avatar Jan Kiene
Browse files

add comparison of whole file along with splits

parent e9bb84c3

tests/codec_be_on_mr_nonselection/test_param_file.py

+34 −5
Original line number Diff line number Diff line
@@ -593,11 +593,38 @@ def run_test( 


        fs = int(sampling_rate) * 1000



        ### run the comparison tools

        split_idx = np.empty(0)

        prop_suffix = [""]



        # 1. run comparison on whole files - this is done always, regardless of the presence of --split_comparison



        output_differs_parts, reason_parts = cmp_pcm(

            ref_file,

            dut_output_file,

            out_config_2_nchannels(output_config),

            fs,

            get_mld=get_mld,

            mld_lim=get_mld_lim,

            abs_tol=abs_tol,

            allow_differing_lengths=allow_differing_lengths,

            get_ssnr=get_ssnr,

            get_odg=get_odg,

            get_odg_bin=get_odg_bin,

            odg_input=odg_input,

            odg_test=odg_test,

            odg_ref=odg_ref,

            ref_jbm_tf=ref_tracefile_dec,

            cut_jbm_tf=dut_tracefile_dec,

            scalefac=test_info.config.option.scalefac,

            split_idx=split_idx,

        )



        # 2. run comparison on split files if --split_comparison is given

        if split_comparison:

            split_idx = get_split_idx(str(Path(testv_file).stem), int(sampling_rate))



        output_differs_parts, reason_parts = cmp_pcm(

            output_differs_splits, reason_splits = cmp_pcm(

                ref_file,

                dut_output_file,

                out_config_2_nchannels(output_config),
@@ -617,10 +644,12 @@ def run_test( 
                scalefac=test_info.config.option.scalefac,

                split_idx=split_idx,

            )

            output_differs_parts += output_differs_splits

            reason_parts += reason_splits



        prop_suffix = [""]

        if len(split_idx) > 0:

            prop_suffix = [f"_split{i}" for i in range(1, len(split_idx) + 1)]

            prop_suffix = ["_whole"] + [

                f"_split{i}" for i in range(1, len(split_idx) + 1)

            ]



        for output_differs, reason, suffix in zip(

            output_differs_parts, reason_parts, prop_suffix

tests/codec_be_on_mr_nonselection/test_sba.py

+34 −6
Original line number Diff line number Diff line
@@ -1267,12 +1267,37 @@ def sba_dec( 


        sampling_rate_Hz = int(sampling_rate) * 1000



        ### run the comparison tools

        split_idx = np.empty(0)

        prop_suffix = [""]



        # 1. run comparison on whole files - this is done always, regardless of the presence of --split_comparison



        output_differs_parts, reason_parts = cmp_pcm(

            dut_out_file,

            ref_out_file,

            output_config,

            sampling_rate_Hz,

            get_mld=get_mld,

            mld_lim=get_mld_lim,

            abs_tol=abs_tol,

            allow_differing_lengths=allow_differing_lengths,

            get_ssnr=get_ssnr,

            get_odg=get_odg,

            get_odg_bin=get_odg_bin,

            odg_input=odg_input,

            odg_test=odg_test,

            odg_ref=odg_ref,

            scalefac=test_info.config.option.scalefac,

            split_idx=split_idx,

        )



        # 2. run comparison on split files if --split_comparison is given

        if split_comparison:

            input_file = f"{test_vector_path}/{tag}.wav"

            split_idx = get_split_idx(str(Path(input_file).stem), int(sampling_rate))



        output_differs_parts, reason_parts = cmp_pcm(

            output_differs_splits, reason_splits = cmp_pcm(

                dut_out_file,

                ref_out_file,

                output_config,
@@ -1290,10 +1315,13 @@ def sba_dec( 
                scalefac=test_info.config.option.scalefac,

                split_idx=split_idx,

            )

            output_differs_parts += output_differs_splits

            reason_parts += reason_splits



            prop_suffix = ["_whole"] + [

                f"_split{i}" for i in range(1, len(split_idx) + 1)

            ]



        prop_suffix = [""]

        if len(split_idx) > 0:

            prop_suffix = [f"_split{i}" for i in range(1, len(split_idx) + 1)]

        for output_differs, reason, suffix in zip(

            output_differs_parts, reason_parts, prop_suffix

        ):