Commit 4ae49556 authored by Manuel Jander's avatar Manuel Jander
Browse files

Correct macro name, now changes are active.

parent 6cd82539

lib_com/ivas_prot_fx.h

+2 −2
Original line number Diff line number Diff line
@@ -6089,7 +6089,7 @@ UWord16 get_indice_st( 


void stereo_mdct_core_enc_fx(

    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                   */

#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX

#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549

    Word16 new_samples[CPE_CHANNELS][L_INP],                    /* i  : new samples                       new_samples_q*/

    Word16 *new_samples_q,

#else
@@ -6141,7 +6141,7 @@ void stereo_switching_dec_fx( 


void ivas_mdct_core_whitening_enc_fx(

    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                   */

#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX

#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549

    Word16 new_samples_fx[CPE_CHANNELS][L_INP],                 /* i  : new samples                             Q_new[]-1*/

    Word16 *Q_new,                                              /* i  : new samples q                           */

#else

lib_enc/ivas_core_enc_fx.c

+6 −6
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ ivas_error ivas_core_enc_fx( 
                FOR( n = 0; n < n_CoreChannels; n++ )

                {

                    st = sts[n];

#ifndef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX

#ifndef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549

                    Scale_sig( old_inp_16k_fx[n], L_INP, sub( Q1, Q_new[n] ) ); // Q0

#endif

                    IF( NE_16( st->element_mode, IVAS_CPE_DFT ) && NE_16( st->element_mode, IVAS_CPE_MDCT ) )
@@ -448,7 +448,7 @@ ivas_error ivas_core_enc_fx( 
                Q_spec_old[1] = hCPE->hCoreCoder[1]->hTcxEnc->spectrum_long_e;

                move16();



#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX

#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549

                ivas_mdct_core_whitening_enc_fx( hCPE, old_inp_16k_fx, Q_new, old_wsp_fx, pitch_buf_fx_new, hMCT->p_mdst_spectrum_long_fx[cpe_id], hMCT->tnsBits[cpe_id], hMCT->p_orig_spectrum_long_fx[cpe_id],

                                                 hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], hMCT->hBstr, 1, hMCT->nchan_out_woLFE, mdst_spectrum_e, orig_spectrum_e );

#else
@@ -461,7 +461,7 @@ ivas_error ivas_core_enc_fx( 
                    st = sts[i];

                    Word16 nSubframes = NB_DIV;

                    move16();

#ifndef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX

#ifndef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549

                    Scale_sig( old_inp_16k_fx[i], L_INP, sub( Q_new[i], Q1 ) ); // Q_new[n] - 1

#endif

                    if ( EQ_16( st->hTcxEnc->tcxMode, TCX_20 ) )
@@ -528,7 +528,7 @@ ivas_error ivas_core_enc_fx( 
                FOR( i = 0; i < CPE_CHANNELS; i++ )

                {

                    st = sts[i];

#ifndef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX

#ifndef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549

                    Scale_sig( old_inp_16k_fx[i], L_INP, sub( Q1, Q_new[i] ) ); // Q0

#endif
@@ -565,7 +565,7 @@ ivas_error ivas_core_enc_fx( 
                Q_spec_old[1] = hCPE->hCoreCoder[1]->hTcxEnc->spectrum_long_e;

                move16();



#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX

#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549

                stereo_mdct_core_enc_fx( hCPE, old_inp_16k_fx, Q_new, old_wsp_fx, pitch_buf_fx );

#else

                stereo_mdct_core_enc_fx( hCPE, old_inp_16k_fx, old_wsp_fx, pitch_buf_fx );
@@ -573,7 +573,7 @@ ivas_error ivas_core_enc_fx( 


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

                {

#ifndef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX

#ifndef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549

                    Scale_sig( old_inp_16k_fx[i], L_INP, sub( Q_new[i], Q1 ) ); // Q_new[n] - 1

#endif

                    st = sts[i];

lib_enc/ivas_corecoder_enc_reconfig_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx( 
                    move16();

                }

            }



            ivas_mcmasa_dmx_modify_fx( len_inp_memory, input_buff_fx, q_input_buff, nSCE_old + CPE_CHANNELS * nCPE_old, st_ivas->nSCE + CPE_CHANNELS * st_ivas->nCPE );

lib_enc/ivas_mdct_core_enc_fx.c

+6 −4
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ static void compute_power_spec( 


void ivas_mdct_core_whitening_enc_fx(

    CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure                 */

#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX

#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549

    Word16 new_samples_fx[CPE_CHANNELS][L_INP], /* i  : new samples                           Q_new[]-1*/

    Word16 *Q_new,                              /* i  : new samples q                         */

#else
@@ -1209,7 +1209,7 @@ void ivas_mdct_core_whitening_enc_fx( 
    Word16 zero_side_flag[NB_DIV];

    Word16 q_com, q_min;

    Word32 *mdst_spectrum_fx[CPE_CHANNELS][NB_DIV];

#ifndef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX

#ifndef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549

    Word16 Q_new;

#endif

    Word16 q_windowedSignal[CPE_CHANNELS];
@@ -1330,12 +1330,14 @@ void ivas_mdct_core_whitening_enc_fx( 


        tcx_ltp_encode_ivas_fx( st, st->hTcxEnc->tcxMode, L_FRAME, old_wsp_fx[ch] + L_WSP_MEM + L_LOOK_12k8, NULL, old_wsp_fx[ch] + L_WSP_MEM + L_LOOK_12k8, T_op[ch], &param_core[ch][1 + NOISE_FILL_RANGES], &ltpBits[ch], NULL, 0, IVAS_CPE_MDCT );



#ifndef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX

#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549

        core_signal_analysis_high_bitrate_ivas_fx( new_samples_fx[ch] + L_INP_MEM, T_op[ch], NULL, NULL, st, tnsSize[ch], tnsBits[ch], param_core[ch], &ltpBits[ch], windowedSignal_fx[ch], st->L_frame, st->hTcxEnc->L_frameTCX, hCPE->last_element_mode, 0, mdst_spectrum_fx[ch], mdst_spectrum_e[ch], Q_new, &q_windowedSignal[ch] );

#else

        Q_new = 0;

        move16();

#endif



        core_signal_analysis_high_bitrate_ivas_fx( new_samples_fx[ch] + L_INP_MEM, T_op[ch], NULL, NULL, st, tnsSize[ch], tnsBits[ch], param_core[ch], &ltpBits[ch], windowedSignal_fx[ch], st->L_frame, st->hTcxEnc->L_frameTCX, hCPE->last_element_mode, 0, mdst_spectrum_fx[ch], mdst_spectrum_e[ch], &Q_new, &q_windowedSignal[ch] );

#endif



        /* BWD in MDCT domain */

        IF( NE_16( st->hTcxCfg->tcx_last_overlap_mode, TRANSITION_OVERLAP ) )

lib_enc/ivas_stereo_mdct_core_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static void sync_tcx_mode_fx( 
 *-------------------------------------------------------------------*/

void stereo_mdct_core_enc_fx(

    CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure               */

#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX

#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549

    Word16 new_samples[CPE_CHANNELS][L_INP], /* i  : new samples                         Q_new[]-1*/

    Word16 *Q_new,

#else
@@ -293,7 +293,7 @@ void stereo_mdct_core_enc_fx( 
     * - TNS

     *---------------------------------------------------------------*/



#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX

#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549

    ivas_mdct_core_whitening_enc_fx( hCPE, new_samples, Q_new, old_wsp, pitch_buf_fx, p_mdst_spectrum_long_fx,

                                     tnsBits, p_orig_spectrum_long_fx, tnsSize, p_param, hBstr, 0, CPE_CHANNELS, mdst_spectrum_e, orig_spectrum_e );

#else