Commit 236f1373 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_975_JBM_USAN

parent bdb14397

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ 


#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_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_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

#define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */

lib_dec/lib_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -2999,7 +2999,6 @@ ivas_error IVAS_DEC_VoIP_FeedFrame( 
    }





#ifdef NONBE_FIX_975_JBM_USAN

    partialCopyFrameType = 0;

    move16();

    partialCopyOffset = 0;
@@ -3007,12 +3006,9 @@ ivas_error IVAS_DEC_VoIP_FeedFrame( 


    IF( EQ_16( hIvasDec->mode, (Word16) 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 );