Commit 87c1c752 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch... 

Merge branch '775-osba-bitrate-switching-crashes-with-foa-and-hoa2-output-with-higher-order-input' into 'main'

[non-BE] Resolve "OSBA bitrate switching crashes with FOA and HOA2 output with higher order input"

See merge request !1089
parents 569c63df dc2163c4

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ 
#define NONBE_FIX_798_OSBA_MC_DEC_CRASH

#define NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX             /* Nokia: issue 806: fix one separated object mode transport mix of the separated object */

#define NONBE_FIX_809_EXTERNAL_TARGET_INTERPOLATION           /* FhG: issue 809: unify external target interpolation inter and intra frame behaviour */

#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 JBM_FOR_OSBA                                          /* FhG: implement OSBA format in the JBM path */

lib_dec/ivas_sba_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -479,6 +479,12 @@ 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

    }

#endif