Commit de23bf36 authored by vaillancour's avatar vaillancour
Browse files

fix BE issue with stereo_dmx_evs

parent 5369ebf5

lib_enc/cod4t64_fx.c

+4 −1
Original line number Diff line number Diff line
@@ -313,8 +313,11 @@ Word16 acelp_4t64_fx( 
    }

    ELSE

    {

#ifdef REUSE_EVS_BE_ACELP_4T64

        E_ACELP_4tsearch_fx( dn, cn, H, code, &config, ind, y, element_mode );

#else

        E_ACELP_4tsearch_fx( dn, cn, H, code, &config, ind, y );



#endif

        FOR( i = 0; i < L_SUBFR; i++ )

        {

            y[i] = shr( y[i], 3 );

lib_enc/enc_acelp_fx.c

+10 −1
Original line number Diff line number Diff line
@@ -1071,7 +1071,11 @@ void E_ACELP_corrmatrix_fx( Word16 h[] /*Q12*/, Word16 sign[] /*Q0*/, Word16 vec 
    return;

}



#ifndef REUSE_EVS_BE_ACELP_4T64

void E_ACELP_4tsearch_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const Word16 H[] /*Q12*/, Word16 code[] /*Q9*/, const PulseConfig *config, Word16 ind[] /*Q0*/, Word16 y[] /*Qy*/ )

#else

void E_ACELP_4tsearch_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const Word16 H[] /*Q12*/, Word16 code[] /*Q9*/, const PulseConfig *config, Word16 ind[] /*Q0*/, Word16 y[] /*Qy*/, const Word16 element_mode )

#endif

{

    Word16 sign[L_SUBFR], vec[L_SUBFR];

    Word16 cor_x[16], cor_y[16], h_buf[4 * L_SUBFR];
@@ -1148,7 +1152,8 @@ void E_ACELP_4tsearch_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const 
        move16();

    }

#ifdef REUSE_EVS_BE_ACELP_4T64 /* To be verified if it affects BE on 26.444, if yes, just a condition for IVAS here*/

    if ( EQ_16( val, 32767 ) )

    test();

    if ( EQ_16( val, 32767 ) && element_mode > EVS_MONO )

    {

        scale = -3;

        move16();
@@ -1822,7 +1827,11 @@ void E_ACELP_4t_fx( 
    }

    ELSE

    {

#ifndef REUSE_EVS_BE_ACELP_4T64

        E_ACELP_4tsearch_fx( dn, cn, H, code, &config, ind, y );

#else

        E_ACELP_4tsearch_fx( dn, cn, H, code, &config, ind, y, element_mode );

#endif

    }

    E_ACELP_indexing_fx( code, &config, NB_TRACK_FCB_4T, _index );

    return;

lib_enc/prot_fx_enc.h

+3 −1
Original line number Diff line number Diff line
@@ -1564,9 +1564,11 @@ void Mode2_pit_encode_fx( 
    Word16 pit_fr2,

    Word16 pit_max,

    Word16 pit_res_max );

void E_ACELP_4tsearch_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const Word16 H[] /*Q12*/, Word16 code[] /*Q9*/, const PulseConfig *config, Word16 ind[] /*Q0*/, Word16 y[] /*Qy*/ );

#ifndef REUSE_EVS_BE_ACELP_4T64

void E_ACELP_4tsearch_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const Word16 H[] /*Q12*/, Word16 code[] /*Q9*/, const PulseConfig *config, Word16 ind[] /*Q0*/, Word16 y[] /*Qy*/ );

void E_ACELP_4tsearch_ivas_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const Word16 H[] /*Q12*/, Word16 code[] /*Q9*/, const PulseConfig *config, Word16 ind[] /*Q0*/, Word16 y[] /*Qy*/ );

#else

void E_ACELP_4tsearch_fx( Word16 dn[] /*Qdn*/, const Word16 cn[] /*Q_xn*/, const Word16 H[] /*Q12*/, Word16 code[] /*Q9*/, const PulseConfig *config, Word16 ind[] /*Q0*/, Word16 y[] /*Qy*/, const Word16 element_mode );

#endif

void E_ACELP_4t_fx(

    Word16 dn[], /* Qdn */