Commit 8345b068 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'float_struct_elements_cleanup_Q_info_updates_lib_com' into 'main' 

Float struct elements cleanup in lib_com and lib_enc, Q-info lib_com updates

See merge request !749
parents 387d70f2 714c56a8

lib_com/fd_cng_com.c

+0 −2
Original line number Diff line number Diff line
@@ -652,7 +652,6 @@ void minimum_statistics_flt( 


    return;

}

#endif





/*-------------------------------------------------------------------
@@ -689,7 +688,6 @@ void apply_scale_flt( 
}





#ifndef IVAS_FLOAT_FIXED

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

 * bandcombinepow_flt()

 *

lib_com/ifft_rel.c

+172 −206

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/igf_base_fx.c

+150 −148

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/index_pvq_opt_fx.c

+128 −127

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/int_lsp.c

+27 −29
Original line number Diff line number Diff line
@@ -98,12 +98,12 @@ void int_lsp( 


void int_lsp_fx(

    const Word16 L_frame,     /* i  : length of the frame               */

    const Word16 lsp_old[],   /* i  : LSPs from past frame              */

    const Word16 lsp_new[],   /* i  : LSPs from present frame           */

    Word16 *Aq,               /* o  : LP coefficients in both subframes */

    const Word16 lsp_old[],   /* i  : Q15 LSPs from past frame              */

    const Word16 lsp_new[],   /* i  : Q15 LSPs from present frame           */

    Word16 *Aq,               /* o  : Q12 LP coefficients in both subframes */

    const Word16 m,           /* i  : order of LP filter                */

    const Word16 *int_coeffs, /* i  : interpolation coefficients        */

    const Word16 Opt_AMR_WB   /* i  : flag indicating AMR-WB IO mode    */

    const Word16 *int_coeffs, /* i  : Q15 interpolation coefficients        */

    const Word16 Opt_AMR_WB   /* i  : Q0 flag indicating AMR-WB IO mode    */

)

