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

Correct some comments about Q format. Correct Q_old_syn_12k8_16k bevore call... 

Correct some comments about Q format. Correct Q_old_syn_12k8_16k bevore call to acelp_core_enc_ivas_fx, but no change in a testcase has been observed yet.
parent fa6bd516

lib_enc/ivas_core_enc_fx.c

+6 −2
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ ivas_error ivas_core_enc_fx( 
        IF( EQ_32( ivas_format, SBA_FORMAT ) )

        {

#ifdef NONBE_FIX_ISSUE_2206

            IF( NE_32( ( error = pre_proc_ivas_fx( st, last_element_mode, element_brate, last_element_brate, input_frame, old_inp_12k8_fx[n] /* i: -1, o: Q_new - 1 */, old_inp_16k_fx[n] /* i: -1, o: Q_new - 1 */,

            IF( NE_32( ( error = pre_proc_ivas_fx( st, last_element_mode, element_brate, last_element_brate, input_frame, old_inp_12k8_fx[n] /* i/o: Q_new - 1 */, old_inp_16k_fx[n] /* i/o: Q_new - 1 */,

                                                   &inp_fx[n], &ener_fx[n], A_fx[n], Aw_fx[n], epsP_fx[n], &epsP_fx_q[n], lsp_new_fx[n], lsp_mid_fx[n], new_inp_resamp16k_fx[n], &q_new_inp_resamp16k_fx[n], &Voicing_flag[n], old_wsp_fx[n], e_old_wsp[n], loc_harm[n],

                                                   vad_flag_dtx[n], MCT_flag, vad_hover_flag[n], flag_16k_smc, enerBuffer_fx[n], enerBuffer_fx_exp[n], fft_buff_fx[n], cor_map_sum_fx[n], &Q_new[n] ) ),

                       IVAS_ERR_OK ) )
@@ -252,7 +252,7 @@ ivas_error ivas_core_enc_fx( 
        ELSE

        {

#ifdef NONBE_FIX_ISSUE_2206

            IF( NE_32( ( error = pre_proc_ivas_fx( st, last_element_mode, element_brate, element_brate, input_frame, old_inp_12k8_fx[n] /* i: -1, o: Q_new - 1 */, old_inp_16k_fx[n] /* i: -1, o: Q_new - 1 */,

            IF( NE_32( ( error = pre_proc_ivas_fx( st, last_element_mode, element_brate, element_brate, input_frame, old_inp_12k8_fx[n] /* i/o: Q_new - 1 */, old_inp_16k_fx[n] /* i/o: Q_new - 1 */,

                                                   &inp_fx[n], &ener_fx[n], A_fx[n], Aw_fx[n], epsP_fx[n], &epsP_fx_q[n], lsp_new_fx[n], lsp_mid_fx[n], new_inp_resamp16k_fx[n], &q_new_inp_resamp16k_fx[n], &Voicing_flag[n], old_wsp_fx[n], e_old_wsp[n], loc_harm[n],

                                                   vad_flag_dtx[n], MCT_flag, vad_hover_flag[n], flag_16k_smc, enerBuffer_fx[n], enerBuffer_fx_exp[n], fft_buff_fx[n], cor_map_sum_fx[n], &Q_new[n] ) ),

                       IVAS_ERR_OK ) )
@@ -338,7 +338,11 @@ ivas_error ivas_core_enc_fx( 
        IF( st->core == ACELP_CORE )

        {

            /* ACELP core encoder */

#ifdef NONBE_FIX_ISSUE_2206

            Word16 Q_old_syn_12k8_16k = sub( Q_new[n], 1 );

#else

            Word16 Q_old_syn_12k8_16k = 0;

#endif

            move16();

            IF( NE_32( ( error = acelp_core_enc_ivas_fx( st, inp_fx[n], /*ener[n],*/ A_fx[n], Aw_fx[n], epsP_fx[n], lsp_new_fx[n], lsp_mid_fx[n], vad_hover_flag[0], attack_flag[n], bwe_exc_extended_fx[n], voice_factors_fx[n], old_syn_12k8_16k_fx[n], &Q_old_syn_12k8_16k, pitch_buf_fx[n], &unbits[n], hStereoTD, tdm_lsfQ_PCh_fx, Q_new[n] ) ), IVAS_ERR_OK ) )

            {