Commit ea04c2d4 authored by emerit's avatar emerit
Browse files

Merge branch '1814_basop_port_MR1549' into 'main' 

1814 basop port mr1549

See merge request !1891
parents 1ea06639 f930a466

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ 
#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */



#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

lib_dec/ivas_mct_dec_fx.c

+7 −0
Original line number Diff line number Diff line
@@ -1425,6 +1425,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_fx( &st_ivas->hEFAPdata );

                }

#endif

            }



            test();