Commit 5ccd2a21 authored by vaclav's avatar vaclav
Browse files

Port fixes from MR 2061

parent b2096097

lib_dec/init_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -294,7 +294,11 @@ ivas_error init_decoder( 
    st->last_active_brate = ACELP_7k20;

    st->last_CNG_L_frame = L_FRAME;



#ifdef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

    st->active_cnt = CNG_TYPE_HO;

#else

    st->active_cnt = 20;

#endif



    if ( idchan == 0 && ( st->element_mode == EVS_MONO || st->element_mode == IVAS_CPE_DFT || st->element_mode == IVAS_CPE_TD ) )

    {

lib_dec/ivas_cpe_dec.c

+10 −0
Original line number Diff line number Diff line
@@ -394,13 +394,23 @@ ivas_error ivas_cpe_dec( 
            if ( sts[1] != NULL )

            {

                sts[1]->active_cnt = 0;

#ifdef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

                if ( sts[1]->ini_frame == 0 )

                {

                    sts[1]->active_cnt = CNG_TYPE_HO;

                }

#endif

            }

        }

        else

        {

            sts[n]->VAD = 1;

            sts[n]->active_cnt++;

#ifdef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

            sts[n]->active_cnt = min( sts[n]->active_cnt, 200 );

#else

            sts[n]->active_cnt = min( sts[n]->active_cnt, 100 );

#endif

        }



        /* set CNA flag */