Commit d271790f authored by emerit's avatar emerit
Browse files

on going fix failed with -n >1

parent 2e653a20

tests/renderer/utils.py

+19 −13
Original line number Diff line number Diff line
@@ -111,8 +111,9 @@ def run_renderer( 
    is_comparetest: Optional[bool] = False,

    framing_5ms: Optional[bool] = False,

    test_case_name: Optional[str] = None,

    hrtf_file: Optional[str] = None,

) -> Tuple[np.ndarray, int]:

    hrtf_file_path: Optional[str] = None,

    hrtf_file_name: Optional[str] = None,

) -> Tuple[Tuple[np.ndarray, int], str]:

    """CuT creation with standalone renderer"""

    if trj_file is not None:

        trj_name = f"_{trj_file.stem}"
@@ -166,7 +167,7 @@ def run_renderer( 


    out_file = str(

        output_path_base.joinpath(

            f"{in_name}_to_{out_name}{trj_name}{non_diegetic_pan}{refrot_name}{refvec_name}{refveclev_name}{config_name}{framing_name}{name_extension}.wav"

            f"{in_name}_to_{out_name}{trj_name}{non_diegetic_pan}{refrot_name}{refvec_name}{refveclev_name}{config_name}{framing_name}{hrtf_file_name}{name_extension}.wav"

        )

    )
@@ -205,8 +206,9 @@ def run_renderer( 
    if framing_5ms:

        cmd.extend(["-fr5"])



    if hrtf_file is not None:

        cmd.extend(["-hrtf", str(hrtf_file)])

    if hrtf_file_name is not None:

        if hrtf_file_path is not None:

            cmd.extend(["-hrtf", str(hrtf_file_path.joinpath(hrtf_file_name))])



    # Set env variables for UBSAN

    env = os.environ.copy()
@@ -217,11 +219,11 @@ def run_renderer( 


    run_cmd(cmd, env)



    return pyaudio3dtools.audiofile.readfile(out_file)

    return pyaudio3dtools.audiofile.readfile(out_file), out_file





def compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt, **kwargs):

    ref, ref_fs = run_renderer(

    [[ref, ref_fs], out_ref]= run_renderer(

        in_fmt,

        out_fmt,

        test_case_name=test_info.node.name,
@@ -229,11 +231,12 @@ def compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt, **kwargs): 
        output_path_base=OUTPUT_PATH_REF,

        **kwargs,

    )

    cut, cut_fs = run_renderer(

    [[cut, cut_fs], out_cut] = run_renderer(

        in_fmt, out_fmt, test_case_name=test_info.node.name, **kwargs

    )

    check_BE(test_info, ref, ref_fs, cut, cut_fs)



    os.remove(out_ref)

    os.remove(out_cut)



def compare_renderer_vs_pyscripts(test_info, in_fmt, out_fmt, **kwargs):

    ref, ref_fs = run_pyscripts(in_fmt, out_fmt, **kwargs)
@@ -256,17 +259,20 @@ def compare_renderer_args( 


def compare_renderer_vs_renderer_with_binary_hrir(test_info, in_fmt, out_fmt, **kwargs):

    

    hrtf_file_path = SCRIPTS_DIR.joinpath("binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin")

    ref, ref_fs = run_renderer(

    hrtf_file_dir = SCRIPTS_DIR.joinpath("binauralRenderer_interface/binaural_renderers_hrtf_data")

    [[ref, ref_fs], outfile_ref] = run_renderer(

        in_fmt,

        out_fmt,

        test_case_name=test_info.node.name,

        output_path_base=OUTPUT_PATH_REF,

        hrtf_file = str(hrtf_file_path),

        hrtf_file_path = hrtf_file_dir,

        hrtf_file_name = "ivas_binaural_48kHz.bin",

        **kwargs,

    )

    cut, cut_fs = run_renderer(

    [[cut, cut_fs], outfile_cut]= run_renderer(

        in_fmt, out_fmt, test_case_name=test_info.node.name, **kwargs

    )

    check_BE(test_info, ref, ref_fs, cut, cut_fs)

    os.remove(outfile_ref)

    os.remove(outfile_cut)