Commit 49d6b653 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2280_REDUCTION_UNNECESSARY_SCALING_NONBE

parent 45db6408

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_2280_REDUCTION_UNNECESSARY_SCALING_NONBE    /* VA: reduction of unnecessary scaling, non-BE part */

#define FIX_2403_COMBINE_PITCH_OL                       /* VA : basop 2403, reusing common code between EVS and IVAS in pitch_ol */

#define FIX_2404_HARM_SIGNAL_CLAS                       /* VA: basop-2404, harmonize signal_clas and signa_ivas_clas */

#define HARMONIZE_ACELP_ENC                             /* VA: basop issue 2400: Remove duplicated main ACELP encoder function */

lib_dec/ivas_core_dec_fx.c

+0 −34
Original line number Diff line number Diff line
@@ -93,9 +93,6 @@ ivas_error ivas_core_dec_fx( 
    ivas_error error;

    Word32 L_tmp;

    Word16 Q_synth;

#ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING_NONBE

    Word16 output_16_fx[CPE_CHANNELS][L_FRAME48k];

#endif

    Word16 hb_synth_16_fx[CPE_CHANNELS][L_FRAME48k];

    Word16 synth_16_fx[CPE_CHANNELS][L_FRAME48k];

    Word32 synth_32_fx[CPE_CHANNELS][L_FRAME48k];
@@ -468,9 +465,6 @@ ivas_error ivas_core_dec_fx( 
         * HQ core decoding

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



#ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING_NONBE

        set16_fx( output_16_fx[n], 0, L_FRAME48k ); /* this is needed for instances like L_norm_arr( p_output_fx[i], L_FRAME48k ) */

#endif

        IF( st->core == ACELP_CORE )

        {

            /* ACELP core decoder */
@@ -880,10 +874,6 @@ ivas_error ivas_core_dec_fx( 
            Copy_Scale_sig_16_32_no_sat( st->delay_buf_out_fx, st->delay_buf_out32_fx, ( HQ_DELTA_MAX * HQ_DELAY_COMP ), sub( Q11, st->hHQ_core->Q_old_postdec ) ); // Q11

        }



#ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING_NONBE

        Scale_sig32( output_32_fx[n], output_frame, ( Q4 - Q11 ) ); // Q4

        Scale_sig32( output_32_fx[n], output_frame, ( Q11 - Q4 ) ); // Q11

#endif



        /*note : cldfb_size here signifies the original size which was assigned to cldfb_state_fx buffer not its current size*/
@@ -924,7 +914,6 @@ ivas_error ivas_core_dec_fx( 
         * WB BWE decoding

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



#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING_NONBE

        Word16 Q_hb_synth_fx, Q_synth_fx;

        Word16 Q_syn_hb;
@@ -932,10 +921,6 @@ ivas_error ivas_core_dec_fx( 
        move16();

        Q_synth_fx = Q_synth;

        move16();

#else

        Word16 Q_input, Q_hb_synth_fx, Q_synth_fx;

        Word16 Q_syn_hb, sf;

#endif



        flaf_swb_tbe = 0;

        move16();
@@ -953,22 +938,6 @@ ivas_error ivas_core_dec_fx( 
            move16();

        }



#ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING_NONBE

        sf = getScaleFactor32( output_32_fx[n], L_FRAME48k );



        Q_input = 0;

        move16();

        if ( LT_16( sf, 5 ) )

        {

            Q_input = sub( sf, 5 );

        }

        Q_hb_synth_fx = 0;

        move16();

        Q_synth_fx = Q_synth;

        move16();



        Copy_Scale_sig_32_16( output_32_fx[n], output_16_fx[n], L_FRAME48k, sub( Q_input, Q11 ) ); // Q_input

#endif

        Copy_Scale_sig_32_16( hb_synth_32_fx[n], hb_synth_16_fx[n], L_FRAME48k, -( Q11 ) ); // Q0

        test();

        test();
@@ -1000,9 +969,6 @@ ivas_error ivas_core_dec_fx( 
        {

            Copy_Scale_sig_16_32_no_sat( hb_synth_16_fx[n], hb_synth_32_fx[n], L_FRAME48k, sub( Q11, Q_hb_synth_fx ) ); // Q11

        }

#ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING_NONBE

        Copy_Scale_sig_16_32_no_sat( output_16_fx[n], output_32_fx[n], L_FRAME48k, sub( Q11, Q_input ) ); // Q11    // Q_input can get value <= -5

#endif

        Copy_Scale_sig_16_32_no_sat( synth_16_fx[n], synth_32_fx[n], output_frame, sub( Q11, Q_synth_fx ) ); // Q11



        IF( hBWE_FD != NULL )