From 3a83289ff87c23b0bacce877db41c714a6b3448e Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 19 May 2025 16:07:41 +0200 Subject: [PATCH] port MR 1372 from float fix for USAN error in OMASA JBM decoding --- lib_com/options.h | 2 +- lib_dec/lib_dec.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 14ce9128d..14ccdb278 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -206,7 +206,7 @@ #define NONBE_FIX_979_OSBA_STEREO_5MS /* FhG : issue #979 : 5ms and 20ms output different for OSBA and stereo */ #define FIX_983_DISC_ISM_DIGEST_NUM_OBJS /* FhG: issue #983: the discrete ISM digest function uses the wrong number of objects */ - +#define NONBE_FIX_975_JBM_USAN /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index fd5f57385..f59168ffc 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -2397,8 +2397,18 @@ ivas_error IVAS_DEC_VoIP_FeedFrame( return IVAS_ERR_INVALID_BITSTREAM; } - /* check if frame contains a partial copy and get its offset */ - evs_dec_previewFrame( au, auSize, &partialCopyFrameType, &partialCopyOffset ); +#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 ); -- GitLab