Commit 70cf2baf authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch '13-sba-cpe-mct-artefacts-in-drums-vector-at-48khz-encode-16khz-decode-64-160-256kbps-189-2_revVE' into 'main'

Resolve "SBA CPE/MCT artefacts in 'Drums' vector at 48khz encode / 16kHz decode, 64/160/256kbps (189)" revVE

See merge request !179
parents b4f570ab 01c9d956

lib_com/ivas_prot.h

+0 −8
Original line number Diff line number Diff line
@@ -860,10 +860,6 @@ void stereo_enc_itd_init( 
void stereo_dft_enc_update(

    STEREO_DFT_ENC_DATA_HANDLE hStereoDft,                      /* i/o: encoder DFT stereo handle           */

    const int16_t max_bwidth                                    /* i  : maximum encoded bandwidth           */

#ifdef DEBUG_MODE_DFT

    ,

    const int16_t res_code_bits                                 /* i  : bits for residual coding           */

#endif

);



void stereo_dft_enc_destroy(
@@ -2000,10 +1996,6 @@ void decoder_tcx_tns( 
    const int16_t bfi,                                          /* i  : Bad frame indicator                     */

    const int16_t frame_cnt,                                    /* i  : frame counter in the super frame        */

    const int16_t whitenedDomain 

#ifdef FIX_I13_TCX_TNS_ISSUE

    ,

    const int16_t isEvsMono /*i: EVS mono flag */

#endif

);



void decoder_tcx_imdct(

lib_com/prot.h

+1 −6
Original line number Diff line number Diff line
@@ -7137,8 +7137,7 @@ void lsf_weight_2st( 
    const float *lsfq,

    float *w,

    const int16_t mode,

    const int32_t sr_core 

);

    const int32_t sr_core );



void mdct_window_sine(

    float *window,
@@ -7886,10 +7885,6 @@ void decoder_tcx( 
    const int16_t bfi,                  /* i  : Bad frame indicator                   */

    const int16_t frame_cnt,            /* i  : frame counter in the super_frame      */

    const int16_t sba_dirac_stereo_flag /* i  : signal stereo output for SBA DirAC    */

#ifdef FIX_I13_TCX_TNS_ISSUE

    ,

    const int16_t isEvsMono /*i: EVS mono flag */

#endif

);



void decoder_tcx_post(

lib_dec/dec_LPD.c

+2 −12
Original line number Diff line number Diff line
@@ -595,12 +595,7 @@ void decoder_LPD( 
        }



        /* TCX decoder */

        decoder_tcx( st, prm, Aq, Aind, &synth[0], &synthFB[0], bfi, 0, 0

#ifdef FIX_I13_TCX_TNS_ISSUE

                     ,

                     1

#endif

        );

        decoder_tcx( st, prm, Aq, Aind, &synth[0], &synthFB[0], bfi, 0, 0 );

    }



    /*--------------------------------------------------------------------------------*
@@ -626,12 +621,7 @@ void decoder_LPD( 
            IGFDecRestoreTCX10SubFrameData( st->hIGFDec, k );



            /* TCX decoder */

            decoder_tcx( st, prm, Aq, Aind, &synth[k * L_frame / 2], &synthFB[k * L_frameTCX / 2], bfi, k, 0

#ifdef FIX_I13_TCX_TNS_ISSUE

                         ,

                         1

#endif

            );

            decoder_tcx( st, prm, Aq, Aind, &synth[k * L_frame / 2], &synthFB[k * L_frameTCX / 2], bfi, k, 0 );

        }

    }

lib_dec/dec_tcx.c

+3 −17
Original line number Diff line number Diff line
@@ -68,10 +68,6 @@ void decoder_tcx( 
    const int16_t bfi,                  /* i  : Bad frame indicator                    */

    const int16_t frame_cnt,            /* i  : frame counter in the super frame       */

    const int16_t sba_dirac_stereo_flag /* i  : signal stereo output for SBA DirAC     */

#ifdef FIX_I13_TCX_TNS_ISSUE

    ,

    const int16_t isEvsMono /*i: EVS mono flag */

#endif

)

{

    float x[N_MAX];
@@ -112,12 +108,7 @@ void decoder_tcx( 


    decoder_tcx_noiseshaping_igf( st, L_spec, L_frame, L_frameTCX, left_rect, &x[0], &gainlpc2[0], &tmp_concealment_method, bfi );



    decoder_tcx_tns( st, L_frame_glob, L_spec, L_frame, L_frameTCX, &x[0], fUseTns, &tnsData, bfi, frame_cnt, 0

#ifdef FIX_I13_TCX_TNS_ISSUE

                     ,

                     isEvsMono

#endif

    );

    decoder_tcx_tns( st, L_frame_glob, L_spec, L_frame, L_frameTCX, &x[0], fUseTns, &tnsData, bfi, frame_cnt, 0 );



    decoder_tcx_imdct( st, L_frame_glob, L_frameTCX_glob, L_spec, tcx_offset, tcx_offsetFB, L_frame, L_frameTCX, left_rect, &x[0], &xn_buf[0], MDCT_IV,

                       fUseTns, &synth[0], &synthFB[0], bfi, frame_cnt, 0, sba_dirac_stereo_flag );
@@ -1497,12 +1488,7 @@ void decoder_tcx_tns( 
    STnsData *tnsData,

    const int16_t bfi,       /* i  : Bad frame indicator                     */

    const int16_t frame_cnt, /* i  : frame counter in the super frame        */

    const int16_t whitenedDomain

#ifdef FIX_I13_TCX_TNS_ISSUE

    ,

    const int16_t isEvsMono /*i: EVS mono flag */

#endif

)

    const int16_t whitenedDomain )

{

    int16_t index, isTCX5, L;

    TCX_CONFIG_HANDLE hTcxCfg = st->hTcxCfg;
@@ -1573,7 +1559,7 @@ void decoder_tcx_tns( 
#ifndef FIX_I13_TCX_TNS_ISSUE

            tcx5TnsUngrouping( L_frameTCX >> 1, hTcxCfg->tnsConfig[0][0].iFilterBorders[0] >> 1, x, DEC );

#else

            if ( isEvsMono ) /*tbc: this is temporary to maintain EVS BE, this is a bug and should be fixed also for EVS (see issue 13) */

            if ( st->element_mode == EVS_MONO ) /* TBC: this is temporary to maintain EVS BE, this is a bug and should be fixed also for EVS (see issue 13) */

            {

                tcx5TnsUngrouping( L_frameTCX >> 1, hTcxCfg->tnsConfig[0][0].iFilterBorders[0] >> 1, x, DEC );

            }

lib_dec/ivas_mdct_core_dec.c

+2 −12
Original line number Diff line number Diff line
@@ -1112,23 +1112,13 @@ void ivas_mdct_core_tns_ns( 
            }



            decoder_tcx_tns( st, L_frame_global[ch], L_spec[ch], L_frame[ch], L_frameTCX[ch], &x[ch][k][0],

                             fUseTns[ch][k], &tnsData[ch][k], bfi, k, 1

#ifdef FIX_I13_TCX_TNS_ISSUE

                             ,

                             0

#endif

            );

                             fUseTns[ch][k], &tnsData[ch][k], bfi, k, 1 );



            sns_shape_spectrum( x[ch][k], st->hTcxCfg->psychParamsCurrent, &sns_int_scf[0], st->hTcxCfg->psychParamsCurrent->nBins );

            v_multc( x[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sns_int_scf[FDNS_NPTS - 1], x[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, L_spec[ch] - st->hTcxCfg->psychParamsCurrent->nBins );



            decoder_tcx_tns( st, L_frame_global[ch], L_spec[ch], L_frame[ch], L_frameTCX[ch], &x[ch][k][0],

                             fUseTns[ch][k], &tnsData[ch][k], bfi, k, 0

#ifdef FIX_I13_TCX_TNS_ISSUE

                             ,

                             0

#endif

            );

                             fUseTns[ch][k], &tnsData[ch][k], bfi, k, 0 );

        }



        if ( bfi && st->tonal_mdct_plc_active )