Commit e4276c5a authored by vaclav's avatar vaclav
Browse files

accept BE_FIX_867_PARAMC_RECONFIG

parent 11876280

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 


#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

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

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

#define NONBE_FIX_850_MASA_HBR_META_RATIO_DECODING            /* Nokia: issue #850: Fixes rare non-valid diffuseness and energy ratio values in 2dir MASA. */

#define NONBE_FIX_MDCT_STEREO_DTX_MONO_OUT                    /* FhG: fix clicks in DTX -> active transition frames in MDCT-Stereo with mono output */

#define NONBE_FIX_836_PARAMUPMIX_HEADROT                      /* Dlb: issue #836: Resolve "ParamUpmix MC to SBA conversion done on the already binaurlized output" */

lib_dec/ivas_mc_param_dec.c

+0 −18
Original line number Diff line number Diff line
@@ -982,26 +982,16 @@ ivas_error ivas_param_mc_dec_reconfig( 
        {

            int16_t n_cldfb_slots;





            if ( hParamMC->Cldfb_RealBuffer_tc != NULL )

            {

                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



            n_cldfb_slots = DEFAULT_JBM_CLDFB_TIMESLOTS;

            if ( st_ivas->hDecoderConfig->Opt_tsm )
@@ -1027,19 +1017,11 @@ 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