Commit cdd11cde authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_878_RS_FEC_STEREO_CNG

parent ca924202
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@
/* all switches in this category should start with "NONBE_" */

#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/
#define NONBE_FIX_878_RS_FEC_STEREO_CNG                       /* Eri: Frame loss and Unified Stereo CNG may cause false BER detection which results in corrupt bitstream decoding */
#define NONBE_FIX_904_JBM_SBA_RS_FOA                          /* FhG: issue #904: fix JBM SBA RS to FOA decoding */
#define NONBE_FIX_898_ISM_BRATE_CRASH                         /* VA: issue 898: fix decoder crash in ISM bitrate switching with DTX and binaural output */
#define NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC                /* DLB: issue 862 : UBSAN: out-of-bound error in SPAR for OSBA bitrate switching with PLC*/
+0 −2
Original line number Diff line number Diff line
@@ -248,10 +248,8 @@ ivas_error ivas_cpe_dec(
            {
                nb_bits -= SID_FORMAT_NBITS;
                sts[1]->bit_stream -= SID_FORMAT_NBITS;
#ifdef NONBE_FIX_878_RS_FEC_STEREO_CNG
                /* set total bitrate of Stereo CNG parameters for BER detection */
                sts[1]->total_brate = IVAS_SID_5k2 - SID_2k40;
#endif
            }

            if ( ( ( st_ivas->ivas_format == MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE ) || ( st_ivas->ivas_format == MASA_ISM_FORMAT && cpe_brate < MASA_STEREO_MIN_BITRATE ) ) && ivas_total_brate > IVAS_SID_5k2 )