Commit 406c8aac authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_691_OSBA_CRASH

parent e7d631f7

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ 
#define OSBA_SPLIT_RENDERING

#endif



#define FIX_691_OSBA_CRASH                              /* FhG: Fix for issue 691: Crash for OSBA Stereo out */

#define FIX_694_OMASA_EXTREME                           /* Nokia: fix for crash in OMASA on extreme sample */

#define FIX_679_JBM_MC2SBA                              /* FhG: fix issue 679: check for transport vs. internal channel count in JBM prior to ivas_mc2sba() */

#define FIX_591_PARAMISM_JBM_ENER_CORRECTION            /* FhG: fix energy correction in ParamISM rendering */

lib_dec/ivas_init_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -1512,7 +1512,6 @@ ivas_error ivas_init_decoder( 
            }

        }



#ifdef FIX_691_OSBA_CRASH

        /* create CPE element for DFT Stereo like upmix */

        if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nCPE == 0 )

        {
@@ -1524,7 +1523,6 @@ ivas_error ivas_init_decoder( 
            st_ivas->hCPE[0]->hCoreCoder[0] = st_ivas->hSCE[0]->hCoreCoder[0]; /* don't allocate unnecessary core coder, simply point to core coder of SCE element */

            st_ivas->hCPE[0]->hCoreCoder[1] = NULL;

        }

#endif



        if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        {