Commit 4ba561be authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

futher harmonization with FLOAT repo

parent 4089a79c

tests/renderer/constants.py

+108 −82
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ accordance with the laws of the Federal Republic of Germany excluding its confli 
the United Nations Convention on Contracts on the International Sales of Goods.

"""



from pathlib import Path

import platform

from pathlib import Path



""" Set up paths """

TESTS_DIR = Path(__file__).parent
@@ -55,6 +55,8 @@ elif platform.system() in ["Linux", "Darwin"]: 
else:

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



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



""" Renderer commandline template """

RENDERER_CMD = [

    str(TESTS_DIR.parent.parent.joinpath("IVAS_rend")),
@@ -115,27 +117,27 @@ FORMAT_TO_FILE_SMOKETEST = { 
    "NDP_ISM4": NCHAN_TO_FILE[4],

    "MASA1": NCHAN_TO_FILE[1],

    "MASA2": NCHAN_TO_FILE[2],

    "OMASA_1_1": NCHAN_TO_FILE[2],

    "OMASA_1_2": NCHAN_TO_FILE[3],

    "OMASA_1_3": NCHAN_TO_FILE[4],

    "OMASA_1_4": NCHAN_TO_FILE[5],

    "OMASA_2_1": NCHAN_TO_FILE[3],

    "OMASA_2_2": NCHAN_TO_FILE[4],

    "OMASA_2_3": NCHAN_TO_FILE[5],

    "OMASA_2_4": NCHAN_TO_FILE[6],

    "OSBA_1_1": NCHAN_TO_FILE[5],

    "OSBA_2_1": NCHAN_TO_FILE[6],

    "OSBA_3_1": NCHAN_TO_FILE[7],

    "OSBA_4_1": NCHAN_TO_FILE[8],

    "OSBA_1_2": NCHAN_TO_FILE[10],

    "OSBA_2_2": NCHAN_TO_FILE[11],

    "OSBA_3_2": NCHAN_TO_FILE[12],

    "OSBA_4_2": NCHAN_TO_FILE[13],

    "OSBA_1_3": NCHAN_TO_FILE[17],

    "OSBA_2_3": NCHAN_TO_FILE[18],

    "OSBA_3_3": NCHAN_TO_FILE[19],

    "OSBA_4_3": NCHAN_TO_FILE[20],

    "META": TEST_VECTOR_DIR.joinpath("mixed_scene.txt"),

    "ISM1MASA1": NCHAN_TO_FILE[2],

    "ISM2MASA1": NCHAN_TO_FILE[3],

    "ISM3MASA1": NCHAN_TO_FILE[4],

    "ISM4MASA1": NCHAN_TO_FILE[5],

    "ISM1MASA2": NCHAN_TO_FILE[3],

    "ISM2MASA2": NCHAN_TO_FILE[4],

    "ISM3MASA2": NCHAN_TO_FILE[5],

    "ISM4MASA2": NCHAN_TO_FILE[6],

    "ISM1SBA1": NCHAN_TO_FILE[5],

    "ISM2SBA1": NCHAN_TO_FILE[6],

    "ISM3SBA1": NCHAN_TO_FILE[7],

    "ISM4SBA1": NCHAN_TO_FILE[8],

    "ISM1SBA2": NCHAN_TO_FILE[10],

    "ISM2SBA2": NCHAN_TO_FILE[11],

    "ISM3SBA2": NCHAN_TO_FILE[12],

    "ISM4SBA2": NCHAN_TO_FILE[13],

    "ISM1SBA3": NCHAN_TO_FILE[17],

    "ISM2SBA3": NCHAN_TO_FILE[18],

    "ISM3SBA3": NCHAN_TO_FILE[19],

    "ISM4SBA3": NCHAN_TO_FILE[20],

    "META": TEST_VECTOR_DIR.joinpath("mixed_scene_48.txt"),

    "16ch_8+4+4": NCHAN_TO_FILE[16],

    "4d4": NCHAN_TO_FILE[8],

    "t_design_4": NCHAN_TO_FILE[12],
@@ -158,27 +160,27 @@ FORMAT_TO_FILE_COMPARETEST = { 
    "ISM4": TESTV_DIR.joinpath("stv4ISM48s.wav"),

    "MASA1": TESTV_DIR.joinpath("stv1MASA1TC48c.wav"),

    "MASA2": TESTV_DIR.joinpath("stv2MASA2TC48c.wav"),

    "OMASA_1_1": TESTV_DIR.joinpath("stvOMASA_1ISM_1MASA1TC48c.wav"),

    "OMASA_1_2": TESTV_DIR.joinpath("stvOMASA_2ISM_2MASA1TC48c.wav"),

    "OMASA_1_3": TESTV_DIR.joinpath("stvOMASA_3ISM_1MASA1TC48c.wav"),

    "OMASA_1_4": TESTV_DIR.joinpath("stvOMASA_4ISM_2MASA1TC48c.wav"),

    "OMASA_2_1": TESTV_DIR.joinpath("stvOMASA_1ISM_1MASA2TC48c.wav"),

    "OMASA_2_2": TESTV_DIR.joinpath("stvOMASA_2ISM_2MASA2TC48c.wav"),

    "OMASA_2_3": TESTV_DIR.joinpath("stvOMASA_3ISM_1MASA2TC48c.wav"),

    "OMASA_2_4": TESTV_DIR.joinpath("stvOMASA_4ISM_2MASA2TC48c.wav"),

    "OSBA_1_1": TESTV_DIR.joinpath("stvOSBA_1ISM_FOA48c.wav"),

    "OSBA_1_2": TESTV_DIR.joinpath("stvOSBA_1ISM_2OA48c.wav"),

    "OSBA_1_3": TESTV_DIR.joinpath("stvOSBA_1ISM_3OA48c.wav"),

    "OSBA_2_1": TESTV_DIR.joinpath("stvOSBA_2ISM_FOA48c.wav"),

    "OSBA_2_2": TESTV_DIR.joinpath("stvOSBA_2ISM_2OA48c.wav"),

    "OSBA_2_3": TESTV_DIR.joinpath("stvOSBA_2ISM_3OA48c.wav"),

    "OSBA_3_1": TESTV_DIR.joinpath("stvOSBA_3ISM_FOA48c.wav"),

    "OSBA_3_2": TESTV_DIR.joinpath("stvOSBA_3ISM_2OA48c.wav"),

    "OSBA_3_3": TESTV_DIR.joinpath("stvOSBA_3ISM_3OA48c.wav"),

    "OSBA_4_1": TESTV_DIR.joinpath("stvOSBA_4ISM_FOA48c.wav"),

    "OSBA_4_2": TESTV_DIR.joinpath("stvOSBA_4ISM_2OA48c.wav"),

    "OSBA_4_3": TESTV_DIR.joinpath("stvOSBA_4ISM_3OA48c.wav"),

    "META": TEST_VECTOR_DIR.joinpath("mixed_scene.txt"),

    "ISM1MASA1": TESTV_DIR.joinpath("stvOMASA_1ISM_1MASA1TC48c.wav"),

    "ISM2MASA1": TESTV_DIR.joinpath("stvOMASA_2ISM_2MASA1TC48c.wav"),

    "ISM3MASA1": TESTV_DIR.joinpath("stvOMASA_3ISM_1MASA1TC48c.wav"),

    "ISM4MASA1": TESTV_DIR.joinpath("stvOMASA_4ISM_2MASA1TC48c.wav"),

    "ISM1MASA2": TESTV_DIR.joinpath("stvOMASA_1ISM_1MASA2TC48c.wav"),

    "ISM2MASA2": TESTV_DIR.joinpath("stvOMASA_2ISM_2MASA2TC48c.wav"),

    "ISM3MASA2": TESTV_DIR.joinpath("stvOMASA_3ISM_1MASA2TC48c.wav"),

    "ISM4MASA2": TESTV_DIR.joinpath("stvOMASA_4ISM_2MASA2TC48c.wav"),

    "ISM1SBA1": TESTV_DIR.joinpath("stvOSBA_1ISM_FOA48c.wav"),

    "ISM1SBA2": TESTV_DIR.joinpath("stvOSBA_1ISM_2OA48c.wav"),

    "ISM1SBA3": TESTV_DIR.joinpath("stvOSBA_1ISM_3OA48c.wav"),

    "ISM2SBA1": TESTV_DIR.joinpath("stvOSBA_2ISM_FOA48c.wav"),

    "ISM2SBA2": TESTV_DIR.joinpath("stvOSBA_2ISM_2OA48c.wav"),

    "ISM2SBA3": TESTV_DIR.joinpath("stvOSBA_2ISM_3OA48c.wav"),

    "ISM3SBA1": TESTV_DIR.joinpath("stvOSBA_3ISM_FOA48c.wav"),

    "ISM3SBA2": TESTV_DIR.joinpath("stvOSBA_3ISM_2OA48c.wav"),

    "ISM3SBA3": TESTV_DIR.joinpath("stvOSBA_3ISM_3OA48c.wav"),

    "ISM4SBA1": TESTV_DIR.joinpath("stvOSBA_4ISM_FOA48c.wav"),

    "ISM4SBA2": TESTV_DIR.joinpath("stvOSBA_4ISM_2OA48c.wav"),

    "ISM4SBA3": TESTV_DIR.joinpath("stvOSBA_4ISM_3OA48c.wav"),

    "META": TEST_VECTOR_DIR.joinpath("mixed_scene_48.txt"),

    "16ch_8+4+4": TESTV_DIR.joinpath("stv3OA48c.wav"),

    "4d4": TESTV_DIR.joinpath("stv71MC48c.wav"),

    "t_design_4": TESTV_DIR.joinpath("stv714MC48c.wav"),
@@ -201,27 +203,27 @@ FORMAT_TO_FILE_LTV = { 
    "ISM4": LTV_DIR.joinpath("ltv48_4ISM.wav"),

    "MASA1": LTV_DIR.joinpath("ltv48_MASA1TC.wav"),

    "MASA2": LTV_DIR.joinpath("ltv48_MASA2TC.wav"),

    "OMASA_1_1": LTV_DIR.joinpath("ltv48_OMASA_1ISM_1TC.wav"),

    "OMASA_1_2": LTV_DIR.joinpath("ltv48_OMASA_2ISM_1TC.wav"),

    "OMASA_1_3": LTV_DIR.joinpath("ltv48_OMASA_3ISM_1TC.wav"),

    "OMASA_1_4": LTV_DIR.joinpath("ltv48_OMASA_4ISM_1TC.wav"),

    "OMASA_2_1": LTV_DIR.joinpath("ltv48_OMASA_1ISM_2TC.wav"),

    "OMASA_2_2": LTV_DIR.joinpath("ltv48_OMASA_2ISM_2TC.wav"),

    "OMASA_2_3": LTV_DIR.joinpath("ltv48_OMASA_3ISM_2TC.wav"),

    "OMASA_2_4": LTV_DIR.joinpath("ltv48_OMASA_4ISM_2TC.wav"),

    "OSBA_1_1": LTV_DIR.joinpath("ltv48_OSBA_1ISM_FOA.wav"),

    "OSBA_1_2": LTV_DIR.joinpath("ltv48_OSBA_1ISM_HOA2.wav"),

    "OSBA_1_3": LTV_DIR.joinpath("ltv48_OSBA_1ISM_HOA3.wav"),

    "OSBA_2_1": LTV_DIR.joinpath("ltv48_OSBA_2ISM_FOA.wav"),

    "OSBA_2_2": LTV_DIR.joinpath("ltv48_OSBA_2ISM_HOA2.wav"),

    "OSBA_2_3": LTV_DIR.joinpath("ltv48_OSBA_2ISM_HOA3.wav"),

    "OSBA_3_1": LTV_DIR.joinpath("ltv48_OSBA_3ISM_FOA.wav"),

    "OSBA_3_2": LTV_DIR.joinpath("ltv48_OSBA_3ISM_HOA2.wav"),

    "OSBA_3_3": LTV_DIR.joinpath("ltv48_OSBA_3ISM_HOA3.wav"),

    "OSBA_4_1": LTV_DIR.joinpath("ltv48_OSBA_4ISM_FOA.wav"),

    "OSBA_4_2": LTV_DIR.joinpath("ltv48_OSBA_4ISM_HOA2.wav"),

    "OSBA_4_3": LTV_DIR.joinpath("ltv48_OSBA_4ISM_HOA3.wav"),

    "META": TEST_VECTOR_DIR.joinpath("mixed_scene.txt"),

    "ISM1MASA1": LTV_DIR.joinpath("ltv48_OMASA_1ISM_1TC.wav"),

    "ISM2MASA1": LTV_DIR.joinpath("ltv48_OMASA_2ISM_1TC.wav"),

    "ISM3MASA1": LTV_DIR.joinpath("ltv48_OMASA_3ISM_1TC.wav"),

    "ISM4MASA1": LTV_DIR.joinpath("ltv48_OMASA_4ISM_1TC.wav"),

    "ISM1MASA2": LTV_DIR.joinpath("ltv48_OMASA_1ISM_2TC.wav"),

    "ISM2MASA2": LTV_DIR.joinpath("ltv48_OMASA_2ISM_2TC.wav"),

    "ISM3MASA2": LTV_DIR.joinpath("ltv48_OMASA_3ISM_2TC.wav"),

    "ISM4MASA2": LTV_DIR.joinpath("ltv48_OMASA_4ISM_2TC.wav"),

    "ISM1SBA1": LTV_DIR.joinpath("ltv48_OSBA_1ISM_FOA.wav"),

    "ISM1SBA2": LTV_DIR.joinpath("ltv48_OSBA_1ISM_HOA2.wav"),

    "ISM1SBA3": LTV_DIR.joinpath("ltv48_OSBA_1ISM_HOA3.wav"),

    "ISM2SBA1": LTV_DIR.joinpath("ltv48_OSBA_2ISM_FOA.wav"),

    "ISM2SBA2": LTV_DIR.joinpath("ltv48_OSBA_2ISM_HOA2.wav"),

    "ISM2SBA3": LTV_DIR.joinpath("ltv48_OSBA_2ISM_HOA3.wav"),

    "ISM3SBA1": LTV_DIR.joinpath("ltv48_OSBA_3ISM_FOA.wav"),

    "ISM3SBA2": LTV_DIR.joinpath("ltv48_OSBA_3ISM_HOA2.wav"),

    "ISM3SBA3": LTV_DIR.joinpath("ltv48_OSBA_3ISM_HOA3.wav"),

    "ISM4SBA1": LTV_DIR.joinpath("ltv48_OSBA_4ISM_FOA.wav"),

    "ISM4SBA2": LTV_DIR.joinpath("ltv48_OSBA_4ISM_HOA2.wav"),

    "ISM4SBA3": LTV_DIR.joinpath("ltv48_OSBA_4ISM_HOA3.wav"),

    "META": TEST_VECTOR_DIR.joinpath("mixed_scene_48.txt"),

    "16ch_8+4+4": LTV_DIR.joinpath("ltv48_HOA3.wav"),

    "4d4": LTV_DIR.joinpath("ltv48_MC71.wav"),

    "t_design_4": LTV_DIR.joinpath("ltv48_MC714.wav"),
@@ -252,44 +254,44 @@ FORMAT_TO_METADATA_FILES = { 
    ],

    "MASA1": [str(TESTV_DIR.joinpath("stv1MASA1TC48c.met"))],

    "MASA2": [str(TESTV_DIR.joinpath("stv2MASA2TC48c.met"))],

    "OMASA_1_1": [

    "ISM1MASA1": [

        str(TESTV_DIR.joinpath("stvISM1.csv")),

        str(TESTV_DIR.joinpath("stvOMASA_1ISM_1MASA1TC48c.met")),

    ],

    "OMASA_1_2": [

    "ISM2MASA1": [

        str(TESTV_DIR.joinpath("stvISM1.csv")),

        str(TESTV_DIR.joinpath("stvISM2.csv")),

        str(TESTV_DIR.joinpath("stvOMASA_2ISM_2MASA1TC48c.met")),

    ],

    "OMASA_1_3": [

    "ISM3MASA1": [

        str(TESTV_DIR.joinpath("stvISM1.csv")),

        str(TESTV_DIR.joinpath("stvISM2.csv")),

        str(TESTV_DIR.joinpath("stvISM3.csv")),

        str(TESTV_DIR.joinpath("stvOMASA_3ISM_1MASA1TC48c.met")),

    ],

    "OMASA_1_4": [

    "ISM4MASA1": [

        str(TESTV_DIR.joinpath("stvISM1.csv")),

        str(TESTV_DIR.joinpath("stvISM2.csv")),

        str(TESTV_DIR.joinpath("stvISM3.csv")),

        str(TESTV_DIR.joinpath("stvISM4.csv")),

        str(TESTV_DIR.joinpath("stvOMASA_4ISM_2MASA1TC48c.met")),

    ],

    "OMASA_2_1": [

    "ISM1MASA2": [

        str(TESTV_DIR.joinpath("stvISM1.csv")),

        str(TESTV_DIR.joinpath("stvOMASA_1ISM_1MASA2TC48c.met")),

    ],

    "OMASA_2_2": [

    "ISM2MASA2": [

        str(TESTV_DIR.joinpath("stvISM1.csv")),

        str(TESTV_DIR.joinpath("stvISM2.csv")),

        str(TESTV_DIR.joinpath("stvOMASA_2ISM_2MASA2TC48c.met")),

    ],

    "OMASA_2_3": [

    "ISM3MASA2": [

        str(TESTV_DIR.joinpath("stvISM1.csv")),

        str(TESTV_DIR.joinpath("stvISM2.csv")),

        str(TESTV_DIR.joinpath("stvISM3.csv")),

        str(TESTV_DIR.joinpath("stvOMASA_3ISM_1MASA2TC48c.met")),

    ],

    "OMASA_2_4": [

    "ISM4MASA2": [

        str(TESTV_DIR.joinpath("stvISM1.csv")),

        str(TESTV_DIR.joinpath("stvISM2.csv")),

        str(TESTV_DIR.joinpath("stvISM3.csv")),
@@ -323,44 +325,44 @@ FORMAT_TO_METADATA_FILES_LTV = { 
    ],

    "MASA1": [str(LTV_DIR.joinpath("ltv48_MASA1TC.met"))],

    "MASA2": [str(LTV_DIR.joinpath("ltv48_MASA2TC.met"))],

    "OMASA_1_1": [

    "ISM1MASA1": [

        str(LTV_DIR.joinpath("ltvISM1.csv")),

        str(LTV_DIR.joinpath("ltv48_OMASA_1ISM_1TC.met")),

    ],

    "OMASA_1_2": [

    "ISM2MASA1": [

        str(LTV_DIR.joinpath("ltvISM1.csv")),

        str(LTV_DIR.joinpath("ltvISM2.csv")),

        str(LTV_DIR.joinpath("ltv48_OMASA_2ISM_1TC.met")),

    ],

    "OMASA_1_3": [

    "ISM3MASA1": [

        str(LTV_DIR.joinpath("ltvISM1.csv")),

        str(LTV_DIR.joinpath("ltvISM2.csv")),

        str(LTV_DIR.joinpath("ltvISM3.csv")),

        str(LTV_DIR.joinpath("ltv48_OMASA_3ISM_1TC.met")),

    ],

    "OMASA_1_4": [

    "ISM4MASA1": [

        str(LTV_DIR.joinpath("ltvISM1.csv")),

        str(LTV_DIR.joinpath("ltvISM2.csv")),

        str(LTV_DIR.joinpath("ltvISM3.csv")),

        str(LTV_DIR.joinpath("ltvISM4.csv")),

        str(LTV_DIR.joinpath("ltv48_OMASA_4ISM_1TC.met")),

    ],

    "OMASA_2_1": [

    "ISM1MASA2": [

        str(LTV_DIR.joinpath("ltvISM1.csv")),

        str(LTV_DIR.joinpath("ltv48_OMASA_1ISM_2TC.met")),

    ],

    "OMASA_2_2": [

    "ISM2MASA2": [

        str(LTV_DIR.joinpath("ltvISM1.csv")),

        str(LTV_DIR.joinpath("ltvISM2.csv")),

        str(LTV_DIR.joinpath("ltv48_OMASA_2ISM_2TC.met")),

    ],

    "OMASA_2_3": [

    "ISM3MASA2": [

        str(LTV_DIR.joinpath("ltvISM1.csv")),

        str(LTV_DIR.joinpath("ltvISM2.csv")),

        str(LTV_DIR.joinpath("ltvISM3.csv")),

        str(LTV_DIR.joinpath("ltv48_OMASA_3ISM_2TC.met")),

    ],

    "OMASA_2_4": [

    "ISM4MASA2": [

        str(LTV_DIR.joinpath("ltvISM1.csv")),

        str(LTV_DIR.joinpath("ltvISM2.csv")),

        str(LTV_DIR.joinpath("ltvISM3.csv")),
@@ -374,6 +376,31 @@ INPUT_FORMATS_AMBI = ["FOA", "HOA2", "HOA3"] 
INPUT_FORMATS_MC = ["MONO", "STEREO", "5_1", "5_1_2", "5_1_4", "7_1", "7_1_4"]

INPUT_FORMATS_ISM = ["ISM1", "ISM2", "ISM3", "ISM4"]

INPUT_FORMATS_MASA = ["MASA1", "MASA2"]

INPUT_FORMATS_OMASA = [

    "ISM1MASA1",

    "ISM2MASA1",

    "ISM3MASA1",

    "ISM4MASA1",

    "ISM1MASA2",

    "ISM2MASA2",

    "ISM3MASA2",

    "ISM4MASA2",

]

INPUT_FORMATS_OSBA = [

    "ISM1SBA1",

    "ISM1SBA2",

    "ISM1SBA3",

    "ISM2SBA1",

    "ISM2SBA2",

    "ISM2SBA3",

    "ISM3SBA1",

    "ISM3SBA2",

    "ISM3SBA3",

    "ISM4SBA1",

    "ISM4SBA2",

    "ISM4SBA3",

]





""" Non binaural / parametric output formats """

OUTPUT_FORMATS = [
@@ -418,4 +445,3 @@ PEAQ_SUPPORTED_FMT = [ 
    "BINAURAL_ROOM_IR",

    "BINAURAL_ROOM_REVERB",

]

tests/renderer/test_renderer.py

+412 −84

File changed.

Preview size limit exceeded, changes collapsed.

tests/renderer/utils.py

+29 −20
Original line number Diff line number Diff line
@@ -30,41 +30,42 @@ accordance with the laws of the Federal Republic of Germany excluding its confli 
the United Nations Convention on Contracts on the International Sales of Goods.

"""



