Commit 7d978928 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Few clean up changes and clang formatting

parent f5b35598

lib_com/ivas_fb_mixer.c

+0 −16
Original line number Diff line number Diff line
@@ -1263,13 +1263,6 @@ void ivas_fb_mixer_get_windowed_fr( 
    float fr_in_block[L_FRAME48k * 2];

    const float *win_ptr;



#ifdef IVAS_FLOAT_FIXED

    Word32 fr_in_block_fx[L_FRAME48k * 2];

    Word16 exp_fr_in_block = 0;

    Word32 frame_f_real_fx[L_FRAME48k * 2] = { 0 };

    Word32 frame_f_imag_fx[L_FRAME48k * 2] = { 0 };

#endif



    n_old_samples = min( ( hFbMixer->fb_cfg->prior_input_length - hFbMixer->fb_cfg->windowed_fr_offset ), ( 2 * mdft_len ) );

    n_new_samples = max( 0, 2 * length - n_old_samples );

    offset = (int16_t) ( 2 * mdft_len - length - hFbMixer->ana_window_offset );
@@ -1292,16 +1285,7 @@ void ivas_fb_mixer_get_windowed_fr( 
            fr_in_block[j] *= ( *( --win_ptr ) );

        }



#ifdef IVAS_FLOAT_FIXED

        f2me_buf( fr_in_block, fr_in_block_fx, &exp_fr_in_block, L_FRAME48k * 2 );



        ivas_mdft_fx( fr_in_block_fx, frame_f_real_fx, frame_f_imag_fx, mdft_len << 1, mdft_len );



        me2f_buf( frame_f_real_fx, exp_fr_in_block, frame_f_real[ch_idx], mdft_len );

        me2f_buf( frame_f_imag_fx, exp_fr_in_block, frame_f_imag[ch_idx], mdft_len );

#else

        ivas_mdft( fr_in_block, frame_f_real[ch_idx], frame_f_imag[ch_idx], mdft_len << 1, mdft_len );

#endif

    }



    return;

lib_com/ivas_prot_fx.h

+1 −2
Original line number Diff line number Diff line
@@ -3440,6 +3440,5 @@ Word16 ivas_arith_encode_cmplx_cell_array( 
    ivas_cell_dim_t *pCell_dims,

    BSTR_ENC_HANDLE hMetaData,

    const Word16 any_diff,

    const Word16 wc_strat_arith

);

    const Word16 wc_strat_arith );

#endif

lib_enc/ivas_stereo_mdct_core_enc.c

+0 −52
Original line number Diff line number Diff line
@@ -1400,58 +1400,6 @@ void stereo_mdct_core_enc( 
                            st->hTdCngEnc->CNG_att_fx = float_to_fix16( st->hTdCngEnc->CNG_att, Q7 );

                        }



                        float max_sb = 0;

                        float max_tb = 0;

                        Word16 max_sb_fx = 0;

                        Word16 max_tb_fx = 0;



                        float max_fir_tb = 0;

                        float max_iir_tb = 0;

                        float max_fir_sb = 0;

                        float max_iir_sb = 0;



                        Word16 max_fir_tb_fx = 0;

                        Word16 max_iir_tb_fx = 0;

                        Word16 max_fir_sb_fx = 0;

                        Word16 max_iir_sb_fx = 0;

                        FOR( Word16 sfb = 0; sfb < 23; sfb++ )

                        {

                            f2me_16( hPrivateData->prevDampingFactor_IIR[sfb], &hPrivateData->prevDampingFactor_IIR_fx[sfb], &hPrivateData->prevDampingFactor_IIR_e[sfb] );



                            max_fir_tb = max( fabsf( hPrivateData->prevSFM_FIR_SFB_TB[sfb] ), max_fir_tb );

                            f2me_16( max_fir_tb, &max_fir_tb_fx, &hPrivateData->prevSFB_FIR_TB_e[sfb] );

                            hPrivateData->prevSFM_FIR_SFB_TB_fx[sfb] = float_to_fix16( hPrivateData->prevSFM_FIR_SFB_TB[sfb], sub( 15, hPrivateData->prevSFB_FIR_TB_e[sfb] ) );



                            max_iir_tb = max( fabsf( hPrivateData->prevSFM_IIR_SFB_TB[sfb] ), max_iir_tb );

                            f2me_16( max_iir_tb, &max_iir_tb_fx, &hPrivateData->prevSFB_IIR_TB_e[sfb] );

                            hPrivateData->prevSFM_IIR_SFB_TB_fx[sfb] = float_to_fix16( hPrivateData->prevSFM_IIR_SFB_TB[sfb], sub( 15, hPrivateData->prevSFB_IIR_TB_e[sfb] ) );



                            max_fir_sb = max( fabsf( hPrivateData->prevSFM_FIR_SFB_SB[sfb] ), max_fir_sb );

                            f2me_16( max_fir_sb, &max_fir_sb_fx, &hPrivateData->prevSFB_FIR_SB_e[sfb] );

                            hPrivateData->prevSFM_FIR_SFB_SB_fx[sfb] = float_to_fix16( hPrivateData->prevSFM_FIR_SFB_SB[sfb], sub( 15, hPrivateData->prevSFB_FIR_SB_e[sfb] ) );



                            max_iir_sb = max( fabsf( hPrivateData->prevSFM_IIR_SFB_SB[sfb] ), max_iir_sb );

                            f2me_16( max_iir_sb, &max_iir_sb_fx, &hPrivateData->prevSFB_IIR_SB_e[sfb] );

                            hPrivateData->prevSFM_IIR_SFB_SB_fx[sfb] = float_to_fix16( hPrivateData->prevSFM_IIR_SFB_SB[sfb], sub( 15, hPrivateData->prevSFB_IIR_SB_e[sfb] ) );



                            max_tb = max( fabsf( hPrivateData->SFM_tb[sfb] ), max_tb );

                            f2me_16( max_tb, &max_tb_fx, &hPrivateData->sfb_tb_e[sfb] );

                            hPrivateData->SFM_tb_fx[sfb] = float_to_fix16( hPrivateData->SFM_tb[sfb], sub( 15, hPrivateData->sfb_tb_e[sfb] ) );



                            max_sb = max( fabsf( hPrivateData->SFM_sb[sfb] ), max_sb );

                            f2me_16( max_sb, &max_sb_fx, &hPrivateData->sfb_sb_e[sfb] );

                            hPrivateData->SFM_sb_fx[sfb] = float_to_fix16( hPrivateData->SFM_sb[sfb], sub( 15, hPrivateData->sfb_sb_e[sfb] ) );

                        }



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

                        {

                            hPrivateData->prevSFM_FIR[i] = float_to_fix( hPrivateData->prevSFM_FIR_flt[i], 16 );   /*15Q16*/

                            hPrivateData->prevSFM_IIR[i] = float_to_fix16( hPrivateData->prevSFM_IIR_flt[i], 13 ); /*2Q13*/

                            for ( int j = 0; j < IGF_PAST_SFM_LEN; j++ )

                            {

                                hPrivateData->igfPastSFM_fx[i][j] = float_to_fix16( hPrivateData->igfPastSFM[i][j], 13 );

                            }

                        }



                        int igfGridIdx;

                        if ( st->last_core == ACELP_CORE && st->core == TCX_20_CORE )

lib_dec/acelp_core_dec_fx.c

+1 −1

File changed.

Contains only whitespace changes.