Commit 0fc61df2 authored by multrus's avatar multrus
Browse files

Merge branch '691-osba-crash-for-stereo-output' into 'main' 

Resolve "OSBA crash for stereo output"

See merge request !946
parents 447d2c2a 9afaa295

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ 
#endif



#define FIX_264_AUDIO_CHANNELS_TO_HEAP                  /* VA: issue 243: Move audio channels memory from stack to heap */

#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

+14 −0
Original line number Diff line number Diff line
@@ -1532,6 +1532,20 @@ 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 )

        {

            if ( ( error = create_cpe_dec( st_ivas, cpe_id, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK )

            {

                return error;

            }



            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 )

        {