import errno

import filecmp

import logging

import os

from pathlib import Path

import re

import subprocess as sp

import sys

import tempfile

from pathlib import Path

from typing import Dict, Optional, Union



import numpy as np

import pytest

import re

import errno

import tempfile



from ..constants import CAT_NORMAL

from .compare_audio import compare_audio_arrays

from .constants import (

    LTV_DIR,

    SCRIPTS_DIR,

    OUTPUT_PATH_REF,

    OUTPUT_PATH_CUT,

    BIN_SUFFIX_MERGETARGET,

    FORMAT_TO_FILE_COMPARETEST,

    FORMAT_TO_FILE_LTV,

    FORMAT_TO_FILE_SMOKETEST,

    FORMAT_TO_METADATA_FILES,

    FORMAT_TO_METADATA_FILES_LTV,

    FORMAT_TO_FILE_SMOKETEST,

    RENDERER_CMD,

    BIN_SUFFIX_MERGETARGET,

    LTV_DIR,

    OUTPUT_PATH_CUT,

    OUTPUT_PATH_REF,

    PEAQ_SUPPORTED_FMT,

    RENDERER_CMD,

    SCRIPTS_DIR,

)

from ..constants import CAT_NORMAL



sys.path.append(SCRIPTS_DIR)

from pyaudio3dtools.audiofile import readfile



