Commit 7f863ead authored by emerit's avatar emerit
Browse files

keep only fix testing modelROM value

parent 2fd080e8

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -156,8 +156,7 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



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

#define FIX_1033_MEMORY_LEAK_OMASA_BIS                  /* Nokia / Second solution Orange: issue 1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */

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



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

lib_dec/ivas_ism_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -272,9 +272,7 @@ 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 −4
Original line number Diff line number Diff line
@@ -1210,15 +1210,13 @@ static ivas_error ivas_mc_dec_reconfig( 


            if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) )

            {

#ifdef FIX_1033_MEMORY_LEAK_OMASA_BIS

#ifdef FIX_1033_MEMORY_LEAK_OMASA

                if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )

                {

#endif

                    ivas_td_binaural_close( &st_ivas->hBinRendererTd );

#ifndef FIX_1033_MEMORY_LEAK_OMASA

                    st_ivas->hHrtfTD = NULL;

#endif

#ifdef FIX_1033_MEMORY_LEAK_OMASA_BIS

#ifdef FIX_1033_MEMORY_LEAK_OMASA

                }

#endif

            }

lib_dec/ivas_omasa_dec.c

+2 −4
Original line number Diff line number Diff line
@@ -391,16 +391,14 @@ ivas_error ivas_omasa_dec_config( 
            }

            else

            {

#ifdef FIX_1033_MEMORY_LEAK_OMASA_BIS

#ifdef FIX_1033_MEMORY_LEAK_OMASA

                if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )

                {

#endif

                    /* TD renderer handle */

                    ivas_td_binaural_close( &st_ivas->hBinRendererTd );

#ifndef FIX_1033_MEMORY_LEAK_OMASA

                    st_ivas->hHrtfTD = NULL;

#endif

#ifdef FIX_1033_MEMORY_LEAK_OMASA_BIS

#ifdef FIX_1033_MEMORY_LEAK_OMASA

                }

#endif

                /* ISM renderer handle + ISM data handle */

lib_dec/ivas_sba_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -526,9 +526,7 @@ 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;