Commit 0122b0da authored by Sandesh Venkatesh's avatar Sandesh Venkatesh Committed by Manuel Jander
Browse files

Cleanup of pre-processor macros in the main branch

parent 4e62ce87

lib_com/fft_fx.c

+0 −26
Original line number Diff line number Diff line
@@ -7596,12 +7596,6 @@ Word16 L_norm_arr( const Word32 *arr, Word16 size ) 
    Word16 q = 31;

    move16();

    FOR( Word16 i = 0; i < size; i++ )

#ifndef FIX_1103_OPT_L_NORM_ARR

    IF( arr[i] != 0 )

    {

        q = s_min( q, norm_l( arr[i] ) );

    }

#else

    {

        Word16 q_tst;
@@ -7612,7 +7606,6 @@ Word16 L_norm_arr( const Word32 *arr, Word16 size ) 
        }

    }



#endif

    return q;

}
@@ -7658,24 +7651,6 @@ Word16 W_norm_arr( Word64 *arr, Word16 size ) 


Word16 get_min_scalefactor( Word32 x, Word32 y )

{

#ifndef FIX_1104_OPT_GETMINSCALEFAC

    Word16 scf = Q31;

    move16();

    test();

    IF( x == 0 && y == 0 )

    {

        return 0;

    }

    IF( x != 0 )

    {

        scf = s_min( scf, norm_l( x ) );

    }

    IF( y != 0 )

    {

        scf = s_min( scf, norm_l( y ) );

    }

    return scf;

#else

    Word16 scf_y;

    Word16 scf = Q31;

    move16();
@@ -7699,7 +7674,6 @@ Word16 get_min_scalefactor( Word32 x, Word32 y ) 
    }



    return scf;

#endif

}

lib_com/ivas_dirac_com_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -610,7 +610,8 @@ void computeDirectionVectors_fixed( 
    Word32 *direction_vector_z, /* o: Q30*/

    Word16 i_e                  /*Exponent of all the intensity buffers*/

    ,

    Word16 *i_e_band )

    Word16 *i_e_band

)

{

    Word16 i;

    Word32 intensityNorm;

lib_com/ivas_prot_fx.h

+2 −3
Original line number Diff line number Diff line
@@ -3268,7 +3268,8 @@ void computeDirectionVectors_fixed( 
    Word32 *direction_vector_z, /*Q30*/

    Word16 i_e                  /*Exponent of all the intensity buffers*/

    ,

    Word16 *i_e_band );

    Word16 *i_e_band

);





UWord8 ivas_masa_surrcoh_signicant_fx(
@@ -5980,9 +5981,7 @@ ivas_error pre_proc_front_ivas_fx( 
    const Word16 front_vad_dtx_flag, /* i  : front-VAD DTX flag to overwrite VAD decision				Q0*/

    const IVAS_FORMAT ivas_format,   /* i  : IVAS format												*/

    const Word16 MCT_flag,           /* i  : hMCT handle allocated (1) or not (0)						Q0*/

#ifdef NONBE_1211_DTX_BR_SWITCHING

    const Word32 last_ivas_total_brate, /* i  : last IVAS total bitrate                                    Q0*/

#endif

    const Word32 ivas_total_brate,   /* i  : IVAS total bitrate - for setting the DTX					Q0*/

    Word16 *Q_new

#ifdef DEBUG_MODE_INFO

lib_com/ivas_qmetadata_com_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -446,6 +446,8 @@ ivas_error only_reduce_bits_direction_fx( 
                }

            }

        }





    }



    *reduce_bits_out = negate( reduce_bits );

lib_com/ivas_spar_com_fx.c

+0 −9
Original line number Diff line number Diff line
@@ -3828,15 +3828,6 @@ void ivas_compute_spar_params_fx( 
                        move32();

                    }

                }

#else

                for ( i = 0; i < IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS; i++ )

                {

                    for ( j = 0; j < IVAS_SPAR_MAX_DMX_CHS - 1; j++ )

                    {

                        hSparMd->band_coeffs[b + i_ts * IVAS_MAX_NUM_BANDS].C_re_fx[i][j] = L_shr( hSparMd->band_coeffs[b + i_ts * IVAS_MAX_NUM_BANDS].C_re_fx[i][j], sub( q_tmp, 22 ) );

                    }

                }

#endif

                hSparMd->band_coeffs[b + ( i_ts * IVAS_MAX_NUM_BANDS )].q_C_re_fx = Q22;

                move16();

            }