Commit b02f619a authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2432_ISM_SPIKES_16KHZ

parent b4663527

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ 
/* any switch which is non-be wrt. TS 26.258 V3.0 */

#define FIX_FLOAT_1493_MASA_ENCODE_STABILITY_IMPROVE    /* Nokia: float issue 1493: Improves float decision stability in MASA encoding by adjusting reduction code */



#define FIX_2432_ISM_SPIKES_16KHZ                       /* VA: basop issue 2432: fix spikes in ISM decoding at 16kHz output sampling rate */

#define FIX_FLOAT_1518                                  /* FhG: fix issue 1518: loudness differences in OSBA decoding to mono or stereo output */

#define FIX_FLOAT_1533_BLEND_SUBFR2                     /* FhG: float issue 1533: correct blending in blend_subfr2() */

lib_dec/ivas_core_dec.c

+0 −14
Original line number Diff line number Diff line
@@ -76,11 +76,7 @@ ivas_error ivas_core_dec( 
    float tmp_buffer[L_FRAME48k];

    int16_t tmps, incr;

    float *bwe_exc_extended[CPE_CHANNELS] = { NULL, NULL };

#ifdef FIX_2432_ISM_SPIKES_16KHZ

    int16_t flag_bwe_bws, flag_swb_tbe;

#else

    int16_t flag_bwe_bws;

#endif

    float voice_factors[CPE_CHANNELS][NB_SUBFR16k];

    int16_t core_switching_flag[CPE_CHANNELS];

    float old_syn_12k8_16k[CPE_CHANNELS][L_FRAME16k];
@@ -517,16 +513,10 @@ ivas_error ivas_core_dec( 
         * SWB(FB) BWE decoding

         *---------------------------------------------------------------------*/



#ifdef FIX_2432_ISM_SPIKES_16KHZ

        flag_swb_tbe = ( st->extl == SWB_TBE || st->extl == FB_TBE || ( st->coder_type != AUDIO && st->coder_type != INACTIVE && st->core_brate >= SID_2k40 && st->core == ACELP_CORE && !st->con_tcx && output_Fs >= 32000 && st->bwidth > NB && st->bws_cnt > 0 ) );

#endif

        flag_bwe_bws = ( output_Fs >= 32000 && st->core == ACELP_CORE && st->bwidth > NB && st->bws_cnt > 0 && st->bfi == 0 );



#ifdef FIX_2432_ISM_SPIKES_16KHZ

        if ( flag_swb_tbe )

#else

        if ( st->extl == SWB_TBE || st->extl == FB_TBE || ( st->coder_type != AUDIO && st->coder_type != INACTIVE && st->core_brate >= SID_2k40 && st->core == ACELP_CORE && !st->con_tcx && output_Fs >= 32000 && st->bwidth > NB && st->bws_cnt > 0 ) )

#endif

        {

            /* SWB TBE decoder */

            swb_tbe_dec( st, hStereoICBWE, bwe_exc_extended[n], voice_factors[n], old_syn_12k8_16k[n], tmp_buffer /*fb_exc*/, hb_synth[n], pitch_buf[n] );
@@ -543,12 +533,8 @@ ivas_error ivas_core_dec( 
            swb_bwe_dec( st, output[n], synth[n], hb_synth[n], use_cldfb_for_dft, output_frame );

        }



#ifdef FIX_2432_ISM_SPIKES_16KHZ

        /* set hb_synth[n] buffer to zeros in case of no BWE decoding */

        if ( ( st->core == ACELP_CORE && ( st->extl == -1 || st->extl == SWB_CNG || ( st->extl == WB_BWE && st->bws_cnt > 0 && flag_swb_tbe == 0 ) ) ) && flag_bwe_bws == 0 )

#else

        if ( ( st->core == ACELP_CORE && ( st->extl == -1 || st->extl == SWB_CNG ) ) && flag_bwe_bws == 0 )

#endif

        {

            set_f( hb_synth[n], 0.0f, L_FRAME48k );

        }