Commit 08356a68 authored by vaclav's avatar vaclav
Browse files

port MR

parent 5da31821
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@
#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 ############################ */

+4 −0
Original line number Diff line number Diff line
@@ -923,6 +923,10 @@ void stereo_cna_update_params(
    }
    else
    {
#ifdef NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING
        hFdCngDec->first_cna_noise_updated = 0;
#endif

        return;
    }

+5 −0
Original line number Diff line number Diff line
@@ -1551,6 +1551,11 @@ void stereo_switching_dec(
        mvr2r( sts[0]->old_exc, sts[1]->old_exc, L_EXC_MEM_DEC );
        mvr2r( sts[0]->lsf_old, sts[1]->lsf_old, M );
        mvr2r( sts[0]->lsp_old, sts[1]->lsp_old, M );

#ifdef NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING
        sts[1]->last_core_brate = sts[0]->last_core_brate;
#endif

        if ( hCPE->element_mode == IVAS_CPE_MDCT )
        {
            sts[1]->last_core = sts[0]->last_core;
+4 −0
Original line number Diff line number Diff line
@@ -801,6 +801,10 @@ void stereo_switching_enc(
        mvr2r( sts[0]->lsf_old1, sts[1]->lsf_old1, M );
        mvr2r( sts[0]->lsp_old1, sts[1]->lsp_old1, M );

#ifdef NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING
        sts[1]->last_core_brate = sts[0]->last_core_brate;
#endif

        sts[1]->GSC_noisy_speech = 0;
        if ( hCPE->element_mode == IVAS_CPE_MDCT )
        {