Commit a2262106 authored by multrus's avatar multrus
Browse files

conditiosn for nf_seed update

parent 8762c411

lib_enc/arith_coder_enc_fx.c

+18 −18
Original line number Diff line number Diff line
@@ -818,8 +818,7 @@ void tcx_arith_encode_envelope_fx( 
    const Word16 tcxltp_pitch,  /* i  : TCX LTP pitch in FD, -1 if n/a  Q0*/

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

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

    Word16 *nf_seed,

    /*IVAS:0*/                  /* o  : noise filling seed            Q0 */

    Word16 *nf_seed,            /* o  : noise filling seed; might be NULL Q0 */

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

)

#else
@@ -951,7 +950,7 @@ void tcx_arith_encode_envelope_ivas_fx( 
    FOR( k = 0; k <= kMax; k++ )

    {

#ifdef HARMONIZE_2598_tcx_arith_encode_envelope

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

        if ( nf_seed != NULL )

        {

            W_tmp2 = W_mac_16_16( W_tmp2, q_spectrum[k], k );

        }
@@ -973,12 +972,13 @@ void tcx_arith_encode_envelope_ivas_fx( 
    set32_fx( spectrum + k, 0, sub( s_max( L_frame, L_spec ), k ) );



#ifdef HARMONIZE_2598_tcx_arith_encode_envelope

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

    if ( nf_seed != NULL )

    {

        /* noise filling seed */

        *nf_seed = extract_l( W_extract_l( W_tmp2 ) );

        move16();

    }

#endif



    return;

}

lib_enc/prot_fx_enc.h

+15 −16
Original line number Diff line number Diff line
@@ -1928,8 +1928,7 @@ void tcx_arith_encode_envelope_fx( 
    const Word16 tcxltp_pitch,  /* i  : TCX LTP pitch in FD, -1 if n/a  Q0*/

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

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

    Word16 *nf_seed,

    /*IVAS:0*/                  /* o  : noise filling seed            Q0 */

    Word16 *nf_seed,            /* o  : noise filling seed, may be NULL Q0 */

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

);

#else