From 59b3c99704a134055ed1f345f9719e5894b6a123 Mon Sep 17 00:00:00 2001 From: "Malenovsky, Vladimir" Date: Tue, 14 Oct 2025 14:52:26 +0200 Subject: [PATCH] additional modification under NONBE_FIX_1297_SPAR_JBM_MEM_SAN --- lib_dec/lib_dec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 86f99a389..daa4a0263 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -1212,8 +1212,15 @@ ivas_error IVAS_DEC_ReadFormat( } #ifdef FIX_HRTF_LOAD +#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN + if ( ( renderer_type_old != st_ivas->renderer_type && renderer_type_old != RENDERER_DISABLE ) || + ( st_ivas->ini_active_frame > 0 && + ( ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->ism_mode != ISM_MASA_MODE_DISC ) || + ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->ism_mode != ISM_SBA_MODE_DISC ) ) ) ) +#else if ( ( renderer_type_old != st_ivas->renderer_type && renderer_type_old != RENDERER_DISABLE ) || ( st_ivas->ini_active_frame > 0 && ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->ism_mode != ISM_MASA_MODE_DISC ) ) +#endif { /* JBM: when granularity goes down (e.g. Discrete ISM with TD Obj Renderer -> ParamISM with binaural fastconv render what still fits in the new granularity */ -- GitLab