Commit 5514ac86 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 801-maintenance-sept-14

parents 591d92df 09b3105f

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -687,6 +687,7 @@ split-rendering-pytest-on-merge-request: 
    - make -j INCLUDE_SPLIT=1



    ### Run test using scripts and input from main

    - if [ $ref_using_main == 1 ]; then git restore lib_com/options.h; fi # Revert changes back before checking out another branch to avoid conflicts

    - if [ $ref_using_main == 1 ]; then git checkout $target_commit; fi



    # run test

lib_com/ivas_cnst.h

+8 −1
Original line number Diff line number Diff line
@@ -1521,9 +1521,16 @@ typedef enum 


#define BINAURAL_MAXBANDS                       60                          /* Max number of bands */

#define BINAURAL_CONVBANDS                      50                          /* Bands upto which convolution is performed */

#ifdef NONBE_FIX_588_UPDATE_FASTCONV_SD

#define BINAURAL_NTAPS                           3

#else

#define BINAURAL_NTAPS                           5



#endif

#ifdef NONBE_FIX_588_UPDATE_FASTCONV_SD

#define BINAURAL_NTAPS_SBA                       BINAURAL_NTAPS

#else

#define BINAURAL_NTAPS_SBA                       3

#endif



#define BINAURAL_NTAPS_MAX                      96

lib_com/ivas_prot.h

+6 −0
Original line number Diff line number Diff line
@@ -5276,6 +5276,12 @@ ivas_error ivas_ism_renderer_open( 
    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                          */

);



#ifdef FIX_ISMRENDERER_HANDLE_DEALLOC

void ivas_ism_renderer_close(

    ISM_RENDERER_HANDLE *hIsmRendererData                       /* i/o: ISM renderer handle                             */

);

#endif



void ivas_ism_render(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                          */

    float *output_f[],                                          /* i/o: core-coder transport channels/object output     */

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ 
/*#define DEBUG_STEREO_DFT_NOSTEREO*/           /* DFT stereo: by-pass stereo processing at encoder and decoder side*/

/*#define DEBUG_STEREO_DFT_NOQRES*/

/*#define DEBUG_STEREO_DFT_OUTRESPRED*/         /* output residual prediction signal instead of L/R*/

/*#define DBG_STEREO_ICBWE2_TBE2K8*/            /* Enables TBE_2K8 for higher bitrates with ICBWE in operation for TD/DFT Stereo. Needs quality eval and currently only used for debugging purposes */



/*DirAC Debug switches*/

/*#define DEBUG_DISABLE_DIRAC_DELAY_COMP */     /* temporarily disable delay compensation on DirAC encoder */
@@ -173,6 +172,7 @@ 
#define FIX_518_ISM_BRIR_EXTREND                        /* FhG: fix issue #518, cleanup ISM to BINAURAL_ROOM_IR rendering in the external renderer */

#define FIX_764_HARM_CODE                               /* VA: issue 764: introduce new function for the same code block at four different places */

#define FIX_747_ISM_TODOS                               /* VA: issue 747 - address ISM ToDos */

#define FIX_ISMRENDERER_HANDLE_DEALLOC                  /* VA: issue 781: harmonize Deallocation of handle 'hIsmRendererData' */





/* #################### End BE switches ################################## */
@@ -199,6 +199,7 @@ 
#define NONBE_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE    /* FhG: fix for cng in ISM DTX on sudden silence periods - JBM addon (issue 552) */

#define NONBE_FIX_738_SBA_BR_SW_ASAN                          /* FhG: issue 738: fixes bug when switching to an MCT bitrate and previous frame was ACELP */

#define NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING             /* VA: Issue 735: Resolve "HP20 filtering bug in SBA/OSBA bitrate switching" */

#define NONBE_FIX_588_UPDATE_FASTCONV_SD                      /* FhG: issue 588: update FastConv SD HRTFs in CLDFB domain with new conversion method */





/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_decision_matrix_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -271,11 +271,7 @@ void ivas_decision_matrix_dec( 
                {

                    st->extl = SWB_TBE;

                    st->extl_brate = SWB_TBE_1k6;

#ifdef DBG_STEREO_ICBWE2_TBE2K8

                    if ( st->total_brate >= MIN_BRATE_SWB_TBE_2k80 && st->flag_ACELP16k )

#else

                    if ( st->total_brate >= MIN_BRATE_SWB_TBE_2k80 && st->flag_ACELP16k && st->element_mode == IVAS_SCE )

#endif

                    {

                        st->extl_brate = SWB_TBE_2k8;

                    }
@@ -314,11 +310,7 @@ void ivas_decision_matrix_dec( 
                {

                    st->extl = FB_TBE;

                    st->extl_brate = FB_TBE_1k8;

#ifdef DBG_STEREO_ICBWE2_TBE2K8

                    if ( st->total_brate >= MIN_BRATE_SWB_TBE_2k80 && st->flag_ACELP16k )

#else

                    if ( st->total_brate >= MIN_BRATE_SWB_TBE_2k80 && st->flag_ACELP16k && st->element_mode == IVAS_SCE )

#endif

                    {

                        st->extl_brate = FB_TBE_3k0;

                    }