From b1dab20acf3e5067f449137ca443e98a200a8213 Mon Sep 17 00:00:00 2001 From: Stefan Bayer Date: Tue, 26 Sep 2023 15:29:30 +0200 Subject: [PATCH] fix #827, use correct buffers and subframing for CREND early reflections in the JBM path --- lib_com/options.h | 2 +- lib_rend/ivas_crend.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 53de4ed729..fe686bae3f 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -214,7 +214,7 @@ #define NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ /* VA: issue 797: fix of crash when the separated object is inactive and the MASA metadata is using very few bits */ #define NONBE_FIX_798_OSBA_MC_DEC_CRASH #define NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX /* Nokia: issue 806: fix one separated object mode transport mix of the separated object */ - +#define NONBE_FIX_827_JBM_CREND_EARLY_REFLECTIONS /* FhG: issue #827: Resolve "JBM Crend early reflections are wrong" */ #define JBM_FOR_OSBA /* FhG: implement OSBA format in the JBM path */ #ifdef JBM_FOR_OSBA diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c index 3a97128355..6582fecbac 100644 --- a/lib_rend/ivas_crend.c +++ b/lib_rend/ivas_crend.c @@ -1968,7 +1968,11 @@ ivas_error ivas_rend_crendProcessSubframe( { if ( hCrend->reflections->use_er == 1 && hCrend->reflections->is_ready == 1 ) { +#ifdef NONBE_FIX_827_JBM_CREND_EARLY_REFLECTIONS + if ( ( error = ivas_er_process( hCrend->reflections, subframe_len, 0, tc_local, inConfig ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_er_process( hCrend->reflections, subframe_len, subframe_idx, output, inConfig ) ) != IVAS_ERR_OK ) +#endif { return error; } -- GitLab