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

Merge branch 'main' into 986-mct-encoder-crashing-with-bitrate-and-bandwidth-switching

parents d558e00a a2de6451

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -1240,6 +1240,7 @@ test-long-self-test: 


    ### switch to main

    - git checkout main

    - git pull origin main

    - echo "Building reference codec at commit $(git rev-parse HEAD)"



    ### build main (ref) binaries

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 
#define FIX_963_USAN_ERROR                              /* Eri: Issue 963: USAN error in Stereo CNG, division by zero */

#define FIX_971_LOG2_IDX_GAIN_0                         /* VA: prevent -Inf due to log2(ratio==0) */

#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */

#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

// #define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

#define FIX_983_DISC_ISM_DIGEST_NUM_OBJS                /* FhG: issue #983: the discrete ISM digest function uses the wrong number of objects */



/* #################### End BE switches ################################## */
@@ -172,6 +172,7 @@ 
#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_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 */

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