Commit 33c056c2 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into basop-2344-align-pre_proc_ivas-between-flp-and-basop
parents c93eec34 42dafd27

lib_enc/acelp_enc_util_fx.c

+0 −25
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <stdint.h>

#include <assert.h>

#include "options.h"

//#include "prot_fx.h"

#include "basop_util.h"

#include "cnst.h"

#include "prot_fx.h"     /* Function prototypes                    */
@@ -176,30 +175,6 @@ void E_ACELP_conv( 
    }

}



void E_ACELP_conv_ivas_fx(

    const Word16 xn2[], /* i    Qnew - 1*/

    const Word16 h2[],  /* i    Q12*/

    Word16 cn2[]        /* o    Qnew*/

)

{

    Word16 i, k;

    Word32 L_tmp;



    FOR( k = 0; k < L_SUBFR; k++ )

    {

        /*cn2[k] = xn2[k];     */

        Word64 L_tmp_64;

        L_tmp_64 = W_deposit32_l( L_mult0( xn2[k], 0x800 ) ); /* Qnew -1 + 12  */

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

        {

            /*cn2[k]-=cn2[i]*h2[k-i];*/

            L_tmp_64 = W_msu0_16_16( L_tmp_64, cn2[i], h2[k - i] ); /*Qnew + 11*/

        }

        L_tmp = W_sat_l( L_tmp_64 );                    /* Qnew + 11 */

        cn2[k] = round_fx_sat( L_shl_sat( L_tmp, 5 ) ); /* Qnew*/

        move16();

    }

}

void E_ACELP_build_code(

    Word16 nb_pulse,       /* i        Q0*/

    const Word16 codvec[], /* i        Q0*/