diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 15:28:34 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:54:51 +0000 |
| commit | 2a19c63448c84c1805fb1a585c3651318bb86ca7 (patch) | |
| tree | eb17888e8531aa6ee5e85721bd553b832a7e5156 /chromium/third_party/libyuv | |
| parent | b014812705fc80bff0a5c120dfcef88f349816dc (diff) | |
| download | qtwebengine-chromium-2a19c63448c84c1805fb1a585c3651318bb86ca7.tar.gz | |
BASELINE: Update Chromium to 69.0.3497.70
Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/libyuv')
23 files changed, 791 insertions, 291 deletions
diff --git a/chromium/third_party/libyuv/BUILD.gn b/chromium/third_party/libyuv/BUILD.gn index 03ce499e6d9..b1bfbfdf1c7 100644 --- a/chromium/third_party/libyuv/BUILD.gn +++ b/chromium/third_party/libyuv/BUILD.gn @@ -329,7 +329,6 @@ if (libyuv_include_tests) { ] deps = [ ":libyuv", - "//build/config:exe_and_shlib_deps", # for asan on llvm libc++ ] if (is_linux) { cflags = [ "-fexceptions" ] @@ -343,7 +342,6 @@ if (libyuv_include_tests) { ] deps = [ ":libyuv", - "//build/config:exe_and_shlib_deps", # for new[] on llvm libc++ ] if (is_linux) { cflags = [ "-fexceptions" ] @@ -359,7 +357,6 @@ if (libyuv_include_tests) { ] deps = [ ":libyuv", - "//build/config:exe_and_shlib_deps", # for new[] on llvm libc++ ] if (!is_ios && !libyuv_disable_jpeg) { @@ -374,7 +371,6 @@ if (libyuv_include_tests) { ] deps = [ ":libyuv", - "//build/config:exe_and_shlib_deps", # for asan on llvm libc++ ] } } diff --git a/chromium/third_party/libyuv/DEPS b/chromium/third_party/libyuv/DEPS index 710a8a2b7d7..60e437ef6bd 100644 --- a/chromium/third_party/libyuv/DEPS +++ b/chromium/third_party/libyuv/DEPS @@ -1,6 +1,5 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '80f0c5570649c35a869429b2ab8c381a0a7246cb', 'swarming_revision': '88229872dd17e71658fe96763feaa77915d8cbd6', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling lss @@ -9,30 +8,34 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': 'e7298f36f7912f2caa122086cfbe71734d04b73f', + 'catapult_revision': 'f3ce003c2baaf3b2aba669681f832139efe5d773', } deps = { 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '39738e75b27f39d4c0030a0b11d5d2ddd34715f7', + Var('chromium_git') + '/chromium/src/build' + '@' + '8cb53523220fec0dee401d2ee5f046cbf43b0656', 'src/buildtools': - Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'a09e064635a49f08e585e3b173d5fbc3dd3f485e', + Var('chromium_git') + '/chromium/buildtools.git' + '@' + '5941c1b3df96c1db756a2834343533335c394c4a', 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '5f7e36cad6434fd3d65674af96653a23ecc9f694', + Var('chromium_git') + '/chromium/src/testing' + '@' + '60b2c69b17816251c0d20557eb818d26ac7e0fe4', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '2c0ced3ddbf84ce1c0759b277d9538da42f23650', + Var('chromium_git') + '/chromium/src/third_party' + '@' + 'e755204b7ae59ba1c63e5720a0420d8661672642', 'src/third_party/catapult': Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'), 'src/third_party/colorama/src': Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', + 'src/third_party/freetype/src': + Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + 'a44e20879cefea41663bb36ff4af908cc4146fb8', 'src/third_party/googletest/src': - Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '0062e4869f07a3ef235703ddf63af604b712446c', + Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'ba96d0b1161f540656efdaed035b3c062b60e006', + 'src/third_party/harfbuzz-ng/src': + Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + '957e7756634a4fdf1654041e20e883cf964ecac9', 'src/third_party/libjpeg_turbo': Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'a1750dbc79a8792dde3d3f7d7d8ac28ba01ac9dd', 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + '6202b67fc46a9984097caf237e12e3b8f7a9f7da', + Var('chromium_git') + '/chromium/src/tools' + '@' + '55c65d8fecf04f55f5ba9e14b1fdba170f0202d0', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb', 'src/tools/swarming_client': @@ -52,41 +55,137 @@ deps = { }, # Android deps: - 'src/third_party/auto/src': { - 'url': Var('chromium_git') + '/external/github.com/google/auto.git' + '@' + '8a81a858ae7b78a1aef71ac3905fade0bbd64e82', - 'condition': 'checkout_android', + 'src/third_party/accessibility_test_framework': { + 'packages': [ + { + 'package': 'chromium/third_party/accessibility-test-framework', + 'version': 'version:2.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', }, 'src/third_party/auto/src': { 'url': Var('chromium_git') + '/external/github.com/google/auto.git' + '@' + '8a81a858ae7b78a1aef71ac3905fade0bbd64e82', 'condition': 'checkout_android', }, 'src/base': { - 'url': Var('chromium_git') + '/chromium/src/base' + '@' + 'ac3d2b81181b085a9952cb83dba748420eefe691', + 'url': Var('chromium_git') + '/chromium/src/base' + '@' + '733a32608c5cd39c03a578cf6001afc2e6c636a2', 'condition': 'checkout_android', }, + 'src/third_party/bazel': { + 'packages': [ + { + 'package': 'chromium/third_party/bazel', + 'version': 'version:0.10.0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/bouncycastle': { + 'packages': [ + { + 'package': 'chromium/third_party/bouncycastle', + 'version': 'version:1.46-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/android_ndk': { - 'url': Var('chromium_git') + '/android_ndk.git' + '@' + 'e951c37287c7d8cd915bf8d4149fd4a06d808b55', + 'url': Var('chromium_git') + '/android_ndk.git' + '@' + '5cd86312e794bdf542a3685c6f10cbb96072990b', 'condition': 'checkout_android', }, + 'src/third_party/android_support_test_runner': { + 'packages': [ + { + 'package': 'chromium/third_party/android_support_test_runner', + 'version': 'version:0.5-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/android_tools': { - 'url': Var('chromium_git') + '/android_tools.git' + '@' + '9a70d48fcdd68cd0e7e968f342bd767ee6323bd1', + 'url': Var('chromium_git') + '/android_tools.git' + '@' + 'c22a664c39af72dd8f89200220713dcad811300a', 'condition': 'checkout_android', }, + 'src/third_party/byte_buddy': { + 'packages': [ + { + 'package': 'chromium/third_party/byte_buddy', + 'version': 'version:1.4.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/ced/src': { 'url': Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + '94c367a1fe3a13207f4b22604fcfd1d9f9ddf6d9', 'condition': 'checkout_android', }, 'src/third_party/errorprone/lib': { - 'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + 'ecc57c2b00627667874744b9ad8efe10734d97a8', + 'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '980d49e839aa4984015efed34b0134d4b2c9b6d7', 'condition': 'checkout_android', }, 'src/third_party/findbugs': { 'url': Var('chromium_git') + '/chromium/deps/findbugs.git' + '@' + '4275d9ac8610db6b1bc9a5e887f97e41b33fac67', 'condition': 'checkout_android', }, + 'src/third_party/gson': { + 'packages': [ + { + 'package': 'chromium/third_party/gson', + 'version': 'version:2.8.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/guava': { + 'packages': [ + { + 'package': 'chromium/third_party/guava', + 'version': 'version:23.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/hamcrest': { + 'packages': [ + { + 'package': 'chromium/third_party/hamcrest', + 'version': 'version:1.3-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/icu': { 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'd888fd2a1be890f4d35e43f68d6d79f42519a357', }, + 'src/third_party/icu4j': { + 'packages': [ + { + 'package': 'chromium/third_party/icu4j', + 'version': 'version:53.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/intellij': { + 'packages': [ + { + 'package': 'chromium/third_party/intellij', + 'version': 'version:12.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/jsr-305/src': { 'url': Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919', 'condition': 'checkout_android', @@ -99,18 +198,78 @@ deps = { 'url': Var('chromium_git') + '/external/mockito/mockito.git' + '@' + 'de83ad4598ad4cf5ea53c69a8a8053780b04b850', 'condition': 'checkout_android', }, + 'src/third_party/objenesis': { + 'packages': [ + { + 'package': 'chromium/third_party/objenesis', + 'version': 'version:2.4-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/ow2_asm': { + 'packages': [ + { + 'package': 'chromium/third_party/ow2_asm', + 'version': 'version:5.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/r8': { + 'packages': [ + { + 'package': 'chromium/third_party/r8', + 'version': 'version:1.0.30', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/requests/src': { 'url': Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4', 'condition': 'checkout_android', }, + 'src/third_party/robolectric': { + 'packages': [ + { + 'package': 'chromium/third_party/robolectric', + 'version': 'version:3.5.1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/robolectric/robolectric': { 'url': Var('chromium_git') + '/external/robolectric.git' + '@' + '7e067f1112e1502caa742f7be72d37b5678d3403', 'condition': 'checkout_android', }, + 'src/third_party/sqlite4java': { + 'packages': [ + { + 'package': 'chromium/third_party/sqlite4java', + 'version': 'version:0.282-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, 'src/third_party/ub-uiautomator/lib': { 'url': Var('chromium_git') + '/chromium/third_party/ub-uiautomator.git' + '@' + '00270549ce3161ae72ceb24712618ea28b4f9434', 'condition': 'checkout_android', }, + 'src/third_party/xstream': { + 'packages': [ + { + 'package': 'chromium/third_party/xstream', + 'version': 'version:1.4.8-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, # iOS deps: 'src/ios': { @@ -124,6 +283,296 @@ deps = { 'url': Var('chromium_git') + '/chromium/deps/yasm/binaries.git' + '@' + '52f9b3f4b0aa06da24ef8b123058bb61ee468881', 'condition': 'checkout_win', }, + + # === ANDROID_DEPS Generated Code Start === + # Generated by //tools/android/roll/android_deps/fetch_all.sh + 'src/third_party/android_deps/repository/android_arch_core_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/android_arch_core_common', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/android_arch_lifecycle_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/android_arch_lifecycle_common', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/android_arch_lifecycle_runtime': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/android_arch_lifecycle_runtime', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_animated_vector_drawable': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_animated_vector_drawable', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_appcompat_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_appcompat_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_cardview_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_cardview_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_design': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_design', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_gridlayout_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_gridlayout_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_leanback_v17': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_leanback_v17', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_mediarouter_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_mediarouter_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_multidex': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_multidex', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_palette_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_palette_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_preference_leanback_v17': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_preference_leanback_v17', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_preference_v14': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_preference_v14', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_preference_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_preference_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_recyclerview_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_recyclerview_v7', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_annotations', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_compat': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_compat', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_core_ui': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_core_ui', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_core_utils': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_core_utils', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_fragment': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_fragment', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_media_compat': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_media_compat', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_v13': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_v13', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_v4': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_v4', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_support_vector_drawable': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_vector_drawable', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/repository/com_android_support_transition': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/repository/com_android_support_transition', + 'version': 'version:27.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + # === ANDROID_DEPS Generated Code End === } # Define rules for which include paths are allowed in our source. @@ -331,12 +780,15 @@ hooks = [ ], }, { - 'name': 'Android CIPD Ensure', + # We used to use src as a CIPD root. We moved it to a different directory + # in crrev.com/c/930178 but left the clobber here to ensure that that CL + # could be reverted safely. This can be safely removed once crbug.com/794764 + # is resolved. + 'name': 'Android Clobber Deprecated CIPD Root', 'pattern': '.', 'condition': 'checkout_android', - 'action': ['src/build/cipd/cipd_wrapper.py', - '--chromium-root', 'src', - '--ensure-file', 'src/build/cipd/android/android.ensure', + 'action': ['src/build/cipd/clobber_cipd_root.py', + '--root', 'src', ], }, # Android dependencies. Many are downloaded using Google Storage these days. diff --git a/chromium/third_party/libyuv/LICENSE_THIRD_PARTY b/chromium/third_party/libyuv/LICENSE_THIRD_PARTY deleted file mode 100644 index a71591e7710..00000000000 --- a/chromium/third_party/libyuv/LICENSE_THIRD_PARTY +++ /dev/null @@ -1,8 +0,0 @@ -This source tree contains third party source code which is governed by third -party licenses. This file contains references to files which are under other -licenses than the one provided in the LICENSE file in the root of the source -tree. - -Files governed by third party licenses: -source/x86inc.asm - diff --git a/chromium/third_party/libyuv/README.chromium b/chromium/third_party/libyuv/README.chromium index 23c10d7950d..4ecdcb2840b 100644 --- a/chromium/third_party/libyuv/README.chromium +++ b/chromium/third_party/libyuv/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1708 +Version: 1714 License: BSD License File: LICENSE diff --git a/chromium/third_party/libyuv/docs/formats.md b/chromium/third_party/libyuv/docs/formats.md index f78f57bb4c4..97e8ce05f48 100644 --- a/chromium/third_party/libyuv/docs/formats.md +++ b/chromium/third_party/libyuv/docs/formats.md @@ -66,7 +66,7 @@ The following is extracted from video_common.h as a complete list of formats sup // 1 Primary Compressed YUV format. FOURCC_MJPG = FOURCC('M', 'J', 'P', 'G'), - // 7 Auxiliary YUV variations: 3 with U and V planes are swapped, 1 Alias. + // 8 Auxiliary YUV variations: 3 with U and V planes are swapped, 1 Alias. FOURCC_YV12 = FOURCC('Y', 'V', '1', '2'), FOURCC_YV16 = FOURCC('Y', 'V', '1', '6'), FOURCC_YV24 = FOURCC('Y', 'V', '2', '4'), @@ -74,6 +74,7 @@ The following is extracted from video_common.h as a complete list of formats sup FOURCC_J420 = FOURCC('J', '4', '2', '0'), FOURCC_J400 = FOURCC('J', '4', '0', '0'), // unofficial fourcc FOURCC_H420 = FOURCC('H', '4', '2', '0'), // unofficial fourcc + FOURCC_H422 = FOURCC('H', '4', '2', '2'), // unofficial fourcc // 14 Auxiliary aliases. CanonicalFourCC() maps these to canonical fourcc. FOURCC_IYUV = FOURCC('I', 'Y', 'U', 'V'), // Alias for I420. diff --git a/chromium/third_party/libyuv/include/libyuv/basic_types.h b/chromium/third_party/libyuv/include/libyuv/basic_types.h index 01d9dfc7736..1bea67f2f25 100644 --- a/chromium/third_party/libyuv/include/libyuv/basic_types.h +++ b/chromium/third_party/libyuv/include/libyuv/basic_types.h @@ -29,6 +29,8 @@ typedef signed char int8_t; #else #include <stdint.h> // for uintptr_t and C99 types #endif // defined(_MSC_VER) && (_MSC_VER < 1600) +// Types are deprecated. Enable this macro for legacy types. +#ifdef LIBYUV_LEGACY_TYPES typedef uint64_t uint64; typedef int64_t int64; typedef uint32_t uint32; @@ -37,6 +39,7 @@ typedef uint16_t uint16; typedef int16_t int16; typedef uint8_t uint8; typedef int8_t int8; +#endif // LIBYUV_LEGACY_TYPES #endif // INT_TYPES_DEFINED #if !defined(LIBYUV_API) diff --git a/chromium/third_party/libyuv/include/libyuv/compare_row.h b/chromium/third_party/libyuv/include/libyuv/compare_row.h index d38f9987dc6..e81f7455eee 100644 --- a/chromium/third_party/libyuv/include/libyuv/compare_row.h +++ b/chromium/third_party/libyuv/include/libyuv/compare_row.h @@ -45,12 +45,6 @@ extern "C" { #endif // clang >= 3.4 #endif // __clang__ -// The following are available for Visual C: -#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && defined(_MSC_VER) && \ - (defined(VISUALC_HAS_AVX2) || defined(CLANG_HAS_AVX2)) -#define HAS_HASHDJB2_AVX2 -#endif - // The following are available for Visual C and GCC: #if !defined(LIBYUV_DISABLE_X86) && \ (defined(__x86_64__) || defined(__i386__) || defined(_M_IX86)) @@ -60,7 +54,7 @@ extern "C" { #endif // The following are available for Visual C and clangcl 32 bit: -#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && \ +#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && defined(_MSC_VER) && \ (defined(VISUALC_HAS_AVX2) || defined(CLANG_HAS_AVX2)) #define HAS_HASHDJB2_AVX2 #define HAS_SUMSQUAREERROR_AVX2 diff --git a/chromium/third_party/libyuv/include/libyuv/macros_msa.h b/chromium/third_party/libyuv/include/libyuv/macros_msa.h index 921eb0714d6..29997ce11fd 100644 --- a/chromium/third_party/libyuv/include/libyuv/macros_msa.h +++ b/chromium/third_party/libyuv/include/libyuv/macros_msa.h @@ -16,30 +16,30 @@ #include <stdint.h> #if (__mips_isa_rev >= 6) -#define LW(psrc) \ - ({ \ - uint8_t* psrc_lw_m = (uint8_t*)(psrc); /* NOLINT */ \ - uint32_t val_m; \ - asm volatile("lw %[val_m], %[psrc_lw_m] \n" \ - : [val_m] "=r"(val_m) \ - : [psrc_lw_m] "m"(*psrc_lw_m)); \ - val_m; \ +#define LW(psrc) \ + ({ \ + const uint8_t* psrc_lw_m = (const uint8_t*)(psrc); \ + uint32_t val_m; \ + asm volatile("lw %[val_m], %[psrc_lw_m] \n" \ + : [val_m] "=r"(val_m) \ + : [psrc_lw_m] "m"(*psrc_lw_m)); \ + val_m; \ }) #if (__mips == 64) -#define LD(psrc) \ - ({ \ - uint8_t* psrc_ld_m = (uint8_t*)(psrc); /* NOLINT */ \ - uint64_t val_m = 0; \ - asm volatile("ld %[val_m], %[psrc_ld_m] \n" \ - : [val_m] "=r"(val_m) \ - : [psrc_ld_m] "m"(*psrc_ld_m)); \ - val_m; \ +#define LD(psrc) \ + ({ \ + const uint8_t* psrc_ld_m = (const uint8_t*)(psrc); \ + uint64_t val_m = 0; \ + asm volatile("ld %[val_m], %[psrc_ld_m] \n" \ + : [val_m] "=r"(val_m) \ + : [psrc_ld_m] "m"(*psrc_ld_m)); \ + val_m; \ }) #else // !(__mips == 64) #define LD(psrc) \ ({ \ - uint8_t* psrc_ld_m = (uint8_t*)(psrc); /* NOLINT */ \ + const uint8_t* psrc_ld_m = (const uint8_t*)(psrc); \ uint32_t val0_m, val1_m; \ uint64_t val_m = 0; \ val0_m = LW(psrc_ld_m); \ @@ -81,30 +81,30 @@ }) #endif // !(__mips == 64) #else // !(__mips_isa_rev >= 6) -#define LW(psrc) \ - ({ \ - uint8_t* psrc_lw_m = (uint8_t*)(psrc); /* NOLINT */ \ - uint32_t val_m; \ - asm volatile("ulw %[val_m], %[psrc_lw_m] \n" \ - : [val_m] "=r"(val_m) \ - : [psrc_lw_m] "m"(*psrc_lw_m)); \ - val_m; \ +#define LW(psrc) \ + ({ \ + const uint8_t* psrc_lw_m = (const uint8_t*)(psrc); \ + uint32_t val_m; \ + asm volatile("ulw %[val_m], %[psrc_lw_m] \n" \ + : [val_m] "=r"(val_m) \ + : [psrc_lw_m] "m"(*psrc_lw_m)); \ + val_m; \ }) #if (__mips == 64) -#define LD(psrc) \ - ({ \ - uint8_t* psrc_ld_m = (uint8_t*)(psrc); /* NOLINT */ \ - uint64_t val_m = 0; \ - asm volatile("uld %[val_m], %[psrc_ld_m] \n" \ - : [val_m] "=r"(val_m) \ - : [psrc_ld_m] "m"(*psrc_ld_m)); \ - val_m; \ +#define LD(psrc) \ + ({ \ + const uint8_t* psrc_ld_m = (const uint8_t*)(psrc); \ + uint64_t val_m = 0; \ + asm volatile("uld %[val_m], %[psrc_ld_m] \n" \ + : [val_m] "=r"(val_m) \ + : [psrc_ld_m] "m"(*psrc_ld_m)); \ + val_m; \ }) #else // !(__mips == 64) #define LD(psrc) \ ({ \ - uint8_t* psrc_ld_m = (uint8_t*)(psrc); /* NOLINT */ \ + const uint8_t* psrc_ld_m = (const uint8_t*)(psrc); \ uint32_t val0_m, val1_m; \ uint64_t val_m = 0; \ val0_m = LW(psrc_ld_m); \ @@ -138,7 +138,7 @@ // TODO(fbarchard): Consider removing __VAR_ARGS versions. #define LD_B(RTYPE, psrc) *((RTYPE*)(psrc)) /* NOLINT */ -#define LD_UB(...) LD_B(v16u8, __VA_ARGS__) +#define LD_UB(...) LD_B(const v16u8, __VA_ARGS__) #define ST_B(RTYPE, in, pdst) *((RTYPE*)(pdst)) = (in) /* NOLINT */ #define ST_UB(...) ST_B(v16u8, __VA_ARGS__) @@ -158,14 +158,14 @@ out0 = LD_B(RTYPE, (psrc)); \ out1 = LD_B(RTYPE, (psrc) + stride); \ } -#define LD_UB2(...) LD_B2(v16u8, __VA_ARGS__) +#define LD_UB2(...) LD_B2(const v16u8, __VA_ARGS__) #define LD_B4(RTYPE, psrc, stride, out0, out1, out2, out3) \ { \ LD_B2(RTYPE, (psrc), stride, out0, out1); \ LD_B2(RTYPE, (psrc) + 2 * stride, stride, out2, out3); \ } -#define LD_UB4(...) LD_B4(v16u8, __VA_ARGS__) +#define LD_UB4(...) LD_B4(const v16u8, __VA_ARGS__) /* Description : Store two vectors with stride each having 16 'byte' sized elements diff --git a/chromium/third_party/libyuv/include/libyuv/row.h b/chromium/third_party/libyuv/include/libyuv/row.h index 646a6abb10c..1468f4b9925 100644 --- a/chromium/third_party/libyuv/include/libyuv/row.h +++ b/chromium/third_party/libyuv/include/libyuv/row.h @@ -56,9 +56,10 @@ extern "C" { #endif // __clang__ // clang >= 6.0.0 required for AVX512. -// TODO(fbarchard): fix xcode 9 ios b/789. #if defined(__clang__) && (defined(__x86_64__) || defined(__i386__)) -#if (__clang_major__ >= 7) && !defined(__APPLE_EMBEDDED_SIMULATOR__) +// clang in xcode follows a different versioning scheme. +// TODO(fbarchard): fix xcode 9 ios b/789. +#if (__clang_major__ >= 7) && !defined(__APPLE__) #define CLANG_HAS_AVX512 1 #endif // clang >= 7 #endif // __clang__ diff --git a/chromium/third_party/libyuv/include/libyuv/version.h b/chromium/third_party/libyuv/include/libyuv/version.h index fc5654115f9..249f61f71ac 100644 --- a/chromium/third_party/libyuv/include/libyuv/version.h +++ b/chromium/third_party/libyuv/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1708 +#define LIBYUV_VERSION 1714 #endif // INCLUDE_LIBYUV_VERSION_H_ diff --git a/chromium/third_party/libyuv/include/libyuv/video_common.h b/chromium/third_party/libyuv/include/libyuv/video_common.h index bcef378b5a4..ffcbdbf1b0c 100644 --- a/chromium/third_party/libyuv/include/libyuv/video_common.h +++ b/chromium/third_party/libyuv/include/libyuv/video_common.h @@ -30,7 +30,8 @@ extern "C" { #ifdef __cplusplus #define FOURCC(a, b, c, d) \ ((static_cast<uint32_t>(a)) | (static_cast<uint32_t>(b) << 8) | \ - (static_cast<uint32_t>(c) << 16) | (static_cast<uint32_t>(d) << 24)) + (static_cast<uint32_t>(c) << 16) | /* NOLINT */ \ + (static_cast<uint32_t>(d) << 24)) /* NOLINT */ #else #define FOURCC(a, b, c, d) \ (((uint32_t)(a)) | ((uint32_t)(b) << 8) | /* NOLINT */ \ @@ -79,7 +80,7 @@ enum FourCC { // 1 Primary Compressed YUV format. FOURCC_MJPG = FOURCC('M', 'J', 'P', 'G'), - // 7 Auxiliary YUV variations: 3 with U and V planes are swapped, 1 Alias. + // 8 Auxiliary YUV variations: 3 with U and V planes are swapped, 1 Alias. FOURCC_YV12 = FOURCC('Y', 'V', '1', '2'), FOURCC_YV16 = FOURCC('Y', 'V', '1', '6'), FOURCC_YV24 = FOURCC('Y', 'V', '2', '4'), @@ -87,6 +88,7 @@ enum FourCC { FOURCC_J420 = FOURCC('J', '4', '2', '0'), FOURCC_J400 = FOURCC('J', '4', '0', '0'), // unofficial fourcc FOURCC_H420 = FOURCC('H', '4', '2', '0'), // unofficial fourcc + FOURCC_H422 = FOURCC('H', '4', '2', '2'), // unofficial fourcc // 14 Auxiliary aliases. CanonicalFourCC() maps these to canonical fourcc. FOURCC_IYUV = FOURCC('I', 'Y', 'U', 'V'), // Alias for I420. @@ -155,6 +157,7 @@ enum FourCCBpp { FOURCC_BPP_J420 = 12, FOURCC_BPP_J400 = 8, FOURCC_BPP_H420 = 12, + FOURCC_BPP_H422 = 16, FOURCC_BPP_H010 = 24, FOURCC_BPP_MJPG = 0, // 0 means unknown. FOURCC_BPP_H264 = 0, diff --git a/chromium/third_party/libyuv/linux.mk b/chromium/third_party/libyuv/linux.mk index b84c89f912e..3cb6addddd4 100644 --- a/chromium/third_party/libyuv/linux.mk +++ b/chromium/third_party/libyuv/linux.mk @@ -13,6 +13,7 @@ LOCAL_OBJ_FILES := \ source/compare.o \ source/compare_common.o \ source/compare_gcc.o \ + source/compare_msa.o \ source/compare_neon64.o \ source/compare_neon.o \ source/compare_win.o \ @@ -32,12 +33,14 @@ LOCAL_OBJ_FILES := \ source/rotate.o \ source/rotate_common.o \ source/rotate_gcc.o \ + source/rotate_msa.o \ source/rotate_neon64.o \ source/rotate_neon.o \ source/rotate_win.o \ source/row_any.o \ source/row_common.o \ source/row_gcc.o \ + source/row_msa.o \ source/row_neon64.o \ source/row_neon.o \ source/row_win.o \ @@ -46,6 +49,7 @@ LOCAL_OBJ_FILES := \ source/scale.o \ source/scale_common.o \ source/scale_gcc.o \ + source/scale_msa.o \ source/scale_neon64.o \ source/scale_neon.o \ source/scale_win.o \ diff --git a/chromium/third_party/libyuv/source/compare_common.cc b/chromium/third_party/libyuv/source/compare_common.cc index 633466addb5..d4b170ad986 100644 --- a/chromium/third_party/libyuv/source/compare_common.cc +++ b/chromium/third_party/libyuv/source/compare_common.cc @@ -55,7 +55,7 @@ uint32_t HammingDistance_C(const uint8_t* src_a, int i; for (i = 0; i < count - 3; i += 4) { - uint32_t x = *((uint32_t*)src_a) ^ *((uint32_t*)src_b); // NOLINT + uint32_t x = *((const uint32_t*)src_a) ^ *((const uint32_t*)src_b); uint32_t u = x - ((x >> 1) & 0x55555555); u = ((u >> 2) & 0x33333333) + (u & 0x33333333); diff += ((((u + (u >> 4)) & 0x0f0f0f0f) * 0x01010101) >> 24); diff --git a/chromium/third_party/libyuv/source/convert_from.cc b/chromium/third_party/libyuv/source/convert_from.cc index b5587ced625..6fa253237ee 100644 --- a/chromium/third_party/libyuv/source/convert_from.cc +++ b/chromium/third_party/libyuv/source/convert_from.cc @@ -1154,8 +1154,8 @@ int I420ToRGB565Dither(const uint8_t* src_y, for (y = 0; y < height; ++y) { I422ToARGBRow(src_y, src_u, src_v, row_argb, &kYuvI601Constants, width); ARGBToRGB565DitherRow(row_argb, dst_rgb565, - *(uint32_t*)(dither4x4 + ((y & 3) << 2)), // NOLINT - width); // NOLINT + *(const uint32_t*)(dither4x4 + ((y & 3) << 2)), + width); dst_rgb565 += dst_stride_rgb565; src_y += src_stride_y; if (y & 1) { diff --git a/chromium/third_party/libyuv/source/convert_from_argb.cc b/chromium/third_party/libyuv/source/convert_from_argb.cc index 2a36d6d83e3..c8d91252e9b 100644 --- a/chromium/third_party/libyuv/source/convert_from_argb.cc +++ b/chromium/third_party/libyuv/source/convert_from_argb.cc @@ -1050,8 +1050,8 @@ int ARGBToRGB565Dither(const uint8_t* src_argb, for (y = 0; y < height; ++y) { ARGBToRGB565DitherRow(src_argb, dst_rgb565, - *(uint32_t*)(dither4x4 + ((y & 3) << 2)), // NOLINT - width); /* NOLINT */ + *(const uint32_t*)(dither4x4 + ((y & 3) << 2)), + width); src_argb += src_stride_argb; dst_rgb565 += dst_stride_rgb565; } diff --git a/chromium/third_party/libyuv/source/convert_to_argb.cc b/chromium/third_party/libyuv/source/convert_to_argb.cc index 677e5d56fcc..bde1aa8891b 100644 --- a/chromium/third_party/libyuv/source/convert_to_argb.cc +++ b/chromium/third_party/libyuv/source/convert_to_argb.cc @@ -28,6 +28,14 @@ extern "C" { // src_height is used to compute location of planes, and indicate inversion // sample_size is measured in bytes and is the size of the frame. // With MJPEG it is the compressed size of the frame. + +// TODO(fbarchard): Add the following: +// H010ToARGB +// I010ToARGB +// J400ToARGB +// J422ToARGB +// J444ToARGB + LIBYUV_API int ConvertToARGB(const uint8_t* sample, size_t sample_size, @@ -123,6 +131,16 @@ int ConvertToARGB(const uint8_t* sample, r = RGBAToARGB(src, src_width * 4, dst_argb, dst_stride_argb, crop_width, inv_crop_height); break; + case FOURCC_AR30: + src = sample + (src_width * crop_y + crop_x) * 4; + r = AR30ToARGB(src, src_width * 4, dst_argb, dst_stride_argb, crop_width, + inv_crop_height); + break; + case FOURCC_AB30: + src = sample + (src_width * crop_y + crop_x) * 4; + r = AB30ToARGB(src, src_width * 4, dst_argb, dst_stride_argb, crop_width, + inv_crop_height); + break; case FOURCC_RGBP: src = sample + (src_width * crop_y + crop_x) * 2; r = RGB565ToARGB(src, src_width * 2, dst_argb, dst_stride_argb, @@ -147,13 +165,15 @@ int ConvertToARGB(const uint8_t* sample, // Biplanar formats case FOURCC_NV12: src = sample + (src_width * crop_y + crop_x); - src_uv = sample + aligned_src_width * (src_height + crop_y / 2) + crop_x; + src_uv = + sample + aligned_src_width * (abs_src_height + crop_y / 2) + crop_x; r = NV12ToARGB(src, src_width, src_uv, aligned_src_width, dst_argb, dst_stride_argb, crop_width, inv_crop_height); break; case FOURCC_NV21: src = sample + (src_width * crop_y + crop_x); - src_uv = sample + aligned_src_width * (src_height + crop_y / 2) + crop_x; + src_uv = + sample + aligned_src_width * (abs_src_height + crop_y / 2) + crop_x; // Call NV12 but with u and v parameters swapped. r = NV21ToARGB(src, src_width, src_uv, aligned_src_width, dst_argb, dst_stride_argb, crop_width, inv_crop_height); @@ -163,6 +183,7 @@ int ConvertToARGB(const uint8_t* sample, r = M420ToARGB(src, src_width, dst_argb, dst_stride_argb, crop_width, inv_crop_height); break; + // Triplanar formats case FOURCC_I420: case FOURCC_YV12: { @@ -187,16 +208,27 @@ int ConvertToARGB(const uint8_t* sample, break; } - case FOURCC_J420: { + case FOURCC_H420: { + int halfwidth = (src_width + 1) / 2; + int halfheight = (abs_src_height + 1) / 2; const uint8_t* src_y = sample + (src_width * crop_y + crop_x); - const uint8_t* src_u; - const uint8_t* src_v; + const uint8_t* src_u = sample + src_width * abs_src_height + + (halfwidth * crop_y + crop_x) / 2; + const uint8_t* src_v = sample + src_width * abs_src_height + + halfwidth * (halfheight + crop_y / 2) + crop_x / 2; + r = H420ToARGB(src_y, src_width, src_u, halfwidth, src_v, halfwidth, + dst_argb, dst_stride_argb, crop_width, inv_crop_height); + break; + } + + case FOURCC_J420: { int halfwidth = (src_width + 1) / 2; int halfheight = (abs_src_height + 1) / 2; - src_u = sample + src_width * abs_src_height + - (halfwidth * crop_y + crop_x) / 2; - src_v = sample + src_width * abs_src_height + - halfwidth * (halfheight + crop_y / 2) + crop_x / 2; + const uint8_t* src_y = sample + (src_width * crop_y + crop_x); + const uint8_t* src_u = sample + src_width * abs_src_height + + (halfwidth * crop_y + crop_x) / 2; + const uint8_t* src_v = sample + src_width * abs_src_height + + halfwidth * (halfheight + crop_y / 2) + crop_x / 2; r = J420ToARGB(src_y, src_width, src_u, halfwidth, src_v, halfwidth, dst_argb, dst_stride_argb, crop_width, inv_crop_height); break; @@ -204,10 +236,10 @@ int ConvertToARGB(const uint8_t* sample, case FOURCC_I422: case FOURCC_YV16: { + int halfwidth = (src_width + 1) / 2; const uint8_t* src_y = sample + src_width * crop_y + crop_x; const uint8_t* src_u; const uint8_t* src_v; - int halfwidth = (src_width + 1) / 2; if (format == FOURCC_YV16) { src_v = sample + src_width * abs_src_height + halfwidth * crop_y + crop_x / 2; @@ -223,6 +255,19 @@ int ConvertToARGB(const uint8_t* sample, dst_argb, dst_stride_argb, crop_width, inv_crop_height); break; } + + case FOURCC_H422: { + int halfwidth = (src_width + 1) / 2; + const uint8_t* src_y = sample + src_width * crop_y + crop_x; + const uint8_t* src_u = + sample + src_width * abs_src_height + halfwidth * crop_y + crop_x / 2; + const uint8_t* src_v = sample + src_width * abs_src_height + + halfwidth * (abs_src_height + crop_y) + crop_x / 2; + r = H422ToARGB(src_y, src_width, src_u, halfwidth, src_v, halfwidth, + dst_argb, dst_stride_argb, crop_width, inv_crop_height); + break; + } + case FOURCC_I444: case FOURCC_YV24: { const uint8_t* src_y = sample + src_width * crop_y + crop_x; diff --git a/chromium/third_party/libyuv/source/convert_to_i420.cc b/chromium/third_party/libyuv/source/convert_to_i420.cc index 1bed9d6440d..df08309f9ba 100644 --- a/chromium/third_party/libyuv/source/convert_to_i420.cc +++ b/chromium/third_party/libyuv/source/convert_to_i420.cc @@ -155,6 +155,7 @@ int ConvertToI420(const uint8_t* sample, dst_stride_u, dst_v, dst_stride_v, crop_width, inv_crop_height); break; + // TODO(fbarchard): Add AR30 and AB30 case FOURCC_I400: src = sample + src_width * crop_y + crop_x; r = I400ToI420(src, src_width, dst_y, dst_stride_y, dst_u, dst_stride_u, @@ -163,7 +164,7 @@ int ConvertToI420(const uint8_t* sample, // Biplanar formats case FOURCC_NV12: src = sample + (src_width * crop_y + crop_x); - src_uv = sample + (src_width * src_height) + + src_uv = sample + (src_width * abs_src_height) + ((crop_y / 2) * aligned_src_width) + ((crop_x / 2) * 2); r = NV12ToI420Rotate(src, src_width, src_uv, aligned_src_width, dst_y, dst_stride_y, dst_u, dst_stride_u, dst_v, @@ -171,7 +172,7 @@ int ConvertToI420(const uint8_t* sample, break; case FOURCC_NV21: src = sample + (src_width * crop_y + crop_x); - src_uv = sample + (src_width * src_height) + + src_uv = sample + (src_width * abs_src_height) + ((crop_y / 2) * aligned_src_width) + ((crop_x / 2) * 2); // Call NV12 but with dst_u and dst_v parameters swapped. r = NV12ToI420Rotate(src, src_width, src_uv, aligned_src_width, dst_y, diff --git a/chromium/third_party/libyuv/source/row_any.cc b/chromium/third_party/libyuv/source/row_any.cc index 0983e2a1a83..e91560c44c6 100644 --- a/chromium/third_party/libyuv/source/row_any.cc +++ b/chromium/third_party/libyuv/source/row_any.cc @@ -673,7 +673,7 @@ ANY11(ARGBAttenuateRow_Any_MSA, ARGBAttenuateRow_MSA, 0, 4, 4, 7) ANY11(ARGBExtractAlphaRow_Any_SSE2, ARGBExtractAlphaRow_SSE2, 0, 4, 1, 7) #endif #ifdef HAS_ARGBEXTRACTALPHAROW_AVX2 -ANY11(ARGBExtractAlphaRow_Any_AVX2, ARGBExtractAlphaRow_AVX2, 0, 4, 1, 32) +ANY11(ARGBExtractAlphaRow_Any_AVX2, ARGBExtractAlphaRow_AVX2, 0, 4, 1, 31) #endif #ifdef HAS_ARGBEXTRACTALPHAROW_NEON ANY11(ARGBExtractAlphaRow_Any_NEON, ARGBExtractAlphaRow_NEON, 0, 4, 1, 15) diff --git a/chromium/third_party/libyuv/source/row_common.cc b/chromium/third_party/libyuv/source/row_common.cc index 6ffaab72133..2bbc5adbf14 100644 --- a/chromium/third_party/libyuv/source/row_common.cc +++ b/chromium/third_party/libyuv/source/row_common.cc @@ -181,7 +181,7 @@ void ARGB4444ToARGBRow_C(const uint8_t* src_argb4444, void AR30ToARGBRow_C(const uint8_t* src_ar30, uint8_t* dst_argb, int width) { int x; for (x = 0; x < width; ++x) { - uint32_t ar30 = *(uint32_t*)src_ar30; + uint32_t ar30 = *(const uint32_t*)src_ar30; uint32_t b = (ar30 >> 2) & 0xff; uint32_t g = (ar30 >> 12) & 0xff; uint32_t r = (ar30 >> 22) & 0xff; @@ -195,7 +195,7 @@ void AR30ToARGBRow_C(const uint8_t* src_ar30, uint8_t* dst_argb, int width) { void AR30ToABGRRow_C(const uint8_t* src_ar30, uint8_t* dst_abgr, int width) { int x; for (x = 0; x < width; ++x) { - uint32_t ar30 = *(uint32_t*)src_ar30; + uint32_t ar30 = *(const uint32_t*)src_ar30; uint32_t b = (ar30 >> 2) & 0xff; uint32_t g = (ar30 >> 12) & 0xff; uint32_t r = (ar30 >> 22) & 0xff; @@ -209,7 +209,7 @@ void AR30ToABGRRow_C(const uint8_t* src_ar30, uint8_t* dst_abgr, int width) { void AR30ToAB30Row_C(const uint8_t* src_ar30, uint8_t* dst_ab30, int width) { int x; for (x = 0; x < width; ++x) { - uint32_t ar30 = *(uint32_t*)src_ar30; + uint32_t ar30 = *(const uint32_t*)src_ar30; uint32_t b = ar30 & 0x3ff; uint32_t ga = ar30 & 0xc00ffc00; uint32_t r = (ar30 >> 20) & 0x3ff; @@ -2762,6 +2762,13 @@ void ARGBPolynomialRow_C(const uint8_t* src_argb, // simply extract the low bits of the exponent and the high // bits of the mantissa from our float and we're done. +// Work around GCC 7 punning warning -Wstrict-aliasing +#if defined(__GNUC__) +typedef uint32_t __attribute__((__may_alias__)) uint32_alias_t; +#else +typedef uint32_t uint32_alias_t; +#endif + void HalfFloatRow_C(const uint16_t* src, uint16_t* dst, float scale, @@ -2770,7 +2777,7 @@ void HalfFloatRow_C(const uint16_t* src, float mult = 1.9259299444e-34f * scale; for (i = 0; i < width; ++i) { float value = src[i] * mult; - dst[i] = (uint16_t)((*(uint32_t*)&value) >> 13); + dst[i] = (uint16_t)((*(const uint32_alias_t*)&value) >> 13); } } diff --git a/chromium/third_party/libyuv/source/row_msa.cc b/chromium/third_party/libyuv/source/row_msa.cc index 66666cefcd9..effa68c8b4a 100644 --- a/chromium/third_party/libyuv/source/row_msa.cc +++ b/chromium/third_party/libyuv/source/row_msa.cc @@ -163,14 +163,14 @@ extern "C" { v8u16 reg0_m, reg1_m, reg2_m, reg3_m, reg4_m, reg5_m, reg6_m, reg7_m; \ v8u16 reg8_m, reg9_m; \ \ - src0_m = (v16u8)__msa_ld_b((v16i8*)s, 0); \ - src1_m = (v16u8)__msa_ld_b((v16i8*)s, 16); \ - src2_m = (v16u8)__msa_ld_b((v16i8*)s, 32); \ - src3_m = (v16u8)__msa_ld_b((v16i8*)s, 48); \ - src4_m = (v16u8)__msa_ld_b((v16i8*)t, 0); \ - src5_m = (v16u8)__msa_ld_b((v16i8*)t, 16); \ - src6_m = (v16u8)__msa_ld_b((v16i8*)t, 32); \ - src7_m = (v16u8)__msa_ld_b((v16i8*)t, 48); \ + src0_m = (v16u8)__msa_ld_b((void*)s, 0); \ + src1_m = (v16u8)__msa_ld_b((void*)s, 16); \ + src2_m = (v16u8)__msa_ld_b((void*)s, 32); \ + src3_m = (v16u8)__msa_ld_b((void*)s, 48); \ + src4_m = (v16u8)__msa_ld_b((void*)t, 0); \ + src5_m = (v16u8)__msa_ld_b((void*)t, 16); \ + src6_m = (v16u8)__msa_ld_b((void*)t, 32); \ + src7_m = (v16u8)__msa_ld_b((void*)t, 48); \ vec0_m = (v16u8)__msa_ilvr_b((v16i8)src0_m, (v16i8)src4_m); \ vec1_m = (v16u8)__msa_ilvr_b((v16i8)src1_m, (v16i8)src5_m); \ vec2_m = (v16u8)__msa_ilvr_b((v16i8)src2_m, (v16i8)src6_m); \ @@ -201,14 +201,14 @@ extern "C" { reg1_m = (v8u16)__msa_srai_h((v8i16)reg1_m, 2); \ argb0 = (v16u8)__msa_pckev_b((v16i8)reg9_m, (v16i8)reg8_m); \ argb1 = (v16u8)__msa_pckev_b((v16i8)reg1_m, (v16i8)reg0_m); \ - src0_m = (v16u8)__msa_ld_b((v16i8*)s, 64); \ - src1_m = (v16u8)__msa_ld_b((v16i8*)s, 80); \ - src2_m = (v16u8)__msa_ld_b((v16i8*)s, 96); \ - src3_m = (v16u8)__msa_ld_b((v16i8*)s, 112); \ - src4_m = (v16u8)__msa_ld_b((v16i8*)t, 64); \ - src5_m = (v16u8)__msa_ld_b((v16i8*)t, 80); \ - src6_m = (v16u8)__msa_ld_b((v16i8*)t, 96); \ - src7_m = (v16u8)__msa_ld_b((v16i8*)t, 112); \ + src0_m = (v16u8)__msa_ld_b((void*)s, 64); \ + src1_m = (v16u8)__msa_ld_b((void*)s, 80); \ + src2_m = (v16u8)__msa_ld_b((void*)s, 96); \ + src3_m = (v16u8)__msa_ld_b((void*)s, 112); \ + src4_m = (v16u8)__msa_ld_b((void*)t, 64); \ + src5_m = (v16u8)__msa_ld_b((void*)t, 80); \ + src6_m = (v16u8)__msa_ld_b((void*)t, 96); \ + src7_m = (v16u8)__msa_ld_b((void*)t, 112); \ vec2_m = (v16u8)__msa_ilvr_b((v16i8)src0_m, (v16i8)src4_m); \ vec3_m = (v16u8)__msa_ilvr_b((v16i8)src1_m, (v16i8)src5_m); \ vec4_m = (v16u8)__msa_ilvr_b((v16i8)src2_m, (v16i8)src6_m); \ @@ -942,10 +942,10 @@ void ARGBToRGB24Row_MSA(const uint8_t* src_argb, uint8_t* dst_rgb, int width) { 21, 22, 24, 25, 26, 28, 29, 30}; for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb, 32); - src3 = (v16u8)__msa_ld_b((v16i8*)src_argb, 48); + src0 = (v16u8)__msa_ld_b((void*)src_argb, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb, 16); + src2 = (v16u8)__msa_ld_b((void*)src_argb, 32); + src3 = (v16u8)__msa_ld_b((void*)src_argb, 48); dst0 = (v16u8)__msa_vshf_b(shuffler0, (v16i8)src1, (v16i8)src0); dst1 = (v16u8)__msa_vshf_b(shuffler1, (v16i8)src2, (v16i8)src1); dst2 = (v16u8)__msa_vshf_b(shuffler2, (v16i8)src3, (v16i8)src2); @@ -966,10 +966,10 @@ void ARGBToRAWRow_MSA(const uint8_t* src_argb, uint8_t* dst_rgb, int width) { 21, 20, 26, 25, 24, 30, 29, 28}; for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb, 32); - src3 = (v16u8)__msa_ld_b((v16i8*)src_argb, 48); + src0 = (v16u8)__msa_ld_b((void*)src_argb, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb, 16); + src2 = (v16u8)__msa_ld_b((void*)src_argb, 32); + src3 = (v16u8)__msa_ld_b((void*)src_argb, 48); dst0 = (v16u8)__msa_vshf_b(shuffler0, (v16i8)src1, (v16i8)src0); dst1 = (v16u8)__msa_vshf_b(shuffler1, (v16i8)src2, (v16i8)src1); dst2 = (v16u8)__msa_vshf_b(shuffler2, (v16i8)src3, (v16i8)src2); @@ -987,8 +987,8 @@ void ARGBToRGB565Row_MSA(const uint8_t* src_argb, uint8_t* dst_rgb, int width) { v16i8 zero = {0}; for (x = 0; x < width; x += 8) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb, 16); + src0 = (v16u8)__msa_ld_b((void*)src_argb, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb, 16); vec0 = (v16u8)__msa_srai_b((v16i8)src0, 3); vec1 = (v16u8)__msa_slli_b((v16i8)src0, 3); vec2 = (v16u8)__msa_srai_b((v16i8)src0, 5); @@ -1023,8 +1023,8 @@ void ARGBToARGB1555Row_MSA(const uint8_t* src_argb, v16i8 zero = {0}; for (x = 0; x < width; x += 8) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb, 16); + src0 = (v16u8)__msa_ld_b((void*)src_argb, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb, 16); vec0 = (v16u8)__msa_srai_b((v16i8)src0, 3); vec1 = (v16u8)__msa_slli_b((v16i8)src0, 2); vec2 = (v16u8)__msa_srai_b((v16i8)vec0, 3); @@ -1066,8 +1066,8 @@ void ARGBToARGB4444Row_MSA(const uint8_t* src_argb, v16i8 zero = {0}; for (x = 0; x < width; x += 8) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb, 16); + src0 = (v16u8)__msa_ld_b((void*)src_argb, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb, 16); vec0 = (v16u8)__msa_srai_b((v16i8)src0, 4); vec1 = (v16u8)__msa_srai_b((v16i8)src1, 4); src0 = (v16u8)__msa_sldi_b(zero, (v16i8)src0, 1); @@ -1098,10 +1098,10 @@ void ARGBToUV444Row_MSA(const uint8_t* src_argb, v16i8 zero = {0}; for (x = width; x > 0; x -= 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb, 32); - src3 = (v16u8)__msa_ld_b((v16i8*)src_argb, 48); + src0 = (v16u8)__msa_ld_b((void*)src_argb, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb, 16); + src2 = (v16u8)__msa_ld_b((void*)src_argb, 32); + src3 = (v16u8)__msa_ld_b((void*)src_argb, 48); reg0 = (v16u8)__msa_pckev_b((v16i8)src1, (v16i8)src0); reg1 = (v16u8)__msa_pckev_b((v16i8)src3, (v16i8)src2); reg2 = (v16u8)__msa_pckod_b((v16i8)src1, (v16i8)src0); @@ -1164,8 +1164,8 @@ void ARGBMultiplyRow_MSA(const uint8_t* src_argb0, v8i16 zero = {0}; for (x = 0; x < width; x += 4) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb1, 0); + src0 = (v16u8)__msa_ld_b((void*)src_argb0, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb1, 0); vec0 = (v8u16)__msa_ilvr_b((v16i8)src0, (v16i8)src0); vec1 = (v8u16)__msa_ilvl_b((v16i8)src0, (v16i8)src0); vec2 = (v8u16)__msa_ilvr_b((v16i8)zero, (v16i8)src1); @@ -1200,10 +1200,10 @@ void ARGBAddRow_MSA(const uint8_t* src_argb0, v16u8 src0, src1, src2, src3, dst0, dst1; for (x = 0; x < width; x += 8) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb1, 0); - src3 = (v16u8)__msa_ld_b((v16i8*)src_argb1, 16); + src0 = (v16u8)__msa_ld_b((void*)src_argb0, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb0, 16); + src2 = (v16u8)__msa_ld_b((void*)src_argb1, 0); + src3 = (v16u8)__msa_ld_b((void*)src_argb1, 16); dst0 = __msa_adds_u_b(src0, src2); dst1 = __msa_adds_u_b(src1, src3); ST_UB2(dst0, dst1, dst_argb, 16); @@ -1221,10 +1221,10 @@ void ARGBSubtractRow_MSA(const uint8_t* src_argb0, v16u8 src0, src1, src2, src3, dst0, dst1; for (x = 0; x < width; x += 8) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb1, 0); - src3 = (v16u8)__msa_ld_b((v16i8*)src_argb1, 16); + src0 = (v16u8)__msa_ld_b((void*)src_argb0, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb0, 16); + src2 = (v16u8)__msa_ld_b((void*)src_argb1, 0); + src3 = (v16u8)__msa_ld_b((void*)src_argb1, 16); dst0 = __msa_subs_u_b(src0, src2); dst1 = __msa_subs_u_b(src1, src3); ST_UB2(dst0, dst1, dst_argb, 16); @@ -1245,8 +1245,8 @@ void ARGBAttenuateRow_MSA(const uint8_t* src_argb, v16u8 mask = {0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, 255}; for (x = 0; x < width; x += 8) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb, 16); + src0 = (v16u8)__msa_ld_b((void*)src_argb, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb, 16); vec0 = (v8u16)__msa_ilvr_b((v16i8)src0, (v16i8)src0); vec1 = (v8u16)__msa_ilvl_b((v16i8)src0, (v16i8)src0); vec2 = (v8u16)__msa_ilvr_b((v16i8)src1, (v16i8)src1); @@ -1316,8 +1316,8 @@ void ARGBToRGB565DitherRow_MSA(const uint8_t* src_argb, vec_d0 = (v8i16)__msa_ilvr_b(zero, (v16i8)vec_d0); for (x = 0; x < width; x += 8) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb, 16); + src0 = (v16u8)__msa_ld_b((void*)src_argb, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb, 16); vec0 = (v16u8)__msa_pckev_b((v16i8)src1, (v16i8)src0); vec1 = (v16u8)__msa_pckod_b((v16i8)src1, (v16i8)src0); reg0 = (v8i16)__msa_ilvev_b(zero, (v16i8)vec0); @@ -1514,8 +1514,8 @@ void ARGB1555ToARGBRow_MSA(const uint8_t* src_argb1555, v8u16 const_0x1F = (v8u16)__msa_ldi_h(0x1F); for (x = 0; x < width; x += 16) { - src0 = (v8u16)__msa_ld_h((v8u16*)src_argb1555, 0); - src1 = (v8u16)__msa_ld_h((v8u16*)src_argb1555, 16); + src0 = (v8u16)__msa_ld_h((void*)src_argb1555, 0); + src1 = (v8u16)__msa_ld_h((void*)src_argb1555, 16); vec0 = src0 & const_0x1F; vec1 = src1 & const_0x1F; src0 = (v8u16)__msa_srli_h((v8i16)src0, 5); @@ -1566,8 +1566,8 @@ void RGB565ToARGBRow_MSA(const uint8_t* src_rgb565, v8u16 const_0xF800 = (v8u16)__msa_fill_h(0xF800); for (x = 0; x < width; x += 16) { - src0 = (v8u16)__msa_ld_h((v8u16*)src_rgb565, 0); - src1 = (v8u16)__msa_ld_h((v8u16*)src_rgb565, 16); + src0 = (v8u16)__msa_ld_h((void*)src_rgb565, 0); + src1 = (v8u16)__msa_ld_h((void*)src_rgb565, 16); vec0 = src0 & const_0x1F; vec1 = src0 & const_0x7E0; vec2 = src0 & const_0xF800; @@ -1611,9 +1611,9 @@ void RGB24ToARGBRow_MSA(const uint8_t* src_rgb24, v16i8 shuffler = {0, 1, 2, 16, 3, 4, 5, 17, 6, 7, 8, 18, 9, 10, 11, 19}; for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_rgb24, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_rgb24, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_rgb24, 32); + src0 = (v16u8)__msa_ld_b((void*)src_rgb24, 0); + src1 = (v16u8)__msa_ld_b((void*)src_rgb24, 16); + src2 = (v16u8)__msa_ld_b((void*)src_rgb24, 32); vec0 = (v16u8)__msa_sldi_b((v16i8)src1, (v16i8)src0, 12); vec1 = (v16u8)__msa_sldi_b((v16i8)src2, (v16i8)src1, 8); vec2 = (v16u8)__msa_sldi_b((v16i8)src2, (v16i8)src2, 4); @@ -1636,9 +1636,9 @@ void RAWToARGBRow_MSA(const uint8_t* src_raw, uint8_t* dst_argb, int width) { v16i8 mask = {2, 1, 0, 16, 5, 4, 3, 17, 8, 7, 6, 18, 11, 10, 9, 19}; for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_raw, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_raw, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_raw, 32); + src0 = (v16u8)__msa_ld_b((void*)src_raw, 0); + src1 = (v16u8)__msa_ld_b((void*)src_raw, 16); + src2 = (v16u8)__msa_ld_b((void*)src_raw, 32); vec0 = (v16u8)__msa_sldi_b((v16i8)src1, (v16i8)src0, 12); vec1 = (v16u8)__msa_sldi_b((v16i8)src2, (v16i8)src1, 8); vec2 = (v16u8)__msa_sldi_b((v16i8)src2, (v16i8)src2, 4); @@ -1666,8 +1666,8 @@ void ARGB1555ToYRow_MSA(const uint8_t* src_argb1555, v8u16 const_0x1080 = (v8u16)__msa_fill_h(0x1080); for (x = 0; x < width; x += 16) { - src0 = (v8u16)__msa_ld_b((v8i16*)src_argb1555, 0); - src1 = (v8u16)__msa_ld_b((v8i16*)src_argb1555, 16); + src0 = (v8u16)__msa_ld_b((void*)src_argb1555, 0); + src1 = (v8u16)__msa_ld_b((void*)src_argb1555, 16); vec0 = src0 & const_0x1F; vec1 = src1 & const_0x1F; src0 = (v8u16)__msa_srai_h((v8i16)src0, 5); @@ -1725,8 +1725,8 @@ void RGB565ToYRow_MSA(const uint8_t* src_rgb565, uint8_t* dst_y, int width) { v8u16 const_0xF800 = (v8u16)__msa_fill_h(0xF800); for (x = 0; x < width; x += 16) { - src0 = (v8u16)__msa_ld_b((v8i16*)src_rgb565, 0); - src1 = (v8u16)__msa_ld_b((v8i16*)src_rgb565, 16); + src0 = (v8u16)__msa_ld_b((void*)src_rgb565, 0); + src1 = (v8u16)__msa_ld_b((void*)src_rgb565, 16); vec0 = src0 & const_0x1F; vec1 = src0 & const_0x7E0; vec2 = src0 & const_0xF800; @@ -1789,9 +1789,9 @@ void RGB24ToYRow_MSA(const uint8_t* src_argb0, uint8_t* dst_y, int width) { v16i8 zero = {0}; for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 32); + src0 = (v16u8)__msa_ld_b((void*)src_argb0, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb0, 16); + src2 = (v16u8)__msa_ld_b((void*)src_argb0, 32); reg0 = (v16u8)__msa_vshf_b(mask0, zero, (v16i8)src0); reg1 = (v16u8)__msa_vshf_b(mask1, (v16i8)src1, (v16i8)src0); reg2 = (v16u8)__msa_vshf_b(mask2, (v16i8)src2, (v16i8)src1); @@ -1830,9 +1830,9 @@ void RAWToYRow_MSA(const uint8_t* src_argb0, uint8_t* dst_y, int width) { v16i8 zero = {0}; for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 32); + src0 = (v16u8)__msa_ld_b((void*)src_argb0, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb0, 16); + src2 = (v16u8)__msa_ld_b((void*)src_argb0, 32); reg0 = (v16u8)__msa_vshf_b(mask0, zero, (v16i8)src0); reg1 = (v16u8)__msa_vshf_b(mask1, (v16i8)src1, (v16i8)src0); reg2 = (v16u8)__msa_vshf_b(mask2, (v16i8)src2, (v16i8)src1); @@ -1877,10 +1877,10 @@ void ARGB1555ToUVRow_MSA(const uint8_t* src_argb1555, v8u16 const_0x1F = (v8u16)__msa_ldi_h(0x1F); for (x = 0; x < width; x += 16) { - src0 = (v8u16)__msa_ld_b((v8i16*)s, 0); - src1 = (v8u16)__msa_ld_b((v8i16*)s, 16); - src2 = (v8u16)__msa_ld_b((v8i16*)t, 0); - src3 = (v8u16)__msa_ld_b((v8i16*)t, 16); + src0 = (v8u16)__msa_ld_b((void*)s, 0); + src1 = (v8u16)__msa_ld_b((void*)s, 16); + src2 = (v8u16)__msa_ld_b((void*)t, 0); + src3 = (v8u16)__msa_ld_b((void*)t, 16); vec0 = src0 & const_0x1F; vec1 = src1 & const_0x1F; vec0 += src2 & const_0x1F; @@ -1959,10 +1959,10 @@ void RGB565ToUVRow_MSA(const uint8_t* src_rgb565, v8u16 const_0x3F = (v8u16)__msa_fill_h(0x3F); for (x = 0; x < width; x += 16) { - src0 = (v8u16)__msa_ld_b((v8i16*)s, 0); - src1 = (v8u16)__msa_ld_b((v8i16*)s, 16); - src2 = (v8u16)__msa_ld_b((v8i16*)t, 0); - src3 = (v8u16)__msa_ld_b((v8i16*)t, 16); + src0 = (v8u16)__msa_ld_b((void*)s, 0); + src1 = (v8u16)__msa_ld_b((void*)s, 16); + src2 = (v8u16)__msa_ld_b((void*)t, 0); + src3 = (v8u16)__msa_ld_b((void*)t, 16); vec0 = src0 & const_0x1F; vec1 = src1 & const_0x1F; vec0 += src2 & const_0x1F; @@ -2041,12 +2041,12 @@ void RGB24ToUVRow_MSA(const uint8_t* src_rgb0, v16i8 zero = {0}; for (x = 0; x < width; x += 16) { - inp0 = (v16u8)__msa_ld_b((v16i8*)s, 0); - inp1 = (v16u8)__msa_ld_b((v16i8*)s, 16); - inp2 = (v16u8)__msa_ld_b((v16i8*)s, 32); - inp3 = (v16u8)__msa_ld_b((v16i8*)t, 0); - inp4 = (v16u8)__msa_ld_b((v16i8*)t, 16); - inp5 = (v16u8)__msa_ld_b((v16i8*)t, 32); + inp0 = (v16u8)__msa_ld_b((void*)s, 0); + inp1 = (v16u8)__msa_ld_b((void*)s, 16); + inp2 = (v16u8)__msa_ld_b((void*)s, 32); + inp3 = (v16u8)__msa_ld_b((void*)t, 0); + inp4 = (v16u8)__msa_ld_b((void*)t, 16); + inp5 = (v16u8)__msa_ld_b((void*)t, 32); src1 = (v16u8)__msa_sldi_b((v16i8)inp1, (v16i8)inp0, 12); src5 = (v16u8)__msa_sldi_b((v16i8)inp4, (v16i8)inp3, 12); src2 = (v16u8)__msa_sldi_b((v16i8)inp2, (v16i8)inp1, 8); @@ -2146,12 +2146,12 @@ void RAWToUVRow_MSA(const uint8_t* src_rgb0, v16i8 zero = {0}; for (x = 0; x < width; x += 16) { - inp0 = (v16u8)__msa_ld_b((v16i8*)s, 0); - inp1 = (v16u8)__msa_ld_b((v16i8*)s, 16); - inp2 = (v16u8)__msa_ld_b((v16i8*)s, 32); - inp3 = (v16u8)__msa_ld_b((v16i8*)t, 0); - inp4 = (v16u8)__msa_ld_b((v16i8*)t, 16); - inp5 = (v16u8)__msa_ld_b((v16i8*)t, 32); + inp0 = (v16u8)__msa_ld_b((void*)s, 0); + inp1 = (v16u8)__msa_ld_b((void*)s, 16); + inp2 = (v16u8)__msa_ld_b((void*)s, 32); + inp3 = (v16u8)__msa_ld_b((void*)t, 0); + inp4 = (v16u8)__msa_ld_b((void*)t, 16); + inp5 = (v16u8)__msa_ld_b((void*)t, 32); src1 = (v16u8)__msa_sldi_b((v16i8)inp1, (v16i8)inp0, 12); src5 = (v16u8)__msa_sldi_b((v16i8)inp4, (v16i8)inp3, 12); src2 = (v16u8)__msa_sldi_b((v16i8)inp2, (v16i8)inp1, 8); @@ -2353,8 +2353,8 @@ void SobelRow_MSA(const uint8_t* src_sobelx, v16u8 alpha = (v16u8)__msa_ldi_b(ALPHA_VAL); for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_sobelx, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_sobely, 0); + src0 = (v16u8)__msa_ld_b((void*)src_sobelx, 0); + src1 = (v16u8)__msa_ld_b((void*)src_sobely, 0); vec0 = __msa_adds_u_b(src0, src1); dst0 = (v16u8)__msa_vshf_b(mask0, (v16i8)alpha, (v16i8)vec0); dst1 = (v16u8)__msa_vshf_b(mask1, (v16i8)alpha, (v16i8)vec0); @@ -2375,10 +2375,10 @@ void SobelToPlaneRow_MSA(const uint8_t* src_sobelx, v16u8 src0, src1, src2, src3, dst0, dst1; for (x = 0; x < width; x += 32) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_sobelx, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_sobelx, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_sobely, 0); - src3 = (v16u8)__msa_ld_b((v16i8*)src_sobely, 16); + src0 = (v16u8)__msa_ld_b((void*)src_sobelx, 0); + src1 = (v16u8)__msa_ld_b((void*)src_sobelx, 16); + src2 = (v16u8)__msa_ld_b((void*)src_sobely, 0); + src3 = (v16u8)__msa_ld_b((void*)src_sobely, 16); dst0 = __msa_adds_u_b(src0, src2); dst1 = __msa_adds_u_b(src1, src3); ST_UB2(dst0, dst1, dst_y, 16); @@ -2398,8 +2398,8 @@ void SobelXYRow_MSA(const uint8_t* src_sobelx, v16u8 alpha = (v16u8)__msa_ldi_b(ALPHA_VAL); for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_sobelx, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_sobely, 0); + src0 = (v16u8)__msa_ld_b((void*)src_sobelx, 0); + src1 = (v16u8)__msa_ld_b((void*)src_sobely, 0); vec0 = __msa_adds_u_b(src0, src1); vec1 = (v16u8)__msa_ilvr_b((v16i8)src0, (v16i8)src1); vec2 = (v16u8)__msa_ilvl_b((v16i8)src0, (v16i8)src1); @@ -2424,10 +2424,10 @@ void ARGBToYJRow_MSA(const uint8_t* src_argb0, uint8_t* dst_y, int width) { v8u16 const_0x40 = (v8u16)__msa_fill_h(0x40); for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 32); - src3 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 48); + src0 = (v16u8)__msa_ld_b((void*)src_argb0, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb0, 16); + src2 = (v16u8)__msa_ld_b((void*)src_argb0, 32); + src3 = (v16u8)__msa_ld_b((void*)src_argb0, 48); ARGBTOY(src0, src1, src2, src3, const_0x4B0F, const_0x26, const_0x40, 7, dst0); ST_UB(dst0, dst_y); @@ -2444,10 +2444,10 @@ void BGRAToYRow_MSA(const uint8_t* src_argb0, uint8_t* dst_y, int width) { v8u16 const_0x1080 = (v8u16)__msa_fill_h(0x1080); for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 32); - src3 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 48); + src0 = (v16u8)__msa_ld_b((void*)src_argb0, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb0, 16); + src2 = (v16u8)__msa_ld_b((void*)src_argb0, 32); + src3 = (v16u8)__msa_ld_b((void*)src_argb0, 48); ARGBTOY(src0, src1, src2, src3, const_0x4200, const_0x1981, const_0x1080, 8, dst0); ST_UB(dst0, dst_y); @@ -2464,10 +2464,10 @@ void ABGRToYRow_MSA(const uint8_t* src_argb0, uint8_t* dst_y, int width) { v8u16 const_0x1080 = (v8u16)__msa_fill_h(0x1080); for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 32); - src3 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 48); + src0 = (v16u8)__msa_ld_b((void*)src_argb0, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb0, 16); + src2 = (v16u8)__msa_ld_b((void*)src_argb0, 32); + src3 = (v16u8)__msa_ld_b((void*)src_argb0, 48); ARGBTOY(src0, src1, src2, src3, const_0x8142, const_0x19, const_0x1080, 8, dst0); ST_UB(dst0, dst_y); @@ -2484,10 +2484,10 @@ void RGBAToYRow_MSA(const uint8_t* src_argb0, uint8_t* dst_y, int width) { v8u16 const_0x1080 = (v8u16)__msa_fill_h(0x1080); for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 32); - src3 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 48); + src0 = (v16u8)__msa_ld_b((void*)src_argb0, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb0, 16); + src2 = (v16u8)__msa_ld_b((void*)src_argb0, 32); + src3 = (v16u8)__msa_ld_b((void*)src_argb0, 48); ARGBTOY(src0, src1, src2, src3, const_0x1900, const_0x4281, const_0x1080, 8, dst0); ST_UB(dst0, dst_y); @@ -2518,14 +2518,14 @@ void ARGBToUVJRow_MSA(const uint8_t* src_rgb0, v8u16 const_0x8080 = (v8u16)__msa_fill_h(0x8080); for (x = 0; x < width; x += 32) { - src0 = (v16u8)__msa_ld_b((v16i8*)s, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)s, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)s, 32); - src3 = (v16u8)__msa_ld_b((v16i8*)s, 48); - src4 = (v16u8)__msa_ld_b((v16i8*)t, 0); - src5 = (v16u8)__msa_ld_b((v16i8*)t, 16); - src6 = (v16u8)__msa_ld_b((v16i8*)t, 32); - src7 = (v16u8)__msa_ld_b((v16i8*)t, 48); + src0 = (v16u8)__msa_ld_b((void*)s, 0); + src1 = (v16u8)__msa_ld_b((void*)s, 16); + src2 = (v16u8)__msa_ld_b((void*)s, 32); + src3 = (v16u8)__msa_ld_b((void*)s, 48); + src4 = (v16u8)__msa_ld_b((void*)t, 0); + src5 = (v16u8)__msa_ld_b((void*)t, 16); + src6 = (v16u8)__msa_ld_b((void*)t, 32); + src7 = (v16u8)__msa_ld_b((void*)t, 48); src0 = __msa_aver_u_b(src0, src4); src1 = __msa_aver_u_b(src1, src5); src2 = __msa_aver_u_b(src2, src6); @@ -2536,14 +2536,14 @@ void ARGBToUVJRow_MSA(const uint8_t* src_rgb0, src7 = (v16u8)__msa_pckod_w((v4i32)src3, (v4i32)src2); vec0 = __msa_aver_u_b(src4, src6); vec1 = __msa_aver_u_b(src5, src7); - src0 = (v16u8)__msa_ld_b((v16i8*)s, 64); - src1 = (v16u8)__msa_ld_b((v16i8*)s, 80); - src2 = (v16u8)__msa_ld_b((v16i8*)s, 96); - src3 = (v16u8)__msa_ld_b((v16i8*)s, 112); - src4 = (v16u8)__msa_ld_b((v16i8*)t, 64); - src5 = (v16u8)__msa_ld_b((v16i8*)t, 80); - src6 = (v16u8)__msa_ld_b((v16i8*)t, 96); - src7 = (v16u8)__msa_ld_b((v16i8*)t, 112); + src0 = (v16u8)__msa_ld_b((void*)s, 64); + src1 = (v16u8)__msa_ld_b((void*)s, 80); + src2 = (v16u8)__msa_ld_b((void*)s, 96); + src3 = (v16u8)__msa_ld_b((void*)s, 112); + src4 = (v16u8)__msa_ld_b((void*)t, 64); + src5 = (v16u8)__msa_ld_b((void*)t, 80); + src6 = (v16u8)__msa_ld_b((void*)t, 96); + src7 = (v16u8)__msa_ld_b((void*)t, 112); src0 = __msa_aver_u_b(src0, src4); src1 = __msa_aver_u_b(src1, src5); src2 = __msa_aver_u_b(src2, src6); @@ -2746,7 +2746,7 @@ void I400ToARGBRow_MSA(const uint8_t* src_y, uint8_t* dst_argb, int width) { v8i16 zero = {0}; for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_y, 0); + src0 = (v16u8)__msa_ld_b((void*)src_y, 0); vec0 = (v8i16)__msa_ilvr_b((v16i8)src0, (v16i8)src0); vec1 = (v8i16)__msa_ilvl_b((v16i8)src0, (v16i8)src0); reg0 = (v4i32)__msa_ilvr_h(zero, vec0); @@ -2792,7 +2792,7 @@ void J400ToARGBRow_MSA(const uint8_t* src_y, uint8_t* dst_argb, int width) { v16u8 alpha = (v16u8)__msa_ldi_b(ALPHA_VAL); for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_y, 0); + src0 = (v16u8)__msa_ld_b((void*)src_y, 0); vec0 = (v16u8)__msa_ilvr_b((v16i8)src0, (v16i8)src0); vec1 = (v16u8)__msa_ilvl_b((v16i8)src0, (v16i8)src0); vec2 = (v16u8)__msa_ilvr_b((v16i8)alpha, (v16i8)src0); @@ -2824,7 +2824,7 @@ void YUY2ToARGBRow_MSA(const uint8_t* src_yuy2, vec_ugvg = (v4i32)__msa_ilvev_h((v8i16)vec_vg, (v8i16)vec_ug); for (x = 0; x < width; x += 8) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_yuy2, 0); + src0 = (v16u8)__msa_ld_b((void*)src_yuy2, 0); src1 = (v16u8)__msa_pckev_b((v16i8)src0, (v16i8)src0); src2 = (v16u8)__msa_pckod_b((v16i8)src0, (v16i8)src0); YUVTORGB(src1, src2, vec_ubvr, vec_ugvg, vec_bb, vec_bg, vec_br, vec_yg, @@ -2852,7 +2852,7 @@ void UYVYToARGBRow_MSA(const uint8_t* src_uyvy, vec_ugvg = (v4i32)__msa_ilvev_h((v8i16)vec_vg, (v8i16)vec_ug); for (x = 0; x < width; x += 8) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_uyvy, 0); + src0 = (v16u8)__msa_ld_b((void*)src_uyvy, 0); src1 = (v16u8)__msa_pckod_b((v16i8)src0, (v16i8)src0); src2 = (v16u8)__msa_pckev_b((v16i8)src0, (v16i8)src0); YUVTORGB(src1, src2, vec_ubvr, vec_ugvg, vec_bb, vec_bg, vec_br, vec_yg, @@ -2884,10 +2884,10 @@ void InterpolateRow_MSA(uint8_t* dst_ptr, if (128 == y1_fraction) { for (x = 0; x < width; x += 32) { - src0 = (v16u8)__msa_ld_b((v16i8*)s, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)s, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)t, 0); - src3 = (v16u8)__msa_ld_b((v16i8*)t, 16); + src0 = (v16u8)__msa_ld_b((void*)s, 0); + src1 = (v16u8)__msa_ld_b((void*)s, 16); + src2 = (v16u8)__msa_ld_b((void*)t, 0); + src3 = (v16u8)__msa_ld_b((void*)t, 16); dst0 = __msa_aver_u_b(src0, src2); dst1 = __msa_aver_u_b(src1, src3); ST_UB2(dst0, dst1, dst_ptr, 16); @@ -2902,10 +2902,10 @@ void InterpolateRow_MSA(uint8_t* dst_ptr, y_frac = (v8u16)__msa_fill_h(y_fractions); for (x = 0; x < width; x += 32) { - src0 = (v16u8)__msa_ld_b((v16i8*)s, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)s, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)t, 0); - src3 = (v16u8)__msa_ld_b((v16i8*)t, 16); + src0 = (v16u8)__msa_ld_b((void*)s, 0); + src1 = (v16u8)__msa_ld_b((void*)s, 16); + src2 = (v16u8)__msa_ld_b((void*)t, 0); + src3 = (v16u8)__msa_ld_b((void*)t, 16); vec0 = (v8u16)__msa_ilvr_b((v16i8)src2, (v16i8)src0); vec1 = (v8u16)__msa_ilvl_b((v16i8)src2, (v16i8)src0); vec2 = (v8u16)__msa_ilvr_b((v16i8)src3, (v16i8)src1); @@ -2947,9 +2947,9 @@ void RAWToRGB24Row_MSA(const uint8_t* src_raw, uint8_t* dst_rgb24, int width) { 24, 23, 28, 27, 26, 31, 30, 29}; for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_raw, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_raw, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_raw, 32); + src0 = (v16u8)__msa_ld_b((void*)src_raw, 0); + src1 = (v16u8)__msa_ld_b((void*)src_raw, 16); + src2 = (v16u8)__msa_ld_b((void*)src_raw, 32); src3 = (v16u8)__msa_sldi_b((v16i8)src1, (v16i8)src0, 8); src4 = (v16u8)__msa_sldi_b((v16i8)src2, (v16i8)src1, 8); dst0 = (v16u8)__msa_vshf_b(shuffler0, (v16i8)src1, (v16i8)src0); @@ -2970,8 +2970,8 @@ void MergeUVRow_MSA(const uint8_t* src_u, v16u8 src0, src1, dst0, dst1; for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_u, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_v, 0); + src0 = (v16u8)__msa_ld_b((void*)src_u, 0); + src1 = (v16u8)__msa_ld_b((void*)src_v, 0); dst0 = (v16u8)__msa_ilvr_b((v16i8)src1, (v16i8)src0); dst1 = (v16u8)__msa_ilvl_b((v16i8)src1, (v16i8)src0); ST_UB2(dst0, dst1, dst_uv, 16); @@ -2988,10 +2988,10 @@ void ARGBExtractAlphaRow_MSA(const uint8_t* src_argb, v16u8 src0, src1, src2, src3, vec0, vec1, dst0; for (i = 0; i < width; i += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb, 32); - src3 = (v16u8)__msa_ld_b((v16i8*)src_argb, 48); + src0 = (v16u8)__msa_ld_b((void*)src_argb, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb, 16); + src2 = (v16u8)__msa_ld_b((void*)src_argb, 32); + src3 = (v16u8)__msa_ld_b((void*)src_argb, 48); vec0 = (v16u8)__msa_pckod_b((v16i8)src1, (v16i8)src0); vec1 = (v16u8)__msa_pckod_b((v16i8)src3, (v16i8)src2); dst0 = (v16u8)__msa_pckod_b((v16i8)vec1, (v16i8)vec0); @@ -3015,10 +3015,10 @@ void ARGBBlendRow_MSA(const uint8_t* src_argb0, v16i8 zero = {0}; for (x = 0; x < width; x += 8) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb0, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb1, 0); - src3 = (v16u8)__msa_ld_b((v16i8*)src_argb1, 16); + src0 = (v16u8)__msa_ld_b((void*)src_argb0, 0); + src1 = (v16u8)__msa_ld_b((void*)src_argb0, 16); + src2 = (v16u8)__msa_ld_b((void*)src_argb1, 0); + src3 = (v16u8)__msa_ld_b((void*)src_argb1, 16); vec0 = (v8u16)__msa_ilvr_b(zero, (v16i8)src0); vec1 = (v8u16)__msa_ilvl_b(zero, (v16i8)src0); vec2 = (v8u16)__msa_ilvr_b(zero, (v16i8)src1); @@ -3083,10 +3083,10 @@ void ARGBQuantizeRow_MSA(uint8_t* dst_argb, v16i8 zero = {0}; for (x = 0; x < width; x += 8) { - src0 = (v16u8)__msa_ld_b((v16i8*)dst_argb, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)dst_argb, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)dst_argb, 32); - src3 = (v16u8)__msa_ld_b((v16i8*)dst_argb, 48); + src0 = (v16u8)__msa_ld_b((void*)dst_argb, 0); + src1 = (v16u8)__msa_ld_b((void*)dst_argb, 16); + src2 = (v16u8)__msa_ld_b((void*)dst_argb, 32); + src3 = (v16u8)__msa_ld_b((void*)dst_argb, 48); vec0 = (v8i16)__msa_ilvr_b(zero, (v16i8)src0); vec1 = (v8i16)__msa_ilvl_b(zero, (v16i8)src0); vec2 = (v8i16)__msa_ilvr_b(zero, (v16i8)src1); @@ -3186,13 +3186,13 @@ void ARGBColorMatrixRow_MSA(const uint8_t* src_argb, v16i8 zero = {0}; v8i16 max = __msa_ldi_h(255); - src0 = __msa_ld_b((v16i8*)matrix_argb, 0); + src0 = __msa_ld_b((void*)matrix_argb, 0); vec0 = (v8i16)__msa_ilvr_b(zero, src0); vec1 = (v8i16)__msa_ilvl_b(zero, src0); for (x = 0; x < width; x += 8) { - src1 = (v16u8)__msa_ld_b((v16i8*)src_argb, 0); - src2 = (v16u8)__msa_ld_b((v16i8*)src_argb, 16); + src1 = (v16u8)__msa_ld_b((void*)src_argb, 0); + src2 = (v16u8)__msa_ld_b((void*)src_argb, 16); vec2 = (v8i16)__msa_ilvr_b(zero, (v16i8)src1); vec3 = (v8i16)__msa_ilvl_b(zero, (v16i8)src1); vec4 = (v8i16)__msa_ilvr_b(zero, (v16i8)src2); @@ -3289,10 +3289,10 @@ void SplitUVRow_MSA(const uint8_t* src_uv, v16u8 src0, src1, src2, src3, dst0, dst1, dst2, dst3; for (x = 0; x < width; x += 32) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_uv, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_uv, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_uv, 32); - src3 = (v16u8)__msa_ld_b((v16i8*)src_uv, 48); + src0 = (v16u8)__msa_ld_b((void*)src_uv, 0); + src1 = (v16u8)__msa_ld_b((void*)src_uv, 16); + src2 = (v16u8)__msa_ld_b((void*)src_uv, 32); + src3 = (v16u8)__msa_ld_b((void*)src_uv, 48); dst0 = (v16u8)__msa_pckev_b((v16i8)src1, (v16i8)src0); dst1 = (v16u8)__msa_pckev_b((v16i8)src3, (v16i8)src2); dst2 = (v16u8)__msa_pckod_b((v16i8)src1, (v16i8)src0); @@ -3329,10 +3329,10 @@ void MirrorUVRow_MSA(const uint8_t* src_uv, for (x = 0; x < width; x += 32) { src_uv -= 64; - src2 = (v16u8)__msa_ld_b((v16i8*)src_uv, 0); - src3 = (v16u8)__msa_ld_b((v16i8*)src_uv, 16); - src0 = (v16u8)__msa_ld_b((v16i8*)src_uv, 32); - src1 = (v16u8)__msa_ld_b((v16i8*)src_uv, 48); + src2 = (v16u8)__msa_ld_b((void*)src_uv, 0); + src3 = (v16u8)__msa_ld_b((void*)src_uv, 16); + src0 = (v16u8)__msa_ld_b((void*)src_uv, 32); + src1 = (v16u8)__msa_ld_b((void*)src_uv, 48); dst0 = (v16u8)__msa_vshf_b(mask1, (v16i8)src1, (v16i8)src0); dst1 = (v16u8)__msa_vshf_b(mask1, (v16i8)src3, (v16i8)src2); dst2 = (v16u8)__msa_vshf_b(mask0, (v16i8)src1, (v16i8)src0); @@ -3359,12 +3359,12 @@ void SobelXRow_MSA(const uint8_t* src_y0, v8i16 max = __msa_ldi_h(255); for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_y0, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_y0, 16); - src2 = (v16u8)__msa_ld_b((v16i8*)src_y1, 0); - src3 = (v16u8)__msa_ld_b((v16i8*)src_y1, 16); - src4 = (v16u8)__msa_ld_b((v16i8*)src_y2, 0); - src5 = (v16u8)__msa_ld_b((v16i8*)src_y2, 16); + src0 = (v16u8)__msa_ld_b((void*)src_y0, 0); + src1 = (v16u8)__msa_ld_b((void*)src_y0, 16); + src2 = (v16u8)__msa_ld_b((void*)src_y1, 0); + src3 = (v16u8)__msa_ld_b((void*)src_y1, 16); + src4 = (v16u8)__msa_ld_b((void*)src_y2, 0); + src5 = (v16u8)__msa_ld_b((void*)src_y2, 16); vec0 = (v8i16)__msa_vshf_b(mask0, (v16i8)src1, (v16i8)src0); vec1 = (v8i16)__msa_vshf_b(mask1, (v16i8)src1, (v16i8)src0); vec2 = (v8i16)__msa_vshf_b(mask0, (v16i8)src3, (v16i8)src2); @@ -3409,8 +3409,8 @@ void SobelYRow_MSA(const uint8_t* src_y0, v8i16 max = __msa_ldi_h(255); for (x = 0; x < width; x += 16) { - src0 = (v16u8)__msa_ld_b((v16i8*)src_y0, 0); - src1 = (v16u8)__msa_ld_b((v16i8*)src_y1, 0); + src0 = (v16u8)__msa_ld_b((void*)src_y0, 0); + src1 = (v16u8)__msa_ld_b((void*)src_y1, 0); vec0 = (v8i16)__msa_ilvr_b((v16i8)zero, (v16i8)src0); vec1 = (v8i16)__msa_ilvl_b((v16i8)zero, (v16i8)src0); vec2 = (v8i16)__msa_ilvr_b((v16i8)zero, (v16i8)src1); @@ -3457,10 +3457,10 @@ void HalfFloatRow_MSA(const uint16_t* src, mult_vec = (v4f32)__msa_splati_w((v4i32)mult_vec, 0); for (i = 0; i < width; i += 32) { - src0 = (v8u16)__msa_ld_h((v8i16*)src, 0); - src1 = (v8u16)__msa_ld_h((v8i16*)src, 16); - src2 = (v8u16)__msa_ld_h((v8i16*)src, 32); - src3 = (v8u16)__msa_ld_h((v8i16*)src, 48); + src0 = (v8u16)__msa_ld_h((void*)src, 0); + src1 = (v8u16)__msa_ld_h((void*)src, 16); + src2 = (v8u16)__msa_ld_h((void*)src, 32); + src3 = (v8u16)__msa_ld_h((void*)src, 48); vec0 = (v4u32)__msa_ilvr_h(zero, (v8i16)src0); vec1 = (v4u32)__msa_ilvl_h(zero, (v8i16)src0); vec2 = (v4u32)__msa_ilvr_h(zero, (v8i16)src1); diff --git a/chromium/third_party/libyuv/tools_libyuv/autoroller/roll_deps.py b/chromium/third_party/libyuv/tools_libyuv/autoroller/roll_deps.py index 09ddc40e730..37727ab1a69 100755 --- a/chromium/third_party/libyuv/tools_libyuv/autoroller/roll_deps.py +++ b/chromium/third_party/libyuv/tools_libyuv/autoroller/roll_deps.py @@ -210,6 +210,8 @@ def BuildDepsentryDict(deps_dict): for path, deps_url_spec in deps_subdict.iteritems(): # The deps url is either an URL and a condition, or just the URL. if isinstance(deps_url_spec, dict): + if deps_url_spec.get('dep_type') == 'cipd': + continue deps_url = deps_url_spec['url'] else: deps_url = deps_url_spec @@ -345,11 +347,9 @@ def UpdateDepsFile(deps_filename, old_cr_revision, new_cr_revision, 'contains all platforms in the target_os list, i.e.\n' 'target_os = ["android", "unix", "mac", "ios", "win"];\n' 'Then run "gclient sync" again.' % local_dep_dir) - _, stderr = _RunCommand( - ['roll-dep-svn', '--no-verify-revision', dep.path, dep.new_rev], - working_dir=CHECKOUT_SRC_DIR, ignore_exit_code=True) - if stderr: - logging.warning('roll-dep-svn: %s', stderr) + _RunCommand( + ['gclient', 'setdep', '--revision', '%s@%s' % (dep.path, dep.new_rev)], + working_dir=CHECKOUT_SRC_DIR) def _IsTreeClean(): diff --git a/chromium/third_party/libyuv/unit_test/scale_argb_test.cc b/chromium/third_party/libyuv/unit_test/scale_argb_test.cc index a1be85b8d8a..6a0a58640e4 100644 --- a/chromium/third_party/libyuv/unit_test/scale_argb_test.cc +++ b/chromium/third_party/libyuv/unit_test/scale_argb_test.cc @@ -319,12 +319,12 @@ int YUVToARGBScaleReference2(const uint8_t* src_y, int src_stride_u, const uint8_t* src_v, int src_stride_v, - uint32 /* src_fourcc */, + uint32_t /* src_fourcc */, int src_width, int src_height, uint8_t* dst_argb, int dst_stride_argb, - uint32 /* dst_fourcc */, + uint32_t /* dst_fourcc */, int dst_width, int dst_height, int clip_x, diff --git a/chromium/third_party/libyuv/unit_test/video_common_test.cc b/chromium/third_party/libyuv/unit_test/video_common_test.cc index 4d89586e76f..a84206a2adb 100644 --- a/chromium/third_party/libyuv/unit_test/video_common_test.cc +++ b/chromium/third_party/libyuv/unit_test/video_common_test.cc @@ -79,6 +79,7 @@ TEST_F(LibYUVBaseTest, TestFourCC) { EXPECT_TRUE(TestValidFourCC(FOURCC_RGBO, FOURCC_BPP_RGBO)); EXPECT_TRUE(TestValidFourCC(FOURCC_R444, FOURCC_BPP_R444)); EXPECT_TRUE(TestValidFourCC(FOURCC_H420, FOURCC_BPP_H420)); + EXPECT_TRUE(TestValidFourCC(FOURCC_H422, FOURCC_BPP_H422)); EXPECT_TRUE(TestValidFourCC(FOURCC_H010, FOURCC_BPP_H010)); EXPECT_TRUE(TestValidFourCC(FOURCC_MJPG, FOURCC_BPP_MJPG)); EXPECT_TRUE(TestValidFourCC(FOURCC_YV12, FOURCC_BPP_YV12)); |