Commit 792c23b0 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Apply new format

parent 646723a1

lib_com/cng_exc_fx.c

+359 −357
Original line number Diff line number Diff line
@@ -147,9 +147,11 @@ void CNG_exc_fx( 
            move16();

        }

    }

    ELSE{

    ELSE

    {

        /* normal CNG update */

        IF( *last_allow_cn_step == 0 ){

        IF( *last_allow_cn_step == 0 )

        {

            /**lp_ener = (float)(A2 * *Enew + (1-A2) * *lp_ener);*/

            L_tmp_ener = Mult_32_16( *Enew, A2 );

            L_tmp_ener = Madd_32_16( L_tmp_ener, *lp_ener, OmA2 );

lib_com/hq2_core_com_fx.c

+78 −76
Original line number Diff line number Diff line
@@ -334,8 +334,10 @@ void hq2_core_configure_fx( 
    }

    ELSE /* (frame_length == SWB) */

    {

            IF( is_transient ){

                IF( LE_32( L_bwe_br, ACELP_13k20 ) ){

        IF( is_transient )

        {

            IF( LE_32( L_bwe_br, ACELP_13k20 ) )

            {

                xcore_config_fx = &xcore_config_32kHz_013200bps_short;

                move16();

            }

lib_com/ivas_qspherical_com_fx.c

+55 −46
Original line number Diff line number Diff line
@@ -278,9 +278,12 @@ Word16 quantize_phi_fx( 
    {

        id_phi = add( id_phi, ( n % 2 ) );

    }

    ELSE{

        IF( EQ_16( id_phi, add( shr( n, 1 ), ( n % 2 ) ) ) ){

            IF( n % 2 ){

    ELSE

    {

        IF( EQ_16( id_phi, add( shr( n, 1 ), ( n % 2 ) ) ) )

        {

            IF( n % 2 )

            {

                id_phi = sub( id_phi, 1 );

            }

            ELSE
@@ -356,9 +359,12 @@ Word16 quantize_phi_enc_fx( 
    {

        id_phi = add( id_phi, ( n % 2 ) );

    }

    ELSE{

        IF( EQ_16( id_phi, add( shr( n, 1 ), ( n % 2 ) ) ) ){

            IF( n % 2 ){

    ELSE

    {

        IF( EQ_16( id_phi, add( shr( n, 1 ), ( n % 2 ) ) ) )

        {

            IF( n % 2 )

            {

                id_phi = sub( id_phi, 1 );

            }

            ELSE
@@ -677,9 +683,12 @@ Word16 quantize_phi_chan_compand_fx( 
    {

        id_phi = add( id_phi, ( n % 2 ) );

    }

    ELSE{

        IF( EQ_16( id_phi, add( shr( n, 1 ), ( n % 2 ) ) ) ){

            IF( n % 2 ){

    ELSE

    {

        IF( EQ_16( id_phi, add( shr( n, 1 ), ( n % 2 ) ) ) )

        {

            IF( n % 2 )

            {

                id_phi = sub( id_phi, 1 );

            }

            ELSE

lib_com/ivas_stereo_td_bit_alloc_fx.c

+26 −24
Original line number Diff line number Diff line
@@ -513,8 +513,10 @@ void tdm_bit_alloc( 
            move16();

            idx = sub( NB_RATE_POSS, 2 );



            FOR( i = 0; i < NB_RATE_POSS; i++ ){

                IF( LE_16( tmp_rate, fast_FCB_rates_2sfr[i] ) ){

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

            {

                IF( LE_16( tmp_rate, fast_FCB_rates_2sfr[i] ) )

                {

                    idx = i;

                    move16();

                    BREAK;

lib_com/lsf_dec_bfi_fx.c

+60 −57
Original line number Diff line number Diff line
@@ -186,9 +186,12 @@ void lsf_dec_bfi( 
    {

        reorder_isf_fx( lsf, ISF_GAP_FX, M, Fs_2 );

    }

    ELSE{

        IF( EQ_16( L_frame, L_FRAME ) ){

            IF( EQ_16( codec_mode, MODE1 ) ){

    ELSE

    {

        IF( EQ_16( L_frame, L_FRAME ) )

        {

            IF( EQ_16( codec_mode, MODE1 ) )

            {

                reorder_lsf_fx( lsf, MODE1_LSF_GAP_FX, M, INT_FS_FX ); /*arg1&2: 14Q1*1.18*/

            }

            ELSE