Commit 3ca869a3 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING

parent 94c0c67b

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ 
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */



#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

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

#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */

#define FIX_1121_MASA_DESCRIPTOR                        /* VA: issue 1121: Define 'ivasmasaFormatDescriptor' at one common place */

#define NONBE_1894_OSBA_SCALING                         /* FhG: do not scale OSBA inputs by 0.5 any more */

lib_dec/ivas_stereo_cng_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -1429,10 +1429,8 @@ void stereo_cna_update_params_fx( 
    }

    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

+0 −2
Original line number Diff line number Diff line
@@ -1993,10 +1993,8 @@ 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 ) )

        {

lib_enc/ivas_stereo_switching_enc_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -906,10 +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();