Commit 0005631d authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 1850-ref-PortFloatMr1527

parents 7bb676a2 555a417a

lib_com/ivas_cnst.h

+6 −1
Original line number Diff line number Diff line
@@ -1464,12 +1464,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.h

+19 −2
Original line number Diff line number Diff line
@@ -84,7 +84,13 @@ void ivas_write_format( 
void ivas_write_format_sid(

    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */

    const int16_t element_mode,                                 /* i  : element bitrate                         */

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

    BSTR_ENC_HANDLE hBstr,                                      /* i/o: encoder bitstream handle                */

    const int16_t sba_order,                                    /* i  : Ambisonic (SBA) order                   */

    const int16_t sba_planar                                    /* i  : SBA planar flag                         */

#else

    BSTR_ENC_HANDLE hBstr                                       /* i/o: encoder bitstream handle                */

#endif

);



ivas_error create_sce_enc(
@@ -3534,7 +3540,7 @@ int16_t ivas_sba_get_nchan_metadata( 
);



#ifdef NONBE_FIX_1052_SBA_EXT

/*! r: number of bits in SPAR SID frame */

/*! r: number of bits in SBA SID frame */

int16_t ivas_sba_spar_sid_bitlen(

    const int16_t nchan_transport                               /* i  : number of transport channels            */

);
@@ -5616,6 +5622,17 @@ ivas_error ivas_osba_render_sf( 
    float *output_f[]                                           /* o  : rendered time signal                    */

);



#ifdef NONBE_1894_OSBA_SCALING

void ivas_osba_stereo_add_channels(

    float *tc_f[],                                              /* i  : transport channels                      */

    float *output_f[],                                          /* i/o: output channels                         */

    const float gain,                                           /* i  : gain bed value                          */

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

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

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

);

#endif



void ivas_osba_data_close(

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

);

lib_com/ivas_rom_com.c

+2 −0
Original line number Diff line number Diff line
@@ -1876,6 +1876,7 @@ const float ivas_param_mc_dmx_fac_CICP19_3tc[36] = 
    0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f /*Ct*/

};













#ifndef FIX_1157_OBSOLETE_DMX_TABLE















const float ivas_param_mc_dmx_fac_CICP19_4tc[48] =















{















    1.0f, 0.0f, INV_SQRT2, INV_SQRT2, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, /*Lht*/









@@ -1883,6 +1884,7 @@ const float ivas_param_mc_dmx_fac_CICP19_4tc[48] =













    0.0f, 0.0f, 0.0f,      0.0f,      0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, /*Lut*/















    0.0f, 0.0f, 0.0f,      0.0f,      0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, /*Rut*/















};













#endif





























/* Coefficient for Parametric MC ILD factorization */















const float ivas_param_mc_ild_fac_CICP6_2tc[6] =

































lib_com/ivas_sba_config.c



+2
−2




























Original line number
Diff line number
Diff line








@@ -163,10 +163,10 @@ int16_t ivas_sba_get_nchan(













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















 * ivas_sba_spar_sid_bitlen()















 *













 * Get number of bits in SPAR SID frame













 * Get number of bits in SBA SID frame















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





























/*! r: number of bits in SPAR SID frame */













/*! r: number of bits in SBA SID frame */















int16_t ivas_sba_spar_sid_bitlen(















    const int16_t nchan_transport /* i  : number of transport channels            */















)

































lib_com/options.h



+13
−2




























Original line number
Diff line number
Diff line








@@ -80,6 +80,7 @@





























#ifdef DEBUG_MODE_MDCT















#define DEBUG_PLOT_BITS













#define DEBUG_OSBA_MD_BITS















#endif































#define ENABLE_BITRATE_VERIFICATION             /* Enable bitrate verification - use when playing with bit budget */










@@ -191,14 +192,24 @@













#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*/















#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_MC_LFE_LPF                                  /* Dlb: Adding the LFE LPF filter back for MC content. */













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















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















#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */















#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 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_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 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  */













#define FIX_1138_SBA_EXT_ERROR_PRINTOUT                 /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */













#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */













#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 FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */



























#define NONBE_1894_OSBA_SCALING                         /* FhG: port OSBA scaling MRs (298,355,360) jointly */































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