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

pass mld-playback-level to compare_dmx function

parent ee8a3d92

tests/codec_be_on_mr_nonselection/test_param_file.py

+6 −1
Original line number Diff line number Diff line
@@ -545,7 +545,12 @@ def run_test( 
                str(f).replace(dut_base_path, reference_path) for f in dut_dmx_files

            ]



            prop_results = compare_dmx_signals(ref_dmx_files, dut_dmx_files, in_sr)

            prop_results = compare_dmx_signals(

                ref_dmx_files,

                dut_dmx_files,

                in_sr,

                test_info.config.options.mld_playback_level,

            )

            for prop, val in prop_results.items():

                dut_decoder_frontend.record_property(prop, val)

tests/codec_be_on_mr_nonselection/test_sba.py

+11 −1
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ def test_pca_enc( 
            plc_pattern=plc_pattern,

            get_enc_stats=get_enc_stats,

            compare_enc_dmx=compare_enc_dmx,

            mld_playback_level=test_info.config.option.mld_playback_level,

        )



    if not encoder_only:
@@ -337,6 +338,7 @@ def test_sba_enc_system( 
            plc_pattern=plc_pattern,

            get_enc_stats=get_enc_stats,

            compare_enc_dmx=compare_enc_dmx,

            mld_playback_level=test_info.config.option.mld_playback_level,

        )



        if update_ref == 0 and get_enc_stats:
@@ -490,6 +492,7 @@ def test_spar_hoa2_enc_system( 
            plc_pattern=plc_pattern,

            get_enc_stats=get_enc_stats,

            compare_enc_dmx=compare_enc_dmx,

            mld_playback_level=test_info.config.option.mld_playback_level,

        )



        if update_ref == 0 and get_enc_stats:
@@ -643,6 +646,7 @@ def test_spar_hoa3_enc_system( 
            plc_pattern=plc_pattern,

            get_enc_stats=get_enc_stats,

            compare_enc_dmx=compare_enc_dmx,

            mld_playback_level=test_info.config.option.mld_playback_level,

        )



        if get_enc_stats:
@@ -811,6 +815,7 @@ def test_sba_enc_BWforce_system( 
            plc_pattern=plc_pattern,

            get_enc_stats=get_enc_stats,

            compare_enc_dmx=compare_enc_dmx,

            mld_playback_level=test_info.config.option.mld_playback_level,

        )



        if update_ref == 0 and get_enc_stats:
@@ -1003,6 +1008,7 @@ def test_sba_plc_system( 
            plc_pattern=plc_pattern,

            get_enc_stats=get_enc_stats,

            compare_enc_dmx=compare_enc_dmx,

            mld_playback_level=test_info.config.option.mld_playback_level,

        )



    if not encoder_only:
@@ -1067,6 +1073,7 @@ def sba_enc( 
    plc_pattern=None,

    get_enc_stats=False,

    compare_enc_dmx=False,

    mld_playback_level=92.0,

):

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

    dtx_mode = dtx == "1"
@@ -1157,7 +1164,10 @@ def sba_enc( 
        ]



        prop_results = compare_dmx_signals(

            ref_dmx_files, dut_dmx_files, int(sampling_rate)

            ref_dmx_files,

            dut_dmx_files,

            int(sampling_rate),

            mld_playback_level,

        )

        for prop, val in prop_results.items():

            dut_encoder_frontend.record_property(prop, val)

tests/conftest.py

+1 −1
Original line number Diff line number Diff line
@@ -1258,7 +1258,7 @@ class MaxDiffPatternNotFound(Exception): 
    pass





def compare_dmx_signals(ref_dmx_files, dut_dmx_files, fs) -> dict:

def compare_dmx_signals(ref_dmx_files, dut_dmx_files, fs, mld_playback_level) -> dict:

    nchannels = len(dut_dmx_files)

    with NamedTemporaryFile(suffix=".ref_dmx.pcm") as dmx_file_ref_tmp:

        with NamedTemporaryFile(suffix=".dut_dmx.pcm") as dmx_file_dut_tmp: