Commit 6a7f832f authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_975_JBM_USAN

parent ff67fea7
Loading
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@

#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */
#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS              /* FhG : issue #982 : 5ms and 20ms output different for OMASA */
#define NONBE_FIX_975_JBM_USAN                          /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */
#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */

#define NONBE_FIX_999_JBM_MCT_FLUSH                     /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */
+0 −4
Original line number Diff line number Diff line
@@ -2397,18 +2397,14 @@ ivas_error IVAS_DEC_VoIP_FeedFrame(
        return IVAS_ERR_INVALID_BITSTREAM;
    }

#ifdef NONBE_FIX_975_JBM_USAN
    partialCopyFrameType = 0;
    partialCopyOffset = 0;

    if ( hIvasDec->mode == IVAS_DEC_MODE_EVS )
    {
#endif
        /* check if frame contains a partial copy and get its offset */
        evs_dec_previewFrame( au, auSize, &partialCopyFrameType, &partialCopyOffset );
#ifdef NONBE_FIX_975_JBM_USAN
    }
#endif

    /* create data unit for primary copy in the frame */
    dataUnit = JB4_AllocDataUnit( hIvasDec->hVoIP->hJBM );