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

Merge branch 'ci/mld-tool-missing-test-updates' into 'main'

[CI] Missing get_mld arguments in tests, for IVAS BASOP repo

See merge request !1293
parents 8a7f3bea c4a502b7
Loading
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ def test_masa_enc_dec(
    masa_metadata_audio_ndir_ntransportch_dtx,
    test_vector_path,
    output_mode,
    get_mld,
):
    # Input parameters
    in_fs = 48
@@ -200,7 +201,7 @@ def test_masa_enc_dec(

            # Compare audio outputs
            pcmcmp_res, reason = cmp_pcm(
                dec_output_dut, dec_output_ref, output_mode, int(out_fs * 1000)
                dec_output_dut, dec_output_ref, output_mode, int(out_fs * 1000), get_mld=get_mld
            )

            # Fail if compare fails compare result
@@ -218,7 +219,7 @@ def test_masa_enc_dec(
            filecmp_res = cmp(dec_output_ref, dec_output_dut)
            if filecmp_res == False:
                cmp_result, reason = cmp_pcm(
                    dec_output_dut, dec_output_ref, output_mode, int(out_fs * 1000)
                    dec_output_dut, dec_output_ref, output_mode, int(out_fs * 1000), get_mld=get_mld
                )
                # Report compare result
                assert cmp_result == 0, reason
+2 −1
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ def test_param_file_tests(
    rootdir,
    keep_files,
    test_tag,
    get_mld,
):
    enc_opts, dec_opts, sim_opts, eid_opts = param_file_test_dict[test_tag]

@@ -324,7 +325,7 @@ def test_param_file_tests(
        ref_output_file = f"{reference_path}/param_file/dec/{output_file}"
        fs = int(sampling_rate) * 1000
        output_differs, reason = cmp_pcm(
            dut_output_file, ref_output_file, output_config, fs
            dut_output_file, ref_output_file, output_config, fs, get_mld=get_mld
        )
        md_out_files = get_expected_md_files(ref_output_file, enc_split, output_config)

+5 −2
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ def test_sba_plc_system(
    tag,
    plc_pattern,
    fs,
    gain_flag
    gain_flag,
    get_mld,
):
    SID = 0
    if dtx == '1' and ivas_br not in ['13200','16400','24400','32000', '64000']:
@@ -118,6 +119,7 @@ def test_sba_plc_system(
        update_ref,
        gain_flag,
        keep_files,
        get_mld=get_mld,
    )


@@ -138,6 +140,7 @@ def sba_dec_plc(
    update_ref,
    gain_flag,
    keep_files,
    get_mld=False,
):

    # ------------  run cmd  ------------
@@ -188,7 +191,7 @@ def sba_dec_plc(

        # --------------  compare cmd  --------------
        fs = int(sampling_rate) * 1000
        cmp_result, reason = cmp_pcm(dut_out_raw, ref_out_raw, output_config, fs)
        cmp_result, reason = cmp_pcm(dut_out_raw, ref_out_raw, output_config, fs, get_mld=get_mld)

        # report compare result
        assert cmp_result == 0, reason
+12 −1
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ def test_pca_enc(
    keep_files,
    tag,
    fs,
    get_mld,
):
    pca = True
    tag = tag + fs + "c"
@@ -147,6 +148,7 @@ def test_pca_enc(
        update_ref,
        gain_flag,
        keep_files,
        get_mld=get_mld,
        pca=pca,
    )

@@ -175,6 +177,7 @@ def test_sba_enc_system(
    fs,
    gain_flag,
    SID,
    get_mld,
):

    if dtx == "1" and ivas_br not in ["13200", "16400", "24400", "32000", "64000"]:
@@ -238,6 +241,7 @@ def test_sba_enc_system(
        update_ref,
        gain_flag,
        keep_files,
        get_mld=get_mld
    )


@@ -256,6 +260,7 @@ def test_spar_hoa2_enc_system(
    keep_files,
    ivas_br,
    tag,
    get_mld,
):
    fs = "48"
    dtx = "0"
@@ -301,6 +306,7 @@ def test_spar_hoa2_enc_system(
        update_ref,
        gain_flag,
        keep_files,
        get_mld=get_mld,
    )


@@ -319,6 +325,7 @@ def test_spar_hoa3_enc_system(
    keep_files,
    ivas_br,
    tag,
    get_mld,
):
    fs = "48"
    dtx = "0"
@@ -364,6 +371,7 @@ def test_spar_hoa3_enc_system(
        update_ref,
        gain_flag,
        keep_files,
        get_mld=get_mld
    )


@@ -386,6 +394,7 @@ def test_sba_enc_BWforce_system(
    dtx,
    tag,
    sample_rate_bw_idx,
    get_mld,
):
    if dtx == "1" and ivas_br not in ["32000", "64000"]:
        # skip high bitrates for DTX until DTX issue is resolved
@@ -437,6 +446,7 @@ def test_sba_enc_BWforce_system(
        update_ref,
        gain_flag,
        keep_files,
        get_mld=get_mld,
    )


@@ -598,6 +608,7 @@ def sba_dec(
    update_ref,
    gain_flag,
    keep_files,
    get_mld=False,
    pca=False,
):
    # --------  run cmd  ------------
@@ -652,7 +663,7 @@ def sba_dec(
        )

        fs = int(sampling_rate) * 1000
        cmp_result, reason = cmp_pcm(dut_out_raw, ref_out_raw, output_config, fs)
        cmp_result, reason = cmp_pcm(dut_out_raw, ref_out_raw, output_config, fs, get_mld=get_mld)

        # report compare result
        assert cmp_result == 0, reason