Commit 12785e1f authored by vaclav's avatar vaclav Committed by Sandesh Venkatesh
Browse files

restore EVS BE - add missing logic into the decision matrix

parent 6a7ac819

lib_dec/decision_matrix_dec_fx.c

+15 −0
Original line number Diff line number Diff line
@@ -713,5 +713,20 @@ void decision_matrix_dec_fx( 
        move16();

    }



#ifdef NONBE_FIX_GSC_BSTR

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

     * set inactive coder_type flag in ACELP core

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



    st->inactive_coder_type_flag = 0; /* AVQ by default */

    move16();



    if ( LE_32( st->total_brate, MAX_GSC_INACTIVE_BRATE ) )

    {

        st->inactive_coder_type_flag = 1; /* GSC */

        move16();

    }



#endif

    return;

}

lib_enc/decision_matrix_enc_fx.c

+15 −0
Original line number Diff line number Diff line
@@ -386,6 +386,21 @@ void decision_matrix_enc_fx( 
        move16();

    }



#ifdef NONBE_FIX_GSC_BSTR

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

     * set inactive coder_type flag in ACELP core

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



    st_fx->inactive_coder_type_flag = 0; /* AVQ by default */

    move16();



    if ( LE_32( st_fx->total_brate, MAX_GSC_INACTIVE_BRATE ) )

    {

        st_fx->inactive_coder_type_flag = 1; /* GSC */

        move16();

    }



#endif

    return;

}