Commit 086de6c7 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch 'main' into 474-heap-buffer-overflow-error-in-sba-to-stereo-decoding-af-512kbps

parents 96e60810 86dcf5af

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -196,6 +196,8 @@ 
#define FIX_441_SBA_PARAMBIN_GAINS                      /* Nokia: Fix issue 441 by changing gains in SBA path of parametric binauralizer */



#define MC_PARAMUPMIX_MODE                              /* Dlb: Contribution 39: Multichannel Parametric Upmix */

#define FIX_469_BRSWITCH_PUPMIX                         /* Dlb: Fix issue 469 for Param Upmix bitrate switching */



#define HODIRAC                                         /* FhG: Contribution 32: Sector-based HO-DirAC method for SBA at high bitrates */

#define DIRAC_ALLOC_HARM                                /* VA: harmonize DirAC parameters allocation/deallocation */

lib_dec/ivas_mct_dec.c

+9 −0
Original line number Diff line number Diff line
@@ -815,8 +815,17 @@ static ivas_error ivas_mc_dec_reconfig( 
                /* remove ls conversion if it was allocated by ParamMC */

                ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion );

            }



#ifdef MC_PARAMUPMIX_MODE

#ifdef FIX_469_BRSWITCH_PUPMIX

            if ( last_mc_mode == MC_MODE_PARAMUPMIX )

            {

                ivas_mc_paramupmix_dec_close( &( st_ivas->hMCParamUpmix ) );

                ivas_ls_setup_conversion_close( &( st_ivas->hLsSetUpConversion ) );

            }

#else

            ivas_mc_paramupmix_dec_close( &( st_ivas->hMCParamUpmix ) );

#endif

#endif

            /* De-allocate McMasa-related handles */

            ivas_masa_dec_close( &( st_ivas->hMasa ) );