Commit 3a5f23d8 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_BASOP_2555_FRAMELEN_CALC

parent 25e9bebe

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_BASOP_2555_FRAMELEN_CALC                    /* FhG: BASOP issue 2555: Simplify (sub-)framelength calculation in ivas_mdct_core_tns_ns_fx() */

#define FIX_BASOP_2095_REMOVE_TABLES_PT01               /* FhG: BASOP issue 2095: remove unused tables, part 01 */

#define FIX_2346_DUPLICATED_IGF_FUNCTIONS_2             /* FhG: part 2 of basop issue 2346: Review potentially duplicated IGF functions */

#define FIX_BASOP_2563_CRASH_HQ_GENERIC_DEC             /* Eri: BASOP issue 2563: Crash in hq_generic decoding. EVS code --> solve with _sat operator */

lib_dec/ivas_mdct_core_dec_fx.c

+0 −31
Original line number Diff line number Diff line
@@ -1513,11 +1513,7 @@ void ivas_mdct_core_tns_ns_fx( 
    Word16 left_rect[CPE_CHANNELS];

    Word16 L_spec[CPE_CHANNELS];

    Word32 sns_int_scf_fx[FDNS_NPTS];

#ifdef FIX_BASOP_2555_FRAMELEN_CALC

    Word16 length;

#else

    Word16 exp, length;

#endif



    /* Initializations */

    sts = hCPE->hCoreCoder;
@@ -1532,7 +1528,6 @@ void ivas_mdct_core_tns_ns_fx( 
    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )

    {

        st = sts[ch];

#ifdef FIX_BASOP_2555_FRAMELEN_CALC

        IF( EQ_16( st->core, TCX_20_CORE ) )

        {

            nSubframes[ch] = 1;
@@ -1559,32 +1554,6 @@ void ivas_mdct_core_tns_ns_fx( 
            move16();

            move16();

        }

#else

        IF( EQ_16( st->core, TCX_20_CORE ) )

        {

            nSubframes[ch] = 1;

        }

        ELSE

        {

            nSubframes[ch] = NB_DIV;

        }

        move16();



        L_frame_global[ch] = BASOP_Util_Divide3216_Scale( st->L_frame, nSubframes[ch], &exp );

        move16();

        L_frame_global[ch] = shl( L_frame_global[ch], add( exp, 1 ) );

        move16();



        L_frameTCX_glob[ch] = BASOP_Util_Divide3216_Scale( st->hTcxDec->L_frameTCX, nSubframes[ch], &exp );

        move16();

        L_frameTCX_glob[ch] = shl( L_frameTCX_glob[ch], add( exp, 1 ) );

        move16();



        L_spec[ch] = BASOP_Util_Divide3216_Scale( st->hTcxCfg->tcx_coded_lines, nSubframes[ch], &exp );

        move16();

        L_spec[ch] = shl( L_spec[ch], add( exp, 1 ) );

        move16();

#endif



        test();

        test();