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

Merge branch 'main' into b_20230817_jbm-for-osba

parents cf647e75 b34fc6df

.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
@@ -1526,9 +1526,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/options.h

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,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 */



#define JBM_FOR_OSBA                                          /* FhG: implement OSBA format in the JBM path */

lib_rend/ivas_rom_binauralRenderer.c

+3418 −0

File changed.

Preview size limit exceeded, changes collapsed.