Commit 1736b70e authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 1133-discontinuity-for-test-case-scaled-10db-for-stereo-mono-output-with-dtx-and-plc
parents f815cfb8 9ad6ef61

lib_com/ivas_cnst.h

+6 −2
Original line number Diff line number Diff line
@@ -1292,10 +1292,14 @@ typedef enum 
#define LFE_CHANNEL                             3



#define MIN_LFE_NRG                             0.5f

#define MCT_MAX_CHANNELS                        MAX_TRANSPORT_CHANNELS

#ifdef ADJUST_MCT_CHANNELS_MAX   

#define MCT_MAX_CHANNELS                        11                          /* == 7.1.4 LS channels without the LFE channel */

#define MCT_MAX_BLOCKS                          ( ( MCT_MAX_CHANNELS + 1 ) / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/

#else

#define MCT_MAX_CHANNELS                        12

#define MCT_MAX_BLOCKS                          ( MCT_MAX_CHANNELS / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/



#define MAX_NUM_DATA                            max( MCT_MAX_CHANNELS, 4 )

#endif



#define NBBITS_MCT_RATIO                        4

#define BITRATE_MCT_RATIO_RANGE                 ( 1 << NBBITS_MCT_RATIO )   /* Range of the coded bitrate distribution ratio */

lib_com/ivas_prot.h

+11 −9
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(
@@ -3039,11 +3045,7 @@ void mctStereoIGF_enc( 
    MCT_ENC_HANDLE hMCT,                                        /* i/o: MCT encoder structure                   */

    Encoder_State **sts,                                        /* i/o: encoder state structure                 */

    float *orig_spectrum[MCT_MAX_CHANNELS][NB_DIV],             /* i  : MDCT spectrum for ITF                   */

#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC 

    float *powerSpec[MCT_MAX_CHANNELS],                         /* i/o: MDCT^2 + MDST^2 spectrum,or estimate    */

#else

    float powerSpec[MCT_MAX_CHANNELS][L_FRAME48k],              /* i/o: MDCT^2 + MDST^2 spectrum,or estimate    */

#endif

    float *powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV],            /* i  : same as above but for inverse spect.    */

    float *inv_spectrum[MCT_MAX_CHANNELS][NB_DIV],              /* i  : inverse spectrum                        */

    const int16_t sp_aud_decision0[MCT_MAX_CHANNELS]            /* i  : speech audio decision                   */
@@ -3496,7 +3498,7 @@ int16_t ivas_sba_get_nchan_metadata( 
    const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                      */

);



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

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

int16_t ivas_sba_spar_sid_bitlen(

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

);

lib_com/ivas_rom_com.c

+7 −0
Original line number Diff line number Diff line
@@ -2471,6 +2471,13 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_ 
 * MASA ROM tables

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













#ifdef FIX_1121_MASA_DESCRIPTOR













const uint8_t ivasmasaFormatDescriptor[8] = 













{ 













    0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */













};

























#endif















const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =















{















     0.00f,

































lib_com/ivas_rom_com.h



+4
−0




























Original line number
Diff line number
Diff line








@@ -264,6 +264,10 @@ extern const uint16_t ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PA













 * MASA ROM tables















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





























#ifdef FIX_1121_MASA_DESCRIPTOR













extern const uint8_t ivasmasaFormatDescriptor[8]; /* "IVASMASA" */



























#endif















extern const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS];















extern const int16_t no_theta_masa[NO_SPHERICAL_GRIDS - 2];















extern const int16_t no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];

































lib_com/ivas_sba_config.c



+3
−2




























Original line number
Diff line number
Diff line








@@ -158,13 +158,14 @@ int16_t ivas_sba_get_nchan(













    return ( nb_channels );















}













































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















 * ivas_sba_spar_sid_bitlen()















 *













 * Get number of bits in SPAR SID frame













 * Get number of bits in SBA SPAR SID frame















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





























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













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















int16_t ivas_sba_spar_sid_bitlen(















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















)