diff --git a/CMakeLists.txt b/CMakeLists.txt index 82034977a..fb4747527 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,6 @@ set(ly_unittest_sources ${ly_base_dir}/unit_test/rotate_argb_test.cc ${ly_base_dir}/unit_test/rotate_test.cc ${ly_base_dir}/unit_test/scale_argb_test.cc - ${ly_base_dir}/unit_test/scale_color_test.cc ${ly_base_dir}/unit_test/scale_test.cc ${ly_base_dir}/unit_test/unit_test.cc ${ly_base_dir}/unit_test/video_common_test.cc diff --git a/README.chromium b/README.chromium index 76e79bbbb..5c6d582bb 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1508 +Version: 1509 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index d940db77d..c07264f4e 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 1508 +#define LIBYUV_VERSION 1509 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/libyuv_test.gyp b/libyuv_test.gyp index fd4a98b25..403f3cd3f 100644 --- a/libyuv_test.gyp +++ b/libyuv_test.gyp @@ -42,7 +42,6 @@ 'unit_test/rotate_argb_test.cc', 'unit_test/rotate_test.cc', 'unit_test/scale_argb_test.cc', - 'unit_test/scale_color_test.cc', 'unit_test/scale_test.cc', 'unit_test/unit_test.cc', 'unit_test/video_common_test.cc', @@ -175,7 +174,7 @@ { # TODO(kjellander): Figure out what to change in build/apk_test.gypi # to it can be used instead of the copied code below. Using it in its - # current version was not possible, since the target starts with 'lib', + # current version was not possible, since the target starts with 'lib', # which somewhere confuses the variables. 'target_name': 'libyuv_unittest_apk', 'type': 'none', diff --git a/unit_test/color_test.cc b/unit_test/color_test.cc index 488dc94aa..8afa60d25 100644 --- a/unit_test/color_test.cc +++ b/unit_test/color_test.cc @@ -37,7 +37,7 @@ namespace libyuv { #endif #define TESTCS(TESTNAME, YUVTOARGB, ARGBTOYUV, HS1, HS, HN, DIFF) \ -TEST_F(LibYUVConvertTest, TESTNAME) { \ +TEST_F(LibYUVColorTest, TESTNAME) { \ const int kPixels = benchmark_width_ * benchmark_height_; \ const int kHalfPixels = ((benchmark_width_ + 1) / 2) * \ ((benchmark_height_ + HS1) / HS); \ @@ -312,7 +312,7 @@ static int RoundToByte(float f) { #define RANDOM256(s) ((s & 1) ? ((s >> 1) ^ 0xb8) : (s >> 1)) -TEST_F(LibYUVConvertTest, TestRoundToByte) { +TEST_F(LibYUVColorTest, TestRoundToByte) { int allb = 0; int count = benchmark_width_ * benchmark_height_; for (int i = 0; i < benchmark_iterations_; ++i) { @@ -339,7 +339,7 @@ static void YUVJToRGBReference(int y, int u, int v, int* r, int* g, int* b) { *b = RoundToByte(y - (u - 128) * -1.77200); } -TEST_F(LibYUVConvertTest, TestYUV) { +TEST_F(LibYUVColorTest, TestYUV) { int r0, g0, b0, r1, g1, b1; // cyan (less red) @@ -385,7 +385,7 @@ TEST_F(LibYUVConvertTest, TestYUV) { } } -TEST_F(LibYUVConvertTest, TestGreyYUV) { +TEST_F(LibYUVColorTest, TestGreyYUV) { int r0, g0, b0, r1, g1, b1, r2, g2, b2; // black @@ -464,7 +464,7 @@ static void PrintHistogram(int rh[256], int gh[256], int bh[256]) { printf("\n"); } -TEST_F(LibYUVConvertTest, TestFullYUV) { +TEST_F(LibYUVColorTest, TestFullYUV) { int rh[256] = { 0, }, gh[256] = { 0, }, bh[256] = { 0, }; for (int u = 0; u < 256; ++u) { for (int v = 0; v < 256; ++v) { @@ -485,7 +485,7 @@ TEST_F(LibYUVConvertTest, TestFullYUV) { PrintHistogram(rh, gh, bh); } -TEST_F(LibYUVConvertTest, TestFullYUVJ) { +TEST_F(LibYUVColorTest, TestFullYUVJ) { int rh[256] = { 0, }, gh[256] = { 0, }, bh[256] = { 0, }; for (int u = 0; u < 256; ++u) { for (int v = 0; v < 256; ++v) { @@ -506,7 +506,7 @@ TEST_F(LibYUVConvertTest, TestFullYUVJ) { PrintHistogram(rh, gh, bh); } -TEST_F(LibYUVConvertTest, TestGreyYUVJ) { +TEST_F(LibYUVColorTest, TestGreyYUVJ) { int r0, g0, b0, r1, g1, b1, r2, g2, b2; // black diff --git a/unit_test/scale_color_test.cc b/unit_test/scale_color_test.cc deleted file mode 100644 index e0c944e33..000000000 --- a/unit_test/scale_color_test.cc +++ /dev/null @@ -1,470 +0,0 @@ -/* - * Copyright 2015 The LibYuv Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#include - -#include "libyuv/convert.h" -#include "libyuv/convert_argb.h" -#include "libyuv/convert_from.h" -#include "libyuv/convert_from_argb.h" -#include "libyuv/cpu_id.h" -#include "libyuv/row.h" // For Sobel -#include "../unit_test/unit_test.h" - -namespace libyuv { - -// TODO(fbarchard): Port high accuracy YUV to RGB to Neon. -#if !defined(LIBYUV_DISABLE_NEON) && \ - (defined(__aarch64__) || defined(__ARM_NEON__) || defined(LIBYUV_NEON)) -#define ERROR_R 1 -#define ERROR_G 1 -#define ERROR_B 3 -#define ERROR_FULL 6 -#define ERROR_J420 4 -#else -#define ERROR_R 1 -#define ERROR_G 1 -#define ERROR_B 3 -#define ERROR_FULL 5 -#define ERROR_J420 3 -#endif - -#define TESTCS(TESTNAME, YUVTOARGB, ARGBTOYUV, HS1, HS, HN, DIFF) \ -TEST_F(LibYUVScaleTest, DISABLED_ ## TESTNAME) { \ - const int kPixels = benchmark_width_ * benchmark_height_; \ - const int kHalfPixels = ((benchmark_width_ + 1) / 2) * \ - ((benchmark_height_ + HS1) / HS); \ - align_buffer_64(orig_y, kPixels); \ - align_buffer_64(orig_u, kHalfPixels); \ - align_buffer_64(orig_v, kHalfPixels); \ - align_buffer_64(orig_pixels, kPixels * 4); \ - align_buffer_64(temp_y, kPixels); \ - align_buffer_64(temp_u, kHalfPixels); \ - align_buffer_64(temp_v, kHalfPixels); \ - align_buffer_64(dst_pixels_opt, kPixels * 4); \ - align_buffer_64(dst_pixels_c, kPixels * 4); \ - \ - MemRandomize(orig_pixels, kPixels * 4); \ - MemRandomize(orig_y, kPixels); \ - MemRandomize(orig_u, kHalfPixels); \ - MemRandomize(orig_v, kHalfPixels); \ - MemRandomize(temp_y, kPixels); \ - MemRandomize(temp_u, kHalfPixels); \ - MemRandomize(temp_v, kHalfPixels); \ - MemRandomize(dst_pixels_opt, kPixels * 4); \ - MemRandomize(dst_pixels_c, kPixels * 4); \ - \ - /* The test is overall for color conversion matrix being reversible, so */ \ - /* this initializes the pixel with 2x2 blocks to eliminate subsampling. */ \ - uint8* p = orig_y; \ - for (int y = 0; y < benchmark_height_ - HS1; y += HS) { \ - for (int x = 0; x < benchmark_width_ - 1; x += 2) { \ - uint8 r = static_cast(fastrand()); \ - p[0] = r; \ - p[1] = r; \ - p[HN] = r; \ - p[HN + 1] = r; \ - p += 2; \ - } \ - if (benchmark_width_ & 1) { \ - uint8 r = static_cast(fastrand()); \ - p[0] = r; \ - p[HN] = r; \ - p += 1; \ - } \ - p += HN; \ - } \ - \ - /* Start with YUV converted to ARGB. */ \ - YUVTOARGB(orig_y, benchmark_width_, \ - orig_u, (benchmark_width_ + 1) / 2, \ - orig_v, (benchmark_width_ + 1) / 2, \ - orig_pixels, benchmark_width_ * 4, \ - benchmark_width_, benchmark_height_); \ - \ - ARGBTOYUV(orig_pixels, benchmark_width_ * 4, \ - temp_y, benchmark_width_, \ - temp_u, (benchmark_width_ + 1) / 2, \ - temp_v, (benchmark_width_ + 1) / 2, \ - benchmark_width_, benchmark_height_); \ - \ - MaskCpuFlags(disable_cpu_flags_); \ - YUVTOARGB(temp_y, benchmark_width_, \ - temp_u, (benchmark_width_ + 1) / 2, \ - temp_v, (benchmark_width_ + 1) / 2, \ - dst_pixels_c, benchmark_width_ * 4, \ - benchmark_width_, benchmark_height_); \ - MaskCpuFlags(-1); \ - \ - for (int i = 0; i < benchmark_iterations_; ++i) { \ - YUVTOARGB(temp_y, benchmark_width_, \ - temp_u, (benchmark_width_ + 1) / 2, \ - temp_v, (benchmark_width_ + 1) / 2, \ - dst_pixels_opt, benchmark_width_ * 4, \ - benchmark_width_, benchmark_height_); \ - } \ - /* Test C and SIMD match. */ \ - for (int i = 0; i < kPixels * 4; ++i) { \ - EXPECT_EQ(dst_pixels_c[i], dst_pixels_opt[i]); \ - } \ - /* Test SIMD is close to original. */ \ - for (int i = 0; i < kPixels * 4; ++i) { \ - EXPECT_NEAR(static_cast(orig_pixels[i]), \ - static_cast(dst_pixels_opt[i]), DIFF); \ - } \ - \ - free_aligned_buffer_64(orig_pixels); \ - free_aligned_buffer_64(orig_y); \ - free_aligned_buffer_64(orig_u); \ - free_aligned_buffer_64(orig_v); \ - free_aligned_buffer_64(temp_y); \ - free_aligned_buffer_64(temp_u); \ - free_aligned_buffer_64(temp_v); \ - free_aligned_buffer_64(dst_pixels_opt); \ - free_aligned_buffer_64(dst_pixels_c); \ -} \ - -TESTCS(ScaleTestI420, I420ToARGB, ARGBToI420, 1, 2, benchmark_width_, - ERROR_FULL) -TESTCS(ScaleTestI422, I422ToARGB, ARGBToI422, 0, 1, 0, ERROR_FULL) -TESTCS(ScaleTestJ420, J420ToARGB, ARGBToJ420, 1, 2, benchmark_width_, - ERROR_J420) -TESTCS(ScaleTestJ422, J422ToARGB, ARGBToJ422, 0, 1, 0, 3) - -static void YUVToRGB(int y, int u, int v, int* r, int* g, int* b) { - const int kWidth = 16; - const int kHeight = 1; - const int kPixels = kWidth * kHeight; - const int kHalfPixels = ((kWidth + 1) / 2) * ((kHeight + 1) / 2); - - SIMD_ALIGNED(uint8 orig_y[16]); - SIMD_ALIGNED(uint8 orig_u[8]); - SIMD_ALIGNED(uint8 orig_v[8]); - SIMD_ALIGNED(uint8 orig_pixels[16 * 4]); - memset(orig_y, y, kPixels); - memset(orig_u, u, kHalfPixels); - memset(orig_v, v, kHalfPixels); - - /* YUV converted to ARGB. */ - I422ToARGB(orig_y, kWidth, - orig_u, (kWidth + 1) / 2, - orig_v, (kWidth + 1) / 2, - orig_pixels, kWidth * 4, - kWidth, kHeight); - - *b = orig_pixels[0]; - *g = orig_pixels[1]; - *r = orig_pixels[2]; -} - -static void YUVJToRGB(int y, int u, int v, int* r, int* g, int* b) { - const int kWidth = 16; - const int kHeight = 1; - const int kPixels = kWidth * kHeight; - const int kHalfPixels = ((kWidth + 1) / 2) * ((kHeight + 1) / 2); - - SIMD_ALIGNED(uint8 orig_y[16]); - SIMD_ALIGNED(uint8 orig_u[8]); - SIMD_ALIGNED(uint8 orig_v[8]); - SIMD_ALIGNED(uint8 orig_pixels[16 * 4]); - memset(orig_y, y, kPixels); - memset(orig_u, u, kHalfPixels); - memset(orig_v, v, kHalfPixels); - - /* YUV converted to ARGB. */ - J422ToARGB(orig_y, kWidth, - orig_u, (kWidth + 1) / 2, - orig_v, (kWidth + 1) / 2, - orig_pixels, kWidth * 4, - kWidth, kHeight); - - *b = orig_pixels[0]; - *g = orig_pixels[1]; - *r = orig_pixels[2]; -} - -static void YToRGB(int y, int* r, int* g, int* b) { - const int kWidth = 16; - const int kHeight = 1; - const int kPixels = kWidth * kHeight; - - SIMD_ALIGNED(uint8 orig_y[16]); - SIMD_ALIGNED(uint8 orig_pixels[16 * 4]); - memset(orig_y, y, kPixels); - - /* YUV converted to ARGB. */ - I400ToARGB(orig_y, kWidth, orig_pixels, kWidth * 4, kWidth, kHeight); - - *b = orig_pixels[0]; - *g = orig_pixels[1]; - *r = orig_pixels[2]; -} - -static void YJToRGB(int y, int* r, int* g, int* b) { - const int kWidth = 16; - const int kHeight = 1; - const int kPixels = kWidth * kHeight; - - SIMD_ALIGNED(uint8 orig_y[16]); - SIMD_ALIGNED(uint8 orig_pixels[16 * 4]); - memset(orig_y, y, kPixels); - - /* YUV converted to ARGB. */ - J400ToARGB(orig_y, kWidth, orig_pixels, kWidth * 4, kWidth, kHeight); - - *b = orig_pixels[0]; - *g = orig_pixels[1]; - *r = orig_pixels[2]; -} - -// Pick a method for rounding. -#define ROUND(f) static_cast(f + 0.5) -static int RoundToByte(float f) { - int i = ROUND(f); - if (i < 0) { - i = 0; - } - if (i > 255) { - i = 255; - } - return i; -} - -#define RANDOM256(s) ((s & 1) ? ((s >> 1) ^ 0xb8) : (s >> 1)) - -static void YUVToRGBReference(int y, int u, int v, int* r, int* g, int* b) { - *r = RoundToByte((y - 16) * 1.164 - (v - 128) * -1.596); - *g = RoundToByte((y - 16) * 1.164 - (u - 128) * 0.391 - (v - 128) * 0.813); - *b = RoundToByte((y - 16) * 1.164 - (u - 128) * -2.018); -} - -static void YUVJToRGBReference(int y, int u, int v, int* r, int* g, int* b) { - *r = RoundToByte(y - (v - 128) * -1.40200); - *g = RoundToByte(y - (u - 128) * 0.34414 - (v - 128) * 0.71414); - *b = RoundToByte(y - (u - 128) * -1.77200); -} - -TEST_F(LibYUVScaleTest, DISABLED_ScaleTestYUV) { - int r0, g0, b0, r1, g1, b1; - - // cyan (less red) - YUVToRGBReference(240, 255, 0, &r0, &g0, &b0); - EXPECT_EQ(56, r0); - EXPECT_EQ(255, g0); - EXPECT_EQ(255, b0); - - YUVToRGB(240, 255, 0, &r1, &g1, &b1); - EXPECT_EQ(57, r1); - EXPECT_EQ(255, g1); - EXPECT_EQ(255, b1); - - // green (less red and blue) - YUVToRGBReference(240, 0, 0, &r0, &g0, &b0); - EXPECT_EQ(56, r0); - EXPECT_EQ(255, g0); - EXPECT_EQ(2, b0); - - YUVToRGB(240, 0, 0, &r1, &g1, &b1); - EXPECT_EQ(57, r1); - EXPECT_EQ(255, g1); - EXPECT_EQ(5, b1); - - for (int i = 0; i < 256; ++i) { - YUVToRGBReference(i, 128, 128, &r0, &g0, &b0); - YUVToRGB(i, 128, 128, &r1, &g1, &b1); - EXPECT_NEAR(r0, r1, ERROR_R); - EXPECT_NEAR(g0, g1, ERROR_G); - EXPECT_NEAR(b0, b1, ERROR_B); - - YUVToRGBReference(i, 0, 0, &r0, &g0, &b0); - YUVToRGB(i, 0, 0, &r1, &g1, &b1); - EXPECT_NEAR(r0, r1, ERROR_R); - EXPECT_NEAR(g0, g1, ERROR_G); - EXPECT_NEAR(b0, b1, ERROR_B); - - YUVToRGBReference(i, 0, 255, &r0, &g0, &b0); - YUVToRGB(i, 0, 255, &r1, &g1, &b1); - EXPECT_NEAR(r0, r1, ERROR_R); - EXPECT_NEAR(g0, g1, ERROR_G); - EXPECT_NEAR(b0, b1, ERROR_B); - } -} - -TEST_F(LibYUVScaleTest, DISABLED_ScaleTestGreyYUV) { - int r0, g0, b0, r1, g1, b1, r2, g2, b2; - - // black - YUVToRGBReference(16, 128, 128, &r0, &g0, &b0); - EXPECT_EQ(0, r0); - EXPECT_EQ(0, g0); - EXPECT_EQ(0, b0); - - YUVToRGB(16, 128, 128, &r1, &g1, &b1); - EXPECT_EQ(0, r1); - EXPECT_EQ(0, g1); - EXPECT_EQ(0, b1); - - // white - YUVToRGBReference(240, 128, 128, &r0, &g0, &b0); - EXPECT_EQ(255, r0); - EXPECT_EQ(255, g0); - EXPECT_EQ(255, b0); - - YUVToRGB(240, 128, 128, &r1, &g1, &b1); - EXPECT_EQ(255, r1); - EXPECT_EQ(255, g1); - EXPECT_EQ(255, b1); - - // grey - YUVToRGBReference(128, 128, 128, &r0, &g0, &b0); - EXPECT_EQ(130, r0); - EXPECT_EQ(130, g0); - EXPECT_EQ(130, b0); - - YUVToRGB(128, 128, 128, &r1, &g1, &b1); - EXPECT_EQ(130, r1); - EXPECT_EQ(130, g1); - EXPECT_EQ(130, b1); - - - for (int y = 0; y < 256; ++y) { - YUVToRGBReference(y, 128, 128, &r0, &g0, &b0); - YUVToRGB(y, 128, 128, &r1, &g1, &b1); - YToRGB(y, &r2, &g2, &b2); - EXPECT_EQ(r0, r1); - EXPECT_EQ(g0, g1); - EXPECT_EQ(b0, b1); - EXPECT_EQ(r0, r2); - EXPECT_EQ(g0, g2); - EXPECT_EQ(b0, b2); - } -} - -static void ScalePrintHistogram(int rh[256], int gh[256], int bh[256]) { - int i; - printf("hist"); - for (i = 0; i < 256; ++i) { - if (rh[i] || gh[i] || bh[i]) { - printf("\t%8d", i - 128); - } - } - printf("\nred"); - for (i = 0; i < 256; ++i) { - if (rh[i] || gh[i] || bh[i]) { - printf("\t%8d", rh[i]); - } - } - printf("\ngreen"); - for (i = 0; i < 256; ++i) { - if (rh[i] || gh[i] || bh[i]) { - printf("\t%8d", gh[i]); - } - } - printf("\nblue"); - for (i = 0; i < 256; ++i) { - if (rh[i] || gh[i] || bh[i]) { - printf("\t%8d", bh[i]); - } - } - printf("\n"); -} - -TEST_F(LibYUVScaleTest, DISABLED_ScaleTestFullYUV) { - int rh[256] = { 0, }, gh[256] = { 0, }, bh[256] = { 0, }; - for (int u = 0; u < 256; ++u) { - for (int v = 0; v < 256; ++v) { - for (int y2 = 0; y2 < 256; ++y2) { - int r0, g0, b0, r1, g1, b1; - int y = RANDOM256(y2); - YUVToRGBReference(y, u, v, &r0, &g0, &b0); - YUVToRGB(y, u, v, &r1, &g1, &b1); - EXPECT_NEAR(r0, r1, ERROR_R); - EXPECT_NEAR(g0, g1, ERROR_G); - EXPECT_NEAR(b0, b1, ERROR_B); - ++rh[r1 - r0 + 128]; - ++gh[g1 - g0 + 128]; - ++bh[b1 - b0 + 128]; - } - } - } - ScalePrintHistogram(rh, gh, bh); -} - -TEST_F(LibYUVScaleTest, DISABLED_ScaleTestFullYUVJ) { - int rh[256] = { 0, }, gh[256] = { 0, }, bh[256] = { 0, }; - for (int u = 0; u < 256; ++u) { - for (int v = 0; v < 256; ++v) { - for (int y2 = 0; y2 < 256; ++y2) { - int r0, g0, b0, r1, g1, b1; - int y = RANDOM256(y2); - YUVJToRGBReference(y, u, v, &r0, &g0, &b0); - YUVJToRGB(y, u, v, &r1, &g1, &b1); - EXPECT_NEAR(r0, r1, 1); - EXPECT_NEAR(g0, g1, 1); - EXPECT_NEAR(b0, b1, 1); - ++rh[r1 - r0 + 128]; - ++gh[g1 - g0 + 128]; - ++bh[b1 - b0 + 128]; - } - } - } - ScalePrintHistogram(rh, gh, bh); -} - -TEST_F(LibYUVScaleTest, DISABLED_ScaleTestGreyYUVJ) { - int r0, g0, b0, r1, g1, b1, r2, g2, b2; - - // black - YUVJToRGBReference(0, 128, 128, &r0, &g0, &b0); - EXPECT_EQ(0, r0); - EXPECT_EQ(0, g0); - EXPECT_EQ(0, b0); - - YUVJToRGB(0, 128, 128, &r1, &g1, &b1); - EXPECT_EQ(0, r1); - EXPECT_EQ(0, g1); - EXPECT_EQ(0, b1); - - // white - YUVJToRGBReference(255, 128, 128, &r0, &g0, &b0); - EXPECT_EQ(255, r0); - EXPECT_EQ(255, g0); - EXPECT_EQ(255, b0); - - YUVJToRGB(255, 128, 128, &r1, &g1, &b1); - EXPECT_EQ(255, r1); - EXPECT_EQ(255, g1); - EXPECT_EQ(255, b1); - - // grey - YUVJToRGBReference(128, 128, 128, &r0, &g0, &b0); - EXPECT_EQ(128, r0); - EXPECT_EQ(128, g0); - EXPECT_EQ(128, b0); - - YUVJToRGB(128, 128, 128, &r1, &g1, &b1); - EXPECT_EQ(128, r1); - EXPECT_EQ(128, g1); - EXPECT_EQ(128, b1); - - for (int y = 0; y < 256; ++y) { - YUVJToRGBReference(y, 128, 128, &r0, &g0, &b0); - YUVJToRGB(y, 128, 128, &r1, &g1, &b1); - YJToRGB(y, &r2, &g2, &b2); - EXPECT_EQ(r0, r1); - EXPECT_EQ(g0, g1); - EXPECT_EQ(b0, b1); - EXPECT_EQ(r0, r2); - EXPECT_EQ(g0, g2); - EXPECT_EQ(b0, b2); - } -} - -} // namespace libyuv diff --git a/unit_test/unit_test.cc b/unit_test/unit_test.cc index 46981f2a8..83e5910b4 100644 --- a/unit_test/unit_test.cc +++ b/unit_test/unit_test.cc @@ -20,7 +20,7 @@ int fastrand_seed = 0xfb; -LibYUVConvertTest::LibYUVConvertTest() : rotate_max_w_(128), rotate_max_h_(128), +LibYUVConvertTest::LibYUVConvertTest() : benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(128), benchmark_height_(72), disable_cpu_flags_(0) { const char* repeat = getenv("LIBYUV_REPEAT"); @@ -55,7 +55,7 @@ LibYUVConvertTest::LibYUVConvertTest() : rotate_max_w_(128), rotate_max_h_(128), static_cast(benchmark_iterations_) + 1279.0) / 1280.0); } -LibYUVScaleTest::LibYUVScaleTest() : rotate_max_w_(128), rotate_max_h_(128), +LibYUVColorTest::LibYUVColorTest() : benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(128), benchmark_height_(72), disable_cpu_flags_(0) { const char* repeat = getenv("LIBYUV_REPEAT"); @@ -90,7 +90,7 @@ LibYUVScaleTest::LibYUVScaleTest() : rotate_max_w_(128), rotate_max_h_(128), static_cast(benchmark_iterations_) + 1279.0) / 1280.0); } -LibYUVRotateTest::LibYUVRotateTest() : rotate_max_w_(128), rotate_max_h_(128), +LibYUVScaleTest::LibYUVScaleTest() : benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(128), benchmark_height_(72), disable_cpu_flags_(0) { const char* repeat = getenv("LIBYUV_REPEAT"); @@ -125,7 +125,7 @@ LibYUVRotateTest::LibYUVRotateTest() : rotate_max_w_(128), rotate_max_h_(128), static_cast(benchmark_iterations_) + 1279.0) / 1280.0); } -LibYUVPlanarTest::LibYUVPlanarTest() : rotate_max_w_(128), rotate_max_h_(128), +LibYUVRotateTest::LibYUVRotateTest() : benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(128), benchmark_height_(72), disable_cpu_flags_(0) { const char* repeat = getenv("LIBYUV_REPEAT"); @@ -160,7 +160,42 @@ LibYUVPlanarTest::LibYUVPlanarTest() : rotate_max_w_(128), rotate_max_h_(128), static_cast(benchmark_iterations_) + 1279.0) / 1280.0); } -LibYUVBaseTest::LibYUVBaseTest() : rotate_max_w_(128), rotate_max_h_(128), +LibYUVPlanarTest::LibYUVPlanarTest() : + benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(128), + benchmark_height_(72), disable_cpu_flags_(0) { + const char* repeat = getenv("LIBYUV_REPEAT"); + if (repeat) { + benchmark_iterations_ = atoi(repeat); // NOLINT + // For quicker unittests, default is 128 x 72. But when benchmarking, + // default to 720p. Allow size to specify. + if (benchmark_iterations_ > 1) { + benchmark_width_ = 1280; + benchmark_height_ = 720; + } + } + const char* width = getenv("LIBYUV_WIDTH"); + if (width) { + benchmark_width_ = atoi(width); // NOLINT + } + const char* height = getenv("LIBYUV_HEIGHT"); + if (height) { + benchmark_height_ = atoi(height); // NOLINT + } + const char* cpu_flags = getenv("LIBYUV_FLAGS"); + if (cpu_flags) { + disable_cpu_flags_ = atoi(cpu_flags); // NOLINT + } + benchmark_pixels_div256_ = static_cast(( + static_cast(Abs(benchmark_width_)) * + static_cast(Abs(benchmark_height_)) * + static_cast(benchmark_iterations_) + 255.0) / 256.0); + benchmark_pixels_div1280_ = static_cast(( + static_cast(Abs(benchmark_width_)) * + static_cast(Abs(benchmark_height_)) * + static_cast(benchmark_iterations_) + 1279.0) / 1280.0); +} + +LibYUVBaseTest::LibYUVBaseTest() : benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(128), benchmark_height_(72), disable_cpu_flags_(0) { const char* repeat = getenv("LIBYUV_REPEAT"); diff --git a/unit_test/unit_test.h b/unit_test/unit_test.h index 4e3086d6a..826d154aa 100644 --- a/unit_test/unit_test.h +++ b/unit_test/unit_test.h @@ -72,13 +72,22 @@ static inline void MemRandomize(uint8* dst, int64 len) { } } +class LibYUVColorTest : public ::testing::Test { + protected: + LibYUVColorTest(); + + int benchmark_iterations_; // Default 1. Use 1000 for benchmarking. + int benchmark_width_; // Default 1280. Use 640 for benchmarking VGA. + int benchmark_height_; // Default 720. Use 360 for benchmarking VGA. + int benchmark_pixels_div256_; // Total pixels to benchmark / 256. + int benchmark_pixels_div1280_; // Total pixels to benchmark / 1280. + int disable_cpu_flags_; // Default 0. Use -1 for benchmarking. +}; + class LibYUVConvertTest : public ::testing::Test { protected: LibYUVConvertTest(); - const int rotate_max_w_; - const int rotate_max_h_; - int benchmark_iterations_; // Default 1. Use 1000 for benchmarking. int benchmark_width_; // Default 1280. Use 640 for benchmarking VGA. int benchmark_height_; // Default 720. Use 360 for benchmarking VGA. @@ -91,9 +100,6 @@ class LibYUVScaleTest : public ::testing::Test { protected: LibYUVScaleTest(); - const int rotate_max_w_; - const int rotate_max_h_; - int benchmark_iterations_; // Default 1. Use 1000 for benchmarking. int benchmark_width_; // Default 1280. Use 640 for benchmarking VGA. int benchmark_height_; // Default 720. Use 360 for benchmarking VGA. @@ -106,9 +112,6 @@ class LibYUVRotateTest : public ::testing::Test { protected: LibYUVRotateTest(); - const int rotate_max_w_; - const int rotate_max_h_; - int benchmark_iterations_; // Default 1. Use 1000 for benchmarking. int benchmark_width_; // Default 1280. Use 640 for benchmarking VGA. int benchmark_height_; // Default 720. Use 360 for benchmarking VGA. @@ -121,9 +124,6 @@ class LibYUVPlanarTest : public ::testing::Test { protected: LibYUVPlanarTest(); - const int rotate_max_w_; - const int rotate_max_h_; - int benchmark_iterations_; // Default 1. Use 1000 for benchmarking. int benchmark_width_; // Default 1280. Use 640 for benchmarking VGA. int benchmark_height_; // Default 720. Use 360 for benchmarking VGA. @@ -136,9 +136,6 @@ class LibYUVBaseTest : public ::testing::Test { protected: LibYUVBaseTest(); - const int rotate_max_w_; - const int rotate_max_h_; - int benchmark_iterations_; // Default 1. Use 1000 for benchmarking. int benchmark_width_; // Default 1280. Use 640 for benchmarking VGA. int benchmark_height_; // Default 720. Use 360 for benchmarking VGA.