Commit 8ef2c953 authored by vaclav's avatar vaclav
Browse files

remove buffer synth_fxl[960]

parent 6324cd49

lib_dec/ivas_core_dec_fx.c

+11 −2
Original line number Diff line number Diff line
@@ -869,7 +869,6 @@ ivas_error ivas_core_dec_fx( 
            move16();

        }





        test();

        test();

        test();
@@ -1206,6 +1205,14 @@ ivas_error ivas_core_dec_fx( 
        IF( ( GE_16( output_frame, L_FRAME32k ) && st->hTdCngDec != NULL ) || ( EQ_16( st->element_mode, IVAS_CPE_DFT ) && GE_16( st->bwidth, SWB ) && st->hTdCngDec != NULL ) )

        {

            /* SHB CNG decoder */

#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING

            Copy_Scale_sig_32_16( hb_synth_32_fx[n], hb_synth_16_fx[n], output_frame, -( Q11 ) );                                                                                                                 // Q0

            Copy_Scale_sig_32_16( synth_32_fx[n], synth_16_fx[n], output_frame, -( Q11 + Q2 ) );                                                                                                                     // Q0

            Scale_sig( hBWE_TD->state_lpc_syn_fx, LPC_SHB_ORDER, sub( Q8, hBWE_TD->prev_Q_bwe_syn ) );                                                                                                            // Q8

            Copy_Scale_sig_32_16( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, ( 2 * ALLPASSSECTIONS_STEEP ), sub( hBWE_TD->prev_Q_bwe_syn2, Q11 ) ); // prev_Q_bew_syn2



            swb_CNG_dec_fx( st, synth_16_fx[n], hb_synth_16_fx[n], sid_bw[n], -Q2 );

#else

            Word16 synth_fxl[960]; /* Q-2 */

            Word16 q;
@@ -1217,6 +1224,7 @@ ivas_error ivas_core_dec_fx( 
            Copy_Scale_sig_32_16( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx_32, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, ( 2 * ALLPASSSECTIONS_STEEP ), sub( hBWE_TD->prev_Q_bwe_syn2, Q11 ) ); // prev_Q_bew_syn2



            swb_CNG_dec_fx( st, synth_fxl, hb_synth_16_fx[n], sid_bw[n], negate( q ) );

#endif



            test();

            IF( st->core_brate == FRAME_NO_DATA || EQ_32( st->core_brate, SID_2k40 ) )
@@ -1236,7 +1244,7 @@ ivas_error ivas_core_dec_fx( 
        IF( n == 0 && GE_16( st->element_mode, IVAS_CPE_DFT ) )

        {

            Word16 q;

            q = 11;

            q = Q11;

            move16();



#ifndef FIX_2367_REMOVE_CODE_ICBWE
@@ -1247,6 +1255,7 @@ ivas_error ivas_core_dec_fx( 
            }

#endif

            stereo_icBWE_dec_fx( hCPE, hb_synth_32_fx[0], hb_synth_32_fx[1], tmp_buffer_fx /*fb_synth_ref*/, voice_factors_fx[0], output_frame, &q, Q_white_exc );

            

            test();

            test();

            test();