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

[cleanup] accept FIX_531_BWS_ISM_BFI

parent dc63f45a

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ 






#define FIX_531_BWS_ISM_BFI                             /* VA: issue 531: fix MemorySanitizer: use-of-uninitialized-value in ISM2 rate switching with frame errors */

#define FIX_395_CNG_BW                                  /* Eri: Issue 395 - CNG bandwidth issue for unified stereo */



#define EXTERNAL_ORIENTATIONS                           /* Nokia: Contribution 41: (external) orientation information handling */

lib_dec/ivas_core_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -504,11 +504,7 @@ ivas_error ivas_core_dec( 
         * SWB(FB) BWE decoding

         *---------------------------------------------------------------------*/



#ifdef FIX_531_BWS_ISM_BFI

        if ( st->extl == SWB_TBE || st->extl == FB_TBE || ( st->coder_type != AUDIO && st->coder_type != INACTIVE && st->core_brate >= SID_2k40 && st->core == ACELP_CORE && !st->con_tcx && output_Fs >= 32000 && st->bwidth > NB && st->bws_cnt > 0 ) )

#else

        if ( st->extl == SWB_TBE || st->extl == FB_TBE || ( st->coder_type != AUDIO && st->coder_type != INACTIVE && st->core_brate >= SID_2k40 && st->core == ACELP_CORE && output_Fs >= 32000 && st->bwidth > NB && st->bws_cnt > 0 ) )

#endif

        {

            /* SWB TBE decoder */

            swb_tbe_dec( st, hStereoICBWE, bwe_exc_extended[n], voice_factors[n], old_syn_12k8_16k[n], tmp_buffer /*fb_exc*/, hb_synth[n], pitch_buf[n] );