Commit 6c31c0c0 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING

parent f2b15a11

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ 
#define NONBE_FIX_975_JBM_USAN                          /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */

#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */



#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */

#define NONBE_FIX_986_MC_BW_SWITCHING                   /* FhG: fix crash in bw and br switching with MC */

#define NONBE_FIX_999_JBM_MCT_FLUSH                     /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */

#define NONBE_FIX_1000_G1_G2_SWB_TBE                    /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */

lib_enc/ivas_mct_core_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -279,14 +279,10 @@ void ivas_mct_core_enc( 


        if ( switch_bw )

        {

#ifdef FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING

            H_IGF_GRID igf_grid;



            igf_grid = sts[ch_core]->igf ? sts[ch_core]->hIGFEnc->igfData.igfInfo.grid : NULL;

            initMdctStereoEncData( hMCT->hBlockData[ch]->hStereoMdct, ivas_format, sts[ch_core]->element_mode, sts[ch_core]->element_brate, sts[ch_core]->bwidth, sts[ch_core]->igf, igf_grid, 0 );

#else

            initMdctStereoEncData( hMCT->hBlockData[ch]->hStereoMdct, ivas_format, sts[ch_core]->element_mode, sts[ch_core]->element_brate, sts[ch_core]->bwidth, sts[ch_core]->igf, sts[ch_core]->hIGFEnc->igfData.igfInfo.grid, 0 );

#endif

        }



        if ( sts[ch_core]->igf )