From 8038a1f79307c3567d251b246fbb9e5be783aef3 Mon Sep 17 00:00:00 2001 From: Stefan Bayer Date: Mon, 2 Oct 2023 13:50:40 +0200 Subject: [PATCH] fix #841, set TD HRFT handle in the main decoder struct zero in MC rate switching --- lib_com/options.h | 2 +- lib_dec/ivas_mct_dec.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 3ccf81b46b..368f3484cc 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -189,7 +189,7 @@ #define NONBE_FIX_730_DPID_NOT_SET_CORRECTLY /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */ #define NONBE_FIX_825_SBA_JBM_MONO_STEREO_OUTPUT /* FhG: issue #825: Resolve "JBM SBA: AGC and PCA run twice for MONO and STEREO output" */ #define NONBE_FIX_808_JBM_PARAMUPMIX_RS /* FhG: Issue 808: fix JBM MC rate switching */ - +#define NONBE_FIX_841_MC_RS_TDOBJ_RENDERER /* FhG: Issue #841: [Non-BE] Resolve "MC RS HRFT handle not set to NULL" */ /* ##################### End NON-BE switches ########################### */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c index 1fb4db5eb8..bd8341d70d 100755 --- a/lib_dec/ivas_mct_dec.c +++ b/lib_dec/ivas_mct_dec.c @@ -1218,6 +1218,9 @@ static ivas_error ivas_mc_dec_reconfig( if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) ) { ivas_td_binaural_close( &st_ivas->hBinRendererTd ); +#ifdef NONBE_FIX_841_MC_RS_TDOBJ_RENDERER + st_ivas->hHrtfTD = NULL; +#endif } #ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN -- GitLab