from ..cmp_pcm import cmp_pcm

from ..conftest import parse_properties, get_split_idx

from ..conftest import get_split_idx, parse_properties



def _run_cmd(cmd, test_info=None, env=None ):

    """
@@ -175,7 +176,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:
@@ -267,12 +268,20 @@ def run_renderer( 
        else:

            in_file = format_to_file[in_fmt]

            in_name = in_fmt

        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]



    # If metadata not given with ISM input, use default NULL

    if in_meta_files is None and isinstance(in_fmt, str) and "ism" in in_fmt.lower():

        match = re.search(r"ism(\d)", in_fmt.lower())

        assert match is not None

        num_obj = int(match[1])

        in_meta_files = ["NULL"] * num_obj



    if out_file is None:

        out_file_stem = 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}{aeid_name}.wav"

        out_file_stem = 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}{aeid_name}_{sr}.wav"

        out_file = str(output_path_base.joinpath(out_file_stem))



    cmd = RENDERER_CMD[:]
@@ -280,7 +289,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 +379,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):
@@ -551,8 +560,8 @@ def binauralize_input_and_output( 
        # If extended metadata is not used, strip the metadata for the external renderer

        extended_md_used = (

            re.search(r"-ism\s?\+[1-4]", enc_opts)

            and not "OMASA" in in_fmt

            and not "OSBA" in in_fmt

            and "OMASA" not in in_fmt

            and "OSBA" not in in_fmt

        )

        if not extended_md_used and n_obj > 0:

            truncated_meta_files = []
@@ -634,7 +643,7 @@ def binauralize_input_and_output( 


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



        if not output_config.upper() in PEAQ_SUPPORTED_FMT:

        if output_config.upper() not in PEAQ_SUPPORTED_FMT:

            # Render output to BINAURAL

            output_reformat = "BINAURAL"

tests/split_rendering/utils.py

+38 −28
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ accordance with the laws of the Federal Republic of Germany excluding its confli 
the United Nations Convention on Contracts on the International Sales of Goods.

"""



