Commit b5e04ae6 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR

parent 3c1a8b37

lib_com/options.h

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


/* #################### Start BASOP porting switches ############################ */



#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/

#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define NONBE_FIX_MC_LFE_LPF                                  /* Dlb: Adding the LFE LPF filter back for MC content. */

#define FIX_1050_EFAP_ALLOC                             /* FhG: issue 1050: reduction of memory allocated to EFAP handle */

lib_dec/ivas_mct_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -1221,12 +1221,10 @@ static ivas_error ivas_mc_dec_reconfig( 
            if ( st_ivas->hBinRenderer != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV && st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM ) )

            {

                ivas_binRenderer_close( &st_ivas->hBinRenderer );

#ifdef FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR

                if ( ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )

                {

                    efap_free_data( &st_ivas->hEFAPdata );

                }

#endif

            }



            if ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hCrend[0] != NULL ) && ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD || st_ivas->hIntSetup.output_config != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) )