Commit 41b67025 authored by norvell's avatar norvell
Browse files

Fix for MASA re-rendering

parent cc4bb425
Loading
Loading
Loading
Loading
+13 −8
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()
        if output_config.upper() not in VALID_DEC_OUTPUT_CONF:
        output_config = dec_split.pop().upper()
        if output_config 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)
@@ -462,12 +462,15 @@ def test_param_file_tests(
        ][0][1]

        record_property = dut_decoder_frontend.record_property if dut_decoder_frontend else ref_decoder_frontend.record_property
        in_meta_files = [str(SCRIPTS_DIR.joinpath(m)) for m in re.findall(r'\b\S+\.csv\b', enc_opts)] # All .csv files in enc_opts are metadata files.
        in_meta_files = [str(SCRIPTS_DIR.joinpath(m)) for m in re.findall(r'\b\S+\.csv\b', enc_opts)] # All .csv files in enc_opts are ISM metadata files.
        in_meta_files = in_meta_files + [str(SCRIPTS_DIR.joinpath(m)) for m in re.findall(r'\b\S+\.met\b', enc_opts)] # All .met files in enc_opts are MASA metadata files.
        n_obj = len(in_meta_files)
        if n_obj > 0 and output_config == "EXT":
            out_meta_files = [f"{dut_output_file}.{i}.csv" for i in range(0,n_obj)]
        else:
        out_meta_files = None
        if output_config == "EXT":
            if "ISM" in in_fmt and n_obj > 0:
                out_meta_files = [f"{dut_output_file}.{i}.csv" for i in range(0,n_obj)]
            if "MASA" in in_fmt:
                out_meta_files = [f"{dut_output_file}.met"]
        if output_config == "EXT":
            output_config = in_fmt
        if output_config == "":
@@ -489,7 +492,9 @@ def test_param_file_tests(
        config_file = findstr(r'-render_config\s+(\S+)', dec_opts)
        binary_suffix = "_ref"
        frame_size = findstr(r'-fr\s+(\S+)', dec_opts)
        hrtf_file = findstr(r'-hrtf\s+(\S+)', dec_opts)
        # hrtf_file = findstr(r'-hrtf\s+(\S+)', dec_opts)
        hrtf_file = None # Default HRTFs used for binaural rendering of output

        aeid = findstr(r'-aeid\s+(\S+)', dec_opts)