Commit 58e1cd8c authored by Manuel Jander's avatar Manuel Jander
Browse files

Improve Q_new update inside ivas_compute_core_buffers_fx(). Deactivate scale... 

Improve Q_new update inside ivas_compute_core_buffers_fx(). Deactivate scale change in DFT downmix domain, to be reactivated later.
parent 885344ce

lib_enc/ivas_core_pre_proc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ ivas_error ivas_compute_core_buffers_fx( 
    Word16 epsP_l[M + 1];



#ifdef NONBE_FIX_ISSUE_2206

    Word16 headroom = 2, preemp_len = 0, inp_max = 0;

    Word16 headroom = sub( 1, Q_old_inp_16k ), preemp_len = 0, inp_max = 0;

#else

    Word16 headroom = 1, preemp_len = 0, inp_max = 0;

#endif

lib_enc/ivas_stereo_switching_enc_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ void stereo_switching_enc_fx( 
        /* window DFT synthesis overlap memory @input_Fs, primary channel */

        FOR( i = 0; i < dft_ovl; i++ )

        {

#ifdef NONBE_FIX_ISSUE_2206

#ifdef NONBE_FIX_ISSUE_2206_NO

            hCPE->hStereoDft->output_mem_dmx_fx[i] = Mpy_32_32_r( hCPE->hStereoDft->win_fx[dft_ovl - 1 - i], old_input_signal_pri[input_frame - dft_ovl + i] ); // q_inp

#else

            hCPE->hStereoDft->output_mem_dmx_fx[i] = L_shl_sat( Mpy_32_32_r( hCPE->hStereoDft->win_fx[dft_ovl - 1 - i], old_input_signal_pri[input_frame - dft_ovl + i] ), sub( 15, q_inp ) ); // Q15
@@ -722,7 +722,7 @@ void stereo_switching_enc_fx( 
            hCPE->hStereoDft->output_mem_dmx_12k8_fx[i] = L_shr( Mpy_32_16_r( hCPE->hStereoDft->win_12k8_fx[STEREO_DFT_OVL_12k8 - 1 - i], sts[0]->buf_speech_enc[L_FRAME32k + L_FRAME - STEREO_DFT_OVL_12k8 + i] ), sub( 16, sts[0]->exp_buf_speech_enc ) ); /* Q15 */

            move32();

        }

#ifdef NONBE_FIX_ISSUE_2206

#ifdef NONBE_FIX_ISSUE_2206_NO

        Word16 q_dmx = q_inp;

#else

        Word16 q_dmx = Q15;
@@ -730,7 +730,7 @@ void stereo_switching_enc_fx( 
        move16();

        /* update DFT synthesis overlap memory @16kHz, primary channel only */

        L_lerp_fx( hCPE->hStereoDft->output_mem_dmx_fx, hCPE->hStereoDft->output_mem_dmx_16k_fx, STEREO_DFT_OVL_16k, dft_ovl, &q_dmx );

#ifdef NONBE_FIX_ISSUE_2206

#ifdef NONBE_FIX_ISSUE_2206_NO

        scale_sig32( hCPE->hStereoDft->output_mem_dmx_16k_fx, STEREO_DFT_OVL_16k, sub( q_inp, q_dmx ) );

        scale_sig32( hCPE->hStereoDft->output_mem_dmx_fx, STEREO_DFT_OVL_MAX, sub( q_inp, q_dmx ) );

#else