Commit aa5d35fe authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'main' into 1527_fix_bitrate_idx_in_CMR_tests

parents 63dbb867 c8f62466
Loading
Loading
Loading
Loading
Loading
+1 −6
Original line number Diff line number Diff line
@@ -52,12 +52,7 @@ from pyaudio3dtools import audiofile
CUT_FROM = "0.0"
GAIN = "1.0"
FILE_IDS = [
    "stvST",
    "stv51MC",
    "stv71MC",
    "stv512MC",
    "stv514MC",
    "stv714MC",
    "stv",
    "ISM",
    "MASA",
]
+1 −15
Original line number Diff line number Diff line
@@ -34,27 +34,19 @@ __doc__ = """
To configure test modules.
"""

import pytest
import csv
import os
import sys
import random

from tempfile import TemporaryDirectory
from pathlib import Path
import soundfile as sf
import numpy as np

ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
sys.path.append(ROOT_DIR)

from tests.conftest import EncoderFrontend, DecoderFrontend
from tests.create_short_testvectors import create_short_testvectors
from tests.renderer.constants import (
    FORMAT_TO_FILE_COMPARETEST,
    FORMAT_TO_METADATA_FILES,
)
from ivasrtp import *
import platform

BIN_EXT = ".exe" if platform.system() == "Windows" else ""
@@ -104,8 +96,8 @@ def test_format_switching_new_encoder (
):
    bitrate = 48000
    fs = 48
    bandwidth = "FB"
    outMode = ""
    cut_suffix = "_cut.wav"

    dut_encoder_path = Path(ROOT_DIR).joinpath(f"IVAS_cod{BIN_EXT}")
    dut_encoder_fmtsw_path = Path(ROOT_DIR).joinpath(f"IVAS_cod_fmtsw{BIN_EXT}")
@@ -113,12 +105,6 @@ def test_format_switching_new_encoder (
        dut_encoder_fmtsw_path, "DUT", record_property
    )

    # Create 1s test files
    cut_suffix = "_cut.wav"
    test_file = Path( str(FORMAT_TO_FILE_COMPARETEST["MONO"]).replace(".wav", cut_suffix) )
    if not test_file.exists():
        create_short_testvectors(1.0, False, None)

    with TemporaryDirectory() as tmp_dir:

        # Create file for encoding commands