Commit 6b6c24e0 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch '752-osba-mct-misconfiguration-causes-crashes-at-256kbps' of... 

Merge branch '752-osba-mct-misconfiguration-causes-crashes-at-256kbps' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 752-osba-mct-misconfiguration-causes-crashes-at-256kbps
parents 55c109a2 6fb017b0

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ codec-smoke-test: 
  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  timeout: "10 minutes"

  timeout: "15 minutes"

  stage: test

  needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"]

  script:

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ 
#define NONBE_FIX_746_NONDIEGETIC_MD                          /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/

#define NONBE_FIX_729_ASAN_2ISM_ACELP                         /* VA: issue 729: fix ASAN ACELP errors with 2 ISM coding using LTV */

#define NONBE_FIX_694_OMASA_ACELP                             /* Nokia: Issue #694: OMASA crash in ACELP with extreme item */

#define NONBE_FIX_760_COHERENCE_MASA                          /* Nokia: Issue 760: fixes decoder crash for some cases when all energy ratios are 1 */#define NONBE_FIX_752_OSBA_MISCONFIG_MCT                    /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/

#define NONBE_FIX_760_COHERENCE_MASA                          /* Nokia: Issue 760: fixes decoder crash for some cases when all energy ratios are 1 */

#define NONBE_FIX_752_OSBA_MISCONFIG_MCT                      /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/

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



/* ################## End DEVELOPMENT switches ######################### */