Commit 4e055a12 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 951-differences-for-5ms-and-20ms-rendering-for-mcmasa-at-13-2-kbps-to-binaural
parents 3fd1d684 2668a005

.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"

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/options.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ 
#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_957_REMOVE_PANNING_DEAD_CODE                /* VA: Remove obsolete non-diegetic panning related code. */



/* #################### End BE switches ################################## */

lib_dec/ivas_jbm_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -1038,11 +1038,13 @@ ivas_error ivas_jbm_dec_render( 
            {

                ivas_dirac_dec_binaural_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, st_ivas->nchan_transport, p_output );

            }

#ifndef FIX_957_REMOVE_PANNING_DEAD_CODE

            else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX )

            {

                *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );

                ivas_apply_non_diegetic_panning( p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );

            }

#endif

            else if ( st_ivas->renderer_type == RENDERER_PARAM_ISM || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

            {

                ivas_param_ism_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output );

scripts/IvasBuildAndRunChecks.py

+10 −3
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
        self.parser.add_argument(

            "--rebuild", help="force a rebuild of the binaries", action="store_true"

        )

        self.parser.add_argument(

            "--usan_supp_file", help="suppression file for undef behaviour sanitizer",

            default=None,

        )



    def run(self):
@@ -157,6 +161,7 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
                    format_select_list=modes,

                    formats_fname=self.args["format_file"],

                    max_workers=self.args["max_workers"],

                    usan_supp_file=self.args["usan_supp_file"],

                )

            IvasScriptsCommon.runner_setup(

                br.build_and_run_dict[check]["runner"], self.args
@@ -168,8 +173,10 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
        if self.args["rebuild"] == True:

            br.force_build = True



        checks_ret_val = list()

        for check in checks:

            br.run(check)

            ret_val = br.run(check)

            checks_ret_val.append(ret_val)

            if self.args["create_html_output"]:

                cmd = ["git", "rev-parse", "HEAD"]

                commit_hash = subprocess.run(cmd, capture_output=True).stdout.decode("utf8")
@@ -194,11 +201,11 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
            )



        returncode = 0

        for check in checks:

        for check, ret_val in zip(checks, checks_ret_val):

            runner = br.build_and_run_dict[check]["runner"]

            failed_encs = runner.failed_modes["enc"]

            failed_decs = runner.failed_modes["dec"]

            if len(failed_encs) > 0 or len(failed_decs) > 0:

            if len(failed_encs) > 0 or len(failed_decs) > 0 or ret_val != 0:

                returncode =  RET_CODE_FAILURE



        return returncode