Commit f7aeb6f9 authored by emerit's avatar emerit
Browse files

Merge branch '1814_ref_port_MR1549' into 'ivas-float-update' 

1814 ref port mr1549

See merge request !1890
parents 79add5ec 3c4e7c6c

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -190,6 +190,8 @@ 


#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/ 



#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 ############################ */



/* clang-format on */

lib_dec/ivas_mct_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -1201,6 +1201,12 @@ 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 ) ) )