Commit e2e47c5a authored by norvell's avatar norvell
Browse files

Fixes for ref_vec_lev tracking and custom ls

parent 41b67025
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -396,8 +396,8 @@ def test_param_file_tests(
    sampling_rate = int(dec_split.pop())
    out_sr = sampling_rate
    if len(dec_split) > 0:
        output_config = dec_split.pop().upper()
        if output_config not in VALID_DEC_OUTPUT_CONF:
        output_config = dec_split.pop()
        if output_config.upper() not in VALID_DEC_OUTPUT_CONF:
            if not output_config.endswith(".txt"):
                # must be EVS tests with additional parameters - put param back
                dec_split.append(output_config)
@@ -485,10 +485,11 @@ def test_param_file_tests(
        rot_tmp_file = findstr(r'-rvf\s+(\S+)', dec_opts)
        refveclev_file = None
        refvec_file = None
        if "-otr ref_vec".upper() in dec_opts.upper():  
            refvec_file = rot_tmp_file
        if "-otr ref_vec_lev".upper() in dec_opts.upper():  
            refveclev_file = rot_tmp_file
        else:
            if "-otr ref_vec".upper() in dec_opts.upper():
                refvec_file = rot_tmp_file
        config_file = findstr(r'-render_config\s+(\S+)', dec_opts)
        binary_suffix = "_ref"
        frame_size = findstr(r'-fr\s+(\S+)', dec_opts)
@@ -498,7 +499,7 @@ def test_param_file_tests(
        aeid = findstr(r'-aeid\s+(\S+)', dec_opts)


        if not output_config in PEAQ_SUPPORTED_FMT:
        if not output_config.upper() in PEAQ_SUPPORTED_FMT:
            # Render output to BINAURAL
            output_reformat = "BINAURAL"

@@ -532,7 +533,7 @@ def test_param_file_tests(
            # Use binauralized file for comparison
            dut_output_file = dut_output_file_binaural

        if in_fmt != output_config:
        if in_fmt.upper() != output_config.upper():
            # Render input to match output_config
            out_fmt = output_config