Commit 55f3ff00 authored by multrus's avatar multrus
Browse files

formatting

parent 691142bc
Loading
Loading
Loading
Loading
+8 −9
Original line number Diff line number Diff line
@@ -457,7 +457,6 @@ ivas_error acelp_core_enc_fx(
            tc_classif_enc_fx( Q_new, st_fx->L_frame, &tc_subfr_fx, &position, attack_flag, st_fx->pitch[0], res_fx );

            config_acelp1_fx( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate, st_fx->L_frame, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, -1, tc_subfr_fx, 1, NULL, unbits_fx, st_fx->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st_fx->idchan, tdm_Pitch_reuse_flag, st_fx->tdm_LRTD_flag, st_fx->GSC_IVAS_mode );

        }

        /*---------------------------------------------------------------*
+1 −2
Original line number Diff line number Diff line
@@ -67,8 +67,7 @@ Word16 acelp_4t64_fx(
    const Word16 cmpl_flag,  /* i  : complexity reduction flag                      */
    const Word16 Opt_AMR_WB  /* i  : flag indicating AMR-WB IO mode                 */
    ,
    const Word16 element_mode
)
    const Word16 element_mode )
{

    Word16 i, k, index, track;
+1 −2
Original line number Diff line number Diff line
@@ -369,8 +369,7 @@ void E_ACELP_4tsearchx_fx(
    const PulseConfig *config,
    Word16 ind[] /*Q0*/
    ,
    const Word16 element_mode
)
    const Word16 element_mode )
{
    Word16 sign[L_SUBFR], vec[L_SUBFR];
    Word16 cor[L_SUBFR];
+4 −8
Original line number Diff line number Diff line
@@ -312,10 +312,8 @@ void encod_gen_voic_fx(
        IF( LE_32( st_fx->core_brate, ACELP_8k00 ) )
        {
            gain_enc_lbr_fx( hBstr, st_fx->acelp_cfg.gains_mode, st_fx->coder_type, i_subfr_fx, xn_fx, y1_fx, shift_wsp, y2_fx, code_fx,
                             &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, g_corr_fx, gc_mem, gp_mem, clip_gain_fx, L_SUBFR
                             ,
                             st_fx->element_mode
            );
                             &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, g_corr_fx, gc_mem, gp_mem, clip_gain_fx, L_SUBFR,
                             st_fx->element_mode );
        }
        ELSE IF( GT_32( st_fx->core_brate, ACELP_32k ) )
        {
@@ -688,10 +686,8 @@ void encod_gen_voic_ivas_fx(
        IF( LE_32( st_fx->core_brate, ACELP_8k00 ) )
        {
            gain_enc_lbr_fx( hBstr, st_fx->acelp_cfg.gains_mode, st_fx->coder_type, i_subfr_fx, xn_fx, y1_fx, shift_wsp, y2_fx, code_fx,
                             &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, g_corr_fx, gc_mem, gp_mem, clip_gain_fx, L_SUBFR
                             ,
                             st_fx->element_mode
            );
                             &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, g_corr_fx, gc_mem, gp_mem, clip_gain_fx, L_SUBFR,
                             st_fx->element_mode );
        }
        ELSE IF( GT_32( st_fx->core_brate, ACELP_32k ) )
        {
+7 −11
Original line number Diff line number Diff line
@@ -333,10 +333,8 @@ void enc_pit_exc_fx(
             * Gain encoding
             *-----------------------------------------------------------------*/

            gain_enc_lbr_fx( st_fx->hBstr, st_fx->acelp_cfg.gains_mode, GENERIC, i_subfr, xn, y1, shift_wsp, y2, code, &gain_pit, &gain_code, &gain_inov, &norm_gain_code, g_corr, gc_mem, gp_mem, clip_gain, 2 * L_SUBFR
                             ,
                             st_fx->element_mode
            );
            gain_enc_lbr_fx( st_fx->hBstr, st_fx->acelp_cfg.gains_mode, GENERIC, i_subfr, xn, y1, shift_wsp, y2, code, &gain_pit, &gain_code, &gain_inov, &norm_gain_code, g_corr, gc_mem, gp_mem, clip_gain, 2 * L_SUBFR,
                             st_fx->element_mode );
        }
        ELSE
        {
@@ -812,10 +810,8 @@ void enc_pit_exc_ivas_fx(
             * Gain encoding
             *-----------------------------------------------------------------*/

            gain_enc_lbr_fx( st_fx->hBstr, st_fx->acelp_cfg.gains_mode, GENERIC, i_subfr, xn, y1, sub( shift_wsp, 1 ), y2, code, &gain_pit, &gain_code, &gain_inov, &norm_gain_code, g_corr, gc_mem, gp_mem, clip_gain, 2 * L_SUBFR
                             ,
                             st_fx->element_mode
            );
            gain_enc_lbr_fx( st_fx->hBstr, st_fx->acelp_cfg.gains_mode, GENERIC, i_subfr, xn, y1, sub( shift_wsp, 1 ), y2, code, &gain_pit, &gain_code, &gain_inov, &norm_gain_code, g_corr, gc_mem, gp_mem, clip_gain, 2 * L_SUBFR,
                             st_fx->element_mode );
        }
        ELSE
        {
Loading