Commit c2bd34bb authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch '1599_ref_usan_error_omasa_jbm' into 'float-pc' 

[non-BE] port MR 1372 from float

See merge request !1607
parents b4312bc7 88e0ca5c

lib_com/options.h

+1 −3
Original line number Diff line number Diff line
@@ -203,14 +203,12 @@ 
#define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */

#define NONBE_FIX_951_MCMASA_5MS_RENDERING                    /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2kbps to BINAURAL */





#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 FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

#define NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN             /* FhG : issue #974: usan in mono and stereo output in OSBA JBM RS */



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



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