Commit 7a5b79f8 authored by multrus's avatar multrus
Browse files

[cleanup] accept IGF_MEMORY_ALLOC_OPT

parent b351bb02

lib_com/options.h

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





#define IGF_MEMORY_ALLOC_OPT                            /* FhG: Issue 157: allocate IGF encoder structure only when needed */

#define FIX_732_PLANAR_SBA_OSBA                         /* Dlb : issue 732: fix for crash in planar mode in OSBA format*/

#define FIX_708_DPID_COMMAND_LINE                       /* issue 708: sanity checks for '-dpid' command-line */

#define FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */

lib_com/prot.h

+0 −4
Original line number Diff line number Diff line
@@ -2272,10 +2272,8 @@ ivas_error init_encoder( 
    const int16_t interval_SID,      /* i  : interval for SID update                */

    const int16_t vad_only_flag,     /* i  : flag to indicate front-VAD structure   */

    const ISM_MODE ism_mode          /* i  : ISM mode                               */

#ifdef IGF_MEMORY_ALLOC_OPT

    ,

    const int32_t element_brate /* element bitrate                             */

#endif

);



void LPDmem_enc_init(
@@ -9873,7 +9871,6 @@ void IGFEncResetTCX10BitCounter( 
    const IGF_ENC_INSTANCE_HANDLE hIGFEnc /* i  : instance handle of IGF Encoder */

);



#ifdef IGF_MEMORY_ALLOC_OPT

ivas_error IGF_Reconfig(

    IGF_ENC_INSTANCE_HANDLE *hIGFEnc, /* i/o: instance handle of IGF Encoder  */

    const int16_t igf,                /* i  : IGF on/off                      */
@@ -9883,7 +9880,6 @@ ivas_error IGF_Reconfig( 
    const int16_t element_mode,       /* i  : IVAS element mode               */

    const int16_t rf_mode             /* i  : flag to signal the RF mode      */

);

#endif



void IGFEncSetMode(

    const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i  : instance handle of IGF Encoder */

lib_enc/cod_tcx.c

+0 −13
Original line number Diff line number Diff line
@@ -1197,15 +1197,8 @@ void QuantizeTCXSpectrum( 
    {

        noiseFillingBorder = st->hIGFEnc->infoStartLine;

    }

#ifndef IGF_MEMORY_ALLOC_OPT

    else

    {

        st->hIGFEnc->infoStopLine = noiseFillingBorder;

    }

#endif

    *pnoiseFillingBorder = noiseFillingBorder;



#ifdef IGF_MEMORY_ALLOC_OPT

    if ( st->igf )

    {

        for ( i = st->hIGFEnc->infoStopLine; i < max( L_frame, L_frameTCX ); i++ )
@@ -1220,12 +1213,6 @@ void QuantizeTCXSpectrum( 
            spectrum[i] = 0.0f;

        }

    }

#else

    for ( i = st->hIGFEnc->infoStopLine; i < max( L_frame, L_frameTCX ); i++ )

    {

        spectrum[i] = 0.0f;

    }

#endif



    /*-----------------------------------------------------------*

     * Quantization                                              *

lib_enc/ext_sig_ana.c

+0 −4
Original line number Diff line number Diff line
@@ -200,11 +200,7 @@ void core_signal_analysis_high_bitrate( 
        overlap_mode[2] = curr_overlap; /* Overlap between the current and the next frame */

    }



#ifdef IGF_MEMORY_ALLOC_OPT

    if ( st->igf && transform_type[0] != TCX_20 )

#else

    if ( transform_type[0] != TCX_20 )

#endif

    {

        IGFEncResetTCX10BitCounter( st->hIGFEnc );

    }

lib_enc/igf_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -2007,7 +2007,6 @@ void IGFSaveSpectrumForITF( 
}





#ifdef IGF_MEMORY_ALLOC_OPT

ivas_error IGF_Reconfig(

    IGF_ENC_INSTANCE_HANDLE *hIGFEnc, /* i/o: instance handle of IGF Encoder  */

    const int16_t igf,                /* i  : IGF on/off                      */
@@ -2042,4 +2041,3 @@ ivas_error IGF_Reconfig( 


    return error;

}
 
#endif