Commit 4ebac5be authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR

parent 40408d53

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ 


/*#define FIX_XXX_JBM_FIFO_BUFFER  */                   /* FhG: prevent wraparound of a length identifier in cause of large frames and many channels*/



#define FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR             /* Eri: Fix for issue 462: Use-of-uninitialized memory in external HRTF deallocation in decoder together with BR switching */

#define FIX_487_LOWRATE_SBA_TUNING_FIX                  /* Dlb: TUning fix for low bitrate cases to match theoretical longest SPAR MD bitstream */

#define FIX_490_MASA_2TC_LBR_DTX                        /* Nokia: Fixes issue 490 by correcting condition. */

#define FIX_393_459_460_SBA_MD                          /* FhG: fix issues 393, 459, 460, 494 all related to MD buffers and the read index for accessing them */

lib_dec/ivas_ism_dec.c

+0 −19
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ static ivas_error ivas_ism_bitrate_switching( 
            ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin );



            /* Open the TD Binaural renderer */

#ifdef FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR

            if ( st_ivas->hHrtfTD == NULL || st_ivas->hBinRendererTd == NULL )

            {

                if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK )
@@ -184,12 +183,6 @@ static ivas_error ivas_ism_bitrate_switching( 
                    return error;

                }

            }

#else

            if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK )

            {

                return error;

            }

#endif

        }

        else

        {
@@ -250,7 +243,6 @@ static ivas_error ivas_ism_bitrate_switching( 
            }



            /* Close the TD Binaural renderer */

#ifdef FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR

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

            {

                if ( st_ivas->hBinRendererTd != NULL )
@@ -263,17 +255,6 @@ static ivas_error ivas_ism_bitrate_switching( 
                    st_ivas->hHrtfTD = NULL;

                }

            }

#else

            if ( st_ivas->hBinRendererTd != NULL )

            {

                ivas_td_binaural_close( &st_ivas->hBinRendererTd );

            }



            if ( st_ivas->hHrtfTD != NULL )

            {

                st_ivas->hHrtfTD = NULL;

            }

#endif

        }

        else

        {