Commit 10a9f69f authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 1861-basop-assert-in-binaural_room_reverb-decoding-with-render-config-and-head-rotation
parents d3358cd1 8785eb25

lib_com/ivas_cnst.h

+6 −1
Original line number Diff line number Diff line
@@ -1610,12 +1610,17 @@ typedef enum 
/*----------------------------------------------------------------------------------*

 * Amplitude Panning (EFAP, VBAP) constants

 *----------------------------------------------------------------------------------*/



#ifndef FIX_1050_EFAP_ALLOC

#define PANNING_AZI_RESOLUTION                  2

#define PANNING_ELE_RESOLUTION                  5

#endif



#define EFAP_MAX_CHAN_NUM                       5                           /* Maximum number of channels that constitute a polygon, 4 or 5 */

#ifdef FIX_1050_EFAP_ALLOC

#define EFAP_MAX_POLY_SET                       54                          /* Upper bound on number of polygons; found to be 54 in the worst case for a speaker setup of 16.0 */

#else

#define EFAP_MAX_POLY_SET                       50                          /* Upper bound on number of polygons; with a Speaker setup of 16.0, we obtain 44 polygons/triangles in the matlab implementation. */

#endif



#define EFAP_MODE_EFAP                          0                           /* EFAP Panning */

#define EFAP_MODE_EFIP                          1                           /* EFIP Panning */

lib_com/ivas_prot_fx.h

+11 −0
Original line number Diff line number Diff line
@@ -3904,6 +3904,17 @@ ivas_error ivas_osba_render_sf_fx( 
    Word32 *p_output[]              /* o  : rendered time signal                      */

);



#ifdef NONBE_1894_OSBA_SCALING

void ivas_osba_stereo_add_channels_fx(

    Word32 *tc_fx[],                    /* i  : transport channels                */

    Word32 *output_fx[],                /* i/o: output channels                   */

    const Word16 gain,                  /* i  : gain bed value       Q11          */

    const Word16 nchan_out,             /* i  : number of output channels         */

    const Word16 nchan_ism,             /* i  : number of ISM channels            */

    const UWord16 n_samples_to_render   /* i  : output frame length per channel   */

);

#endif



void ivas_osba_data_close_fx(

    SBA_ISM_DATA_HANDLE *hSbaIsmData /* i/o: OSBA rendering handle                   */

);

lib_com/ivas_rom_com.c

+2 −1
Original line number Diff line number Diff line
@@ -1737,6 +1737,7 @@ const Word32 ivas_param_mc_dmx_fac_CICP19_3tc_fx[36] = 
    0,0,2147483647,2147483647,0,0,0,0,0,0,0,0 /*Ct*/

};



#ifndef FIX_1157_OBSOLETE_DMX_TABLE

const Word32 ivas_param_mc_dmx_fac_CICP19_4tc_fx[48] =

{

    2147483647,0,1518500224,1518500224,2147483647,0,2147483647,0,0,0,0,0, /*Lht*/
@@ -1744,7 +1745,7 @@ const Word32 ivas_param_mc_dmx_fac_CICP19_4tc_fx[48] = 
    0,0,0,0,0,0,0,0,2147483647,0,2147483647,0, /*Lut*/

    0,0,0,0,0,0,0,0,0,2147483647,0,2147483647 /*Rut*/

};



#endif



//Q15

const Word16 ivas_param_mc_ild_fac_CICP6_2tc_fx[6] =

lib_com/options.h

+5 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ 
#define NONBE_1215_FIX_JBM_MAX_SCALING                  /* FhG: issue 1215: Fix assert hit in a specific VoIP decoder config. Caused by integer overflow in max scaling calculation. */



#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF              /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */

#define FIX_1050_EFAP_ALLOC                             /* FhG: issue 1050: reduction of memory allocated to EFAP handle */

#define NONBE_FIX_1091_PMC_LOW_SIGNAL_BURSTS            /* FhG: fix for #1091, fix limit calculation for the regularized inverse of Kx to avoid bursts in very low signals */



#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/
@@ -119,10 +120,12 @@ 
#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/

#define NONBE_FIX_1052_SBA_EXT                          /* Dlb: SBA external output support */

#define NONBE_FIX_MC_LFE_LPF                                  /* Dlb: Adding the LFE LPF filter back for MC content. */

#define NONBE_FIX_1096_NAN_VALUES_IN_DIRAC_TO_STEREO    /* FhG: avoid sidegain DFT-Stereo param to be larger than 1 when converting from Dirac parameters */

#define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR            /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */

#define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS              /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */

#define NONBE_FIX_1130_DIV_ZERO_LEV_DUR                 /* VA: issue 1130: avoid div by zero in L-D by thresholding R[0] to a min value of 100.0 */

#define FIX_1111_TDM_LSP_BUFFER                         /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */

#define FIX_1157_OBSOLETE_DMX_TABLE                     /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */

#define NONBE_1325_TD_STEREO_QUANT_LSF_SEC              /* Nokia: issue 1325: fix for usage of active_cnt variable in TD stereo LSFQ */

#define NONBE_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/

#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER            /* FhG: issue 1128: set output ambisonics order to input order for EXT output  */
@@ -131,6 +134,8 @@ 
#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */



#define NONBE_1894_OSBA_SCALING                          /* FhG: do not scale OSBA inputs by 0.5 any more */



/* #################### End BASOP porting switches ############################ */



#define FIX_1766_TCX2ACELP_BWE_ISSUE    /* VA : Fix rare BWE issue when switching from TCX to ACELP */

lib_dec/ivas_ism_renderer_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -70,7 +70,15 @@ ivas_error ivas_ism_renderer_open_fx( 
    test();

    test();

    test();

#ifdef FIX_1050_EFAP_ALLOC

    test();

    IF( st_ivas->hIntSetup.is_loudspeaker_setup &&

        st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_STEREO &&

        st_ivas->hIntSetup.ls_azimuth_fx != NULL && st_ivas->hIntSetup.ls_elevation_fx != NULL &&

        st_ivas->hEFAPdata == NULL )

#else

    IF( st_ivas->hIntSetup.is_loudspeaker_setup && st_ivas->hIntSetup.ls_azimuth_fx != NULL && st_ivas->hIntSetup.ls_elevation_fx != NULL && st_ivas->hEFAPdata == NULL )

#endif

    {

        IF( NE_32( ( error = efap_init_data_fx( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth_fx, st_ivas->hIntSetup.ls_elevation_fx, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ), IVAS_ERR_OK ) )

        {