Commit 86e58077 authored by vaillancour's avatar vaillancour
Browse files

fixes to make EVS BE

parent 5f0e5d8c

lib_enc/sig_clas_fx.c

+18 −1
Original line number Diff line number Diff line
@@ -777,7 +777,9 @@ void coder_type_modif_fx( 
                hSC_VBR->vbr_generic_ho = 0;

                move16();

            }



#ifdef FIX_2334_HARM_CODER_MODIF

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

            {

            hSC_VBR->last_7k2_coder_type = st->coder_type;

            move16();

            test();
@@ -787,6 +789,21 @@ void coder_type_modif_fx( 
                move16();

            }

        }

#endif

        }

#ifdef FIX_2334_HARM_CODER_MODIF

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

        {

            hSC_VBR->last_7k2_coder_type = st->coder_type;

            move16();

            test();

            if ( st->localVAD == 0 && EQ_16( st->coder_type, UNVOICED ) )

            {

                hSC_VBR->last_7k2_coder_type = GENERIC;

                move16();

            }

        }

#endif



        IF( st->element_mode == 0 )

        {

lib_enc/vad_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ Word16 wb_vad_fx( 
        move16();

    }

#ifdef FIX_2334_HARM_CODER_MODIF

    IF( st_fx->Opt_SC_VBR ) /* this keep 26.444 BE */

    IF( st_fx->Opt_SC_VBR || ( !st_fx->Opt_SC_VBR && st_fx->element_mode == EVS_MONO ) ) /* this keep 26.444 BE */

#else

    IF( 1 ) // st_fx->Opt_SC_VBR )     /* this keep 26.444 BE */

#endif