coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-07 01:06:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Copy width to 64 bit register to work around clang 3.4 warning

Browse Source 
BUG=none
TESTED=local ios 64 bit build completes without size warnings on xcode 5.1.1
R=harryjin@google.com

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

git-svn-id: http://libyuv.googlecode.com/svn/trunk@1120 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2014-10-13 23:26:17 +00:00
parent f58c85199e
commit f6e495169c
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 1119 Version: 1120
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1119 #define LIBYUV_VERSION 1120
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

10
source/rotate_neon64.cc
View File

@ -27,6 +27,7 @@ void TransposeWx8_NEON(const uint8* src, int src_stride,
uint8* dst, int dst_stride, uint8* dst, int dst_stride,
int width) { int width) {
const uint8* src_temp = NULL; const uint8* src_temp = NULL;
int64 width64 = (int64) width; // Work around clang 3.4 warning.
asm volatile ( asm volatile (
// loops are on blocks of 8. loop will stop when // loops are on blocks of 8. loop will stop when
// counter gets to or below 0. starting the counter // counter gets to or below 0. starting the counter
@ -237,10 +238,10 @@ void TransposeWx8_NEON(const uint8* src, int src_stride,
: "+r"(src_temp), // %0 : "+r"(src_temp), // %0
"+r"(src), // %1 "+r"(src), // %1
"+r"(dst), // %2 "+r"(dst), // %2
"+r"(width) // %3 "+r"(width64) // %3
: "r"(&kVTbl4x4Transpose), // %4 : "r"(&kVTbl4x4Transpose), // %4
"r"((ptrdiff_t)src_stride), // %5 "r"(static_cast<ptrdiff_t>(src_stride)), // %5
"r"((ptrdiff_t)dst_stride) // %6 "r"(static_cast<ptrdiff_t>(dst_stride)) // %6
: "memory", "cc", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v16", : "memory", "cc", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v16",
"v17", "v18", "v19", "v20", "v21", "v22", "v23" "v17", "v18", "v19", "v20", "v21", "v22", "v23"
); );
@ -255,6 +256,7 @@ void TransposeUVWx8_NEON(const uint8* src, int src_stride,
uint8* dst_b, int dst_stride_b, uint8* dst_b, int dst_stride_b,
int width) { int width) {
const uint8* src_temp = NULL; const uint8* src_temp = NULL;
int64 width64 = (int64) width; // Work around clang 3.4 warning.
asm volatile ( asm volatile (
// loops are on blocks of 8. loop will stop when // loops are on blocks of 8. loop will stop when
// counter gets to or below 0. starting the counter // counter gets to or below 0. starting the counter
@ -522,7 +524,7 @@ void TransposeUVWx8_NEON(const uint8* src, int src_stride,
"+r"(src), // %1 "+r"(src), // %1
"+r"(dst_a), // %2 "+r"(dst_a), // %2
"+r"(dst_b), // %3 "+r"(dst_b), // %3
"+r"(width) // %4 "+r"(width64) // %4
: "r"(static_cast<ptrdiff_t>(src_stride)), // %5 : "r"(static_cast<ptrdiff_t>(src_stride)), // %5
"r"(static_cast<ptrdiff_t>(dst_stride_a)), // %6 "r"(static_cast<ptrdiff_t>(dst_stride_a)), // %6
"r"(static_cast<ptrdiff_t>(dst_stride_b)), // %7 "r"(static_cast<ptrdiff_t>(dst_stride_b)), // %7