Commit c99fa63f authored by fbarchard@google.com's avatar fbarchard@google.com

arm64 initial port using C

BUG=319
TESTED=GYP_DEFINES="OS=ios target_arch=armv7 target_subarch=64" GYP_CROSSCOMPILE=1 GYP_GENERATOR_FLAGS="output_dir=out_ios" ./build/gyp_chromium -f ninja --depth=. libyuv_test.gyp  && ninja -j7 -C out_ios/Debug-iphoneos
R=tpsiaki@google.com

Review URL: https://webrtc-codereview.appspot.com/10909004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@994 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 614c9fa8
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 990
Version: 994
License: BSD
License File: LICENSE
......
......@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 990
#define LIBYUV_VERSION 994
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
......@@ -14,7 +14,7 @@
'use_system_libjpeg%': 0,
'build_neon': 0,
'conditions': [
[ '(target_arch == "armv7" or target_arch == "armv8" or (target_arch == "arm" and arm_version >= 7)) and (arm_neon == 1 or arm_neon_optional == 1)', {
[ '(target_arch == "armv7" or target_arch == "armv7s" or (target_arch == "arm" and arm_version >= 7)) and target_subarch != 64 and (arm_neon == 1 or arm_neon_optional == 1)', {
'build_neon': 1,
}],
],
......@@ -66,6 +66,11 @@
# Allows libyuv.a redistributable library without external dependencies.
'standalone_static_library': 1,
'conditions': [
[ 'OS == "ios" and target_subarch == 64', {
'defines': [
'LIBYUV_DISABLE_NEON'
],
}],
# TODO(fbarchard): Use gyp define to enable jpeg.
[ 'OS != "ios"', {
'defines': [
......
......@@ -51,6 +51,11 @@
'-fexceptions',
],
}],
[ 'OS == "ios" and target_subarch == 64', {
'defines': [
'LIBYUV_DISABLE_NEON'
],
}],
[ 'OS != "ios"', {
'defines': [
'HAVE_JPEG',
......@@ -105,6 +110,13 @@
'util/psnr.cc',
'util/ssim.cc',
],
'conditions': [
[ 'OS == "ios" and target_subarch == 64', {
'defines': [
'LIBYUV_DISABLE_NEON'
],
}],
], # conditions
},
{
'target_name': 'cpuid',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment