Commit 030f40b3 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch... 

Merge branch '1068-asan-memory-leak-in-mc-to-binaural_room-decoding-with-bitrate-switching' into 'main'

Resolve "ASAN: Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching"

See merge request !1549
parents dccafe3f 70d0580e

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ 
#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */

#define FIX_1052_EXT_OUTPUT                             /* VA: issue 1052: define EXT decoder output configuration for stereo and MC formats */ 





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

/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

lib_dec/ivas_mct_dec.c

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

            }



#ifdef SPLIT_REND_WITH_HEAD_ROT

scripts/config/self_test.prm

+4 −0
Original line number Diff line number Diff line
@@ -1348,6 +1348,10 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_cod -mc 5_1 ../scripts/switchPaths/sw_mctech_5fr.bin 48 testv/stv51MC48c.wav bit

../IVAS_dec BINAURAL_ROOM_REVERB 16 bit testv/stv51MC48c.wav_sw_48-16_Binaural_room.tst



// Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 32kHz in, 48kHz out, BINAURAL_ROOM_IR out

../IVAS_cod -mc 5_1 ../scripts/switchPaths/sw_mctech_5fr.bin 32 testv/stv51MC32c.wav bit

../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv51MC32c.wav_sw_32-48_Binaural_room.tst



// Multi-channel 5_1 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 10%, bandwidth switching

../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -mc 5_1 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv51MC48c.wav bit

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g192 bit_error

scripts/testv/stv51MC32c.wav

0 → 100644LFS
+132 B

File added.

No diff preview for this file type.

View file