From 0e462e6f450b9248a83feee50871e1ad76d317c3 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 11 Jan 2016 14:57:50 -0800 Subject: [PATCH] Remove use_sysroot=0 use_sysroot=0 is required for webrtc on linux intel builds, but libyuv doesnt use the affected libraries, so removing this. R=harryjin@google.com, sbc@chromium.org BUG=libyuv:534,libyuv:542 Review URL: https://codereview.chromium.org/1566303002 . --- libyuv.gyp | 13 ----- source/scale_win.cc | 2 +- unit_test/convert_test.cc | 100 +++++++++++++++++++------------------- 3 files changed, 50 insertions(+), 65 deletions(-) diff --git a/libyuv.gyp b/libyuv.gyp index b8e1c580d..3909a9738 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -17,19 +17,6 @@ 'GCC_PRECOMPILE_PREFIX_HEADER': 'NO', }, 'variables': { - 'variables': { - # Disable use of sysroot for Linux. It's enabled by default in Chromium, - # but it currently lacks the libudev-dev package. - # TODO(kjellander): Remove when crbug.com/561584 is fixed. - 'conditions': [ - ['target_arch=="ia32" or target_arch=="x64"', { - 'use_sysroot': 0, - }, { - 'use_sysroot%': 1, - }], - ], - }, - 'use_sysroot%': '<(use_sysroot)', 'use_system_libjpeg%': 0, 'libyuv_disable_jpeg%': 0, # 'chromium_code' treats libyuv as internal and increases warning level. diff --git a/source/scale_win.cc b/source/scale_win.cc index 5ab4fa0cc..21b1ed923 100644 --- a/source/scale_win.cc +++ b/source/scale_win.cc @@ -289,7 +289,7 @@ void ScaleRowDown2Box_AVX2(const uint8* src_ptr, ptrdiff_t src_stride, vpmaddubsw ymm3, ymm3, ymm4 vpaddw ymm0, ymm0, ymm2 // vertical add vpaddw ymm1, ymm1, ymm3 - vpsrlw ymm0, ymm0, 1 + vpsrlw ymm0, ymm0, 1 // (x + 2) / 4 = (x / 2 + 1) / 2 vpsrlw ymm1, ymm1, 1 vpavgw ymm0, ymm0, ymm5 // (x + 1) / 2 vpavgw ymm1, ymm1, ymm5 diff --git a/unit_test/convert_test.cc b/unit_test/convert_test.cc index 1d736bdfe..b0b14b924 100644 --- a/unit_test/convert_test.cc +++ b/unit_test/convert_test.cc @@ -1682,12 +1682,12 @@ TEST_F(LibYUVConvertTest, NAME) { \ TESTPTOB(TestYUY2ToNV12, YUY2ToI420, YUY2ToNV12) TESTPTOB(TestUYVYToNV12, UYVYToI420, UYVYToNV12) -#define TESTPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B, \ +#define TESTPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, SUB_B, BPP_B, \ W1280, N, NEG, OFF, FMT_C, BPP_C) \ TEST_F(LibYUVConvertTest, FMT_PLANAR##To##FMT_B##_##FMT_C##N) { \ const int kWidth = ((W1280) > 0) ? (W1280) : 1; \ const int kHeight = benchmark_height_; \ - const int kStrideB = kWidth * BPP_B; \ + const int kStrideB = SUBSAMPLE(kWidth, SUB_B) * BPP_B; \ const int kStrideUV = SUBSAMPLE(kWidth, SUBSAMP_X); \ const int kSizeUV = kStrideUV * SUBSAMPLE(kHeight, SUBSAMP_Y); \ align_buffer_64(src_y, kWidth * kHeight + OFF); \ @@ -1735,58 +1735,56 @@ TEST_F(LibYUVConvertTest, FMT_PLANAR##To##FMT_B##_##FMT_C##N) { \ free_aligned_buffer_64(dst_argb_bc); \ } -#define TESTPLANARTOE(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B, \ +#define TESTPLANARTOE(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, SUB_B, BPP_B, \ FMT_C, BPP_C) \ - TESTPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B, \ + TESTPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, SUB_B, BPP_B, \ benchmark_width_ - 4, _Any, +, 0, FMT_C, BPP_C) \ - TESTPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B, \ + TESTPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, SUB_B, BPP_B, \ benchmark_width_, _Unaligned, +, 1, FMT_C, BPP_C) \ - TESTPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B, \ + TESTPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, SUB_B, BPP_B, \ benchmark_width_, _Invert, -, 0, FMT_C, BPP_C) \ - TESTPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B, \ + TESTPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, SUB_B, BPP_B, \ benchmark_width_, _Opt, +, 0, FMT_C, BPP_C) -TESTPLANARTOE(I420, 2, 2, ARGB, 4, ABGR, 4) -TESTPLANARTOE(J420, 2, 2, ARGB, 4, ARGB, 4) -TESTPLANARTOE(J420, 2, 2, ABGR, 4, ARGB, 4) -TESTPLANARTOE(H420, 2, 2, ARGB, 4, ARGB, 4) -TESTPLANARTOE(H420, 2, 2, ABGR, 4, ARGB, 4) -TESTPLANARTOE(I420, 2, 2, BGRA, 4, ARGB, 4) -TESTPLANARTOE(I420, 2, 2, ABGR, 4, ARGB, 4) -TESTPLANARTOE(I420, 2, 2, RGBA, 4, ARGB, 4) -TESTPLANARTOE(I420, 2, 2, RGB24, 3, ARGB, 4) -TESTPLANARTOE(I420, 2, 2, RAW, 3, RGB24, 3) -TESTPLANARTOE(I420, 2, 2, RGB24, 3, RAW, 3) -TESTPLANARTOE(I420, 2, 2, ARGB, 4, RAW, 3) -TESTPLANARTOE(I420, 2, 2, RAW, 3, ARGB, 4) -TESTPLANARTOE(I420, 2, 2, ARGB, 4, RGB565, 2) -TESTPLANARTOE(I420, 2, 2, ARGB, 4, ARGB1555, 2) -TESTPLANARTOE(I420, 2, 2, ARGB, 4, ARGB4444, 2) -TESTPLANARTOE(I422, 2, 1, ARGB, 4, ARGB, 4) -TESTPLANARTOE(J422, 2, 1, ARGB, 4, ARGB, 4) -TESTPLANARTOE(J422, 2, 1, ABGR, 4, ARGB, 4) -TESTPLANARTOE(H422, 2, 1, ARGB, 4, ARGB, 4) -TESTPLANARTOE(H422, 2, 1, ABGR, 4, ARGB, 4) -TESTPLANARTOE(I422, 2, 1, BGRA, 4, ARGB, 4) -TESTPLANARTOE(I422, 2, 1, ABGR, 4, ARGB, 4) -TESTPLANARTOE(I422, 2, 1, RGBA, 4, ARGB, 4) -TESTPLANARTOE(I411, 4, 1, ARGB, 4, ARGB, 4) -TESTPLANARTOE(I444, 1, 1, ARGB, 4, ARGB, 4) -TESTPLANARTOE(J444, 1, 1, ARGB, 4, ARGB, 4) -TESTPLANARTOE(I444, 1, 1, ABGR, 4, ARGB, 4) -// TESTPLANARTOE(I420, 2, 2, YUY2, 2, ARGB, 4) -// TESTPLANARTOE(I420, 2, 2, UYVY, 2, ARGB, 4) -TESTPLANARTOE(I422, 2, 1, YUY2, 2, ARGB, 4) -TESTPLANARTOE(I422, 2, 1, UYVY, 2, ARGB, 4) -// TESTPLANARTOE(I420, 2, 2, ARGB, 4, I400, 1) -// TESTPLANARTOE(J420, 2, 2, ARGB, 4, J400, 1) +TESTPLANARTOE(I420, 2, 2, ARGB, 1, 4, ABGR, 4) +TESTPLANARTOE(J420, 2, 2, ARGB, 1, 4, ARGB, 4) +TESTPLANARTOE(J420, 2, 2, ABGR, 1, 4, ARGB, 4) +TESTPLANARTOE(H420, 2, 2, ARGB, 1, 4, ARGB, 4) +TESTPLANARTOE(H420, 2, 2, ABGR, 1, 4, ARGB, 4) +TESTPLANARTOE(I420, 2, 2, BGRA, 1, 4, ARGB, 4) +TESTPLANARTOE(I420, 2, 2, ABGR, 1, 4, ARGB, 4) +TESTPLANARTOE(I420, 2, 2, RGBA, 1, 4, ARGB, 4) +TESTPLANARTOE(I420, 2, 2, RGB24, 1, 3, ARGB, 4) +TESTPLANARTOE(I420, 2, 2, RAW, 1, 3, RGB24, 3) +TESTPLANARTOE(I420, 2, 2, RGB24, 1, 3, RAW, 3) +TESTPLANARTOE(I420, 2, 2, ARGB, 1, 4, RAW, 3) +TESTPLANARTOE(I420, 2, 2, RAW, 1, 3, ARGB, 4) +TESTPLANARTOE(I420, 2, 2, ARGB, 1, 4, RGB565, 2) +TESTPLANARTOE(I420, 2, 2, ARGB, 1, 4, ARGB1555, 2) +TESTPLANARTOE(I420, 2, 2, ARGB, 1, 4, ARGB4444, 2) +TESTPLANARTOE(I422, 2, 1, ARGB, 1, 4, ARGB, 4) +TESTPLANARTOE(J422, 2, 1, ARGB, 1, 4, ARGB, 4) +TESTPLANARTOE(J422, 2, 1, ABGR, 1, 4, ARGB, 4) +TESTPLANARTOE(H422, 2, 1, ARGB, 1, 4, ARGB, 4) +TESTPLANARTOE(H422, 2, 1, ABGR, 1, 4, ARGB, 4) +TESTPLANARTOE(I422, 2, 1, BGRA, 1, 4, ARGB, 4) +TESTPLANARTOE(I422, 2, 1, ABGR, 1, 4, ARGB, 4) +TESTPLANARTOE(I422, 2, 1, RGBA, 1, 4, ARGB, 4) +TESTPLANARTOE(I411, 4, 1, ARGB, 1, 4, ARGB, 4) +TESTPLANARTOE(I444, 1, 1, ARGB, 1, 4, ARGB, 4) +TESTPLANARTOE(J444, 1, 1, ARGB, 1, 4, ARGB, 4) +TESTPLANARTOE(I444, 1, 1, ABGR, 1, 4, ARGB, 4) +TESTPLANARTOE(I420, 2, 2, YUY2, 2, 4, ARGB, 4) +TESTPLANARTOE(I420, 2, 2, UYVY, 2, 4, ARGB, 4) +TESTPLANARTOE(I422, 2, 1, YUY2, 2, 4, ARGB, 4) +TESTPLANARTOE(I422, 2, 1, UYVY, 2, 4, ARGB, 4) -#define TESTQPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B, \ +#define TESTQPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, SUB_B, BPP_B, \ W1280, N, NEG, OFF, FMT_C, BPP_C, ATTEN) \ TEST_F(LibYUVConvertTest, FMT_PLANAR##To##FMT_B##_##FMT_C##N) { \ const int kWidth = ((W1280) > 0) ? (W1280) : 1; \ const int kHeight = benchmark_height_; \ - const int kStrideB = kWidth * BPP_B; \ + const int kStrideB = SUBSAMPLE(kWidth, SUB_B) * BPP_B; \ const int kSizeUV = \ SUBSAMPLE(kWidth, SUBSAMP_X) * SUBSAMPLE(kHeight, SUBSAMP_Y); \ align_buffer_64(src_y, kWidth * kHeight + OFF); \ @@ -1840,20 +1838,20 @@ TEST_F(LibYUVConvertTest, FMT_PLANAR##To##FMT_B##_##FMT_C##N) { \ free_aligned_buffer_64(dst_argb_bc); \ } -#define TESTQPLANARTOE(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B, \ +#define TESTQPLANARTOE(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, SUB_B, BPP_B, \ FMT_C, BPP_C) \ - TESTQPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B, \ + TESTQPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, SUB_B, BPP_B, \ benchmark_width_ - 4, _Any, +, 0, FMT_C, BPP_C, 0) \ - TESTQPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B, \ + TESTQPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, SUB_B, BPP_B, \ benchmark_width_, _Unaligned, +, 1, FMT_C, BPP_C, 0) \ - TESTQPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B, \ + TESTQPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, SUB_B, BPP_B, \ benchmark_width_, _Invert, -, 0, FMT_C, BPP_C, 0) \ - TESTQPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B, \ + TESTQPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, SUB_B, BPP_B, \ benchmark_width_, _Opt, +, 0, FMT_C, BPP_C, 0) \ - TESTQPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B, \ + TESTQPLANARTOEI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, SUB_B, BPP_B, \ benchmark_width_, _Premult, +, 0, FMT_C, BPP_C, 1) -TESTQPLANARTOE(I420Alpha, 2, 2, ARGB, 4, ABGR, 4) -TESTQPLANARTOE(I420Alpha, 2, 2, ABGR, 4, ARGB, 4) +TESTQPLANARTOE(I420Alpha, 2, 2, ARGB, 1, 4, ABGR, 4) +TESTQPLANARTOE(I420Alpha, 2, 2, ABGR, 1, 4, ARGB, 4) } // namespace libyuv