Commit b549d048 authored by multrus's avatar multrus
Browse files

formatting

parent 2246d80d

lib_com/core_com_config.c

+1 −2
Original line number Diff line number Diff line
@@ -167,8 +167,7 @@ int16_t getTcxonly( 
    const int32_t total_brate,  /* i  : total bitrate                       */

    const int16_t MCT_flag      /* i  : hMCT handle allocated (1) or not (0)*/

    ,

    const int16_t is_ism_format

)

    const int16_t is_ism_format )

{

    int16_t tcxonly = 0;

lib_com/hq_tools.c

+0 −1
Original line number Diff line number Diff line
@@ -1288,7 +1288,6 @@ int16_t calc_nor_delta_hf( 
                push_indice( hBstr, IND_DELTA_ENV_HQ, delta - min_delta, bitsforDelta );

                ynrm[i] += delta;

                add_bits_denv += bitsforDelta;



            }

        }

lib_com/options.h

+1 −7
Original line number Diff line number Diff line
@@ -150,17 +150,11 @@ 
#define FIX_545_ASSERT                                  /* VA: fix issue 545, replace assert() with warning message when hitting memory limit in the buffer of indices */

#endif











#define FIX_383_CLEAN_UP                                /* Dlb : Clean up of unused functions */





#define FIX_532_ISM_MD_INACTIVE                         /* VA: issue 532: improve MD coding in ISM inactive frames */



#define FIX_547_NAN_IGF_DEC                             /* FhG: issue 547: fix possible nan in IGF decoder */





/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_com/prot.h

+1 −2
Original line number Diff line number Diff line
@@ -9767,8 +9767,7 @@ int16_t getTcxonly( 
    const int32_t total_brate,  /* i  : total bitrate                       */

    const int16_t MCT_flag      /* i  : hMCT handle allocated (1) or not (0)*/

    ,

    const int16_t is_ism_format

);

    const int16_t is_ism_format );



int16_t getTnsAllowed(

    const int32_t total_brate, /* i  : total bitrate               */

lib_dec/core_dec_init.c

+4 −8
Original line number Diff line number Diff line
@@ -74,10 +74,8 @@ void open_decoder_LPD( 
        st->fscale_old = st->fscale;

    }



    st->sr_core = getCoreSamplerateMode2( st->element_mode, total_brate, bwidth, st->flag_ACELP16k, st->rf_flag

                                          ,

                                          st->is_ism_format

    );

    st->sr_core = getCoreSamplerateMode2( st->element_mode, total_brate, bwidth, st->flag_ACELP16k, st->rf_flag,

                                          st->is_ism_format );

    st->fscale = sr2fscale( st->sr_core );

    fscaleFB = sr2fscale( st->output_Fs );
@@ -96,10 +94,8 @@ void open_decoder_LPD( 
        }

    }



    st->tcxonly = getTcxonly( st->element_mode, total_brate, MCT_flag

                              ,

                              st->is_ism_format

    );

    st->tcxonly = getTcxonly( st->element_mode, total_brate, MCT_flag,

                              st->is_ism_format );



    /* the TD TCX PLC in MODE1 still runs with 80ms subframes */

    if ( ( st->element_mode == EVS_MONO && st->L_frame == L_FRAME16k && total_brate <= ACELP_32k ) || ( st->element_mode > EVS_MONO && st->L_frame == L_FRAME16k && total_brate <= MAX_ACELP_BRATE ) || ( st->tcxonly && ( st->sr_core == 32000 || st->sr_core == 16000 ) ) )