Commit 33376587 authored by Jan Kiene's avatar Jan Kiene
Browse files

add MASA which was missing

parent a5f4a575

ci/delay_measurement_test.py

+32 −6
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ import sys 
import re

import numpy as np

import pandas as pd

import shutil



PYAUDIO3DTOOLS_PATH = "./scripts/"

sys.path.append(PYAUDIO3DTOOLS_PATH)
@@ -46,8 +47,10 @@ FORMATS = [ 
    "7_1",

    "7_1_4",

    "SBA",

    "MASA1TC",

    "MASA2TC",

    "MASA_1TC_1DIR",

    "MASA_1TC_2DIR",

    "MASA_2TC_1DIR",

    "MASA_2TC_2DIR",

]

TEST_FILE = "./delay_test_file_{}.wav"

CFG = "ci/delay_test_linux.json"
@@ -90,13 +93,26 @@ def gen_signal(channels:int) -> np.ndarray: 




def main():

    for form in FORMATS[:-2]:

    for form in FORMATS:



        # generate test signal

        test_file = TEST_FILE.format(form)

        gen_form = form

        if form == "SBA":

            gen_form = "HOA3"

        if "MASA" in form:

            # copy over files

            masa_source_files = ["scripts/testv/stv_IVASMASA_1dir1TC.pcm"]

            for tcs in [1, 2]:

                for dir in [1, 2]:

                    source_signal = f"scripts/testv/stv_IVASMASA_{dir}dir{tcs}TC.pcm"

                    source_metadata = f"scripts/testv/stv_IVASMASA_{dir}dir{tcs}TC.met"

                    target_signal = f"delay_test_file_MASA_{tcs}TC_{dir}DIR.wav"

                    target_metadata = f"delay_test_file_MASA_{tcs}TC_{dir}DIR.met"

                    s, fs = audiofile.readfile(source_signal, nchannels=tcs)

                    audiofile.writefile(target_signal, s)

                    shutil.copy(source_metadata, target_metadata)

        else:

            sig = gen_signal(OC_TO_NCHANNELS[gen_form.upper()])

            audiofile.writefile(test_file, sig)
@@ -104,6 +120,7 @@ def main(): 


        # run format

        outfolder_delaycmp = "out_delay_cmp"



        run_cmd = [

            "python3",

            "./scripts/runIvasCodec.py",
@@ -156,6 +173,7 @@ def get_delay_for_folders(folder_delay_cmp: str, folder_no_delay_cmp: str): 


    output = {

        "format": list(),

        "out_format": list(),

        "fs": list(),

        "bitrate": list(),

        "bandwidth": list(),
@@ -174,6 +192,9 @@ def get_delay_for_folders(folder_delay_cmp: str, folder_no_delay_cmp: str): 


        search_prefix = "delay_test_file_(([0-9_]+)|[a-zA-Z0-9]+_)"

        op_name = re.sub(search_prefix, "", f).split(".wav")[0]



        out_format = op_name.split(".dec.")[-1]



        op_name_split = op_name.split("_b")



        search_br = "b[0-9]+(_[0-9])*"
@@ -187,7 +208,12 @@ def get_delay_for_folders(folder_delay_cmp: str, folder_no_delay_cmp: str): 
        elif "_nb_" in op_name:

            bw = "nb"



        output["format"].append(op_name_split[0])

        form = op_name_split[0]

        if "MASA" in form:

            form = form[form.index("MASA"):]



        output["format"].append(form)

        output["out_format"].append(out_format)

        output["fs"].append(fs)

        output["bitrate"].append(br)

        output["bandwidth"].append(bw)

ci/delay_test_linux.json

+4 −4
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ 
        "HOA2": "delay_test_file_HOA2.wav",

        "HOA3": "delay_test_file_HOA3.wav",

        "SBA": "delay_test_file_SBA.wav",

        "MASA1TC1DIR": "delay_test_file_MASA1TC.wav",

        "MASA1TC2DIR": "delay_test_file_MASA1TC.wav",

        "MASA2TC1DIR": "delay_test_file_MASA2TC.wav",

        "MASA2TC2DIR": "delay_test_file_MASA2TC.wav",

        "MASA1TC1DIR": "delay_test_file_MASA_1TC_1DIR.wav",

        "MASA1TC2DIR": "delay_test_file_MASA_1TC_2DIR.wav",

        "MASA2TC1DIR": "delay_test_file_MASA_2TC_1DIR.wav",

        "MASA2TC2DIR": "delay_test_file_MASA_2TC_2DIR.wav",

        "5_1": "delay_test_file_5_1.wav",

        "5_1_2": "delay_test_file_5_1_2.wav",

        "5_1_4": "delay_test_file_5_1_4.wav",