diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-24 07:24:38 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-24 07:24:38 +0000 |
| commit | c85b838a65360747539d85099d92268dd3994d11 (patch) | |
| tree | 4f088dbfd47d22d3f90ebcbcf054a26d6e69bdce /libFDK/include | |
| parent | e30420c551a348fdf0a20888ca2b95b527060061 (diff) | |
| parent | a4d1f0ad52e2cf6f168d2193216602f52033fc27 (diff) | |
| download | fdk-aac-c85b838a65360747539d85099d92268dd3994d11.tar.gz fdk-aac-c85b838a65360747539d85099d92268dd3994d11.tar.bz2 fdk-aac-c85b838a65360747539d85099d92268dd3994d11.zip | |
Snap for 4801384 from a4d1f0ad52e2cf6f168d2193216602f52033fc27 to pi-release
Change-Id: Iab0959417db83cdeb3af7ce59ef4d8584a96b8be
Diffstat (limited to 'libFDK/include')
| -rw-r--r-- | libFDK/include/cplx_mul.h | 20 | ||||
| -rw-r--r-- | libFDK/include/mdct.h | 1 |
2 files changed, 1 insertions, 20 deletions
diff --git a/libFDK/include/cplx_mul.h b/libFDK/include/cplx_mul.h index 9c5da57..eb1afce 100644 --- a/libFDK/include/cplx_mul.h +++ b/libFDK/include/cplx_mul.h @@ -260,26 +260,6 @@ inline void cplxMult(FIXP_DBL *c_Re, FIXP_DBL *c_Im, const FIXP_DBL a_Re, } #endif -#if !defined(FUNCTION_cplxMult_nIm) -#define FUNCTION_cplxMult_nIm - -/* Same as cplxMult, but - a_Im must be negated, when used - c_re must be negated, when output -*/ -inline void cplxMult_nIm(FIXP_DBL *c_Re, FIXP_DBL *c_Im, const FIXP_DBL a_Re, - const FIXP_DBL a_Im, const FIXP_SPK w) { - *c_Re = -(fMult(a_Re, w.v.re) + fMult(a_Im, w.v.im)); - *c_Im = fMult(a_Re, w.v.im) - fMult(a_Im, w.v.re); -} - -inline void cplxMult_nIm(FIXP_DBL *c_Re, FIXP_DBL *c_Im, const FIXP_DBL a_Re, - const FIXP_DBL a_Im, const FIXP_DPK w) { - *c_Re = -(fMult(a_Re, w.v.re) + fMult(a_Im, w.v.im)); - *c_Im = fMult(a_Re, w.v.im) - fMult(a_Im, w.v.re); -} -#endif - /* ############################################################################# */ diff --git a/libFDK/include/mdct.h b/libFDK/include/mdct.h index e671da9..1382374 100644 --- a/libFDK/include/mdct.h +++ b/libFDK/include/mdct.h @@ -119,6 +119,7 @@ amm-info@iis.fraunhofer.de #define IMDCT_SCALE(x) SATURATE_LEFT_SHIFT(x, -MDCT_OUTPUT_SCALE, PCM_OUT_BITS) #endif #define IMDCT_SCALE_DBL(x) (FIXP_DBL)(x) +#define IMDCT_SCALE_DBL_LSH1(x) SATURATE_LEFT_SHIFT_ALT((x), 1, DFRACT_BITS) #define MLT_FLAG_CURR_ALIAS_SYMMETRY 1 |