Commit 8eb844e9 authored by vaclav's avatar vaclav
Browse files

Revert "port MR" 

This reverts commit 4b4561ac.
parent 4b4561ac

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ 
#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_stereo_cng_dec_fx.c

+1 −5
Original line number Diff line number Diff line
@@ -1422,17 +1422,13 @@ void stereo_cna_update_params_fx( 
    {

        FindEmEs_fx( output_fx[0], output_fx[1], output_frame, &hCPE->lt_es_em_fx );





        hCPE->hStereoCng->first_SID_after_TD = 1; /* Q0 */

        move16();

        stereo_cng_compute_LRcorr_fx( hCPE, output_fx, output_frame, tdm_ratio_idx );

    }

    ELSE

    {

#ifdef NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING

        hFdCngDec->first_cna_noise_updated = 0;

        move16();

#endif



        return;

    }

lib_dec/ivas_stereo_switching_dec_fx.c

+6 −15
Original line number Diff line number Diff line
@@ -1689,15 +1689,12 @@ void synchro_synthesis_fx( 
 * Handling of memories in case of CPE modes switching

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



static const Word32 side_gain_table[32 + 1] = {

    -ONE_IN_Q31, -2040109440, -1932735232, -1825361152, -1717986944,

Word32 side_gain_table[32 + 1] = { -ONE_IN_Q31, -2040109440, -1932735232, -1825361152, -1717986944,

                                   -1610612736, -1503238528, -1395864320, -1288490240, -1181115904, -1073741824,

                                   -966367616, -858993408, -751619200, -644245120, -536870912, -429496704,

                                   -322122496, -214748288, -107374208, 0, 107374336, 214748416,

                                   322122496, 429496832, 536870912, 644245248, 751619328, 858993408,

    966367744, 1073741824, 1181116160, 1288490240

};



                                   966367744, 1073741824, 1181116160, 1288490240 };

void stereo_switching_dec(

    CPE_DEC_HANDLE hCPE,          /* i/o: CPE decoder structure         */

    const Word32 ivas_total_brate /* i  : IVAS total bitrate          Q0*/
@@ -1989,12 +1986,6 @@ void stereo_switching_dec( 


        Copy( sts[0]->lsf_old_fx, sts[1]->lsf_old_fx, M ); /* Q2.56 */

        Copy( sts[0]->lsp_old_fx, sts[1]->lsp_old_fx, M ); /* Q15 */



#ifdef NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING

        sts[1]->last_core_brate = sts[0]->last_core_brate;

        move16();

#endif



        IF( EQ_16( hCPE->element_mode, IVAS_CPE_MDCT ) )

        {

            sts[1]->last_core = sts[0]->last_core; /* Q0 */

lib_enc/ivas_stereo_switching_enc_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -906,14 +906,8 @@ void stereo_switching_enc_fx( 
        Copy( sts[0]->lsf_old1_fx, sts[1]->lsf_old1_fx, M ); /* Qlog2(2.56) */

        Copy( sts[0]->lsp_old1_fx, sts[1]->lsp_old1_fx, M ); /* Q15 */



#ifdef NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING

        sts[1]->last_core_brate = sts[0]->last_core_brate;

        move16();

#endif



        sts[1]->GSC_noisy_speech = 0;

        move16();



        IF( EQ_16( hCPE->element_mode, IVAS_CPE_MDCT ) )

        {

            /* cross-fade overlap region of DFT Stereo downmix and original stereo channels */