Commit c3e4e19c authored by vaclav's avatar vaclav
Browse files

Merge branch '1855-ref-PortFlpMr1611' into 'ivas-float-update' 

[non-BE] Port MR1611 from float to FLP-ref

See merge request !2054
parents 45e1df50 38dabad3

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ 
#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 FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

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



#define NONBE_1894_OSBA_SCALING                         /* FhG: port OSBA scaling MRs (298,355,360) jointly */

#define NONBE_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

lib_dec/ivas_stereo_cng_dec.c

+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;

    }

lib_dec/ivas_stereo_switching_dec.c

+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;

lib_enc/ivas_stereo_switching_enc.c

+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 )

        {