From b22a0d6e36cc4b146d3c8815b8205571e4c54431 Mon Sep 17 00:00:00 2001 From: marc emerit Date: Wed, 9 Jul 2025 15:24:34 +0200 Subject: [PATCH 1/2] initial version --- lib_com/options.h | 2 ++ lib_dec/ivas_mct_dec_fx.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 7a8ea4d33..24a0d54ca 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -118,6 +118,8 @@ #define FIX_1741_REVERB_TIMES_Q_FORMAT /* Philips: reverberation times in Q26 format instead of Q31 */ +#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/ + /* #################### End BASOP porting switches ############################ */ #endif diff --git a/lib_dec/ivas_mct_dec_fx.c b/lib_dec/ivas_mct_dec_fx.c index 97b794b44..92b6e72ea 100644 --- a/lib_dec/ivas_mct_dec_fx.c +++ b/lib_dec/ivas_mct_dec_fx.c @@ -1478,6 +1478,13 @@ static ivas_error ivas_mc_dec_reconfig_fx( IF( st_ivas->hBinRenderer != NULL && ( NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) ) ) { ivas_binRenderer_close_fx( &st_ivas->hBinRenderer ); +#ifdef FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR + test(); + IF( ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) ) + { + efap_free_data( &st_ivas->hEFAPdata ); + } +#endif } test(); -- GitLab From 91419fb661c50d1f4547bc19ed341c8e46e38d48 Mon Sep 17 00:00:00 2001 From: marc emerit Date: Tue, 5 Aug 2025 13:58:01 +0200 Subject: [PATCH 2/2] fix compiling error --- lib_dec/ivas_mct_dec_fx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_dec/ivas_mct_dec_fx.c b/lib_dec/ivas_mct_dec_fx.c index 7f2adfb75..0543ab8af 100644 --- a/lib_dec/ivas_mct_dec_fx.c +++ b/lib_dec/ivas_mct_dec_fx.c @@ -1425,7 +1425,7 @@ static ivas_error ivas_mc_dec_reconfig_fx( test(); IF( ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) ) { - efap_free_data( &st_ivas->hEFAPdata ); + efap_free_data_fx( &st_ivas->hEFAPdata ); } #endif } -- GitLab