Commit 3f961fae authored by vaclav's avatar vaclav
Browse files

revert memory saving part

parent c9abae98

lib_enc/ivas_core_enc.c

+1 −15
Original line number Diff line number Diff line
@@ -90,13 +90,8 @@ ivas_error ivas_core_enc( 
    float *inp[CPE_CHANNELS];

    float new_inp_resamp16k[CPE_CHANNELS][L_FRAME16k]; /* new input signal @16kHz, non pre-emphasised, used by the WB TBE/BWE */

    float old_syn_12k8_16k[CPE_CHANNELS][L_FRAME16k];  /* ACELP core synthesis at 12.8kHz or 16kHz to be used by the SWB BWE */

#ifdef SIMPLIFY_IVAS_CORE

    float *shb_speech;

    float *hb_speech;

#else

    float shb_speech[L_FRAME16k];

    float hb_speech[L_FRAME16k / 4];

#endif

    float *new_swb_speech;

    float new_swb_speech_buffer[L_FRAME48k + STEREO_DFT_OVL_MAX];

    float bwe_exc_extended[CPE_CHANNELS][L_FRAME32k + NL_BUFF_OFFSET];
@@ -160,9 +155,8 @@ ivas_error ivas_core_enc( 
    input_Fs = sts[0]->input_Fs;

    input_frame = (int16_t) ( input_Fs / FRAMES_PER_SEC );



#ifndef SIMPLIFY_IVAS_CORE

    set_f( new_swb_speech_buffer, 0, L_FRAME48k + STEREO_DFT_OVL_MAX );

#endif



    for ( n = 0; n < n_CoreChannels; n++ )

    {

        st = sts[n];
@@ -346,10 +340,6 @@ ivas_error ivas_core_enc( 
         * WB BWE encoding

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



#ifdef SIMPLIFY_IVAS_CORE

        hb_speech = new_swb_speech_buffer; /* reuse existing buffer: hb_speech[L_FRAME16k/4]; */



#endif

        if ( input_Fs >= 16000 && st->bwidth < SWB && st->hBWE_TD != NULL )

        {

            /* Common pre-processing for WB TBE and WB BWE */
@@ -373,10 +363,6 @@ ivas_error ivas_core_enc( 
         *---------------------------------------------------------------------*/



        new_swb_speech = new_swb_speech_buffer + STEREO_DFT_OVL_MAX;

#ifdef SIMPLIFY_IVAS_CORE

        set_f( new_swb_speech_buffer, 0, L_FRAME48k + STEREO_DFT_OVL_MAX );

        shb_speech = new_inp_resamp16k[n]; /* reuse existing buffer: shb_speech[L_FRAME16k] */

#endif



        if ( !st->Opt_SC_VBR && input_Fs >= 32000 && st->hBWE_TD != NULL )

        {