Commit e78d3b30 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

deactivated ISSUE_1796 macro in all lib_com files for testing

parent aa2932b6

lib_com/arith_coder_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ void tcx_arith_scale_envelope( 


    tmp2 = BASOP_Util_Add_MantExp( negate( b ), b_e, tmp, tmp2, &scale ); /* exp(scale) */

    scale = BASOP_Util_Divide1616_Scale( scale, round_fx( a ), &tmp );

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

    scale = shl_sat( scale, sub( sub( add( tmp, tmp2 ), a_e ), 1 ) ); /* Q15 */

#else

    scale = shl_o( scale, sub( sub( add( tmp, tmp2 ), a_e ), 1 ), &Overflow ); /* Q15 */

lib_com/bitalloc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ Word16 BitAllocF_fx( 
    Word16 tmp, exp1, exp2;

    Word32 Rsubband_w32_fx[NB_SFM]; /* Q15  */

    Word16 B_w16_fx;

#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1796_replace_shl_o_

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -444,7 +444,7 @@ Word16 BitAllocF_fx( 
            exp1 = sub( norm_l( L_tmp2 ), 1 );

            exp2 = norm_s( n );

            tmp = div_s( extract_h( L_shl( L_tmp2, exp1 ) ), shl( n, exp2 ) ); /*15 + 15 + exp1 - 16 - exp2*/

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

            m_fx = shl_sat( tmp, sub( exp2, exp1 ) ); /*Q14*/

#else

            m_fx = shl_o( tmp, sub( exp2, exp1 ), &Overflow ); /*Q14*/

lib_com/codec_tcx_common_fx.c

+5 −5
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ void tcxFormantEnhancement( 
    Word16 i, j, k, l, n;

    Word16 fac, fac0, fac1, fac_e, d, tmp;

    Word16 xn_buf_e, xn_one, m, e;

#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1796_replace_shl_o_

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -141,7 +141,7 @@ void tcxFormantEnhancement( 
            {

                fac = add( fac0, mult( d, extract_l( L_mult0( j, inv_int[n] ) ) ) );

                BASOP_SATURATE_WARNING_OFF_EVS;

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

                xn_buf[l + j] = s_min( xn_one, shl_sat( mult( xn_buf[l + j], fac ), fac_e ) );

#else

                xn_buf[l + j] = s_min( xn_one, shl_o( mult( xn_buf[l + j], fac ), fac_e, &Overflow ) );
@@ -233,7 +233,7 @@ void tcxFormantEnhancement_with_shift( 
    Word16 i, j, k, l, n;

    Word16 fac, fac0, fac1, fac_e, d, tmp;

    Word16 xn_buf_e, xn_one, m, e;

#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1796_replace_shl_o_

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -317,7 +317,7 @@ void tcxFormantEnhancement_with_shift( 
            {

                fac = add( fac0, mult( d, extract_l( L_mult0( j, inv_int[n] ) ) ) );

                BASOP_SATURATE_WARNING_OFF_EVS;

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

                xn_buf[l + j] = s_min( xn_one, shl_sat( mult( xn_buf[l + j], fac ), fac_e ) );

#else

                xn_buf[l + j] = s_min( xn_one, shl_o( mult( xn_buf[l + j], fac ), fac_e, &Overflow ) );
@@ -366,7 +366,7 @@ void tcxFormantEnhancement_with_shift( 
    {

        fac = add( fac0, mult( d, extract_l( L_mult0( j, inv_int[n] ) ) ) );

        BASOP_SATURATE_WARNING_OFF_EVS;

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

        xn_buf[l + j] = s_min( xn_one, shl_sat( mult( xn_buf[l + j], fac ), fac_e ) );

#else

        xn_buf[l + j] = s_min( xn_one, shl_o( mult( xn_buf[l + j], fac ), fac_e, &Overflow ) );

lib_com/env_stab_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ Word16 env_stability_fx( /* in Q15 */ 
            mem_norm[i] = ynrm[i];

            move16();

        }

#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1796_replace_shl_o_

        Overflow = 0;

        move16();

        env_delta = shl_o( *mem_env_delta, 1, &Overflow );

lib_com/fd_cng_com_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -2279,7 +2279,7 @@ static void getmidbands( 
)

{

    Word16 j, max_psize, shift;

#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1796_replace_shl_o_

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -2318,7 +2318,7 @@ static void getmidbands( 
    move16();

    FOR( j = 0; j < npart; j++ )

    {

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

        psize_norm[j] = shl_sat( psize[j], shift ); // Q(15 - psize_norm_exp)

#else

        psize_norm[j] = shl_o( psize[j], shift, &Overflow ); // Q(15 - psize_norm_exp)