Commit e5f2d688 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_975_JBM_USAN

parent 531fa54e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ 
#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#endif                                                                                     

#define NONBE_FIX_975_JBM_USAN                                /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */

#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS                    /* FhG : issue #982 : 5ms and 20ms output different for OMASA */



#ifdef SPLIT_REND_WITH_HEAD_ROT

lib_dec/lib_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -2410,18 +2410,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 );