Commit b3417339 authored by Manuel Jander's avatar Manuel Jander
Browse files

Adapt NONBE_FIX_ISSUE_2206 to HARMONIZE_ACELP_ENC, old_syn_12k8_16k scale.... 

Adapt NONBE_FIX_ISSUE_2206 to HARMONIZE_ACELP_ENC, old_syn_12k8_16k scale. Could be improved by changing save_old_syn_fx().
parent 412328d6

lib_enc/acelp_core_enc_fx.c

+12 −1
Original line number Diff line number Diff line
@@ -1185,6 +1185,9 @@ ivas_error acelp_core_enc_ivas_fx( 
#ifdef HARMONIZE_ACELP_ENC

            IF( st->element_mode == EVS_MONO )

            {

#ifdef NONBE_FIX_ISSUE_2206

                assert( Q_new - 1 == 0 );

#endif

                save_old_syn_fx( st->L_frame, syn1_fx, old_syn_12k8_16k, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );

            }

            ELSE
@@ -1193,6 +1196,9 @@ ivas_error acelp_core_enc_ivas_fx( 
                st->hBWE_FD->mem_deemph_old_syn_fx = shl_sat( st->hBWE_FD->mem_deemph_old_syn_fx, sub( st->Q_syn, st->hBWE_FD->q_mem_deemph_old_syn ) ); /* st->Q_syn */

                move16();

                Scale_sig( st->hBWE_FD->old_syn_12k8_16k_fx, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ), sub( st->Q_syn, st->hBWE_FD->q_mem_deemph_old_syn ) ); /* st->Q_syn */

#if defined( NONBE_FIX_ISSUE_2206 ) && defined( HARMONIZE_ACELP_ENC )

                Scale_sig( old_syn_12k8_16k, st->L_frame, sub( st->Q_syn, sub( Q_new, 1 ) ) );

#endif

                save_old_syn_fx( st->L_frame, syn1_fx, old_syn_12k8_16k, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );

#ifdef HARMONIZE_ACELP_ENC

                Scale_sig( old_syn_12k8_16k, st->L_frame, sub( sub( Q_new, 1 ), st->Q_syn ) ); // Q_syn
@@ -1514,6 +1520,9 @@ ivas_error acelp_core_enc_ivas_fx( 
#ifdef HARMONIZE_ACELP_ENC

            IF( st->element_mode == EVS_MONO )

            {

#ifdef NONBE_FIX_ISSUE_2206

                assert( Q_new - 1 == 0 );

#endif

                save_old_syn_fx( st->L_frame, syn_fx, old_syn_12k8_16k, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );

            }

            ELSE
@@ -1522,7 +1531,9 @@ ivas_error acelp_core_enc_ivas_fx( 
                st->hBWE_FD->mem_deemph_old_syn_fx = shl_sat( st->hBWE_FD->mem_deemph_old_syn_fx, sub( s_min( st->Q_syn, st->hBWE_FD->q_mem_deemph_old_syn ), st->hBWE_FD->q_mem_deemph_old_syn ) ); // s_min( st->Q_syn, st->hBWE_FD->q_mem_deemph_old_syn )

                move16();

                Scale_sig( st->hBWE_FD->old_syn_12k8_16k_fx, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ), sub( s_min( st->Q_syn, st->hBWE_FD->q_mem_deemph_old_syn ), st->hBWE_FD->q_mem_deemph_old_syn ) ); // s_min( st->Q_syn, st->hBWE_FD->q_mem_deemph_old_syn )



#if defined( NONBE_FIX_ISSUE_2206 ) && defined( HARMONIZE_ACELP_ENC )

                Scale_sig( old_syn_12k8_16k, st->L_frame, sub( st->Q_syn, sub( Q_new, 1 ) ) );

#endif

                save_old_syn_fx( st->L_frame, syn_fx, old_syn_12k8_16k, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );

#ifdef HARMONIZE_ACELP_ENC

                Scale_sig( old_syn_12k8_16k, st->L_frame, sub( sub( Q_new, 1 ), st->Q_syn ) ); // Q_syn