{

    Word16 lsp[M], fnew, fold;
@@ -116,12 +116,12 @@ void int_lsp_fx( 


    IF( EQ_16( L_frame, L_FRAME ) )

    {

        pt_int_coeffs = int_coeffs;

        pt_int_coeffs = int_coeffs; /*Q15*/

        move16();

    }

    ELSE /* L_frame == L_FRAME16k */

    {

        pt_int_coeffs = interpol_frac_16k_fx;

        pt_int_coeffs = interpol_frac_16k_fx; /*Q15*/

    }

    FOR( k = 0; k < tmp; k++ )

    {
@@ -134,13 +134,13 @@ void int_lsp_fx( 
        }

        FOR( i = 0; i < m; i++ )

        {

            L_tmp = L_mult( lsp_old[i], fold );

            L_tmp = L_mac( L_tmp, lsp_new[i], fnew );

            L_tmp = L_mult( lsp_old[i], fold );       /*Q31*/

            L_tmp = L_mac( L_tmp, lsp_new[i], fnew ); /*Q31*/

            IF( fold == 0 )

            {

                L_tmp = L_mac( L_tmp, lsp_new[i], 1 ); /* 'fnew' should have been 32768 */

            }

            lsp[i] = round_fx( L_tmp );

            lsp[i] = round_fx( L_tmp ); /*Q15*/

        }

        IF( Opt_AMR_WB )

        {
@@ -257,38 +257,38 @@ void int_lsp4_fx( 
    {

        IF( EQ_16( relax_prev_lsf_interp, 1 ) )

        {

            pt_int_coeffs = interpol_frac_mid_relaxprev_12k8_fx;

            pt_int_coeffs = interpol_frac_mid_relaxprev_12k8_fx; /*Q15*/

        }

        ELSE IF( EQ_16( relax_prev_lsf_interp, 2 ) )

        {

            pt_int_coeffs = interpol_frac_mid_FEC_fx;

            pt_int_coeffs = interpol_frac_mid_FEC_fx; /*Q15*/

        }

        ELSE IF( EQ_16( relax_prev_lsf_interp, -1 ) )

        {

            pt_int_coeffs = interpol_frac_mid_relaxprev_pred_12k8_fx;

            pt_int_coeffs = interpol_frac_mid_relaxprev_pred_12k8_fx; /*Q15*/

        }

        ELSE

        {

            pt_int_coeffs = interpol_frac_mid_fx;

            pt_int_coeffs = interpol_frac_mid_fx; /*Q15*/

        }

    }

    ELSE /* L_frame == L_FRAME16k */

    {

        IF( EQ_16( relax_prev_lsf_interp, 1 ) )

        {

            pt_int_coeffs = interpol_frac_mid_relaxprev_16k_fx;

            pt_int_coeffs = interpol_frac_mid_relaxprev_16k_fx; /*Q15*/

        }

        ELSE IF( EQ_16( relax_prev_lsf_interp, 2 ) )

        {

            pt_int_coeffs = interpol_frac_mid_16k_FEC_fx;

            pt_int_coeffs = interpol_frac_mid_16k_FEC_fx; /*Q15*/

        }

        ELSE IF( EQ_16( relax_prev_lsf_interp, -1 ) )

        {

            pt_int_coeffs = interpol_frac_mid_relaxprev_pred_16k_fx;

            pt_int_coeffs = interpol_frac_mid_relaxprev_pred_16k_fx; /*Q15*/

        }

        ELSE

        {

            pt_int_coeffs = interpol_frac_mid_16k_fx;

            pt_int_coeffs = interpol_frac_mid_16k_fx; /*Q15*/

        }

    }

    k = sub( shr( L_frame, 6 ), 1 );
@@ -302,11 +302,9 @@ void int_lsp4_fx( 
            move16();

        }

        pt_int_coeffs += 3;

        move16();



        E_LPC_f_lsp_a_conversion( lsp, Aq, m );

        Aq += add( m, 1 );

        move16();

    }



    /* Last subframe */
@@ -334,42 +332,42 @@ void int_lsp4_ivas_fx( 
    {

        IF( EQ_16( relax_prev_lsf_interp, 1 ) )

        {

            pt_int_coeffs = interpol_frac_mid_relaxprev_12k8_fx;

            pt_int_coeffs = interpol_frac_mid_relaxprev_12k8_fx; /*Q15*/

        }

        ELSE IF( EQ_16( relax_prev_lsf_interp, 2 ) )

        {

            pt_int_coeffs = interpol_frac_mid_FEC_fx;

            pt_int_coeffs = interpol_frac_mid_FEC_fx; /*Q15*/

        }

        ELSE IF( EQ_16( relax_prev_lsf_interp, -1 ) )

        {

            pt_int_coeffs = interpol_frac_mid_relaxprev_pred_12k8_fx;

            pt_int_coeffs = interpol_frac_mid_relaxprev_pred_12k8_fx; /*Q15*/

        }

        ELSE IF( EQ_16( relax_prev_lsf_interp, -2 ) )

        {

            pt_int_coeffs = interpol_frac2_mid_fx;

            pt_int_coeffs = interpol_frac2_mid_fx; /*Q15*/

        }

        ELSE

        {

            pt_int_coeffs = interpol_frac_mid_fx;

            pt_int_coeffs = interpol_frac_mid_fx; /*Q15*/

        }

    }

    ELSE /* L_frame == L_FRAME16k */

    {

        IF( EQ_16( relax_prev_lsf_interp, 1 ) )

        {

            pt_int_coeffs = interpol_frac_mid_relaxprev_16k_fx;

            pt_int_coeffs = interpol_frac_mid_relaxprev_16k_fx; /*Q15*/

        }

        ELSE IF( EQ_16( relax_prev_lsf_interp, 2 ) )

        {

            pt_int_coeffs = interpol_frac_mid_16k_FEC_fx;

            pt_int_coeffs = interpol_frac_mid_16k_FEC_fx; /*Q15*/

        }

        ELSE IF( EQ_16( relax_prev_lsf_interp, -1 ) )

        {

            pt_int_coeffs = interpol_frac_mid_relaxprev_pred_16k_fx;

            pt_int_coeffs = interpol_frac_mid_relaxprev_pred_16k_fx; /*Q15*/

        }

        ELSE

        {

            pt_int_coeffs = interpol_frac_mid_16k_fx;

            pt_int_coeffs = interpol_frac_mid_16k_fx; /*Q15*/

        }

    }

    k = sub( shr( L_frame, 6 ), 1 );