Commit 906f470f authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'basop-ci/add-encoder-logging' of... 

Merge branch 'basop-ci/add-encoder-logging' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into basop-ci/add-encoder-logging
parents cd241c5e f8caaff4

tests/cmp_stats_files.py

+11 −4
Original line number Diff line number Diff line
@@ -129,8 +129,15 @@ if __name__ == "__main__": 


    parser.add_argument("ref_stats_file", type=str)

    parser.add_argument("dut_stats_file", type=str)

    parser.add_argument("--min_enc_file_length_diff", type=float, default=0.1, dest="min_enc_file_length_diff")

    parser.add_argument("--min_enc_stats_diff", type=float, default=0.1, dest="min_enc_stats_diff")

    parser.add_argument(

        "--min_enc_file_length_diff",

        type=float,

        default=0.1,

        dest="min_enc_file_length_diff",

    )

    parser.add_argument(

        "--min_enc_stats_diff", type=float, default=0.1, dest="min_enc_stats_diff"

    )

    args = parser.parse_args()



    enc_test_result, enc_test_result_msg = cmp_stats_files(**vars(args))

tests/codec_be_on_mr_nonselection/test_param_file.py

+9 −6
Original line number Diff line number Diff line
@@ -317,7 +317,10 @@ def test_param_file_tests( 
    # remove leading "../"

    dec_split = [x[3:] if x.startswith("../") else x for x in dec_split]

    # convert "scripts/" paths into absolute ones

    dec_split = [str(SCRIPTS_DIR.joinpath(x[8:])) if x.startswith("scripts/") else x for x in dec_split]

    dec_split = [

        str(SCRIPTS_DIR.joinpath(x[8:])) if x.startswith("scripts/") else x

        for x in dec_split

    ]



    output_file = dec_split.pop()

    bitstream_file_dec = dec_split.pop()

tests/codec_be_on_mr_nonselection/test_sba.py

+46 −46
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ __doc__ = """ 


import errno

import os

from typing import Tuple

import pytest

from cut_bs import cut_from_start
@@ -46,7 +45,6 @@ from ..cmp_stats_files import cmp_stats_files 
from ..constants import TESTV_DIR, MIN_ENC_FILE_LENGTH_DIFF, MIN_ENC_STATS_DIFF

from tests.testconfig import use_ltv



import pdb



tag_list = ["ltvFOA" if use_ltv else "stvFOA"]

tag_list_HOA2 = ["ltvHOA2" if use_ltv else "stv2OA"]
@@ -163,7 +161,6 @@ def test_pca_enc( 
            get_enc_stats=get_enc_stats,

        )





    if not encoder_only:

        sba_dec(

            record_property,
@@ -332,7 +329,6 @@ def test_sba_enc_system( 
                if enc_test_result != 0:

                    pytest.fail(enc_test_result_msg)





    if not encoder_only:

        sba_dec(

            record_property,
@@ -804,7 +800,7 @@ def test_sba_plc_system( 
    abs_tol,

    get_ssnr,

    get_odg,

    get_enc_stats

    get_enc_stats,

):

    sid = 0

    pca = False
@@ -818,7 +814,12 @@ def test_sba_plc_system( 
        pytest.skip()



    if bitrate == "13200" or bitrate == "16400":

        if dtx == "1" and gain_flag == 0 and sampling_rate != "16" and plc_pattern == "PLperc12mblen5":

        if (

            dtx == "1"

            and gain_flag == 0

            and sampling_rate != "16"

            and plc_pattern == "PLperc12mblen5"

        ):

            sid = 1

        else:

            pytest.skip()
@@ -898,6 +899,7 @@ def test_sba_plc_system( 


#########################################################





def sba_enc(

    dut_encoder_frontend,

    test_vector_path,
@@ -1139,5 +1141,3 @@ def sba_dec( 
        # if not keep_files:

        #     os.remove(dut_out_file)

        #     os.remove(dut_pkt_file)

tests/conftest.py

+3 −1
Original line number Diff line number Diff line
@@ -711,7 +711,9 @@ class DecoderFrontend: 


            # TODO: centralize this in a utils file

            if system == "Windows":

                netsim_path = SCRIPTS_DIR.joinpath("tools/Win32/networkSimulator_g192.exe")

                netsim_path = SCRIPTS_DIR.joinpath(

                    "tools/Win32/networkSimulator_g192.exe"

                )

            elif system == "Linux":

                netsim_path = SCRIPTS_DIR.joinpath("tools/Linux/networkSimulator_g192")

            elif system == "Darwin":