Commit 7807e717 authored by Manuel Jander's avatar Manuel Jander
Browse files

clang format and deactivate FIX_867_CLDFB_NRG_SCALE_PROTO_NORESCALE.

parent 91ba8cfd

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
#endif



#define FIX_867_CLDFB_NRG_SCALE

#define FIX_867_CLDFB_NRG_SCALE_PROTO_NORESCALE

//#define FIX_867_CLDFB_NRG_SCALE_PROTO_NORESCALE



#define FIX_1378_ACELP_OUT_OF_BOUNDS

lib_rend/ivas_dirac_output_synthesis_dec_fx.c

+10 −9
Original line number Diff line number Diff line
@@ -2380,7 +2380,8 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx( 
    // Update the Q-factor

    h_dirac_output_synthesis_state->proto_power_smooth_prev_q[0] = s_min( h_dirac_output_synthesis_state->proto_power_smooth_q[0], h_dirac_output_synthesis_state->proto_power_smooth_prev_q[0] );

    h_dirac_output_synthesis_state->proto_power_smooth_prev_q[1] = s_min( h_dirac_output_synthesis_state->proto_power_smooth_q[1], h_dirac_output_synthesis_state->proto_power_smooth_prev_q[1] );

    move16(); move16();

    move16();

    move16();



    q_tmp = add( sub( Q31, min_exp ), sub( Q31, h_dirac_output_synthesis_state->proto_power_smooth_prev_q[0] ) );

    q_tmp2 = add( sub( Q31, min_exp2 ), sub( Q31, h_dirac_output_synthesis_state->proto_power_smooth_prev_q[1] ) );

lib_rend/ivas_dirac_rend_fx.c

+27 −23
Original line number Diff line number Diff line
@@ -1779,7 +1779,8 @@ void protoSignalComputation2_fx( 
#ifdef FIX_867_CLDFB_NRG_SCALE

    min_q_shift[0] = Q31;

    min_q_shift[1] = Q31;

    move16(); move16();

    move16();

    move16();

#else

    min_q_shift = Q31;

    move16();
@@ -2851,7 +2852,6 @@ void protoSignalComputation2_fx( 
            proto_frame_f_fx[4 * num_freq_bands + 2 * l + 1] = im2; // q_cldfb+ min_q_shift

            move32();

        }



    }

#ifdef FIX_867_CLDFB_NRG_SCALE

    q_reference_power_64fx = shl( add( q_cldfb, min_q_shift[0] ), 1 );
@@ -2919,7 +2919,9 @@ void protoSignalComputation2_fx( 
        }

        *q_proto_frame_f = add( q_cldfb, min_q_shift[1] );

        move16();

    } ELSE {

    }

    ELSE

    {

        FOR( l = 0; l < i_mult( num_proto, num_freq_bands ); l += num_freq_bands )

        {

            Scale_sig32( proto_frame_f_fx + shl( add( l, CLDFB_NO_CHANNELS_HALF ), 1 ), shl( s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), 1 ), sub( min_q_shift[0], min_q_shift[1] ) );
@@ -2935,7 +2937,9 @@ void protoSignalComputation2_fx( 
        }

        *q_proto_direct_buffer_f = add( q_cldfb, min_q_shift[1] );

        move16();

    } ELSE {

    }

    ELSE

    {

        FOR( l = 0; l < i_mult( num_proto, num_freq_bands ); l += num_freq_bands )

        {

            Scale_sig32( p_proto_buffer_fx + shl( add( l, CLDFB_NO_CHANNELS_HALF ), 1 ), shl( s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), 1 ), sub( min_q_shift[0], min_q_shift[1] ) );