Commit 4d402204 authored by multrus's avatar multrus
Browse files

[cleanup] accept OPT_SBA_ENC_V2_BE, OPT_SBA_ENC_V2_NBE, OPT_SBA_ENC_V1_BE

parent 53fee1dd

lib_com/interpol_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -70,14 +70,8 @@ Word32 Interpol_lc_fx( /* o : interpolated value 
            c2 += up_samp; /* move16() not needed, since the coefficient can be rearrange in bit exact way */

            c1 += up_samp;

        }

#ifdef OPT_SBA_ENC_V2_BE

        L_sum = W_shl_sat_l( L_sum64, 1 ); /*Q15*/

    }

#else

        L_sum = W_sat_l( L_sum64 ); /*Q14*/

    }

    L_sum = L_shl_sat( L_sum, 1 ); /*Q15*/

#endif

    return L_sum;

}

lib_com/ivas_dirac_com_fx.c

+1 −161

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_fb_mixer_fx.c

+0 −42

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_spar_com_fx.c

+0 −171

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -77,9 +77,6 @@ 
/* Note: each compile switch (FIX_1101_...) is independent from the other ones */

#define OPT_MCT_ENC_V3_BE

#define OPT_BIN_REND_V2_NBE

#define OPT_SBA_ENC_V2_BE

#define OPT_SBA_ENC_V2_NBE

#define OPT_SBA_ENC_V1_BE

#define OPT_SBA_DEC_PATH                    /* Optimization made in SBA decoding path */

#define OPT_IVAS_FILTER_ROM                    /* Optimization made in IVAS filter table */

/* Both following 2 macros (IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST*) are independent from each other, they refer to different code blocks */