Commit d4452776 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

undo some unintended changes - deactivate inDev-defines

parent 760c0943

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ 
#define FIX_1298                                /* VA: fix possible assert in gaus_enc */

#define FIX_1300_ICA_SHIFT_QUANT_IMPROV         /* VA: Fix to 1300 to improve precision of the lag quantizer */



#define FIX_1072_SPEEDUP_ivas_dirac_dec_get_response_fx /*FhG: WMOPS tuning, in development*/

#define FIX1072_SPEEDUP_ivas_dirac_dec_output_synthesis_process_slot /*FhG: WMOPS tuning, in development*/

//#define FIX_1072_SPEEDUP_ivas_dirac_dec_get_response_fx /*FhG: WMOPS tuning, in development*/

//#define FIX1072_SPEEDUP_ivas_dirac_dec_output_synthesis_process_slot /*FhG: WMOPS tuning, in development*/



#endif

lib_rend/ivas_dirac_output_synthesis_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -959,7 +959,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx( 
                        }

                        sqr = Sqrt32( sqr_inp, &sqr_exp ); /*Q(31-sqr_exp)*/

                        sqr = L_shr( sqr, 2 );             /*Q(31-sqr_exp)*/

                    }

                    



                    IF( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] != 0 )

                    {
@@ -986,6 +986,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx( 
                        Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );

                        move16();

                    }

                    }

#else

                    FOR( ; k < num_freq_bands; k++ )

                    {
@@ -1042,8 +1043,6 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx( 
                        }

                        sqr = Sqrt32( sqr_inp, &sqr_exp ); /*Q(31-sqr_exp)*/

                        sqr = L_shr( sqr, 2 );             /*Q(31-sqr_exp)*/

                    }



                    IF( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] != 0 )

                    {

                        IF( LT_16( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) )
@@ -1069,6 +1068,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx( 
                        Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );

                        move16();

                    }

                    }

#endif