Commit fc81006a authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_778_TNS_UNFIED_STEREO_MSAN

parent 69a35f84

lib_com/options.h

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


#define NONBE_FIX_774_OSBA_MONO_DEC_CRASH                     /* FhG: issue 774: decoder crash for OSBA to mono */

#define NONBE_FIX_802_PARAMUPMIX_HIGHPASS                     /* Dlb: issue 802: Move HighPass filter operation for ParamUpmix */

#define NONBE_FIX_778_TNS_UNFIED_STEREO_MSAN                  /* FhG: Issue 778: MSAN error due to uninitialized TNS configuration */

#define NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ                 /* VA: issue 797:  fix of crash when the separated object is inactive and the MASA metadata is using very few bits */

#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 */

lib_enc/ivas_tcx_core_enc.c

+0 −6
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ void stereo_tcx_init_enc( 
    Encoder_State *st /* i/o: encoder state structure */

)

{

#ifdef NONBE_FIX_778_TNS_UNFIED_STEREO_MSAN

    int16_t prev_IsTNSAllowed;

#endif

    assert( st->core_brate != SID_2k40 && st->core_brate != FRAME_NO_DATA );



    /* Get the raw coder type from signal analysis*/
@@ -103,21 +101,17 @@ void stereo_tcx_init_enc( 
    st->hTcxCfg->resq = getResq( st->bits_frame_nominal * FRAMES_PER_SEC );

    st->hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_mode, st->element_mode );

    st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode );

#ifdef NONBE_FIX_778_TNS_UNFIED_STEREO_MSAN

    prev_IsTNSAllowed = st->hTcxCfg->fIsTNSAllowed;

#endif

    if ( st->element_mode != EVS_MONO )

    {

        st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode );

    }

#ifdef NONBE_FIX_778_TNS_UNFIED_STEREO_MSAN

    if ( !prev_IsTNSAllowed && st->hTcxCfg->fIsTNSAllowed && st->element_mode == IVAS_CPE_DFT ) /* may happen in unified stereo when switching stereo technologies */

    {

        InitTnsConfigs( st->bwidth, st->hTcxCfg->tcx_coded_lines, st->hTcxCfg->tnsConfig, st->hIGFEnc->infoStopFrequency, st->bits_frame_nominal * FRAMES_PER_SEC, st->element_mode, 0 );



        SetAllowTnsOnWhite( st->hTcxCfg->tnsConfig, 0 );

    }

#endif

    st->core_brate = st->total_brate;



    return;