Commit 7f4684f7 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

check old EVSbranch in decodeSID_ivas_fx()

parent e7c4ef8f

lib_dec/acelp_core_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -658,11 +658,7 @@ ivas_error acelp_core_dec_fx( 
                {

                    IF( EQ_16( st->element_mode, EVS_MONO ) )

                    {

#ifdef HARMONIZE_2494_FdCng_decodeSID_fx

                        FdCng_decodeSID_ivas_fx( st );

#else

                        FdCng_decodeSID_fx( st->hFdCngDec->hFdCngCom, st );

#endif

                    }

                    ELSE

                    {

lib_dec/dec_acelp_tcx_main_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -521,11 +521,7 @@ Word16 dec_acelp_tcx_frame_fx( 


        IF( EQ_16( st->m_frame_type, SID_FRAME ) )

        {

#ifdef HARMONIZE_2494_FdCng_decodeSID_fx

            FdCng_decodeSID_ivas_fx( st );

#else

            FdCng_decodeSID_fx( st->hFdCngDec->hFdCngCom, st );

#endif

        }



        /* updates */

lib_dec/fd_cng_dec_fx.c

+4 −2
Original line number Diff line number Diff line
@@ -4336,13 +4336,14 @@ void FdCng_decodeSID_ivas_fx( 
    Word32 *invTrfMatrix_fx;

    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];

    Word16 tmp16;



#ifndef HARMONIZE_2494_FdCng_decodeSID_fx

    IF( st->element_mode == EVS_MONO )

    {

        tmp16 = GAIN_Q_OFFSET_EVS_FX_Q0;

        move16();

    }

    ELSE

#endif

    {

        tmp16 = GAIN_Q_OFFSET_IVAS_FX_Q0;

        move16();
@@ -4374,13 +4375,14 @@ void FdCng_decodeSID_ivas_fx( 
    index = get_next_indice_fx( st, 7 );



    /* MSVQ decoder */



#ifndef HARMONIZE_2494_FdCng_decodeSID_fx

    IF( st->element_mode != EVS_MONO )

    {

        create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, FDCNG_VQ_MAX_LEN * FDCNG_VQ_DCT_MAXTRUNC );

        msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix_fx, v, NULL, 7 );

    }

    ELSE

#endif

    { /* Legacy EVS_MONO MSVQ tables */

        msvq_dec_fx( cdk_37bits, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 0, NULL, v, NULL, 7 );

    }