Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
fdk-aac
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
fdk-aac
Commits
fb2e8451
Commit
fb2e8451
authored
Apr 09, 2014
by
Glenn Kasten
Committed by
Android Git Automerger
Apr 09, 2014
Browse files
Options
Browse Files
Download
Plain Diff
am
35f30c5a
: Merge "AArch64: Make LONG 4 bytes"
* commit '
35f30c5a
': AArch64: Make LONG 4 bytes
parents
603f48ab
35f30c5a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
libFDK/include/common_fix.h
libFDK/include/common_fix.h
+2
-2
libSYS/include/machine_type.h
libSYS/include/machine_type.h
+3
-3
No files found.
libFDK/include/common_fix.h
View file @
fb2e8451
...
@@ -226,7 +226,7 @@ FDK_INLINE FIXP_SGL fAbs(FIXP_SGL x)
...
@@ -226,7 +226,7 @@ FDK_INLINE FIXP_SGL fAbs(FIXP_SGL x)
{
return
fixabs_S
(
x
);
}
{
return
fixabs_S
(
x
);
}
/* workaround for TI C6x compiler but not for TI ARM9E compiler */
/* workaround for TI C6x compiler but not for TI ARM9E compiler */
#if (!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__
x86_
64__)
#if (!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__
LP
64__)
FDK_INLINE
INT
fAbs
(
INT
x
)
FDK_INLINE
INT
fAbs
(
INT
x
)
{
return
fixabs_I
(
x
);
}
{
return
fixabs_I
(
x
);
}
#endif
#endif
...
@@ -336,7 +336,7 @@ FDK_INLINE FIXP_SGL fMax(FIXP_SGL a, FIXP_SGL b)
...
@@ -336,7 +336,7 @@ FDK_INLINE FIXP_SGL fMax(FIXP_SGL a, FIXP_SGL b)
{
return
fixmax_S
(
a
,
b
);
}
{
return
fixmax_S
(
a
,
b
);
}
/* workaround for TI C6x compiler but not for TI ARM9E */
/* workaround for TI C6x compiler but not for TI ARM9E */
#if ((!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__
x86_
64__)) || (FIX_FRACT == 1)
#if ((!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__
LP
64__)) || (FIX_FRACT == 1)
FDK_INLINE
INT
fMax
(
INT
a
,
INT
b
)
FDK_INLINE
INT
fMax
(
INT
a
,
INT
b
)
{
return
fixmax_I
(
a
,
b
);
}
{
return
fixmax_I
(
a
,
b
);
}
FDK_INLINE
INT
fMin
(
INT
a
,
INT
b
)
FDK_INLINE
INT
fMin
(
INT
a
,
INT
b
)
...
...
libSYS/include/machine_type.h
View file @
fb2e8451
...
@@ -154,15 +154,15 @@ amm-info@iis.fraunhofer.de
...
@@ -154,15 +154,15 @@ amm-info@iis.fraunhofer.de
typedef
signed
int
INT
;
typedef
signed
int
INT
;
typedef
unsigned
int
UINT
;
typedef
unsigned
int
UINT
;
#ifdef __
x86_
64__
#ifdef __
LP
64__
/* force FDK long-datatypes to 4 byte */
/* force FDK long-datatypes to 4 byte */
/* jdr: Use defines to avoid type alias problems on 64 bit machines. */
/* jdr: Use defines to avoid type alias problems on 64 bit machines. */
#define LONG INT
#define LONG INT
#define ULONG UINT
#define ULONG UINT
#else
/* __
x86_
64__ */
#else
/* __
LP
64__ */
typedef
signed
long
LONG
;
typedef
signed
long
LONG
;
typedef
unsigned
long
ULONG
;
typedef
unsigned
long
ULONG
;
#endif
/* __
x86_
64__ */
#endif
/* __
LP
64__ */
typedef
signed
short
SHORT
;
typedef
signed
short
SHORT
;
typedef
unsigned
short
USHORT
;
typedef
unsigned
short
USHORT
;
typedef
signed
char
SCHAR
;
typedef
signed
char
SCHAR
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment