Commit 63ceea43 authored by multrus's avatar multrus
Browse files

wrap in switch

parent cf372e4b

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ 
#define FIX_657_REMOVE_EDITING                          /* Nokia: Remove remaining unused coded related to object editing */

#define FIX_634_MASA_JBM_UNUSED_PARAMETER               /* Nokia: Fix issue 634 by removing the unnecessary argument. */

#define FIX_675_WB_OMASA                                /* Nokia: Fix for issue 675 solving the crash in OMASA for WB input */

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



/* ################## End BE DEVELOPMENT switches ######################### */

lib_dec/ivas_init_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -1537,6 +1537,7 @@ 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 )

        {
@@ -1548,6 +1549,7 @@ 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



#ifdef OSBA_BR_SWITCHING

        if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )