Commit 9c6af891 authored by thomas dettbarn's avatar thomas dettbarn
Browse files

one variable still had a name from the development nomenklature.

parent a63daf0b

lib_enc/ACcontextMapping_enc_fx.c

+8 −8
Original line number Diff line number Diff line
@@ -1238,13 +1238,13 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx( 


    Word16 symbol;

    const UWord8 *lookup;

    Word64 nbits2_accu;

    Word64 nbits2_fx;



    /* Initialization */

    bit_estimate_fx = MAKE_NUMBER_QX( 2, Q23 );

    move64();



    nbits2_accu = 0;

    nbits2_fx = 0;

    move64();



    /* bits to encode lastnz */
@@ -1258,7 +1258,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx( 
        /* check while condition */

    }



    nbits2_accu = bit_estimate_fx;

    nbits2_fx = bit_estimate_fx;

    move64();



    IF( hm_cfg )
@@ -1386,7 +1386,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx( 
            ELSE

            {

                lastnz2 = add( b1_i, 1 );

                nbits2_accu = bit_estimate_fx;

                nbits2_fx = bit_estimate_fx;

                move64();

            }
@@ -1432,7 +1432,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx( 


        IF( *stop )

        {

            total_output_bits = round_fx( W_shr( nbits2_accu, Q7 ) );

            total_output_bits = round_fx( W_shr( nbits2_fx, Q7 ) );

        }



        IF( stop2 )
@@ -1458,7 +1458,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx( 
        move16();





        return round_fx( L_add( W_shr( nbits2_accu, Q7 ), ONE_IN_Q14 ) ); /* Q0 */

        return round_fx( L_add( W_shr( nbits2_fx, Q7 ), ONE_IN_Q14 ) ); /* Q0 */

    }

    ELSE /* if (!hm_cfg) */

    {
@@ -1565,7 +1565,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx( 
            {

                IF( abs_s( x[k] ) || abs_s( x[k + 1] ) ) /* No overflow & non-zero tuple */

                {

                    nbits2_accu = bit_estimate_fx; /* exp(bit_estimate_e) */

                    nbits2_fx = bit_estimate_fx; /* exp(bit_estimate_e) */

                    move64();



                    lastnz2 = add( k, 2 );
@@ -1587,7 +1587,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx( 


        } /*end of the 2-tuples loop*/



        tot_bits2 = round_fx( W_shr( nbits2_accu, Q7 ) );

        tot_bits2 = round_fx( W_shr( nbits2_fx, Q7 ) );

        IF( LT_16( lastnz2, lastnz ) ) /* Overflow occured because unable to code all tuples */

        {

            overflow_flag = 1;