Commit d89a0875 authored by JÜRGEN Gerstacker's avatar JÜRGEN Gerstacker
Browse files

issue _1965_ fix

parent fe66b0d8

lib_enc/cod_tcx_fx.c

+5 −7
Original line number Diff line number Diff line
@@ -1274,7 +1274,7 @@ void QuantizeSpectrum_fx( 
    CONTEXT_HM_CONFIG *phm_cfg;

    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOWxxx

#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

    Flag Overflow = 0;

    Flag Carry = 0;

#endif
@@ -1851,9 +1851,9 @@ void QuantizeSpectrum_fx( 
                spectrum[i] = L_mult( sqQ[i], 1 << ( 30 - SPEC_EXP_DEC ) );

                move32();

                /* noise filling seed */

#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOWxxx

#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

                tmp32 = L_macNs_co( tmp32, abs_s( sqQ[i] ), i, &Carry, &Overflow );

                //#else

#else

                seed = W_mac_16_16( seed, abs_s( sqQ[i] ), i );

#endif

            }
@@ -1861,11 +1861,9 @@ void QuantizeSpectrum_fx( 
            move16();



#ifdef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

            Word16 nf_seed2 = extract_l( W_extract_l( seed ) ); // Q0

                                                                ///#else

            nf_seed = extract_l( W_extract_l( seed ) ); // Q0

#else

            nf_seed = extract_l( tmp32 );

            if ( nf_seed != nf_seed2 )

                fprintf( stderr, "nfseed=0x%04x, nf_seed2= 0x%04x\n", nf_seed & 0xffff, nf_seed2 & 0xffff );

#endif

        }

        ELSE /* low rates: new arithmetic coder */