Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
2c60f875
Commit
2c60f875
authored
Jan 10, 2014
by
Johann
Committed by
Gerrit Code Review
Jan 10, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Apply neon flags to intrinsic files"
parents
ca677a38
dadf3505
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
build/make/Android.mk
build/make/Android.mk
+5
-1
vp8/common/arm/neon/bilinearpredict_neon.c
vp8/common/arm/neon/bilinearpredict_neon.c
+0
-0
vp8/vp8_common.mk
vp8/vp8_common.mk
+1
-1
No files found.
build/make/Android.mk
View file @
2c60f875
...
...
@@ -135,10 +135,14 @@ CODEC_SRCS_UNIQUE = $(sort $(CODEC_SRCS))
# Pull out C files. vpx_config.c is in the immediate directory and
# so it does not need libvpx/ prefixed like the rest of the source files.
# The neon files with intrinsics need to have .neon appended so the proper
# flags are applied.
CODEC_SRCS_C
=
$(
filter
%.c,
$(CODEC_SRCS_UNIQUE)
)
LOCAL_CODEC_SRCS_C
=
$(
filter-out
vpx_config.c,
$(CODEC_SRCS_C)
)
LOCAL_NEON_SRCS_C
=
$(
filter
%_neon.c,
$(CODEC_SRCS_C)
)
LOCAL_CODEC_SRCS_C
=
$(
filter-out
vpx_config.c %_neon.c,
$(CODEC_SRCS_C)
)
LOCAL_SRC_FILES
+=
$(
foreach
file,
$(LOCAL_CODEC_SRCS_C)
, libvpx/
$(file)
)
LOCAL_SRC_FILES
+=
$(
foreach
file,
$(LOCAL_NEON_SRCS_C)
, libvpx/
$(file)
.neon
)
# Pull out assembly files, splitting NEON from the rest. This is
# done to specify that the NEON assembly files use NEON assembler flags.
...
...
vp8/common/arm/neon/bilinearpredict_neon
_intrinsics
.c
→
vp8/common/arm/neon/bilinearpredict_neon.c
View file @
2c60f875
File moved
vp8/vp8_common.mk
View file @
2c60f875
...
...
@@ -188,7 +188,7 @@ VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_subpixelvariance16x16_neon$
VP8_COMMON_SRCS-$(HAVE_NEON)
+=
common/arm/neon/vp8_subpixelvariance16x16s_neon
$(ASM)
# common (neon intrinsics)
VP8_COMMON_SRCS-$(HAVE_NEON)
+=
common/arm/neon/bilinearpredict_neon
_intrinsics
.c
VP8_COMMON_SRCS-$(HAVE_NEON)
+=
common/arm/neon/bilinearpredict_neon.c
$(eval
$(call
rtcd_h_template,vp8_rtcd,vp8/common/rtcd_defs.sh))
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