Commit 5d089633 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1298_MEMORY_OPT_IVAS_CORE_ENC

parent aba8928a

lib_com/options.h

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


#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define NONBE_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

#define FIX_1298_MEMORY_OPT_IVAS_CORE_ENC               /* VA: issue 1298: Memory saving in ivas_core_enc() */

#define NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND /* Eri: issue 1337: Missing directivity setting and distance attenuation in external renderer IVAS_rend */

#define NONBE_1214_PLC_LSF_MEMORY                       /* VA: issue 1224: reset ACELP PLC FEC memory in case of switching from MDCT stereo to TD/DFT stereo */

#define NONBE_1293_SR_HRTF                              /* VA: issue 1293: add support of external HRTFs in split rendering */

lib_enc/ivas_core_enc_fx.c

+0 −18
Original line number Diff line number Diff line
@@ -94,19 +94,11 @@ ivas_error ivas_core_enc_fx( 
    Word32 shb_speech_fx32[L_FRAME16k];

    Word32 *new_swb_speech_fx;

    Word16 *inp_fx[CPE_CHANNELS];

#ifdef FIX_1298_MEMORY_OPT_IVAS_CORE_ENC

    Word16 *shb_speech_fx;

#else

    Word16 shb_speech_fx[L_FRAME16k]; // Q_shb_spch

#endif

    Word16 Q_shb_spch;

    Word32 new_swb_speech_buffer_fx[L_FRAME48k + STEREO_DFT_OVL_MAX];

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

#ifdef FIX_1298_MEMORY_OPT_IVAS_CORE_ENC

    Word16 *hb_speech_fx;

#else

    Word16 hb_speech_fx[L_FRAME16k / 4];

#endif

    Word32 bwe_exc_extended_fx[CPE_CHANNELS][L_FRAME32k + NL_BUFF_OFFSET]; /* 2 * Q_new */

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

    Word16 *new_swb_speech_fx_16;
@@ -123,18 +115,12 @@ ivas_error ivas_core_enc_fx( 
    Word16 i, shift, Q_min;



    set32_fx( new_swb_speech_buffer_fx, 0, L_FRAME48k + STEREO_DFT_OVL_MAX );

#ifndef FIX_1298_MEMORY_OPT_IVAS_CORE_ENC

    set16_fx( new_swb_speech_buffer_fx_16, 0, L_FRAME48k + STEREO_DFT_OVL_MAX );

#endif



    FOR( i = 0; i < CPE_CHANNELS; i++ )

    {

        set_zero_fx( bwe_exc_extended_fx[i], L_FRAME32k + NL_BUFF_OFFSET );

        set16_fx( old_syn_12k8_16k_fx[i], 0, L_FRAME16k );

    }

#ifndef FIX_1298_MEMORY_OPT_IVAS_CORE_ENC

    set16_fx( shb_speech_fx, 0, L_FRAME16k );

#endif



    push_wmops( "ivas_core_enc" );
@@ -672,9 +658,7 @@ ivas_error ivas_core_enc_fx( 
         * WB BWE encoding

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



#ifdef FIX_1298_MEMORY_OPT_IVAS_CORE_ENC

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

#endif



        test();

        test();
@@ -704,10 +688,8 @@ ivas_error ivas_core_enc_fx( 


        new_swb_speech_fx = new_swb_speech_buffer_fx + STEREO_DFT_OVL_MAX;

        new_swb_speech_fx_16 = new_swb_speech_buffer_fx_16 + STEREO_DFT_OVL_MAX;

#ifdef FIX_1298_MEMORY_OPT_IVAS_CORE_ENC

        set16_fx( new_swb_speech_buffer_fx_16, 0, L_FRAME48k + STEREO_DFT_OVL_MAX );

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

#endif



        test();

        test();