Commit 3acda6ad authored by multrus's avatar multrus
Browse files

simplifications

parent 47bc9aea

lib_dec/arith_coder_dec_fx.c

+1 −19
Original line number Diff line number Diff line
@@ -394,18 +394,7 @@ void tcx_arith_decode_envelope_ivas_fx( 
    {

        IF( prm_hm[0] != 0 )

        {

#ifdef HARMONIZE_2598_tcx_arith_decode_envelope

            IF( EQ_16( st->element_mode, EVS_MONO ) )

            {

                tcx_hm_decode( L_spec, env, target_bits, hTcxCfg->coder_type, prm_hm, tcxltp_pitch, &hm_bits );

            }

            ELSE

            {

#endif

            tcx_hm_decode( L_spec, env, target_bits, st->coder_type, prm_hm, tcxltp_pitch, &hm_bits );

#ifdef HARMONIZE_2598_tcx_arith_decode_envelope

            }

#endif



            IF( hm_bits < 0 )

            {
@@ -428,13 +417,6 @@ void tcx_arith_decode_envelope_ivas_fx( 
        *signaling_bits = add( *signaling_bits, hm_bits );

        move16();

    }

#ifdef HARMONIZE_2598_tcx_arith_decode_envelope

    IF( EQ_16( st->element_mode, EVS_MONO ) && ( use_hm == 0 ) )

    {

        prm_hm[0] = 0; /* just to be sure */

        move16();

    }

#endif



    L_spec_core = L_spec;

    move16();

lib_enc/arith_coder_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -957,9 +957,13 @@ void tcx_arith_encode_envelope_ivas_fx( 
        }

#endif

        if ( signs[k] != 0 )

        {

            L_tmp = L_mult( q_spectrum[k], -( 1 << ( 30 - SPEC_EXP_DEC ) ) );

        }

        if ( signs[k] == 0 )

        {

            L_tmp = L_mult( q_spectrum[k], 1 << ( 30 - SPEC_EXP_DEC ) );

        }

        spectrum[k] = L_tmp;

        move32();

    }

lib_enc/cod_tcx_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -3494,7 +3494,7 @@ void QuantizeTCXSpectrum_fx( 
            move16();

        }

#ifdef HARMONIZE_2598_tcx_arith_encode_envelope

        tcx_arith_encode_envelope_fx( spectrum_fx, spectrum_e, hm_cfg->indexBuffer, L_frame, L_spec, st, Aqind, sqTargetBits, sqQ, tmp8, prm_hm, /* HM parameter area */ LtpPitchLag, &sqBits, &signaling_bits, 0, low_complexiety );

        tcx_arith_encode_envelope_fx( spectrum_fx, spectrum_e, hm_cfg->indexBuffer, L_frame, L_spec, st, Aqind, sqTargetBits, sqQ, tmp8, prm_hm, /* HM parameter area */ LtpPitchLag, &sqBits, &signaling_bits, NULL, low_complexiety );

#else

        tcx_arith_encode_envelope_ivas_fx( spectrum_fx, spectrum_e, hm_cfg->indexBuffer, L_frame, L_spec, st, Aqind, sqTargetBits, sqQ, tmp8, prm_hm, /* HM parameter area */ LtpPitchLag, &sqBits, &signaling_bits, low_complexiety );

#endif