Commit 59c128ce authored by multrus's avatar multrus
Browse files

revert unncessary changes

parent ec68c338

lib_dec/ari_dec_fx.c

+2 −6
Original line number Diff line number Diff line
@@ -545,7 +545,6 @@ static Word16 ari_lookup_sign_fx( Tastat *s, Word16 base ) 


    range = L_sub( s->high, s->low );

    cum = L_sub( s->value, s->low );



    range = L_shr( range, 1 );



    IF( GT_32( range, cum ) )
@@ -647,8 +646,7 @@ static Word16 ari_decode_14bits_notbl_fx( 
Word16 ari_decode_14bits_pow_fx( Word16 *ptr, Word16 bp, Word16 bits, Word16 *res, Tastat *s, Word16 base )

{

    /* There are two versions to call: pow_ivas or pow_fx (default) */

    Word16 result = ari_decode_14bits_notbl_fx( ptr, bp, bits, res, s, base, ari_lookup_pow_fx );

    return result;

    return ari_decode_14bits_notbl_fx( ptr, bp, bits, res, s, base, ari_lookup_pow_fx );

}



/*------------------------------------------------------------------------
@@ -658,8 +656,7 @@ Word16 ari_decode_14bits_pow_fx( Word16 *ptr, Word16 bp, Word16 bits, Word16 *re 
 *-------------------------------------------------------------------------*/

Word16 ari_decode_14bits_sign_fx( Word16 *ptr, Word16 bp, Word16 bits, Word16 *res, Tastat *s )

{

    Word16 result = ari_decode_14bits_notbl_fx( ptr, bp, bits, res, s, 0, ari_lookup_sign_fx );

    return result;

    return ari_decode_14bits_notbl_fx( ptr, bp, bits, res, s, 0, ari_lookup_sign_fx );

}



/*---------------------------------------------------------------
@@ -732,7 +729,6 @@ Word16 ari_decode_14bits_pow_ivas( 
    cum = (UWord32) W_add( W_shl( ( W_sub( value, low ) ), stat_bitsnew ), ( 1 << stat_bitsnew ) - 1 );

    move32();





    /* search for the interval where "cum" fits */

    IF( GT_64( W_mult0_32_32( L_shr( base, 1 ), range ), cum ) ) /* below pow-1 */

    {

lib_enc/ari_enc_fx.c

+7 −6
Original line number Diff line number Diff line
@@ -378,8 +378,8 @@ Word16 ari_encode_14bits_range_fx( 


    high = L_add( s->low, mul_sbc_14bits( range, cum_freq_high ) ); /* Q0 */

    low = L_add( s->low, mul_sbc_14bits( range, cum_freq_low ) );   /* Q0 */

    Word16 ret = ari_encode_14bits_high_low( ptr, bp, bits, s, high, low );

    return ret;



    return ari_encode_14bits_high_low( ptr, bp, bits, s, high, low );

}

#endif /* FIX_2402_REPL_EVS_ARI_CODEC_ENC */
@@ -432,6 +432,7 @@ Word16 ari_encode_14bits_sign_fx( 
    high = L_add( s->high, 0 );

    low = L_add( s->low, 0 );

    range = L_sub( high, low ); /* Q0 */



    L_tmp = L_shr( range, 1 );

    if ( sign != 0 )

    {
@@ -442,8 +443,7 @@ Word16 ari_encode_14bits_sign_fx( 
        low = L_add( low, L_tmp ); /* Q0 */

    }



    Word16 ret = ari_encode_14bits_high_low( ptr, bp, bits, s, high, low );

    return ret;

    return ari_encode_14bits_high_low( ptr, bp, bits, s, high, low );

}

#endif /* FIX_2402_REPL_EVS_ARI_CODEC_ENC */
@@ -462,6 +462,7 @@ Word16 ari_done_cbr_encoding_14bits_fx( 
    TastatEnc *s )

{

    Word16 high, tmp, k;



    tmp = sub( bits, 16 ); /* Q0 */

    WHILE( GT_16( sub( tmp, bp ), s->value ) )

    {
@@ -642,6 +643,7 @@ Word16 ari_encode_14bits_ext_ivas_fx( 
    move32();

    s->bits_to_follow = bits_to_follow; /* Q0 */

    move32();



    return bp;

}
@@ -746,6 +748,5 @@ Word16 ari_encode_14bits_sign_ivas_fx( 
        low = L_add( low, L_tmp ); /* Q0 */

    }



    Word16 ret = ari_encode_14bits_high_low_ivas_fx( ptr, bp, extract_l( bits ), s, high, low );

    return ret;

    return ari_encode_14bits_high_low_ivas_fx( ptr, bp, extract_l( bits ), s, high, low );

}