Commit aef5f5a8 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] align with main, mostly whitespace changes

parent ad34cd96

apps/decoder.c

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ typedef struct 
#ifdef OBJ_EDITING_EXAMPLE

    bool objEditEnabled;

#endif



} DecArguments;
@@ -3195,6 +3196,7 @@ static ivas_error decodeVoIP( 
#ifdef OBJ_EDITING_API

        nSamplesRendered = 0;

#endif



        /* reference vector */

        if ( arg.enableReferenceVectorTracking && vec_pos_update == 0 )

        {

lib_dec/ivas_ism_param_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -818,10 +818,8 @@ void ivas_param_ism_dec_digest_tc( 
)

{

#ifndef OBJ_EDITING_API

    int16_t ch, nchan_transport;

    int16_t slot_idx;

    int16_t nchan_out, nchan_out_woLFE, i;

    int16_t bin_idx;

    int16_t ch, nchan_transport, nchan_out, nchan_out_woLFE, i;

    int16_t slot_idx, bin_idx;

    int32_t ivas_total_brate;

#else

    int16_t ch, nchan_transport;
@@ -1420,6 +1418,7 @@ void ivas_param_ism_dec_render( 
 *

 *

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



void ivas_param_ism_params_to_masa_param_mapping(

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

)
@@ -1493,6 +1492,7 @@ void ivas_param_ism_params_to_masa_param_mapping( 
        {

            brange[0] = hParamIsmDec->hParamIsm->band_grouping[band_idx];

            brange[1] = hParamIsmDec->hParamIsm->band_grouping[band_idx + 1];



#ifdef OBJ_EDITING_API

            azimuth[0] = (int16_t) roundf( hParamIsmDec->edited_azimuth_values[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][0]] );

            elevation[0] = (int16_t) roundf( hParamIsmDec->edited_elevation_values[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][0]] );

lib_dec/ivas_mc_param_dec.c

+9 −5
Original line number Diff line number Diff line
@@ -1331,16 +1331,20 @@ void ivas_param_mc_dec_digest_tc( 
)

{

    PARAM_MC_DEC_HANDLE hParamMC;

    int16_t ch;

#ifdef OBJ_EDITING_API

    int16_t ch, slot_idx;

    int16_t nchan_transport;

#else

    int16_t i, ch;

#ifdef FIX_835_PARAMMC_BUFFER_VALUES

    int16_t is_next_band, skip_next_band;

#endif

    int16_t slot_idx;

    int16_t nchan_transport;

    int16_t slot_idx, param_band_idx;

    int16_t nchan_transport, nchan_out_transport, nchan_out_cldfb;

    int16_t nchan_out_cov;

#endif



#ifndef OBJ_EDITING_API

    int16_t nchan_out_transport, nchan_out_cldfb, i, param_band_idx;

    int16_t nchan_out_cov;

    /*CLDFB*/

#ifdef FIX_835_PARAMMC_BUFFER_VALUES

    float *pCx, *pCx_imag;

lib_dec/ivas_stat_dec.h

+1 −0
Original line number Diff line number Diff line
@@ -951,6 +951,7 @@ typedef struct ivas_masa_ism_data_structure 
    float preprocEneTarget[CLDFB_NO_CHANNELS_MAX];

    float preprocEneRealized[CLDFB_NO_CHANNELS_MAX];

#endif



    float **delayBuffer;

    int16_t delayBuffer_size;

    int16_t delayBuffer_nchan;

lib_dec/lib_dec.c

+6 −4
Original line number Diff line number Diff line
@@ -1426,14 +1426,16 @@ ivas_error IVAS_DEC_GetSamples( 
)

{

    ivas_error error;

#ifdef OBJ_EDITING_API

    int16_t nSamplesToRender;

    uint16_t nSamplesRendered, nSamplesRendered_loop;

    uint8_t nOutChannels;

#ifndef OBJ_EDITING_API

    uint8_t nTransportChannels;

    int16_t nOutSamplesElse;

    uint16_t nTimeScalerOutSamples, l_ts;

#else

    int16_t nOutSamplesElse, nSamplesToRender;

    uint16_t nSamplesRendered, nSamplesRendered_loop, l_ts, nTimeScalerOutSamples;

    uint8_t nTransportChannels, nOutChannels;

#endif



    nSamplesRendered = 0;

    nOutChannels = 0;

    nSamplesRendered_loop = 0;