Commit 8f72a467 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2254_IMPROV_COMPLEXITY_BE

parent 540070c0

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ 
#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK       /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/

#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_2254_IMPROV_COMPLEXITY_BE                   /* VA: BE small complexity reduction  */

#define FIX_2275_OOB_INDEXING_IN_PREDICT_SIGNAL_FUNC    /* FhG: fix a USAN OOB error */

#define FIX_2284_ADD_ASSERT_LOG                         /* FhG: add asserts to Log2_norm_lc() and log10_fx() */

#define FIX_2286_GCC_WARNING_Idx2Freq_Tbl               /* FhG: Fix compiler warning for OOB access of Idx2Freq_Tbl[] */

lib_com/pred_lt4_fx.c

+0 −5
Original line number Diff line number Diff line
@@ -58,13 +58,8 @@ void pred_lt4_ivas_fx( 
            FOR( i = 0; i < nb_coef; i++ )

            {

                /*s += (*x1--) * (*c1) + (*x2++) * (*c2);*/

#ifdef FIX_2254_IMPROV_COMPLEXITY_BE

                s64 = W_mac_32_16( s64, ( *c1 ), *x1-- ); /* Q_exc + Q32 */

                s64 = W_mac_32_16( s64, ( *c2 ), *x2++ ); /* Q_exc + Q32 */

#else

                s64 = W_mac_32_32( s64, L_deposit_l( *x1-- ), ( *c1 ) ); /* Q_exc + Q32 */

                s64 = W_mac_32_32( s64, L_deposit_l( *x2++ ), ( *c2 ) ); /* Q_exc + Q32 */

#endif

                c1 += up_sample;

                c2 += up_sample;

            }

lib_dec/ivas_sns_dec_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -81,11 +81,7 @@ static void sns_1st_dec_fx( 


    FOR( i = 0; i < M / 2; i++ )

    {

#ifdef FIX_2254_IMPROV_COMPLEXITY_BE

        snsq_fx[i] = L_mac( L_mult( ( *p_dico++ ), cdbk_fix ), means[i], means_fix ); // Q16

#else

        snsq_fx[i] = L_add( L_mult( ( *p_dico++ ), cdbk_fix ), L_mult( means[i], means_fix ) ); // Q16

#endif

        move32();

    }
@@ -93,11 +89,7 @@ static void sns_1st_dec_fx( 


    FOR( i = M / 2; i < M; i++ )

    {

#ifdef FIX_2254_IMPROV_COMPLEXITY_BE

        snsq_fx[i] = L_mac( L_mult( ( *p_dico++ ), cdbk_fix ), means[i], means_fix ); /*Q16*/

#else

        snsq_fx[i] = L_add( L_mult( ( *p_dico++ ), cdbk_fix ), L_mult( means[i], means_fix ) ); /*Q16*/

#endif

        move32();

    }

lib_enc/ivas_omasa_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1542,11 +1542,7 @@ static void ivas_omasa_dmx_fx( 
                    g1 = interpolator[k];

                    move16();

                    g2 = sub( MAX_WORD16, g1 ); /*q15*/

#ifdef FIX_2254_IMPROV_COMPLEXITY_BE

                    data_out[j][k] = L_add( data_out[j][k], Mpy_32_32( L_mac( L_mult( g1, gains[j] ), g2, prev_gains[i][j] ) /*q31*/, data_in[i][k] ) ); /*Qx*/

#else

                    data_out[j][k] = L_add( data_out[j][k], Mpy_32_32( L_add( L_mult( g1, gains[j] ), L_mult( g2, prev_gains[i][j] ) ) /*q31*/, data_in[i][k] ) ); /*Qx*/

#endif

                    move32();

                }

            }

lib_enc/swb_tbe_enc_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -3986,11 +3986,7 @@ void swb_tbe_enc_ivas_fx( 
            FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )

            {

                // GainShape[i] = ( 1 - feedback ) * GainShape[i] + feedback * GainShape_Interp[i];

#ifdef FIX_2254_IMPROV_COMPLEXITY_BE

                GainShape_fx[i] = extract_h( L_mac( L_mult( sub( MAX16B, feedback ), GainShape_fx[i] ), feedback, GainShape_Interp_fx[i] ) );

#else

                GainShape_fx[i] = extract_h( L_add( L_mult( sub( MAX16B, feedback ), GainShape_fx[i] ), L_mult( feedback, GainShape_Interp_fx[i] ) ) );

#endif

                move16();

            }

        }
@@ -4104,11 +4100,7 @@ void swb_tbe_enc_ivas_fx( 
            FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )

            {

                // GainShape[i] = ( 1 - feedback ) * GainShape[i * NUM_SHB_SUBGAINS] + feedback * GainShape_Interp[i];

#ifdef FIX_2254_IMPROV_COMPLEXITY_BE

                GainShape_fx[i] = extract_h( L_mac( L_mult( sub( MAX16B, feedback ), GainShape_fx[i * NUM_SHB_SUBGAINS] ), feedback, GainShape_Interp_fx[i] ) ); // Q15

#else

                GainShape_fx[i] = extract_h( L_add( L_mult( sub( MAX16B, feedback ), GainShape_fx[i * NUM_SHB_SUBGAINS] ), L_mult( feedback, GainShape_Interp_fx[i] ) ) ); // Q15

#endif

                move16();

            }