Commit 47936d8f authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1601_basop_port_fl1354' into 'main-pc' 

Port Float MR 1354 to main-pc

See merge request !1609
parents bfc890b6 499840dc

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ 
#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 FIX_983_DISC_ISM_DIGEST_NUM_OBJS                /* FhG: issue #983: the discrete ISM digest function uses the wrong number of objects */

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





/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_sba_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -282,7 +282,11 @@ 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 )