Commit d9afb164 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/activate_missing_osba_ltv_selftest_condition

parents ee2d33c9 88345249

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ 
#define NONBE_FIX_874_OMASA_BRSW_2TD                          /* Nokia: issue 874: Fixes the crashes with the long test vectors that prompted switching to TD*/

#define NONBE_FIX_871_ACELP_CRASH_IN_OSBA                     /* FhG: isse 871: crash in ACELP core encoder with OSBA */

#define NONBE_FIX_225_MASA_EXT_REND                           /* Nokia: Resolve #225: Complete MASA external renderer implementation */

#define NONBE_FIX_897_USAN_WITH_MASA_RENDERING                /* Nokia: issue #897: USAN null pointer in MASA external renderer to Ambisonics */



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

lib_rend/ivas_dirac_rend.c

+4 −1
Original line number Diff line number Diff line
@@ -2141,10 +2141,13 @@ static void ivas_masa_ext_dirac_render_sf( 
    DirAC_mem = hDirACRend->stack_mem;



    reference_power = DirAC_mem.reference_power;

#ifdef NONBE_FIX_897_USAN_WITH_MASA_RENDERING

    reference_power_smooth = ( DirAC_mem.reference_power == NULL ) ? NULL : DirAC_mem.reference_power + hSpatParamRendCom->num_freq_bands;

#else

    reference_power_smooth = DirAC_mem.reference_power + hSpatParamRendCom->num_freq_bands;

#endif

    onset_filter = DirAC_mem.onset_filter;

    onset_filter_subframe = ( DirAC_mem.onset_filter == NULL ) ? NULL : DirAC_mem.onset_filter + hSpatParamRendCom->num_freq_bands;



    coherence_flag = 1; /* There is always coherence assumed for ext rend of MASA */



    /* Construct default MASA band mapping */

tests/renderer/constants.py

+1 −3
Original line number Diff line number Diff line
@@ -192,9 +192,7 @@ FORMAT_TO_METADATA_FILES = { 
INPUT_FORMATS_AMBI = ["FOA", "HOA2", "HOA3"]

INPUT_FORMATS_MC = ["MONO", "STEREO", "5_1", "5_1_2", "5_1_4", "7_1", "7_1_4"]

INPUT_FORMATS_ISM = ["ISM1", "ISM2", "ISM3", "ISM4"]

INPUT_FORMATS_MASA = [

    "MASA2"

]  # ["MASA1", "MASA2"] # Disable MASA1 tests until MASA1 can be implemented properly

INPUT_FORMATS_MASA = ["MASA1", "MASA2"]



""" Non binaural / parametric output formats """

OUTPUT_FORMATS = [

tests/split_rendering/constants.py

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ FORMAT_TO_IVAS_COD_FORMAT = { 
INPUT_FORMATS_AMBI_SPLIT_REND = ["FOA", "HOA3"]

INPUT_FORMATS_MC_SPLIT_REND = ["5_1", "7_1_4"]

INPUT_FORMATS_ISM_SPLIT_REND = ["ISM4"]

INPUT_FORMATS_MASA_SPLIT_REND = ["MASA2"]

INPUT_FORMATS_MASA_SPLIT_REND = ["MASA1", "MASA2"]

INPUT_FORMATS_OSBA_SPLIT_REND = [

    "OSBA_1_1",

    "OSBA_4_3",