From a43c9f8822c3066efc91de366bb1b3c3bf88387a Mon Sep 17 00:00:00 2001 From: Fraunhofer IIS FDK Date: Fri, 17 Apr 2020 15:15:06 +0200 Subject: Prevent undefined values for CODING_SCHEME type in huff_decode(). Bug: 186706541 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I82da4a5660289d1c96888d48c315f96a4a5c1c2a --- libFDK/include/nlc_dec.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'libFDK/include') diff --git a/libFDK/include/nlc_dec.h b/libFDK/include/nlc_dec.h index cca97f1..aded569 100644 --- a/libFDK/include/nlc_dec.h +++ b/libFDK/include/nlc_dec.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -159,9 +159,6 @@ typedef enum { #ifndef HUFFDEC_PARAMS #define HUFFDEC_PARMS -#define PAIR_SHIFT 4 -#define PAIR_MASK 0xf - #define MAX_ENTRIES 168 #define HANDLE_HUFF_NODE const SHORT(*)[MAX_ENTRIES][2] -- cgit v1.2.3 From 7f328b93ee2aa8bb4e94613b6ed218e7525d8dc0 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 10 Jul 2021 13:06:57 +0200 Subject: Do not force inlining of indirect functions * A function called indirectly cannot be decorated with `__attribute((always_inline))`, as this is guaranteed to only work with direct calls: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63220#c1 Bug: https://bugs.gentoo.org/798045 --- libFDK/include/fft.h | 4 ++-- libFDK/src/fft.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libFDK/include') diff --git a/libFDK/include/fft.h b/libFDK/include/fft.h index d394046..4ef62b4 100644 --- a/libFDK/include/fft.h +++ b/libFDK/include/fft.h @@ -139,7 +139,7 @@ void ifft(int length, FIXP_DBL *pInput, INT *scalefactor); * bit scale headroom. The values are interleaved, real/imag pairs. */ LNK_SECTION_CODE_L1 -static FDK_FORCEINLINE void fft_4(FIXP_DBL *x) { +static inline void fft_4(FIXP_DBL *x) { FIXP_DBL a00, a10, a20, a30, tmp0, tmp1; a00 = (x[0] + x[4]) >> 1; /* Re A + Re B */ @@ -168,7 +168,7 @@ static FDK_FORCEINLINE void fft_4(FIXP_DBL *x) { #ifndef FUNCTION_fft_8 LNK_SECTION_CODE_L1 -static FDK_FORCEINLINE void fft_8(FIXP_DBL *x) { +static inline void fft_8(FIXP_DBL *x) { FIXP_SPK w_PiFOURTH = {{FIXP_SGL(0x5A82), FIXP_SGL(0x5A82)}}; FIXP_DBL a00, a10, a20, a30; diff --git a/libFDK/src/fft.cpp b/libFDK/src/fft.cpp index 4e6fdd2..c9ee784 100644 --- a/libFDK/src/fft.cpp +++ b/libFDK/src/fft.cpp @@ -170,7 +170,7 @@ amm-info@iis.fraunhofer.de /* Performs the FFT of length 2. Input vector unscaled, output vector scaled * with factor 0.5 */ -static FDK_FORCEINLINE void fft2(FIXP_DBL *RESTRICT pDat) { +static inline void fft2(FIXP_DBL *RESTRICT pDat) { FIXP_DBL r1, i1; FIXP_DBL r2, i2; @@ -196,7 +196,7 @@ static FDK_FORCEINLINE void fft2(FIXP_DBL *RESTRICT pDat) { #ifndef FUNCTION_fft3 /* Performs the FFT of length 3 according to the algorithm after winograd. */ -static FDK_FORCEINLINE void fft3(FIXP_DBL *RESTRICT pDat) { +static inline void fft3(FIXP_DBL *RESTRICT pDat) { FIXP_DBL r1, r2; FIXP_DBL s1, s2; FIXP_DBL pD; @@ -233,7 +233,7 @@ static FDK_FORCEINLINE void fft3(FIXP_DBL *RESTRICT pDat) { /* performs the FFT of length 5 according to the algorithm after winograd */ /* This version works with a prescale of 2 instead of 3 */ -static FDK_FORCEINLINE void fft5(FIXP_DBL *RESTRICT pDat) { +static inline void fft5(FIXP_DBL *RESTRICT pDat) { FIXP_DBL r1, r2, r3, r4; FIXP_DBL s1, s2, s3, s4; FIXP_DBL t; -- cgit v1.2.3 From 3aabcb6abd1b32344370758aaae424735ca061a6 Mon Sep 17 00:00:00 2001 From: "haocheng.zy" Date: Fri, 13 May 2022 23:26:42 +0800 Subject: Add riscv64 support Signed-off-by: Zhang Ye Signed-off-by: Mao Han Change-Id: Ifc1c8801d885b0b4ac1bf91842830ab650780328 --- libFDK/include/FDK_archdef.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libFDK/include') diff --git a/libFDK/include/FDK_archdef.h b/libFDK/include/FDK_archdef.h index 95601bb..3d0cddf 100644 --- a/libFDK/include/FDK_archdef.h +++ b/libFDK/include/FDK_archdef.h @@ -219,6 +219,13 @@ amm-info@iis.fraunhofer.de #define POW2COEFF_16BIT #define LDCOEFF_16BIT +#elif defined(__riscv) +#define ARCH_PREFER_MULT_32x16 +#define SINETABLE_16BIT +#define POW2COEFF_16BIT +#define LDCOEFF_16BIT +#define WINDOWTABLE_16BIT + #else #warning >>>> Please set architecture characterization defines for your platform (FDK_HIGH_PERFORMANCE)! <<<< -- cgit v1.2.3 From c16d5d72c99a77c8bcb788a922323b0b59035803 Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Sun, 17 Aug 2014 09:38:29 -0500 Subject: Add build support for s390x --- libFDK/include/FDK_archdef.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libFDK/include') diff --git a/libFDK/include/FDK_archdef.h b/libFDK/include/FDK_archdef.h index 2ece9a4..f3254f2 100644 --- a/libFDK/include/FDK_archdef.h +++ b/libFDK/include/FDK_archdef.h @@ -232,6 +232,14 @@ amm-info@iis.fraunhofer.de #elif defined(__powerpc__) #define ARCH_PREFER_MULT_32x32 +#elif defined(__s390x__) +#define ARCH_PREFER_MULT_32x32 +#define ARCH_PREFER_MULT_32x16 +#define SINETABLE_16BIT +#define POW2COEFF_16BIT +#define LDCOEFF_16BIT +#define WINDOWTABLE_16BIT + #else #warning >>>> Please set architecture characterization defines for your platform (FDK_HIGH_PERFORMANCE)! <<<< -- cgit v1.2.3