Commit ba33ff88 authored by vaclav's avatar vaclav
Browse files

Merge branch 'formatting_after_acceptation_of_switches' into 'main' 

formatting_after_acceptation_of_switches

See merge request !709
parents a942844b 222f8232

apps/decoder.c

+1 −2
Original line number Diff line number Diff line
@@ -2255,8 +2255,7 @@ static ivas_error decodeVoIP( 




        /* decode and get samples */

        if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, pcmBuf, systemTime_ms,

                                                 &nSamplesAvailableNext

        if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, pcmBuf, systemTime_ms, &nSamplesAvailableNext

#ifdef SUPPORT_JBM_TRACEFILE

                                                 ,

                                                 writeJbmTraceFileFrameWrapper,

lib_com/bitstream.c

+20 −15
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ Word16 rate2EVSmode( 


ivas_error ind_list_realloc(

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

    int16_t max_num_indices /* i  : new maximum number of allowed indices in the list */

    const int16_t max_num_indices /* i  : new maximum number of allowed indices in the list */

)

{

    int16_t i, ind_list_pos;
@@ -281,7 +281,8 @@ ivas_error ind_list_realloc( 
 * Get the maximum allowed number of indices in the encoder

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



int16_t get_ivas_max_num_indices(                                /* o  : maximum number of indices */

/*! r: maximum number of indices */

int16_t get_ivas_max_num_indices(

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

    const int32_t ivas_total_brate /* i  : IVAS total bitrate        */

)
@@ -519,7 +520,8 @@ int16_t get_ivas_max_num_indices( /* o : maximum 
 * Get the maximum allowed number of indices in the core coder

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



int16_t get_core_max_num_indices(                           /* o  : maximum number of indices */

/*! r: maximum number of indices */

int16_t get_core_max_num_indices(

    const int16_t core,       /* i  : core                      */

    const int32_t total_brate /* i  : total bitrate             */

)
@@ -694,7 +696,8 @@ int16_t get_core_max_num_indices( /* o : maximum numb 
 * Get the maximum number of indices in the BWE

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



int16_t get_BWE_max_num_indices(                          /* o  : maximum number of indices */

/*! r: maximum number of indices */

int16_t get_BWE_max_num_indices(

    const int32_t extl_brate /* i  : extensiona layer bitrate  */

)

{
@@ -716,7 +719,8 @@ int16_t get_BWE_max_num_indices( /* o : maximum number 
 * Set the maximum allowed number of metadata indices in the list

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



int16_t get_ivas_max_num_indices_metadata(                                /* o  : maximum number of indices */

/*! r: maximum number of indices */

int16_t get_ivas_max_num_indices_metadata(

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

    const int32_t ivas_total_brate /* i  : IVAS total bitrate       */

)
@@ -1377,7 +1381,7 @@ void push_next_bits( 
/*! r: result: index of the indice in the list, -1 if not found */

int16_t find_indice(

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

    int16_t id,            /* i  : ID of the indice                            */

    const int16_t id,      /* i  : ID of the indice                            */

    uint16_t *value,       /* o  : value of the quantized indice               */

    int16_t *nb_bits       /* o  : number of bits used to quantize the indice  */

)
@@ -1397,6 +1401,7 @@ int16_t find_indice( 
    return -1;

}





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

 * delete_indice()

 *
@@ -1406,7 +1411,7 @@ int16_t find_indice( 
/*! r: number of deleted indices */

uint16_t delete_indice(

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

    int16_t id             /* i  : ID of the indice                            */

    const int16_t id       /* i  : ID of the indice                            */

)

{

    int16_t i, j;

lib_com/ivas_cnst.h

+1 −2
Original line number Diff line number Diff line
@@ -983,8 +983,7 @@ typedef enum 
typedef enum

{

    DIRAC_OPEN,                                 /* initialize to default value              */

    DIRAC_RECONFIGURE                           /* HOA3                                     */

    ,

    DIRAC_RECONFIGURE,                          /* HOA3                                     */

    DIRAC_RECONFIGURE_MODE

} DIRAC_CONFIG_FLAG;

lib_com/ivas_cov_smooth.c

+8 −10
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ static void ivas_set_up_cov_smoothing( 
    ivas_filterbank_t *pFb,

    const float max_update_rate,

    const int16_t min_pool_size,

    const COV_SMOOTHING_TYPE smooth_mode /* i  : flag multichannel vs SPAR       */

    ,

    const COV_SMOOTHING_TYPE smooth_mode, /* i  : flag multichannel vs SPAR       */



    const int32_t ivas_total_brate )

{

    int16_t j, k;
@@ -150,9 +150,8 @@ ivas_error ivas_spar_covar_smooth_enc_open( 
    ivas_cov_smooth_state_t **hCovState_out,     /* i/o: SPAR Covar. smoothing handle       */

    const ivas_cov_smooth_cfg_t *cov_smooth_cfg, /* i  : SPAR config. handle                */

    ivas_filterbank_t *pFb,                      /* i/o: FB handle                          */

    const int16_t nchan_inp                      /* i  : number of input channels       */

    ,

    COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC */

    const int16_t nchan_inp,                     /* i  : number of input channels           */

    const COV_SMOOTHING_TYPE smooth_mode,        /* i  : Smooth covariance for SPAR or MC   */

    const int32_t ivas_total_brate               /* i  : IVAS total bitrate                 */

)

{
@@ -181,7 +180,6 @@ ivas_error ivas_spar_covar_smooth_enc_open( 
        }

    }





    ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size, smooth_mode, ivas_total_brate );



    *hCovState_out = hCovState;

lib_com/ivas_fb_mixer.c

+8 −14
Original line number Diff line number Diff line
@@ -104,8 +104,7 @@ ivas_error ivas_fb_set_cfg( 
    const int16_t num_in_chans,    /* i  : number of FB input channels      */

    const int16_t num_out_chans,   /* i  : number of FB output channels     */

    const int16_t active_w_mixing, /* i  : active_w_mixing flag             */

    const int32_t sampling_rate    /* i  : sampling rate                    */

    ,

    const int32_t sampling_rate,   /* i  : sampling rate                    */

    const int16_t nchan_fb_in      /* i  : number of dirAC analysis channels*/

)

{
@@ -478,8 +477,7 @@ void ivas_fb_mixer_pcm_ingest( 
    IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle             */

    float pcm_in[][L_FRAME48k],    /* i  : input audio channels        */

    float **ppOut_pcm,             /* o  : output audio channels       */

    const int16_t frame_len        /* i  : frame length                */

    ,

    const int16_t frame_len,       /* i  : frame length                */

    const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH] )

{

    int16_t i;
@@ -519,16 +517,13 @@ void ivas_fb_mixer_pcm_ingest( 
void ivas_fb_mixer_update_prior_input(

    IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle              */

    float *pcm_in[],               /* i  : input audio channels         */

    const int16_t length           /* i  : length of time slot          */

    ,

    const int16_t length,          /* i  : length of time slot          */

    const int16_t nchan_fb_in      /* i  : number of analysis channels  */

)

{

    int16_t i;



    for ( i = 0; i <

                 nchan_fb_in;

          i++ )

    for ( i = 0; i < nchan_fb_in; i++ )

    {

        mvr2r( &hFbMixer->ppFilterbank_prior_input[i][length], hFbMixer->ppFilterbank_prior_input[i], hFbMixer->fb_cfg->prior_input_length - length );

        mvr2r( pcm_in[i], &hFbMixer->ppFilterbank_prior_input[i][hFbMixer->fb_cfg->prior_input_length - length], length );
@@ -550,8 +545,7 @@ void ivas_fb_mixer_get_windowed_fr( 
    float *frame_f_real[],         /* o  : real freq domain values            */

    float *frame_f_imag[],         /* o  : imag freq domain values            */

    const int16_t length,          /* i  : number of new samples in time slot */

    const int16_t mdft_len         /* i  : MDFT frame length                  */

    ,

    const int16_t mdft_len,        /* i  : MDFT frame length                  */

    const int16_t nchan_fb_in      /* i  : number of analysis channels        */

)

{