Commit 0e9ba170 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING

parent debf58bb

lib_com/options.h

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

#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 FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */

#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 FIX_1121_MASA_DESCRIPTOR                        /* VA: issue 1121: Define 'ivasmasaFormatDescriptor' at one common place */

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

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

lib_dec/ivas_stereo_cng_dec.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -923,9 +923,7 @@ void stereo_cna_update_params( 
    }

    }

    else

    else

    {

    {

#ifdef NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING

        hFdCngDec->first_cna_noise_updated = 0;

        hFdCngDec->first_cna_noise_updated = 0;

#endif





        return;

        return;

    }

    }

lib_dec/ivas_stereo_switching_dec.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1552,9 +1552,7 @@ void stereo_switching_dec( 
        mvr2r( sts[0]->lsf_old, sts[1]->lsf_old, M );

        mvr2r( sts[0]->lsf_old, sts[1]->lsf_old, M );

        mvr2r( sts[0]->lsp_old, sts[1]->lsp_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;

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

#endif





        if ( hCPE->element_mode == IVAS_CPE_MDCT )

        if ( hCPE->element_mode == IVAS_CPE_MDCT )

        {

        {

lib_enc/ivas_stereo_switching_enc.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -801,9 +801,7 @@ void stereo_switching_enc( 
        mvr2r( sts[0]->lsf_old1, sts[1]->lsf_old1, M );

        mvr2r( sts[0]->lsf_old1, sts[1]->lsf_old1, M );

        mvr2r( sts[0]->lsp_old1, sts[1]->lsp_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;

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

#endif





        sts[1]->GSC_noisy_speech = 0;

        sts[1]->GSC_noisy_speech = 0;

        if ( hCPE->element_mode == IVAS_CPE_MDCT )

        if ( hCPE->element_mode == IVAS_CPE_MDCT )