Commit 75afa4fb authored by vaclav's avatar vaclav
Browse files

accept NONBE_FIX_775_OSBA_BR_SWITCHING_CRASH

parent 1545e20e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ 




#define NONBE_FIX_787_PARAM_UPMIX_LEVEL                       /* Dlb: issue 787: fix level of Mono/Stereo for ParamUpmix mode */

#define NONBE_FIX_775_OSBA_BR_SWITCHING_CRASH                 /* FhG: issue 775: fix crash in OSBA with bitrate switching and output order lower than input order */

#define NONBE_FIX_827_JBM_CREND_EARLY_REFLECTIONS             /* FhG: issue #827: Resolve "JBM Crend early reflections are wrong" */

#define NONBE_FIX_833_OSBA_JBM_OBJECT_GAINS                   /* Fhg: issue #833: Resolve "JBM OSBA: the gains for the discrete objects are not computed" */

#define JBM_FOR_OSBA                                          /* FhG: implement OSBA format in the JBM path */

lib_dec/ivas_sba_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -458,12 +458,11 @@ ivas_error ivas_sba_dec_reconfigure( 


        ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ),

                                 st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 );

#ifdef NONBE_FIX_775_OSBA_BR_SWITCHING_CRASH



        if ( st_ivas->hDirAC )

        {

            st_ivas->hDirAC->hConfig->enc_param_start_band = st_ivas->hSpar->enc_param_start_band;

        }

#endif

    }



    if ( st_ivas->renderer_type == RENDERER_DISABLE )