Skip to content

Commit 6dc03da

Browse files
fbarchardlibyuv LUCI CQ
authored and
libyuv LUCI CQ
committed
Split scale_test and scale_plane_test to allow building on small devices
Bug: libyuv:956 Change-Id: I1903aa616243e891440ed92836dfb0992d31d4cd Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/5107257 Commit-Queue: Frank Barchard <[email protected]> Reviewed-by: Wan-Teh Chang <[email protected]>
1 parent 9e61d7f commit 6dc03da

File tree

9 files changed

+765
-649
lines changed

9 files changed

+765
-649
lines changed

Android.bp

+1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ cc_test {
133133
"unit_test/rotate_argb_test.cc",
134134
"unit_test/rotate_test.cc",
135135
"unit_test/scale_argb_test.cc",
136+
"unit_test/scale_plane_test.cc",
136137
"unit_test/scale_rgb_test.cc",
137138
"unit_test/scale_test.cc",
138139
"unit_test/scale_uv_test.cc",

Android.mk

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ LOCAL_SRC_FILES := \
9999
unit_test/rotate_argb_test.cc \
100100
unit_test/rotate_test.cc \
101101
unit_test/scale_argb_test.cc \
102+
unit_test/scale_plane_test.cc \
102103
unit_test/scale_rgb_test.cc \
103104
unit_test/scale_test.cc \
104105
unit_test/scale_uv_test.cc \

BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ if (libyuv_include_tests) {
324324
"unit_test/rotate_argb_test.cc",
325325
"unit_test/rotate_test.cc",
326326
"unit_test/scale_argb_test.cc",
327+
"unit_test/scale_plane_test.cc",
327328
"unit_test/scale_rgb_test.cc",
328329
"unit_test/scale_test.cc",
329330
"unit_test/scale_uv_test.cc",

README.chromium

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name: libyuv
22
URL: https://chromium.googlesource.com/libyuv/libyuv/
3-
Version: 1881
3+
Version: 1882
44
License: BSD
55
License File: LICENSE
66
Shipped: yes

include/libyuv/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
#ifndef INCLUDE_LIBYUV_VERSION_H_
1212
#define INCLUDE_LIBYUV_VERSION_H_
1313

14-
#define LIBYUV_VERSION 1881
14+
#define LIBYUV_VERSION 1882
1515

1616
#endif // INCLUDE_LIBYUV_VERSION_H_

unit_test/convert_argb_test.cc

+274-216
Large diffs are not rendered by default.

unit_test/convert_test.cc

+11
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@
3131
#include "libyuv/row.h" /* For ARGBToAR30Row_AVX2 */
3232
#endif
3333

34+
#if defined(__riscv) && !defined(__clang__)
35+
#define DISABLE_SLOW_TESTS
36+
#undef ENABLE_FULL_TESTS
37+
#undef ENABLE_ROW_TESTS
38+
#define LEAN_TESTS
39+
#endif
40+
3441
// Some functions fail on big endian. Enable these tests on all cpus except
3542
// PowerPC, but they are not optimized so disabled by default.
3643
#if !defined(DISABLE_SLOW_TESTS) && !defined(__powerpc__)
@@ -784,6 +791,8 @@ TESTATOBP(UYVY, 2, 4, NV12, 2, 2)
784791
TESTATOBP(AYUV, 1, 4, NV12, 2, 2)
785792
TESTATOBP(AYUV, 1, 4, NV21, 2, 2)
786793

794+
#if !defined(LEAN_TESTS)
795+
787796
#ifdef HAVE_JPEG
788797
TEST_F(LibYUVConvertTest, ValidateJpeg) {
789798
const int kOff = 10;
@@ -2057,4 +2066,6 @@ TEST_F(LibYUVConvertTest, TestRGB24ToI420) {
20572066
}
20582067
#endif
20592068

2069+
#endif // !defined(LEAN_TESTS)
2070+
20602071
} // namespace libyuv

0 commit comments

Comments
 (0)