diff --git a/README.chromium b/README.chromium index b811b8175..86eb70cdf 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 502 +Version: 503 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 5094c5801..3dc1d62a7 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 502 +#define LIBYUV_VERSION 503 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_posix.cc b/source/row_posix.cc index c046b7d65..aab0e920d 100644 --- a/source/row_posix.cc +++ b/source/row_posix.cc @@ -4346,7 +4346,6 @@ void ARGBInterpolateRow_SSSE3(uint8* dst_argb, const uint8* src_argb, ); } - void HalfRow_SSE2(const uint8* src_uv, int src_uv_stride, uint8* dst_uv, int pix) { asm volatile ( diff --git a/unit_test/rotate_argb_test.cc b/unit_test/rotate_argb_test.cc index 9cc3e4a95..5ae4cb3f3 100644 --- a/unit_test/rotate_argb_test.cc +++ b/unit_test/rotate_argb_test.cc @@ -19,7 +19,7 @@ namespace libyuv { static int ARGBTestRotate(int src_width, int src_height, int dst_width, int dst_height, - libyuv::RotationMode mode, int runs) { + libyuv::RotationMode mode, int benchmark_iterations) { const int b = 128; int src_argb_plane_size = (src_width + b * 2) * (src_height + b * 2) * 4; int src_stride_argb = (b * 2 + src_width) * 4; @@ -63,12 +63,12 @@ static int ARGBTestRotate(int src_width, int src_height, MaskCpuFlags(-1); // Enable all CPU optimization. double opt_time = get_time(); - for (i = 0; i < runs; ++i) { + for (i = 0; i < benchmark_iterations; ++i) { ARGBRotate(src_argb + (src_stride_argb * b) + b * 4, src_stride_argb, dst_argb_opt + (dst_stride_argb * b) + b * 4, dst_stride_argb, src_width, src_height, mode); } - opt_time = (get_time() - opt_time) / runs; + opt_time = (get_time() - opt_time) / benchmark_iterations; // Report performance of C vs OPT printf("filter %d - %8d us C - %8d us OPT\n", diff --git a/unit_test/scale_argb_test.cc b/unit_test/scale_argb_test.cc index 7822a7ffb..cae91010b 100644 --- a/unit_test/scale_argb_test.cc +++ b/unit_test/scale_argb_test.cc @@ -58,13 +58,12 @@ static int ARGBTestFilter(int src_width, int src_height, MaskCpuFlags(0); // Disable all CPU optimization. double c_time = get_time(); - for (i = 0; i < benchmark_iterations; ++i) { - ARGBScale(src_argb + (src_stride_argb * b) + b * 4, src_stride_argb, - src_width, src_height, - dst_argb_c + (dst_stride_argb * b) + b * 4, dst_stride_argb, - dst_width, dst_height, f); - } - c_time = (get_time() - c_time) / benchmark_iterations; + ARGBScale(src_argb + (src_stride_argb * b) + b * 4, src_stride_argb, + src_width, src_height, + dst_argb_c + (dst_stride_argb * b) + b * 4, dst_stride_argb, + dst_width, dst_height, f); + + c_time = (get_time() - c_time); MaskCpuFlags(-1); // Enable all CPU optimization. double opt_time = get_time(); diff --git a/unit_test/scale_test.cc b/unit_test/scale_test.cc index 1a90c5f17..4ce1a11bd 100644 --- a/unit_test/scale_test.cc +++ b/unit_test/scale_test.cc @@ -88,17 +88,16 @@ static int TestFilter(int src_width, int src_height, MaskCpuFlags(0); // Disable all CPU optimization. double c_time = get_time(); - for (i = 0; i < benchmark_iterations; ++i) { - I420Scale(src_y + (src_stride_y * b) + b, src_stride_y, - src_u + (src_stride_uv * b) + b, src_stride_uv, - src_v + (src_stride_uv * b) + b, src_stride_uv, - src_width, src_height, - dst_y_c + (dst_stride_y * b) + b, dst_stride_y, - dst_u_c + (dst_stride_uv * b) + b, dst_stride_uv, - dst_v_c + (dst_stride_uv * b) + b, dst_stride_uv, - dst_width, dst_height, f); - } - c_time = (get_time() - c_time) / benchmark_iterations; + I420Scale(src_y + (src_stride_y * b) + b, src_stride_y, + src_u + (src_stride_uv * b) + b, src_stride_uv, + src_v + (src_stride_uv * b) + b, src_stride_uv, + src_width, src_height, + dst_y_c + (dst_stride_y * b) + b, dst_stride_y, + dst_u_c + (dst_stride_uv * b) + b, dst_stride_uv, + dst_v_c + (dst_stride_uv * b) + b, dst_stride_uv, + dst_width, dst_height, f); + + c_time = (get_time() - c_time); MaskCpuFlags(-1); // Enable all CPU optimization. double opt_time = get_time();