Commit 8720a844 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

fixed common path in harmonized function

parent 01410072

lib_com/prot_fx.h

+1 −2
Original line number Diff line number Diff line
@@ -9962,8 +9962,7 @@ void tcx_arith_render_envelope_ivas_fx( 


#ifdef HARMONIZE_2598_tcx_arith_decode_envelope

void tcx_arith_decode_envelope_fx(

    Decoder_State *st,

    /* i/o: coder state                   */ /*EVS: move argument 5->1 */

    Decoder_State *st,                       /* i/o: coder state                   */ /*EVS: move argument 5->1 */

    Word32 q_spectrum[],                     /* o  : quantised MDCT coefficients Q(31-q_spectrum_e)  */

    Word16 *q_spectrum_e,                    /* o  : MDCT exponent                 */

    const Word16 L_frame,                    /* i  : frame or MDCT length          */

lib_dec/arith_coder_dec_fx.c

+17 −19
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ void tcx_arith_decode_envelope_fx( 
    Word16 tcxltp_pitch,                                     /* i  : TCX LTP pitch in FD, -1 if n/a*/

    Word16 *arith_bits,                                      /* o  : bits used for ari. coding     */

    Word16 *signaling_bits,                                  /* o  : bits used for signaling       */

    Word16 *nf_seed,                         /* o  : noise filling seed         Q0 */

    Word16 *nf_seed, /* o  : noise filling seed         Q0 */ /*IVAS: 0*/

    const Word16 low_complexity                              /* i  : low-complexity flag           */

#else

void tcx_arith_decode_envelope_ivas_fx(
@@ -368,11 +368,10 @@ void tcx_arith_decode_envelope_ivas_fx( 
    }



    hTcxCfg = st->hTcxCfg;

    hTcxDec = st->hTcxDec;

    *signaling_bits = 0;

    move16();



    assert( hTcxDec->enableTcxLpc );

    assert( st->hTcxDec->enableTcxLpc );

    gamma_w = MAX16B;

    move16();

    gamma_uw = st->inv_gamma;
@@ -385,11 +384,10 @@ void tcx_arith_decode_envelope_ivas_fx( 
    ELSE

    {

#endif

        tcx_arith_render_envelope( A_ind, L_frame, L_spec, hTcxCfg->preemph_fac, gamma_w, gamma_uw, env );

        tcx_arith_render_envelope_ivas_fx( A_ind, L_frame, L_spec, hTcxCfg->preemph_fac, gamma_w, gamma_uw, env );

#ifdef HARMONIZE_2598_tcx_arith_decode_envelope

    }

#endif

    tcx_arith_render_envelope_ivas_fx( A_ind, L_frame, L_spec, hTcxCfg->preemph_fac, gamma_w, gamma_uw, env );





    IF( use_hm != 0 )