Commit e6b606ca authored by bayers's avatar bayers
Browse files

Merge branch... 

Merge branch '867-parammc-reconfiguration-does-not-reallocate-the-cldfb-buffer-for-the-imaginary-parts-asan' into 'main'

Resolve "ParamMC reconfiguration does not deallocate the CLDFB buffer for the imaginary parts (asan)"

See merge request !1167
parents 2cc8dd38 cc31b491

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -172,9 +172,10 @@ 
#define BE_FIX_832_ASAN_ERROR_EFAP_OSBA                       /* FhG: issue #832: fix ASAN error caused by re-allocating EFAP memories in OSBA*/

#define NONBE_FIX_819_DOUBLE_PREC_COMB_FORMATS                /* VA: issue 820: Double precision arithmetic in combined formats */

#define NONBE_FIX_849_OMASA_BFI_CRASH                         /* VA: issue 849: fix OMASA 2TC and FEC crashes */



#define NONBE_UNIFIED_DECODING_PATHS                          /* FhG: unify decoding paths   */

#define NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING             /* VA: issue 861: fix MASA 2TC crash when switching from MDCT stereo to TD/DFT stereo */



#define BE_FIX_867_PARAMC_RECONFIG                            /* FhG: issue #867: fix ParamMC CLDFB buffer dealloc when reconfiguring */



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

lib_dec/ivas_mc_param_dec.c

+16 −1
Original line number Diff line number Diff line
@@ -989,11 +989,19 @@ ivas_error ivas_param_mc_dec_reconfig( 
                hParamMC->Cldfb_RealBuffer_tc = NULL;

            }



#ifdef BE_FIX_867_PARAMC_RECONFIG

            if ( hParamMC->Cldfb_ImagBuffer_tc != NULL )

            {

                free( hParamMC->Cldfb_ImagBuffer_tc );

                hParamMC->Cldfb_ImagBuffer_tc = NULL;

            }

#else

            if ( hParamMC->Cldfb_RealBuffer_tc != NULL )

            {

                free( hParamMC->Cldfb_RealBuffer_tc );

                hParamMC->Cldfb_RealBuffer_tc = NULL;

            }

#endif



            n_cldfb_slots = DEFAULT_JBM_CLDFB_TIMESLOTS;

            if ( st_ivas->hDecoderConfig->Opt_tsm )
@@ -1019,12 +1027,19 @@ ivas_error ivas_param_mc_dec_reconfig( 
                free( hParamMC->Cldfb_RealBuffer_tc );

                hParamMC->Cldfb_RealBuffer_tc = NULL;

            }



#ifdef BE_FIX_867_PARAMC_RECONFIG

            if ( hParamMC->Cldfb_ImagBuffer_tc != NULL )

            {

                free( hParamMC->Cldfb_ImagBuffer_tc );

                hParamMC->Cldfb_ImagBuffer_tc = NULL;

            }

#else

            if ( hParamMC->Cldfb_RealBuffer_tc != NULL )

            {

                free( hParamMC->Cldfb_RealBuffer_tc );

                hParamMC->Cldfb_RealBuffer_tc = NULL;

            }

#endif

        }

    }

#endif