Commit 3a83289f authored by Jan Kiene's avatar Jan Kiene
Browse files

port MR 1372 from float 

fix for USAN error in OMASA JBM decoding
parent 109c1d8b

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -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 ############################ */

lib_dec/lib_dec.c

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