Commit 18f00132 authored by vaclav's avatar vaclav
Browse files

formatting

parent c6dff318

lib_com/ivas_prot.h

+45 −14
Original line number Diff line number Diff line
@@ -785,19 +785,19 @@ float ism_dequant_meta( 
    const int16_t cbsize                                        /* i  : codebook size                               */

);



ivas_error set_ism_metadata(

ivas_error ivas_set_ism_metadata(

    ISM_METADATA_HANDLE hIsmMeta,                               /* o  : ISM metadata handle                         */

    const float azimuth,                                        /* i  : azimuth value                               */

    const float elevation                                       /* i  : elevation value                             */

);



ivas_error create_ism_metadata_enc(

ivas_error ivas_ism_metadata_enc_create(

    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                      */

    const int16_t n_ISms,                                       /* i  : number of objects                           */

    int32_t element_brate_tmp[]                                 /* o  : element bitrate per object                  */

);



ivas_error create_ism_metadata_dec(

ivas_error ivas_ism_metadata_dec_create(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                      */

    const int16_t n_ISms,                                       /* i  : number of objects                           */

    int32_t element_brate_tmp[]                                 /* o  : element bitrate per object                  */
@@ -3114,6 +3114,7 @@ void ivas_dirac_param_est_enc( 
    const SBA_MODE sba_mode                                    

 );





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

 * SBA format prototypes

 *----------------------------------------------------------------------------------*/
@@ -3920,11 +3921,41 @@ void ivas_spar_bitrate_dist( 
    const int16_t bwidth                                        /* i  : audio bandwidth                         */

);



void ivas_mdct( const float *pIn, float *pOut, const int16_t length );

void ivas_dct_windowing( const int16_t fade_len, const int16_t full_len, const int16_t dct_len, const int16_t zero_pad_len, const float *pWindow_coeffs, const int16_t frame_len, float *pOut_buf, float *pBuffer_prev, float *pTemp_lfe );

void ivas_tda( const float *pIn, float *pOut, const int16_t length );

void ivas_imdct( const float *pIn, float *pOut, const int16_t length );

void ivas_itda( const float *re, float *pOut, const int16_t length );

void ivas_mdct( 

    const float *pIn, 

    float *pOut, 

    const int16_t length 

);



void ivas_dct_windowing( 

    const int16_t fade_len, 

    const int16_t full_len, 

    const int16_t dct_len, 

    const int16_t zero_pad_len, 

    const float *pWindow_coeffs, 

    const int16_t frame_len, 

    float *pOut_buf, 

    float *pBuffer_prev, 

    float *pTemp_lfe 

);



void ivas_tda( 

    const float *pIn, 

    float *pOut, 

    const int16_t length 

);



void ivas_imdct( 

    const float *pIn, 

    float *pOut, 

    const int16_t length 

);



void ivas_itda( 

    const float *re, 

    float *pOut, 

    const int16_t length 

);



void ivas_spar_get_cldfb_gains(

    SPAR_DEC_HANDLE hSpar,

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ ivas_error ivas_init_decoder( 
            }

        }



        if ( ( error = create_ism_metadata_dec( st_ivas, st_ivas->nSCE, element_brate_tmp ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_ism_metadata_dec_create( st_ivas, st_ivas->nSCE, element_brate_tmp ) ) != IVAS_ERR_OK )

        {

            return error;

        }

lib_dec/ivas_ism_metadata_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -516,12 +516,12 @@ ivas_error ivas_ism_metadata_dec( 




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

 * create_ism_metadata_dec()

 * ivas_ism_metadata_dec_create()

 *

 * Create, allocate, initialize and configure IVAS decoder ISM handles

 * Create, allocate, initialize and configure IVAS decoder ISM metadata handles

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



ivas_error create_ism_metadata_dec(

ivas_error ivas_ism_metadata_dec_create(

    Decoder_Struct *st_ivas,    /* i/o: IVAS decoder structure      */

    const int16_t n_ISms,       /* i  : number of objects           */

    int32_t element_brate_tmp[] /* o  : element bitrate per object  */

lib_enc/ivas_init_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ ivas_error ivas_init_encoder( 


        st_ivas->ism_mode = ivas_ism_mode_select( hEncoderConfig->nchan_inp, ivas_total_brate );



        if ( ( error = create_ism_metadata_enc( st_ivas, hEncoderConfig->nchan_inp, element_brate_tmp ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_ism_metadata_enc_create( st_ivas, hEncoderConfig->nchan_inp, element_brate_tmp ) ) != IVAS_ERR_OK )

        {

            return error;

        }

lib_enc/ivas_ism_metadata_enc.c

+7 −6
Original line number Diff line number Diff line
@@ -60,12 +60,12 @@ 




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

 * set_ism_metadata()

 * ivas_set_ism_metadata()

 *

 * Set metadata of for one ISM

 * Set metadata of one ISM MD handle

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



ivas_error set_ism_metadata(

ivas_error ivas_set_ism_metadata(

    ISM_METADATA_HANDLE hIsmMeta, /* o  : ISM metadata handle   */

    const float azimuth,          /* i  : azimuth value         */

    const float elevation         /* i  : elevation value       */
@@ -138,6 +138,7 @@ static void rate_ism_importance( 
    return;

}





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

 * ivas_ism_metadata_enc()

 *
@@ -731,12 +732,12 @@ ivas_error ivas_ism_metadata_enc( 
}



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

 * create_ism_metadata_enc()

 * ivas_ism_metadata_enc_create()

 *

 * Create, allocate, initialize and configure IVAS encoder ISM handles

 * Create, allocate, initialize and configure IVAS encoder ISM metadata handles

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



ivas_error create_ism_metadata_enc(

ivas_error ivas_ism_metadata_enc_create(

    Encoder_Struct *st_ivas,    /* i/o: IVAS encoder structure      */

    const int16_t n_ISms,       /* i  : number of objects           */

    int32_t element_brate_tmp[] /* o  : element bitrate per object  */