Commit 7d2a71b8 authored by Nishant S Kulgod's avatar Nishant S Kulgod
Browse files

commit 2

parent a10b026c

lib_dec/cng_dec.c

+77 −1
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ static void shb_CNG_decod( 
 *

 *

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



#ifdef IVAS_FLOAT_FIXED

void td_cng_dec_init(

    DEC_CORE_HANDLE st /* i/o: decoder state structure     */

)
@@ -843,4 +843,80 @@ void td_cng_dec_init( 


    return;

}

#else

void td_cng_dec_init(

  DEC_CORE_HANDLE st /* i/o: decoder state structure     */

)

{

  int16_t i;

  TD_CNG_DEC_HANDLE hTdCngDec;



  hTdCngDec = st->hTdCngDec;



  hTdCngDec->cng_seed = RANDOM_INITSEED;

  hTdCngDec->cng_ener_seed = RANDOM_INITSEED;

  hTdCngDec->cng_ener_seed1 = RANDOM_INITSEED;

  hTdCngDec->old_enr_index = -1;

  hTdCngDec->Enew = 0.0f;

  mvr2r(st->lsp_old, st->lspCNG, M);

  hTdCngDec->last_allow_cn_step = 0;

  hTdCngDec->shb_cng_ener = -6.02f;

  if (st->element_mode != EVS_MONO)

  {

    set_f(hTdCngDec->shb_lpcCNG, 0.0f, LPC_SHB_ORDER + 1);

    hTdCngDec->shb_lpcCNG[0] = 1.0f;

    hTdCngDec->shb_cng_gain = -82.0; /* a  dB value approximately corresponding to  shb  index 0(used as index -15)   */

  }



  hTdCngDec->wb_cng_ener = -6.02f;

  hTdCngDec->last_wb_cng_ener = -6.02f;

  hTdCngDec->last_shb_cng_ener = -6.02f;

  hTdCngDec->swb_cng_seed = RANDOM_INITSEED;

  hTdCngDec->ho_hist_ptr = -1;

  hTdCngDec->ho_sid_bw = 0;

  set_f(hTdCngDec->ho_lsp_hist, 0, HO_HIST_SIZE * M);

  set_f(hTdCngDec->ho_ener_hist, 0, HO_HIST_SIZE);

  set_f(hTdCngDec->ho_env_hist, 0, HO_HIST_SIZE * NUM_ENV_CNG);

  hTdCngDec->ho_hist_size = 0;

  hTdCngDec->act_cnt = 0;

  hTdCngDec->ho_circ_ptr = -1;

  set_f(hTdCngDec->ho_lsp_circ, 0, HO_HIST_SIZE * M);

  set_f(hTdCngDec->ho_ener_circ, 0, HO_HIST_SIZE);

  set_f(hTdCngDec->ho_env_circ, 0, HO_HIST_SIZE * NUM_ENV_CNG);

  hTdCngDec->ho_circ_size = 0;



  set_s(hTdCngDec->ho_16k_lsp, 0, HO_HIST_SIZE);

  st->CNG_mode = -1;

  hTdCngDec->act_cnt2 = 0;

  hTdCngDec->num_ho = 0;

  set_f(hTdCngDec->lp_env, 0.0f, NUM_ENV_CNG);

  set_f(hTdCngDec->exc_mem, 0.0f, 24);

  set_f(hTdCngDec->exc_mem1, 0.0f, 30);

  set_f(hTdCngDec->old_env, 0.0f, NUM_ENV_CNG);



  for (i = 0; i < LPC_SHB_ORDER; i++)

  {

    if (st->element_mode != EVS_MONO)

    {

      hTdCngDec->lsp_shb_prev[i] = 0.5f * ((float)(i + 1)) / ((float)(LPC_SHB_ORDER + 1));

    }

    else

    {

      hTdCngDec->lsp_shb_prev[i] = 0.5f * ((float)i) / ((float)LPC_SHB_ORDER);

    }

    hTdCngDec->lsp_shb_prev_prev[i] = hTdCngDec->lsp_shb_prev[i];

  }



  hTdCngDec->shb_dtx_count = 0;

  hTdCngDec->trans_cnt = 0;

  hTdCngDec->burst_cnt = 0;



  hTdCngDec->last_shb_ener = 0.001f;





  set_f(hTdCngDec->interpol_3_2_cng_dec, 0.0f, INTERP_3_2_MEM_LEN);



  return;

}

#endif

#endif
 
 No newline at end of file

lib_dec/core_dec_init.c

+662 −1

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/fd_cng_dec.c

+69 −1

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/init_dec.c

+3 −63

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/jbm_pcmdsp_window.c

+41 −69
Original line number Diff line number Diff line
@@ -134,38 +134,6 @@ void overlapAdd( 
  return;

}



#endif

void overlapAdd_ivas(

    const float *fadeOut,

    const float *fadeIn,

    float *out,

    uint16_t n,

    uint16_t nChannels,

    const float *fadeOutWin,

    const float *fadeInWin )

{

    float fdOutVal, fdInVal;

    int16_t i, j, hannIter;

    float combinedVal;



    for ( j = 0; j < nChannels; j++ )

    {

        /* reset Hann window iterator to beginning (both channels use same window) */

        hannIter = 0;

        for ( i = j; i < n; i += nChannels )

        {

            fdOutVal = fadeOut[i] * fadeOutWin[hannIter];

            fdInVal = fadeIn[i] * fadeInWin[hannIter];

            /* round combinedVal value (taking care of sign) */

            combinedVal = fdInVal + fdOutVal;

            out[i] = combinedVal;

            hannIter++;

        }

    }



    return;

}



void overlapAddEvs(

  const float *fadeOut,

  const float *fadeIn,
@@ -214,6 +182,10 @@ void overlapAddEvs( 
  return;

}



#endif







#ifdef IVAS_FLOAT_FIXED

void overlapAdd_fx(const Word16 *fadeOut, const Word16 *fadeIn, Word16 *out,

                Word16 n, Word16 nChannels, const Word16 *fadeOutWin, const Word16 *fadeInWin )