Commit 03a826eb authored by emerit's avatar emerit
Browse files

First try

parent 02360d4e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_1027_GSC_INT_OVERFLOW                       /* VA: issue 2207: overflow in GSC */

#define FIX_1033_MEMORY_LEAK_OMASA                      /* VA: issue 1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */



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

lib_dec/ivas_ism_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -272,7 +272,9 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
            if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )

            {

                ivas_td_binaural_close( &st_ivas->hBinRendererTd );

#ifndef FIX_1033_MEMORY_LEAK_OMASA

                st_ivas->hHrtfTD = NULL;

#endif



                if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                {

lib_dec/ivas_mct_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -1211,7 +1211,9 @@ static ivas_error ivas_mc_dec_reconfig( 
            if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) )

            {

                ivas_td_binaural_close( &st_ivas->hBinRendererTd );

#ifndef FIX_1033_MEMORY_LEAK_OMASA

                st_ivas->hHrtfTD = NULL;

#endif

            }



#ifdef SPLIT_REND_WITH_HEAD_ROT

lib_dec/ivas_omasa_dec.c

+2 −1
Original line number Diff line number Diff line
@@ -393,8 +393,9 @@ ivas_error ivas_omasa_dec_config( 
            {

                /* TD renderer handle */

                ivas_td_binaural_close( &st_ivas->hBinRendererTd );

#ifndef FIX_1033_MEMORY_LEAK_OMASA

                st_ivas->hHrtfTD = NULL;



#endif

                /* ISM renderer handle + ISM data handle */

                ivas_omasa_separate_object_renderer_close( st_ivas );

            }

lib_dec/ivas_sba_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -526,7 +526,9 @@ ivas_error ivas_sba_dec_reconfigure( 
                if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )

                {

                    ivas_td_binaural_close( &st_ivas->hBinRendererTd );

#ifndef FIX_1033_MEMORY_LEAK_OMASA

                    st_ivas->hHrtfTD = NULL;

#endif

                }

            }

            nchan_transport_old += st_ivas->nchan_ism;