Commit cea17ad5 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_235

parent d1517cab

apps/decoder.c

+0 −2
Original line number Diff line number Diff line
@@ -501,14 +501,12 @@ cleanup: 
#ifdef DEBUG_SBA_AUDIO_DUMP

    IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );

#endif

#ifdef FIX_235

    if ( arg.hrtfReaderEnabled )

    {

        IVAS_DEC_HRTF_HANDLE hHrtfTD;

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );

        dealloc_HRTF_binary( hHrtfTD );

    }

#endif

    IVAS_DEC_Close( &hIvasDec );

    CustomLsReader_close( &hLsCustomReader );

    hrtfFileReader_close( &hrtfReader );

lib_com/ivas_prot.h

+0 −5
Original line number Diff line number Diff line
@@ -5089,11 +5089,6 @@ void BSplineModelEvalDealloc( 
    ModelEval_t *modelEval                                      /* i  : Model evaluation structure              */

);



#ifndef FIX_235 

void BSplineModelEvalITDDealloc(

    ModelParamsITD_t *model                                     /* i  : Model parameters                        */

);

#endif



#ifdef TDREND_HRTF_TABLE_METHODS

void TDREND_HRFILT_SetFiltSet(

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ 
#endif

#define FIX_I59_DELAY_ROUNDING                          /* Issue 59: rounding in sample domain instead of nanosec for IVAS_ENC_GetDelay() and IVAS_DEC_GetDelay() */

#define FIX_FIX_I59                                     /* Issue 59:  small fix concerning LFE delay rounding */

#define FIX_235                                         /* Issue 235: Deallocation of HR filter memory separately for lib_rend (ROM) and lib_util (from file) */

#define ENV_STAB_FIX                                    /* Contribution 23: HQ envelope stability memory fix */

#define STABILIZE_GIPD                                  /* FhG: Contribution 22: gIPD stabilization */

#define FIX_292_VBAP_CALLOC_REMOVAL                     /* Nokia: Fixes issue 292 by removing the remnant callocs */

lib_dec/ivas_init_dec.c

+0 −7
Original line number Diff line number Diff line
@@ -1709,13 +1709,6 @@ void ivas_destroy_dec( 
    }

    else if ( st_ivas->hHrtfTD != NULL )

    {

#ifndef FIX_235

        /* Case when HRTF filter is mistakenly specified but TD renderer was not active */

        if ( st_ivas->hHrtfTD->ModelParams.UseItdModel && !st_ivas->hHrtfTD->ModelParams.modelROM )

        {

            BSplineModelEvalITDDealloc( &st_ivas->hHrtfTD->ModelParamsITD );

        }

#endif

        BSplineModelEvalDealloc( &st_ivas->hHrtfTD->ModelParams, &st_ivas->hHrtfTD->ModelEval );



        ivas_HRTF_binary_close( &st_ivas->hHrtfTD );

lib_dec/ivas_sba_dec.c

+0 −7
Original line number Diff line number Diff line
@@ -213,13 +213,6 @@ ivas_error ivas_sba_dec_reinit( 
    }

    else if ( st_ivas->hHrtfTD != NULL )

    {

#ifndef FIX_235

        /* Case when HRTF filter is mistakenly specified but TD renderer was not active */

        if ( st_ivas->hHrtfTD->ModelParams.UseItdModel && !st_ivas->hHrtfTD->ModelParams.modelROM )

        {

            BSplineModelEvalITDDealloc( &st_ivas->hHrtfTD->ModelParamsITD );

        }

#endif

        BSplineModelEvalDealloc( &st_ivas->hHrtfTD->ModelParams, &st_ivas->hHrtfTD->ModelEval );



        ivas_HRTF_binary_close( &st_ivas->hHrtfTD );