import sys

import re

import sys

from pathlib import Path

from tempfile import TemporaryDirectory

from typing import Tuple, Optional
@@ -41,14 +41,22 @@ import numpy as np 
import pytest

import logging



from tests.renderer.constants import (

    BIN_SUFFIX_MERGETARGET,

    FORMAT_TO_FILE_COMPARETEST,

    FORMAT_TO_FILE_SMOKETEST,

    FORMAT_TO_METADATA_FILES,

)

from tests.renderer.utils import (

    check_BE,

    run_ivas_isar_enc_cmd,

    run_ivas_isar_dec_cmd,

    run_isar_post_rend_cmd,

    run_isar_ext_rend_cmd,

    run_isar_post_rend_cmd,

    run_ivas_isar_dec_cmd,

    run_ivas_isar_enc_cmd,

    run_cmd,

)

from tests.split_rendering.constants import *



from ..cmp_pcm import cmp_pcm

from ..conftest import parse_properties
@@ -111,7 +119,7 @@ def check_xfail( 
            f"Unsupported configuration with {in_fmt} at IVAS bitrate {ivas_bitrate}bps"

        )



    if not "0dof" in render_config and pre_rend_fr != 20:

    if "0dof" not in render_config and pre_rend_fr != 20:

        pytest.xfail("pose correction (== !0dof) is expected to use 20ms")



    if (
@@ -175,6 +183,9 @@ def run_full_chain_split_rendering( 
        renderer_fmt_for_filename = renderer_fmt.replace("BINAURAL_", "")

        filename_base = f"{in_fmt}_{bitrate}_{renderer_fmt_for_filename}_full_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}"



        if delay_profile:

            filename_base += f"_{delay_profile.stem}"



        ivas_bitstream_stem = f"{filename_base}.192"

        # NOTE: the split bitstream files need to have ".bit" extension otherwise the conformance test breaks

        split_bitstream_stem = f"{filename_base}.splt.bit"
@@ -196,14 +207,10 @@ def run_full_chain_split_rendering( 
            split_md_file = output_path_base.joinpath(split_md_file_stem)



        # check for metadata files

        if in_fmt.upper().startswith("OSBA"):

        if in_fmt.upper().startswith("ISM") and "SBA" in in_fmt.upper():

            # use same MD as ISM

            in_meta_files = FORMAT_TO_METADATA_FILES[f"ISM{in_fmt[5]}"]

        elif (

            in_fmt.upper().startswith("ISM")

            or in_fmt.upper().startswith("MASA")

            or in_fmt.upper().startswith("OMASA")

        ):

            in_meta_files = FORMAT_TO_METADATA_FILES[f"ISM{in_fmt[3]}"]

        elif in_fmt.upper().startswith("ISM") or in_fmt.upper().startswith("MASA"):

            in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt]

        else:

            in_meta_files = None
@@ -388,7 +395,10 @@ def run_external_split_rendering( 
            split_md_file = output_path_base.joinpath(split_md_file_stem)



        # check for metadata files

        if in_fmt.upper().startswith("ISM") or in_fmt.upper().startswith("MASA"):

        if in_fmt.upper().startswith("ISM") and "SBA" in in_fmt.upper():

            # use name MD as ISM

            in_meta_files = FORMAT_TO_METADATA_FILES[f"ISM{in_fmt[3]}"]

        elif in_fmt.upper().startswith("ISM") or in_fmt.upper().startswith("MASA"):

            in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt]

        else:

            in_meta_files = None
@@ -463,11 +473,10 @@ def run_external_split_rendering( 
                    f"CuT not BE to REF! SNR : {snr:3.2f} dB, Gain CuT: {gain_b:1.3f}, Max Diff = {int(max_diff)}"

                )

        else:

            # see constants.py

            output_differs, reason = cmp_pcm(

                out_file,

                out_file_ref,

                2,  # is always "BINAURAL",

                2,  # is always "BINAURAL"

                ref_fs,

                get_mld=get_mld,

                mld_lim=mld_lim,
@@ -475,6 +484,7 @@ def run_external_split_rendering( 
                get_odg=get_odg,

                get_odg_bin=get_odg_bin,

            )

            

        # NOTE: split comparison not implemented for split rendering, always unpack values

        reason = reason[0]

        output_differs = output_differs[0]