Commit 7dfdec5b authored by malenov's avatar malenov
Browse files

cleanup NONBE_FIX_1087_OOB_SBA_DTX_RS

parent 0ea63ae3

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ 
#define NONBE_FIX_1213_SBA_DET_MAT_INV_3BY3             /*Dolby: issue 1213: fix for inverse of det < 0*/

#define NONBE_FIX_1204_MDCT_STEREO_NOISE_EST_SCALING    /* FhG: fixes for decoder-side noise level estimation in MDCT-Stereo to prevent noise bursts in stereo switching */



#define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */

#define NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD      /* VA/Eri: FLP issue 1277: Fix Mismatch in DTX high-rate threshold between EVS float and BASOP */

#define NONBE_FIX_708_OSBA_BR_SWITCHING_CRASH           /* FhG: issue 708: fix crash in OSBA BR switching with long test vectors */

lib_dec/ivas_mct_dec.c

+0 −6
Original line number Diff line number Diff line
@@ -83,9 +83,7 @@ ivas_error ivas_mct_dec( 
    STnsData tnsData[MCT_MAX_BLOCKS][CPE_CHANNELS][NB_DIV];

    Decoder_State **sts;

    float synth[CPE_CHANNELS][L_FRAME_PLUS];

#ifdef NONBE_FIX_1087_OOB_SBA_DTX_RS

    float *p_output_orig[2];

#endif

    float output_lfe_ch[L_FRAME48k];

    int32_t ivas_total_brate;

    ivas_error error;
@@ -147,7 +145,6 @@ ivas_error ivas_mct_dec( 
    /* MCT side bits decoder */

    ivas_mct_side_bits( hMCT, st_ivas->hCPE, nCPE, st_ivas->hCPE[0]->hCoreCoder[0], st_ivas->bfi, st_ivas->hCPE[0]->hCoreCoder[0]->bit_stream, ivas_total_brate, nb_bits_metadata );



#ifdef NONBE_FIX_1087_OOB_SBA_DTX_RS

    /* in case of switching from an SID frame (with ACELP core) to MCT, buffer of L_FRAME_PLUS samples is needed -> use synth[] as a temporary buffer */

    if ( st_ivas->hCPE[0]->hCoreCoder[0]->last_core == ACELP_CORE )

    {
@@ -157,7 +154,6 @@ ivas_error ivas_mct_dec( 
            output[n] = synth[n];

        }

    }

#endif



    for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ )

    {
@@ -243,7 +239,6 @@ ivas_error ivas_mct_dec( 


        ivas_mdct_core_reconstruct( hCPE, x, synth, fUseTns[cpe_id], 1 );



#ifdef NONBE_FIX_1087_OOB_SBA_DTX_RS

        /* set pointers back */

        if ( cpe_id == 0 && st_ivas->hCPE[0]->hCoreCoder[0]->last_core == ACELP_CORE )

        {
@@ -253,7 +248,6 @@ ivas_error ivas_mct_dec( 
            }

        }



#endif

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

         * CoreCoder Post-processing and updates

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