diff options
| author | Jana Grill <janagrill@google.com> | 2021-02-17 12:35:20 +0000 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2021-03-29 09:43:07 +0000 |
| commit | ed936c8da203893cb0cf518d4e112021675adb93 (patch) | |
| tree | a8c80e50ecec120c8bd3acc420ac44e3482a105b /chromium/third_party/libyuv/unit_test/cpu_thread_test.cc | |
| parent | 212a1e9728ba63249bd1ee878a00f06914bc28b4 (diff) | |
[Backport] Security bug 1062941
Manual backport (library update) of patch originally reviewed on
https://chromium-review.googlesource.com/c/chromium/src/+/2692542:
Roll src/third_party/libyuv/ 6866adbec..1d3f901aa (17 commits)
https://chromium.googlesource.com/libyuv/libyuv.git/+log/6866adbec5af..1d3f901aa016
$ git log 6866adbec..1d3f901aa --date=short --no-merges --format='%ad %ae %s'
2020-12-25 fbarchard Scale bug fix with msan when scaling up in height and down in width with box filter.
2020-12-22 fbarchard Test Box filter scale plane with 1 dimension growing and the other reducing
2020-12-03 eshr NV12 Copy, include scale_uv.h
2020-11-18 thakis Stop setting mac_xcode_version in DEPS
2020-11-06 libyuv-ci-autoroll-builder Roll chromium_revision 5aaa70b53c..64c8c30faa (822628:824854)
2020-11-03 fbarchard Scale by even factor low level row function
2020-10-30 libyuv-ci-autoroll-builder Roll chromium_revision df9aecfc0b..5aaa70b53c (820568:822628)
2020-10-28 fbarchard PlaneScale, UVScale and ARGBScale test 3x and 4x down sample.
2020-10-27 fbarchard MJPGToNV12 added and build files sorted
2020-10-24 libyuv-ci-autoroll-builder Roll chromium_revision e812106b13..df9aecfc0b (817907:820568)
2020-10-16 libyuv-ci-autoroll-builder Roll chromium_revision 4892423355..e812106b13 (815587:817907)
2020-10-13 fbarchard UVScale down use AVX2 and Neon for aarch32
2020-10-13 fbarchard UVScale down by 4 use SSSE3/NEON
2020-10-12 fbarchard 2x down sample for UV planes ported to SSSE3 / NEON
2020-10-09 libyuv-ci-autoroll-builder Roll chromium_revision ccec2ad009..4892423355 (811963:815587)
2020-10-02 fbarchard I420ToARGB prototype added to convert_from.h
2020-10-01 fbarchard scale neon adjust PRFM instruction to co-issue with math
Created with:
roll-dep src/third_party/libyuv
(cherry picked from commit 1a60856f34aa15def686168c3b392dc37a120c51)
Bug: chromium:1158178, chromium:1062941, libyuv:875, b/176195584
Change-Id: Iecf360198a90acabcbd71e57791634f5e3e861c3
Commit-Queue: Frank Barchard <fbarchard@chromium.org>
Reviewed-by: Frank Barchard <fbarchard@chromium.org>
Reviewed-by: Eugene Zemtsov <eugene@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#839493}
Commit-Queue: Jana Grill <janagrill@chromium.org>
Reviewed-by: Victor-Gabriel Savu <vsavu@google.com>
Cr-Commit-Position: refs/branch-heads/4240@{#1545}
Cr-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218}
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'chromium/third_party/libyuv/unit_test/cpu_thread_test.cc')
| -rw-r--r-- | chromium/third_party/libyuv/unit_test/cpu_thread_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/libyuv/unit_test/cpu_thread_test.cc b/chromium/third_party/libyuv/unit_test/cpu_thread_test.cc index 59061b98e0b..69aab74e7c8 100644 --- a/chromium/third_party/libyuv/unit_test/cpu_thread_test.cc +++ b/chromium/third_party/libyuv/unit_test/cpu_thread_test.cc @@ -12,7 +12,7 @@ #include "libyuv/cpu_id.h" -#if defined(__clang__) +#if defined(__clang__) && !defined(__wasm__) #if __has_include(<pthread.h>) #define LIBYUV_HAVE_PTHREAD 1 #endif @@ -30,7 +30,7 @@ namespace libyuv { void* ThreadMain(void* arg) { int* flags = static_cast<int*>(arg); - *flags = TestCpuFlag(kCpuHasSSSE3); + *flags = TestCpuFlag(kCpuInitialized); return nullptr; } #endif // LIBYUV_HAVE_PTHREAD |