diff options
| author | fbarchard@google.com <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90> | 2012-03-12 18:53:19 +0000 |
|---|---|---|
| committer | fbarchard@google.com <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90> | 2012-03-12 18:53:19 +0000 |
| commit | 18184fd19dba08d6567357e3913285a779e4b9f3 (patch) | |
| tree | 4bb927881fddb8bcb957285f3eda730fb628f06e /source/rotate.cc | |
| parent | 1ff03571039ffe24a89a9ba3d06c5c9bd52754db (diff) | |
| download | libyuv-18184fd19dba08d6567357e3913285a779e4b9f3.tar.gz | |
switch looping to jg from ja to allow non-multiple of 16 to underflow to a negative
BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/453001
git-svn-id: http://libyuv.googlecode.com/svn/trunk@214 16f28f9a-4ce2-e073-06de-1de4eb20be90
Diffstat (limited to 'source/rotate.cc')
| -rw-r--r-- | source/rotate.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source/rotate.cc b/source/rotate.cc index 67011480..d62c36a7 100644 --- a/source/rotate.cc +++ b/source/rotate.cc @@ -153,7 +153,7 @@ static void TransposeWx8_SSSE3(const uint8* src, int src_stride, sub ecx, 8 movq qword ptr [edx + esi], xmm7 lea edx, [edx + 2 * esi] - ja convertloop + jg convertloop pop ebp pop esi @@ -281,7 +281,7 @@ static void TransposeUVWx8_SSE2(const uint8* src, int src_stride, lea edx, [edx + 2 * esi] movhpd qword ptr [ebx + ebp], xmm0 lea ebx, [ebx + 2 * ebp] - ja convertloop + jg convertloop mov esp, [esp + 16] pop ebp @@ -366,7 +366,7 @@ static void TransposeWx8_SSSE3(const uint8* src, int src_stride, "sub $0x8,%2 \n" "movq %%xmm7,(%1,%4) \n" "lea (%1,%4,2),%1 \n" - "ja 1b \n" + "jg 1b \n" : "+r"(src), // %0 "+r"(dst), // %1 "+r"(width) // %2 @@ -493,7 +493,7 @@ extern "C" void TransposeUVWx8_SSE2(const uint8* src, int src_stride, "lea (%edx,%esi,2),%edx \n" "movhpd %xmm0,(%ebx,%ebp,1) \n" "lea (%ebx,%ebp,2),%ebx \n" - "ja 1b \n" + "jg 1b \n" "mov 0x10(%esp),%esp \n" "pop %ebp \n" "pop %edi \n" @@ -629,7 +629,7 @@ static void TransposeWx8_FAST_SSSE3(const uint8* src, int src_stride, "sub $0x10,%2 \n" "movq %%xmm15,(%1,%4) \n" "lea (%1,%4,2),%1 \n" - "ja 1b \n" + "jg 1b \n" : "+r"(src), // %0 "+r"(dst), // %1 "+r"(width) // %2 @@ -737,7 +737,7 @@ static void TransposeUVWx8_SSE2(const uint8* src, int src_stride, "lea (%1,%5,2),%1 \n" "movhpd %%xmm8,(%2,%6) \n" "lea (%2,%6,2),%2 \n" - "ja 1b \n" + "jg 1b \n" : "+r"(src), // %0 "+r"(dst_a), // %1 "+r"(dst_b), // %2 @@ -755,8 +755,8 @@ static void TransposeUVWx8_SSE2(const uint8* src, int src_stride, static void TransposeWx8_C(const uint8* src, int src_stride, uint8* dst, int dst_stride, - int w) { - for (int i = 0; i < w; ++i) { + int width) { + for (int i = 0; i < width; ++i) { dst[0] = src[0 * src_stride]; dst[1] = src[1 * src_stride]; dst[2] = src[2 * src_stride]; @@ -888,9 +888,9 @@ void RotatePlane180(const uint8* src, int src_stride, static void TransposeUVWx8_C(const uint8* src, int src_stride, uint8* dst_a, int dst_stride_a, uint8* dst_b, int dst_stride_b, - int w) { + int width) { int i; - for (i = 0; i < w; ++i) { + for (i = 0; i < width; ++i) { dst_a[0] = src[0 * src_stride + 0]; dst_b[0] = src[0 * src_stride + 1]; dst_a[1] = src[1 * src_stride + 0]; @@ -916,10 +916,10 @@ static void TransposeUVWx8_C(const uint8* src, int src_stride, static void TransposeUVWxH_C(const uint8* src, int src_stride, uint8* dst_a, int dst_stride_a, uint8* dst_b, int dst_stride_b, - int w, int h) { + int width, int height) { int i, j; - for (i = 0; i < w * 2; i += 2) - for (j = 0; j < h; ++j) { + for (i = 0; i < width * 2; i += 2) + for (j = 0; j < height; ++j) { dst_a[j + ((i >> 1) * dst_stride_a)] = src[i + (j * src_stride)]; dst_b[j + ((i >> 1) * dst_stride_b)] = src[i + (j * src_stride) + 1]; } |