Commit 7f10e62e authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR

parent c8cbebb7

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,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 NONBE_FIX_1052_SBA_EXT                          /* Dlb: SBA external output support */

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

#define FIX_1158_FASTCONV_REVERB_HRTF                   /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */

lib_dec/ivas_mct_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -1449,13 +1449,11 @@ 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();