Commit a2de6451 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '975-usan-errors-in-omasa-jbm-decoding' into 'main' 

[Non-BE] Resolve "USAN errors in OMASA JBM decoding"

See merge request !1372
parents 72451d23 2a92f0ea

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ 
#define NONBE_FIX_567_DOUBLE_STEREO_DMX                       /* Orange: Double-precision replaced by single-precision */   

#define NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */  

#define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */     

#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 */

/* ##################### End NON-BE switches ########################### */

lib_dec/lib_dec.c

+12 −2
Original line number Diff line number Diff line
@@ -2333,8 +2333,18 @@ 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 );