Commit 23da79dd authored by vasilache's avatar vasilache
Browse files

Merge branch 'main' into 1231-align-with-basop-for-masa2total-ratios-threshold

parents b964bbef 3794957f

ci/complexity_measurements/getWmops.sh

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and

# the United Nations Convention on Contracts on the International Sales of Goods.



set -euxo pipefail



function usage {

  echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\" \"mode{full(default)|mem_only}\" \"repo{float(default)|basop}\" [wmops_ref_logfile]"

  exit 1

lib_debug/debug.c

+5 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "options.h"

#ifdef DEBUGGING

#include "debug.h"

#include <assert.h>

#ifdef DEBUG_MODE_INFO

#ifdef DEBUG_MODE_INFO_TWEAK

#include <sys/stat.h>
@@ -771,8 +772,10 @@ char *fname( 
    const int16_t id,

    const int16_t enc_dec )

{

    char idd[5] = ".idX";

    idd[3] = (char) ( id + '0' );

    char idd[6];



    assert( id < 100 );

    sprintf( idd, ".id%d", id );



    strcpy( tmp_fname, dir );

    strcat( tmp_fname, file );

tests/codec_be_on_mr_nonselection/test_param_file.py

+6 −5
Original line number Diff line number Diff line
@@ -60,9 +60,6 @@ from tests.constants import ( 
    MAX_ENC_STATS_DIFF,

    SCRIPTS_DIR,

    MAX_ENC_DIFF,

    DMX_DIFF,

    DMX_MLD,

    DMX_SSNR,

)

from tests.renderer.utils import check_and_makedir, binauralize_input_and_output
@@ -316,8 +313,12 @@ def run_test( 
    bitrate = enc_split.pop()

    in_sr = sampling_rate



    # bitrate can be a filename: remove leading "../"

    if bitrate.startswith("../"):

    # bitrate can be a filename: change it to an absolute path

    if not bitrate.isdigit():

        if compare_enc_dmx:

            pytest.skip(

                "Rate switching + --compare_enc_dmx currently skipped due to DEBUGGING code limitations with varying number of transport channels"

            )

        bitrate = Path(bitrate[3:]).absolute()



    testv_base = testv_file.split("/")[-1]