Commit 387fb807 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

update ref creation command to use the correct constant for BIN_SUFFIX_MERGETARGET + formatting

parent c8d6a857

tests/renderer/utils.py

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ def run_renderer( 
    cmd[8] = str(out_fmt)



    if test_info.config.option.create_ref:

        cmd[0] += "_ref"

        cmd[0] += BIN_SUFFIX_MERGETARGET

    cmd[0] += binary_suffix



    if in_meta_files is not None:

tests/split_rendering/constants.py

+1 −3
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ 


from pathlib import Path





from tests.renderer.constants import (

    BIN_SUFFIX_MERGETARGET,

    CUSTOM_LS_TO_TEST,

    FORMAT_TO_FILE_COMPARETEST,

    FORMAT_TO_FILE_SMOKETEST,
@@ -41,7 +41,6 @@ from tests.renderer.constants import ( 
    METADATA_SCENES_TO_TEST,

)





""" Set up paths """

TESTS_DIR = Path(__file__).parent

RENDER_CFG_DIR = TESTS_DIR.joinpath("renderer_configs").resolve()
@@ -55,7 +54,6 @@ CUSTOM_LAYOUT_DIR = SCRIPTS_DIR.joinpath("ls_layouts") 
HR_TRAJECTORY_DIR = SCRIPTS_DIR.joinpath("trajectories")

TESTV_DIR = SCRIPTS_DIR.joinpath("testv")



BIN_SUFFIX_MERGETARGET = "_ref"



""" Renderer configurations """

RENDERER_CONFIGS_DEFAULT_CODEC = [

tests/split_rendering/utils.py

+5 −5
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ def run_full_chain_split_rendering( 
        cmd = SPLIT_PRE_COD_CMD[:]



        if test_info.config.option.create_ref:

            cmd[0] += "_ref"

            cmd[0] += BIN_SUFFIX_MERGETARGET

        cmd[0] += binary_suffix

        cmd[1] = bitrate

        # if in REF or CUT creation mode use the comparetestv
@@ -132,7 +132,7 @@ def run_full_chain_split_rendering( 
        cmd = SPLIT_PRE_DEC_CMD[:]



        if test_info.config.option.create_ref:

            cmd[0] += "_ref"

            cmd[0] += BIN_SUFFIX_MERGETARGET

        cmd[0] += binary_suffix

        cmd[2] = str(pre_trajectory)

        cmd[4] = str(render_config)
@@ -149,7 +149,7 @@ def run_full_chain_split_rendering( 
        cmd = SPLIT_POST_REND_CMD[:]



        if test_info.config.option.create_ref:

            cmd[0] += "_ref"

            cmd[0] += BIN_SUFFIX_MERGETARGET

        cmd[0] += binary_suffix

        cmd[4] = str(split_bitstream)

        cmd[6] = renderer_fmt
@@ -225,7 +225,7 @@ def run_external_split_rendering( 
        cmd = SPLIT_PRE_REND_CMD[:]



        if test_info.config.option.create_ref:

            cmd[0] += "_ref"

            cmd[0] += BIN_SUFFIX_MERGETARGET

        cmd[0] += binary_suffix

        cmd[4] = str(render_config)

        if is_comparetest:
@@ -252,7 +252,7 @@ def run_external_split_rendering( 
        cmd = SPLIT_POST_REND_CMD[:]



        if test_info.config.option.create_ref:

            cmd[0] += "_ref"

            cmd[0] += BIN_SUFFIX_MERGETARGET

        cmd[0] += binary_suffix

        cmd[4] = str(split_bitstream)

        cmd[6] = renderer_fmt