Commit 874a784f authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into 955-fastconv-renderer-in-ism-format

parents 7e47f0bd 0ddbb7a5

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ variables: 
  BUILD_OUTPUT: "build_output.txt"

  EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"

  EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec"

  SANITIZER_TESTS: "CLANG1 CLANG2"

  SANITIZER_TESTS: "CLANG1 CLANG2 CLANG3"

  OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"

  OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"

  OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"

apps/decoder.c

+20 −0
Original line number Diff line number Diff line
@@ -1619,7 +1619,27 @@ static bool parseCmdlIVAS_dec( 
     * Mandatory input arguments

     *-----------------------------------------------------------------*/



#ifdef FIX_956_DECODER_COMMAND_LINE_FIX

    if ( i < argc - 4 )

    {

        for ( i = 1; i < argc; i++ )

        {

            if ( argv[i][0] == '-' )

            {

                fprintf( stderr, "Error: Wrong order of command-line arguments (optional arguments are first)\n\n" );

                usage_dec();

                return false;

            }

        }



        fprintf( stderr, "Error: Too many mandatory command-line arguments\n\n" );

        usage_dec();

        return false;

    }

    else if ( i < argc - 3 )

#else

    if ( i < argc - 3 )

#endif

    {

        arg->outputConfig = cmdline2config( argv[i] );

        if ( arg->outputConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )

ci/run_scheduled_sanitizer_test.py

+4 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ from combine_genpatt_and_jbm_profile import combine_error_profiles 
SCRIPT_DIR = pathlib.Path("./scripts").resolve()

DURATION = "120"

CFG = "ci_linux_ltv.json"

SUPPORTED_TESTS = ["CLANG1", "CLANG2", "CLANG3", "VALGRIND"]

SUPPORTED_TESTS = ["CLANG1", "CLANG2", "CLANG3"]

USAN_SUPP_FILE = str(SCRIPT_DIR.joinpath("ubsan.supp"))

EP_FILE = "ep_015.g192"

DLY_PROFILE_IN = SCRIPT_DIR.joinpath("dly_error_profiles/dly_error_profile_5.dat")

DLY_PROFILE_OUT = "dly_profile.dat"
@@ -145,6 +146,8 @@ def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = Tr 
        "--oc",

        *out_formats,

        *md_file_command,

        "--usan_supp_file",

        USAN_SUPP_FILE,

    ]



    print(

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -1556,9 +1556,7 @@ typedef enum 
#define MAX_SPLIT_MD_SUBFRAMES                  1

#define COMPLEX_MD_BAND_THRESH                  MAX_SPLIT_REND_MD_BANDS

#define COMPLEX_MD_BAND_THRESH_LOW              5

#ifdef SPLIT_REND_HF_TUNING

#define SPLIT_REND_RO_MD_BAND_THRESH            4

#endif



#define IVAS_SPLIT_REND_NUM_QUANT_STRATS        4

#define IVAS_SPLIT_REND_PRED_63QUANT_PNTS       63

lib_com/options.h

+5 −6
Original line number Diff line number Diff line
@@ -155,6 +155,9 @@ 
#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange: Missing left/right and coherence late reverb tables in binary format*/

#define FIX_OLD_BINARY_FORMAT                           /* Orange: temporary to maintain bitexactness */

#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */

#define FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION     /* Ericsson: Fix related to issue 667 in IVAS BASOP. Handling of initial lost frame in IVAS causes non-BE on EVS BASOP 26.444 */ 

#define FIX_957_REMOVE_PANNING_DEAD_CODE                /* VA: Remove obsolete non-diegetic panning related code. */

#define FIX_956_DECODER_COMMAND_LINE_FIX                /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */

#define FIX_955_FASTCONV_REND_IN_ISM                    /* VA: put FastConv rendering call under DEBUGGING */



/* #################### End BE switches ################################## */
@@ -167,13 +170,9 @@ 
#define NONBE_FIX_AVG_IAC_CLDFB_REVERB                        /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */

#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA                 /* Nokia: issue 944: fix FEC error in OMASA */

#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER           /* Qualcomm: issue 953: fix order or ER channels in LC mode*/

#define NONBE_FIX_949_MC_5MS_FRAMING                          /* Dlb: issue 949: fix for issue 949, distorted output in MC mode with 5ms framing*/



#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_HF_TUNING                                  /* Dlb: issue 950: split rendering MD tuning change at high frequencies*/

#define SPLIT_REND_MC_FIX_LFE                                 /* Dlb: issue 950: split rendering LFE fix for 7.1 and 5.1 MC mode*/

#define SPLIT_EXT_REND_FIX_LIMITER_POS                        /* Dlb: issue 950: fixing limiter position in split rendering mode in external renderer*/

#endif

#define NONBE_FIX_952_MC_PARAMUPMIX_5MS                       /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/



/* ##################### End NON-BE switches ########################### */