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

Merge remote-tracking branch 'origin/main-pc' into... 

Merge remote-tracking branch 'origin/main-pc' into 1600_basop_mc_encoder_crashes_with_br_and_bw_switching
parents baee97b6 4eb66a95

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -115,10 +115,12 @@ 
#define NONBE_FIX_951_MCMASA_5MS_RENDERING              /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2 kbps 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 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 FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */

#define NONBE_FIX_986_MC_BW_SWITCHING                   /* FhG: fix crash in bw and br switching with MC */

#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_fx.c

+15 −2
Original line number Diff line number Diff line
@@ -2998,8 +2998,21 @@ ivas_error IVAS_DEC_VoIP_FeedFrame( 
        return IVAS_ERR_INVALID_BITSTREAM;

    }





#ifdef NONBE_FIX_975_JBM_USAN

    partialCopyFrameType = 0;

    move16();

    partialCopyOffset = 0;

    move16();



    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 );