Commit 127ed96d authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

modify renderer sampling rate testcase naming to include kHz

parent b5e1d22e

tests/renderer/constants.py

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ elif platform.system() in ["Linux", "Darwin"]: 
else:

    assert False, f"Unsupported platform {platform.system()}"



SAMPLING_RATES = ["48", "32", "16"]

SAMPLING_RATES = ["48kHz", "32kHz", "16kHz"]



""" Renderer commandline template """

RENDERER_CMD = [

tests/renderer/test_renderer.py

+2 −2
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ def test_masa_prerend( 
        test_info,

        "META",

        "MASA2",

        metadata_input=TEST_VECTOR_DIR.joinpath(f"{in_fmt}_{fs}.txt"),

        metadata_input=TEST_VECTOR_DIR.joinpath(f"{in_fmt}_{fs[:2]}.txt"),

        binary_suffix=EXE_SUFFIX,

        get_mld=get_mld,

        mld_lim=get_mld_lim,
@@ -878,7 +878,7 @@ def test_metadata( 
        test_info,

        "META",

        out_fmt,

        metadata_input=TEST_VECTOR_DIR.joinpath(f"{in_fmt}_{fs}.txt"),

        metadata_input=TEST_VECTOR_DIR.joinpath(f"{in_fmt}_{fs[:2]}.txt"),

        binary_suffix=EXE_SUFFIX,

        frame_size=frame_size,

        get_mld=get_mld,

tests/renderer/utils.py

+4 −4
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ def run_renderer( 
    aeid: Optional[Union[Path, int]] = None,

    in_file=None,

    out_file=None,

    sr="48",

    sr="48kHz",

    render_for_peaq=False,

    split_comparison=False,

) -> str:
@@ -266,7 +266,7 @@ def run_renderer( 
        else:

            in_file = format_to_file[in_fmt]

            in_name = in_fmt

        in_file = str(in_file).replace("48", sr)

        in_file = str(in_file).replace("48", sr[:2])



    if in_meta_files is None and in_fmt in format_to_metadata_files:

        in_meta_files = format_to_metadata_files[in_fmt]
@@ -280,7 +280,7 @@ def run_renderer( 
    cmd[4] = str(in_fmt)

    cmd[6] = str(out_file)

    cmd[8] = str(out_fmt)

    cmd[10] = str(sr)

    cmd[10] = str(sr[:2])



    if test_info.config.option.create_ref:

        cmd[0] += BIN_SUFFIX_MERGETARGET
@@ -370,7 +370,7 @@ def run_renderer( 
                cmd2[4] = str(out_fmt)  # in_fmt

                cmd2[6] = odg_test  # out_file

                cmd2[8] = new_fmt  # out_fmt

                cmd2[10] = str(sr)

                cmd2[10] = str(sr[:2])

                cmd2[0] += BIN_SUFFIX_MERGETARGET  # Use IVAS_rend_ref for re-rendering

                cmd2[0] += binary_suffix

                if "MASA" in str(out_fmt):