Commit 83285383 authored by vaclav's avatar vaclav
Browse files

issue 849: fix OMASA 2TC and FEC crashes; under NONBE_FIX_849_OMASA_BFI_CRASH

parent b15a5701

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ 
#define NONBE_FIX_840_PARAMMC_RS                              /* FhG: Issue #840: Resolve "MC RS ParamMC hoa encoder wrongly set to zero" */

#define NONBE_FIX_826_JBM_MASA_CNA_CNG                        /* FhG: issue #826:  Resolve "JBM MASA: CNA and CNG not in sync with non-JBM decoding" */

#define NONBE_FIX_835_JBM_PARAMUPMIX_HEADROT                  /* FhG: issue #835: Resolve "JBM: ParamUpmix head rotation broken" */

#define NONBE_FIX_849_OMASA_BFI_CRASH                         /* VA: issue 849: fix OMASA 2TC and FEC crashes */





/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_cpe_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1106,7 +1106,11 @@ static void stereo_mode_combined_format_dec( 
{

    int32_t element_brate_ref;



#ifdef NONBE_FIX_849_OMASA_BFI_CRASH

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT && !st_ivas->bfi )

#else

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

#endif

    {

        element_brate_ref = hCPE->element_brate;