Commit 2e7eefcc authored by multrus's avatar multrus
Browse files

formatting

parent d3b2a082

lib_com/core_com_config.c

+10 −12
Original line number Diff line number Diff line
@@ -799,8 +799,7 @@ void init_tcx_cfg( 
    const int16_t infoIGFStopFreq,

    const int16_t element_mode,

    const int16_t ini_frame,

    const int16_t MCT_flag

)

    const int16_t MCT_flag )

{

    int16_t i;

    int16_t mdctWindowLength;
@@ -832,8 +831,7 @@ void init_tcx_cfg( 


    /* TNS in TCX */

    hTcxCfg->pCurrentTnsConfig = NULL;

    hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, igf, element_mode

    );

    hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, igf, element_mode );



    if ( hTcxCfg->fIsTNSAllowed )

    {

lib_com/options.h

+0 −4
Original line number Diff line number Diff line
@@ -142,11 +142,7 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */











#define FIX_398_MASA_DIRECTION_ALIGNMENT                /* Nokia: Issue 398: in 2dir MASA, dynamically adjust directions to be consistent */



#define REND_DEBUGGING_REVISION                         /* VA: encapsulate rendering debugging options with DEBUGGING */

#define FIX_419_ISM_MD_FIX                              /* VA: Issue 419: fix the upper value limitation for parameter angle1_diff_cnt */

lib_com/tcx_utils.c

+10 −12
Original line number Diff line number Diff line
@@ -248,8 +248,7 @@ void WindowSignal( 
     * Init                                                      *

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



    tcx_get_windows( hTcxCfg, left_overlap_mode, right_overlap_mode, &l, &left_win, &r, &right_win, fullband

    );

    tcx_get_windows( hTcxCfg, left_overlap_mode, right_overlap_mode, &l, &left_win, &r, &right_win, fullband );



    /* Init lengths */
@@ -275,8 +274,7 @@ void WindowSignal( 


    tcx_windowing_analysis( in - l / 2 + offset, *L_frame, l, left_win, r, right_win, out );



    if ( left_overlap_mode == FULL_OVERLAP && truncate_aldo

    )

    if ( left_overlap_mode == FULL_OVERLAP && truncate_aldo )

    {

        /* fade truncated ALDO window to avoid discontinuities */

        if ( !fullband )

lib_dec/core_dec_init.c

+2 −4
Original line number Diff line number Diff line
@@ -190,8 +190,7 @@ void open_decoder_LPD( 
    {

        if ( !is_init || st->element_mode != IVAS_CPE_MDCT )

        {

            init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->output_Fs, st->L_frame, st->bwidth, st->hTcxDec->L_frameTCX, st->fscale, encoderLookahead, encoderLookaheadFB, st->preemph_fac, st->tcxonly, st->rf_flag, st->igf, st->hIGFDec->infoIGFStopFreq, st->element_mode, st->ini_frame, MCT_flag

            );

            init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->output_Fs, st->L_frame, st->bwidth, st->hTcxDec->L_frameTCX, st->fscale, encoderLookahead, encoderLookaheadFB, st->preemph_fac, st->tcxonly, st->rf_flag, st->igf, st->hIGFDec->infoIGFStopFreq, st->element_mode, st->ini_frame, MCT_flag );

        }

        else

        {
@@ -675,8 +674,7 @@ void open_decoder_LPD( 
    if ( st->hTcxCfg != NULL &&

         st->element_mode != EVS_MONO )

    {

        st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( is_init ? total_brate : st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode

        );

        st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( is_init ? total_brate : st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode );

    }

    if ( hTcxDec != NULL )

    {

lib_dec/core_dec_switch.c

+2 −4
Original line number Diff line number Diff line
@@ -91,8 +91,7 @@ void mode_switch_decoder_LPD( 
        switchWB = 1; /*force init when coming from MODE1*/

    }



    st->igf = getIgfPresent( st->element_mode, total_brate, bwidth, st->rf_flag

    );

    st->igf = getIgfPresent( st->element_mode, total_brate, bwidth, st->rf_flag );



    if ( st->hIGFDec != NULL )

    {
@@ -141,8 +140,7 @@ void mode_switch_decoder_LPD( 
        if ( st->hTcxCfg != NULL )

        {

            st->hTcxCfg->pCurrentTnsConfig = NULL;

            st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, st->igf, st->element_mode

            );

            st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, st->igf, st->element_mode );

        }



        if ( st->hTcxCfg->fIsTNSAllowed && st->hIGFDec != NULL && st->hTcxCfg != NULL )