Commit 2a5711ea authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN

parent d27a7334

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ 
#define NONBE_FIX_951_MCMASA_5MS_RENDERING              /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2 kbps to BINAURAL */

#define NONBE_FIX_979_OSBA_STEREO_5MS                   /* FhG : issue #979 : 5ms and 20ms output different for OSBA and stereo */



#define NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN             /* FhG : issue #974: usan in mono and stereo output in OSBA JBM RS */

#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */

#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS              /* FhG : issue #982 : 5ms and 20ms output different for OMASA */

#define NONBE_FIX_986_MC_BW_SWITCHING                   /* FhG: fix crash in bw and br switching with MC */

lib_dec/ivas_sba_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -282,11 +282,7 @@ ivas_error ivas_sba_dec_reconfigure_fx( 
    }



    /* save old */

#ifdef NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN

    IF( NE_16( ism_mode_old, ISM_SBA_MODE_DISC ) && NE_16( st_ivas->hTcBuffer->tc_buffer_mode, TC_BUFFER_MODE_BUFFER ) )

#else

    IF( NE_16( ism_mode_old, ISM_SBA_MODE_DISC ) )

#endif

    {

        test();

        IF( st_ivas->hDirAC == NULL && st_ivas->hSpar != NULL )