Commit f82d8bdf authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1087_OOB_SBA_DTX_RS

parent 266a61bf

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/ 

#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_1091_PMC_LOW_SIGNAL_BURSTS            /* FhG: fix for #1091, fix limit calculation for the regularized inverse of Kx to avoid bursts in very low signals */

#define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR            /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */

#define NONBE_FIX_1096_NAN_VALUES_IN_DIRAC_TO_STEREO    /* FhG: avoid sidegain DFT-Stereo param to be larger than 1 when converting from Dirac parameters */

lib_dec/ivas_mct_dec.c

+0 −6
Original line number Diff line number Diff line
@@ -87,9 +87,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;
@@ -151,7 +149,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 )

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

        }

    }

#endif



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

    {
@@ -247,7 +243,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 )

        {
@@ -257,7 +252,6 @@ ivas_error ivas_mct_dec( 
            }

        }



#endif

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

         * CoreCoder Post-processing and updates

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