diff --git a/AUTHORS b/AUTHORS index 8d9c6fc..aa1ca40 100644 --- a/AUTHORS +++ b/AUTHORS
@@ -247,6 +247,7 @@ Evgeny Agafonchikov <evgeny.agafonchikov@akvelon.com> Fabien Tassin <fta@sofaraway.org> Felix H. Dahlke <fhd@ubercode.de> +Fengrong Fang <fr.fang@samsung.com> Fernando Jiménez Moreno <ferjmoreno@gmail.com> Finbar Crago <finbar.crago@gmail.com> François Beaufort <beaufort.francois@gmail.com>
diff --git a/DEPS b/DEPS index adc0fe42..d6a7a44 100644 --- a/DEPS +++ b/DEPS
@@ -93,7 +93,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': '263de54ce2ae281af5213a4ad9414751a24fa943', + 'v8_revision': '6b76faea0a217398f7f05a6fa7c93599793b7c34', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client # and whatever else without interference from each other. @@ -101,7 +101,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. - 'angle_revision': '3ec304dba28dd43b8a19692439e220c15c6c58f8', + 'angle_revision': '5f21df8318e9dae7e4eca2809a176f2989410da8', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling build tools # and whatever else without interference from each other. @@ -113,7 +113,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling PDFium # and whatever else without interference from each other. - 'pdfium_revision': 'e61e2f3d34efee51b69838646dd4e7462989ca08', + 'pdfium_revision': 'dd2a629f9ede484e0e570ce09d1e9d8906aa11be', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling openmax_dl # and whatever else without interference from each other. @@ -149,7 +149,7 @@ # 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': '19f413e511563048bbd00578921fcdaf1e6958b6', + 'catapult_revision': '219bbf110903207c2112a382cdf4741a089993e3', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -259,7 +259,7 @@ }, 'src/ios/third_party/material_components_ios/src': { - 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '3a443a0c0f575db3672541e896daa5a483c6c9b4', + 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '58f627bcd48de53f1633cf980008dca1e33e4970', 'condition': 'checkout_ios', }, @@ -309,7 +309,7 @@ }, 'src/media/cdm/api': - Var('chromium_git') + '/chromium/cdm.git' + '@' + '57e20546bc2afeabae7716ae3fc73bf091a76343', + Var('chromium_git') + '/chromium/cdm.git' + '@' + '163f87884f15037bbcaad74abdcdd1c9d8c34bb7', 'src/native_client': { 'url': Var('chromium_git') + '/native_client/src/native_client.git' + '@' + Var('nacl_revision'), @@ -488,7 +488,7 @@ # Build tools for Chrome OS. Note: This depends on third_party/pyelftools. 'src/third_party/chromite': { - 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'b915daddaea12c0fc209d422119c7dd7d6cca4b2', + 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'ef1ada9adf6a5e1b8b0d4a4b51188dff91f39582', 'condition': 'checkout_linux', }, @@ -692,7 +692,7 @@ }, 'src/third_party/leveldatabase/src': - Var('chromium_git') + '/external/leveldb.git' + '@' + '6fa45666703add49f77652b2eadd874d49aedaf6', + Var('chromium_git') + '/external/leveldb.git' + '@' + 'd177a0263cce4344d05188521ad53459c369b940', 'src/third_party/libFuzzer/src': Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git' + '@' + Var('libfuzzer_revision'), @@ -741,7 +741,7 @@ }, 'src/third_party/libvpx/source/libvpx': - Var('chromium_git') + '/webm/libvpx.git' + '@' + 'be5df6080154e58db88fa3640e127efd18c04bde', + Var('chromium_git') + '/webm/libvpx.git' + '@' + '3b460db214b5bec07a3da6914a224d90c361ccac', 'src/third_party/libwebm/source': Var('chromium_git') + '/webm/libwebm.git' + '@' + 'b03c65468b06d097f27235d93d76bfc45f490ede', @@ -953,7 +953,7 @@ Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '7c0541da63f571512c49758cbc0767117997a270', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + '6847f9b49096dfe436b440d4c601caf6a6c9d1b6', # commit position 21742 + Var('webrtc_git') + '/src.git' + '@' + 'bd7392829a81d0720887dae9ac0bf83da8d9e80d', # commit position 21742 'src/third_party/xdg-utils': { 'url': Var('chromium_git') + '/chromium/deps/xdg-utils.git' + '@' + 'd80274d5869b17b8c9067a1022e4416ee7ed5e0d',
diff --git a/android_webview/browser/net/aw_cookie_store_wrapper.cc b/android_webview/browser/net/aw_cookie_store_wrapper.cc index cc3f4f8e..91859d7 100644 --- a/android_webview/browser/net/aw_cookie_store_wrapper.cc +++ b/android_webview/browser/net/aw_cookie_store_wrapper.cc
@@ -59,21 +59,18 @@ GetCookieStore()->DeleteCanonicalCookieAsync(cookie, std::move(callback)); } -void DeleteAllCreatedBetweenAsyncOnCookieThread( - const base::Time& delete_begin, - const base::Time& delete_end, +void DeleteAllCreatedWithinRangeAsyncOnCookieThread( + const net::CookieStore::TimeRange& creation_range, net::CookieStore::DeleteCallback callback) { - GetCookieStore()->DeleteAllCreatedBetweenAsync(delete_begin, delete_end, - std::move(callback)); + GetCookieStore()->DeleteAllCreatedInTimeRangeAsync(creation_range, + std::move(callback)); } -void DeleteAllCreatedBetweenWithPredicateAsyncOnCookieThread( - const base::Time& delete_begin, - const base::Time& delete_end, - const net::CookieStore::CookiePredicate& predicate, +void DeleteAllMatchingInfoAsyncOnCookieThread( + net::CookieStore::CookieDeletionInfo delete_info, net::CookieStore::DeleteCallback callback) { - GetCookieStore()->DeleteAllCreatedBetweenWithPredicateAsync( - delete_begin, delete_end, predicate, std::move(callback)); + GetCookieStore()->DeleteAllMatchingInfoAsync(std::move(delete_info), + std::move(callback)); } void DeleteSessionCookiesAsyncOnCookieThread( @@ -154,26 +151,22 @@ CreateWrappedCallback<uint32_t>(std::move(callback)))); } -void AwCookieStoreWrapper::DeleteAllCreatedBetweenAsync( - const base::Time& delete_begin, - const base::Time& delete_end, +void AwCookieStoreWrapper::DeleteAllCreatedInTimeRangeAsync( + const TimeRange& creation_range, DeleteCallback callback) { DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); PostTaskToCookieStoreTaskRunner(base::BindOnce( - &DeleteAllCreatedBetweenAsyncOnCookieThread, delete_begin, delete_end, + &DeleteAllCreatedWithinRangeAsyncOnCookieThread, creation_range, CreateWrappedCallback<uint32_t>(std::move(callback)))); } -void AwCookieStoreWrapper::DeleteAllCreatedBetweenWithPredicateAsync( - const base::Time& delete_begin, - const base::Time& delete_end, - const CookiePredicate& predicate, +void AwCookieStoreWrapper::DeleteAllMatchingInfoAsync( + net::CookieStore::CookieDeletionInfo delete_info, DeleteCallback callback) { DCHECK(client_task_runner_->RunsTasksInCurrentSequence()); - PostTaskToCookieStoreTaskRunner( - base::BindOnce(&DeleteAllCreatedBetweenWithPredicateAsyncOnCookieThread, - delete_begin, delete_end, predicate, - CreateWrappedCallback<uint32_t>(std::move(callback)))); + PostTaskToCookieStoreTaskRunner(base::BindOnce( + &DeleteAllMatchingInfoAsyncOnCookieThread, std::move(delete_info), + CreateWrappedCallback<uint32_t>(std::move(callback)))); } void AwCookieStoreWrapper::DeleteSessionCookiesAsync(DeleteCallback callback) {
diff --git a/android_webview/browser/net/aw_cookie_store_wrapper.h b/android_webview/browser/net/aw_cookie_store_wrapper.h index 088f70b..38634291 100644 --- a/android_webview/browser/net/aw_cookie_store_wrapper.h +++ b/android_webview/browser/net/aw_cookie_store_wrapper.h
@@ -60,13 +60,10 @@ base::OnceClosure callback) override; void DeleteCanonicalCookieAsync(const net::CanonicalCookie& cookie, DeleteCallback callback) override; - void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin, - const base::Time& delete_end, - DeleteCallback callback) override; - void DeleteAllCreatedBetweenWithPredicateAsync( - const base::Time& delete_begin, - const base::Time& delete_end, - const CookiePredicate& predicate, + void DeleteAllCreatedInTimeRangeAsync(const TimeRange& creation_range, + DeleteCallback callback) override; + void DeleteAllMatchingInfoAsync( + net::CookieStore::CookieDeletionInfo delete_info, DeleteCallback callback) override; void DeleteSessionCookiesAsync(DeleteCallback callback) override; void FlushStore(base::OnceClosure callback) override;
diff --git a/ash/assistant/OWNERS b/ash/assistant/OWNERS deleted file mode 100644 index 530b0016..0000000 --- a/ash/assistant/OWNERS +++ /dev/null
@@ -1,3 +0,0 @@ -# Temporary, since the IPC endpoint is just a skeleton. -per-file ash_assistant_controller.cc=set noparent -per-file ash_assistant_controller.cc=file://ipc/SECURITY_OWNERS \ No newline at end of file
diff --git a/ash/components/shortcut_viewer/BUILD.gn b/ash/components/shortcut_viewer/BUILD.gn index d53553d6..ed8f95da 100644 --- a/ash/components/shortcut_viewer/BUILD.gn +++ b/ash/components/shortcut_viewer/BUILD.gn
@@ -26,11 +26,10 @@ defines = [ "KSV_IMPLEMENTATION" ] deps = [ - "//ash/components/resources", "//ash/components/shortcut_viewer/vector_icons", "//ash/components/strings", "//ash/public/cpp", - "//ash/resources", + "//ash/public/cpp/resources:ash_public_unscaled_resources", "//cc/paint", "//ui/accessibility", "//ui/aura",
diff --git a/ash/components/shortcut_viewer/DEPS b/ash/components/shortcut_viewer/DEPS index 6b5e2147..556e450 100644 --- a/ash/components/shortcut_viewer/DEPS +++ b/ash/components/shortcut_viewer/DEPS
@@ -1,10 +1,8 @@ include_rules = [ # KSV is intended to be a small app with restrictive DEPS in order to make it # easy to be migrated to a completely independent mojo app under mustash. - "+ash/components/resources", "+ash/components/shortcut_viewer", "+ash/components/strings", - "+ash/resources", "+base", "+cc/paint", "+testing/gtest",
diff --git a/ash/components/shortcut_viewer/views/keyboard_shortcut_view.cc b/ash/components/shortcut_viewer/views/keyboard_shortcut_view.cc index a05cc508..8702922 100644 --- a/ash/components/shortcut_viewer/views/keyboard_shortcut_view.cc +++ b/ash/components/shortcut_viewer/views/keyboard_shortcut_view.cc
@@ -6,7 +6,6 @@ #include <algorithm> -#include "ash/components/resources/grit/ash_components_resources.h" #include "ash/components/shortcut_viewer/keyboard_shortcut_viewer_metadata.h" #include "ash/components/shortcut_viewer/vector_icons/vector_icons.h" #include "ash/components/shortcut_viewer/views/keyboard_shortcut_item_list_view.h" @@ -14,9 +13,9 @@ #include "ash/components/shortcut_viewer/views/ksv_search_box_view.h" #include "ash/components/strings/grit/ash_components_strings.h" #include "ash/public/cpp/app_list/internal_app_id_constants.h" +#include "ash/public/cpp/resources/grit/ash_public_unscaled_resources.h" #include "ash/public/cpp/shelf_item.h" #include "ash/public/cpp/window_properties.h" -#include "ash/resources/grit/ash_resources.h" #include "base/bind.h" #include "base/i18n/string_search.h" #include "base/metrics/user_metrics.h" @@ -138,7 +137,7 @@ window->SetTitle(l10n_util::GetStringUTF16(IDS_KSV_TITLE)); gfx::ImageSkia* icon = ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( - IDR_KEYBOARD_SHORTCUT_VIEWER_LOGO_192); + IDR_SHORTCUT_VIEWER_LOGO_192); // The new gfx::ImageSkia instance is owned by the window itself. window->SetProperty(aura::client::kWindowIconKey, new gfx::ImageSkia(*icon));
diff --git a/ash/public/cpp/resources/BUILD.gn b/ash/public/cpp/resources/BUILD.gn new file mode 100644 index 0000000..99e663a --- /dev/null +++ b/ash/public/cpp/resources/BUILD.gn
@@ -0,0 +1,13 @@ +# Copyright 2018 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//tools/grit/grit_rule.gni") + +grit("ash_public_unscaled_resources") { + source = "ash_public_unscaled_resources.grd" + outputs = [ + "grit/ash_public_unscaled_resources.h", + "ash_public_unscaled_resources.pak", + ] +}
diff --git a/ash/public/cpp/resources/ash_public_unscaled_resources.grd b/ash/public/cpp/resources/ash_public_unscaled_resources.grd new file mode 100644 index 0000000..2dc1f27 --- /dev/null +++ b/ash/public/cpp/resources/ash_public_unscaled_resources.grd
@@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- This grd file contains images that are not pre-scaled for device + scale factors. The image returned by + ui::ResourceBundle::GetImageNamed() only contains 100P, and + it is the caller's responsibility to do the right thing when the + display is not at 100P device scale factor. + --> +<grit latest_public_release="0" current_release="1" output_all_resource_defines="false"> + <outputs> + <output filename="grit/ash_public_unscaled_resources.h" type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="ash_public_unscaled_resources.pak" type="data_package" /> + </outputs> + <release seq="1"> + <includes> + <!-- CrOS internal apps images --> + <include name="IDR_SHORTCUT_VIEWER_LOGO_192" file="unscaled_resources/shortcut_viewer_logo_192.png" type="BINDATA" /> + <include name="IDR_SETTINGS_LOGO_192" file="unscaled_resources/settings_logo_192.png" type="BINDATA" /> + </includes> + </release> +</grit>
diff --git a/ash/resources/default_100_percent/cros/settings_logo_192.png b/ash/public/cpp/resources/unscaled_resources/settings_logo_192.png similarity index 100% rename from ash/resources/default_100_percent/cros/settings_logo_192.png rename to ash/public/cpp/resources/unscaled_resources/settings_logo_192.png Binary files differ
diff --git a/ash/resources/default_100_percent/cros/keyboard_shortcut_viewer_logo_192.png b/ash/public/cpp/resources/unscaled_resources/shortcut_viewer_logo_192.png similarity index 100% rename from ash/resources/default_100_percent/cros/keyboard_shortcut_viewer_logo_192.png rename to ash/public/cpp/resources/unscaled_resources/shortcut_viewer_logo_192.png Binary files differ
diff --git a/ash/public/interfaces/wallpaper.mojom b/ash/public/interfaces/wallpaper.mojom index 16e3c70..b71bffdd 100644 --- a/ash/public/interfaces/wallpaper.mojom +++ b/ash/public/interfaces/wallpaper.mojom
@@ -79,21 +79,37 @@ gfx.mojom.ImageSkia image, bool preview_mode); - // Sets wallpaper from the wallpaper picker selection, i.e., the wallpaper - // type is ONLINE. + // Sets wallpaper from the Chrome OS wallpaper picker. If the wallpaper file + // corresponding to |url| already exists in local file system (i.e. + // |SetOnlineWallpaperFromData| was called earlier with the same |url|), + // returns true and sets wallpaper for the user, otherwise returns false. // |user_info|: The user's information related to wallpaper. - // |image|: The wallpaper image. - // |url|: The url corresponding to this wallpaper. Used as a placeholder for - // the location in WallpaperInfo. + // |url|: The wallpaper url. // |layout|: The layout of the wallpaper, used for wallpaper resizing. // |preview_mode|: If true, show the wallpaper immediately but doesn't change // the user wallpaper info until |ConfirmPreviewWallpaper| is // called. - SetOnlineWallpaper(WallpaperUserInfo user_info, - gfx.mojom.ImageSkia image, - string url, - WallpaperLayout layout, - bool preview_mode); + // |file_exists|: If the wallpaper file exists in local file system. + SetOnlineWallpaperIfExists(WallpaperUserInfo user_info, + url.mojom.Url url, + WallpaperLayout layout, + bool preview_mode) => (bool file_exists); + + // Sets wallpaper from the Chrome OS wallpaper picker and saves the wallpaper + // to local file system. After this, |SetOnlineWallpaperIfExists| will return + // true for the same |url|, so that there's no need to provide |image_data| + // when the same wallpaper needs to be set again or for another user. + // |user_info|: The user's information related to wallpaper. + // |url|: The wallpaper url. + // |layout|: The layout of the wallpaper, used for wallpaper resizing. + // |preview_mode|: If true, show the wallpaper immediately but doesn't change + // the user wallpaper info until |ConfirmPreviewWallpaper| is + // called. + SetOnlineWallpaperFromData(WallpaperUserInfo user_info, + string image_data, + url.mojom.Url url, + WallpaperLayout layout, + bool preview_mode); // Sets the user's wallpaper to be the default wallpaper. Note: different user // types may have different default wallpapers. @@ -194,6 +210,11 @@ // |wallpaper_files_id|: The file id for user_info.account_id. RemovePolicyWallpaper(WallpaperUserInfo user_info, string wallpaper_files_id); + // Returns the file names of the wallpapers that exist in local file system + // (i.e. |SetOnlineWallpaperFromData| was called earlier). The file name is + // used as id to identify which wallpapers are available to be set offline. + GetOfflineWallpaperList() => (array<string> file_names); + // Sets wallpaper animation duration. Passing an empty value disables the // animation. SetAnimationDuration(mojo_base.mojom.TimeDelta animation_duration);
diff --git a/ash/resources/BUILD.gn b/ash/resources/BUILD.gn index b337be9..445078ee 100644 --- a/ash/resources/BUILD.gn +++ b/ash/resources/BUILD.gn
@@ -28,6 +28,7 @@ sources = [ "$root_gen_dir/ash/components/resources/ash_components_resources_${percent}_percent.pak", + "$root_gen_dir/ash/public/cpp/resources/ash_public_unscaled_resources.pak", "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak", "$root_gen_dir/ui/app_list/resources/app_list_resources_${percent}_percent.pak", "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${percent}_percent.pak", @@ -48,6 +49,7 @@ deps = [ "//ash/components/resources", + "//ash/public/cpp/resources:ash_public_unscaled_resources", "//ash/resources", "//mojo/public/js:resources", "//ui/app_list/resources",
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd index 66005153..786edc425 100644 --- a/ash/resources/ash_resources.grd +++ b/ash/resources/ash_resources.grd
@@ -22,11 +22,6 @@ <!-- Crostini terminal images --> <structure type="chrome_scaled_image" name="IDR_LOGO_CROSTINI_TERMINAL" file="cros/crostini/logo_crostini_terminal.png" /> - - <!-- CrOS internal apps images --> - <structure type="chrome_scaled_image" name="IDR_KEYBOARD_SHORTCUT_VIEWER_LOGO_192" file="cros/keyboard_shortcut_viewer_logo_192.png" /> - <structure type="chrome_scaled_image" name="IDR_SETTINGS_LOGO_192" file="cros/settings_logo_192.png" /> - </structures> </release> </grit>
diff --git a/ash/shell.cc b/ash/shell.cc index 6606007..c8077b5 100644 --- a/ash/shell.cc +++ b/ash/shell.cc
@@ -815,6 +815,7 @@ // These need a valid Shell instance to clean up properly, so explicitly // delete them before invalidating the instance. // Alphabetical. TODO(oshima): sort. + ash_assistant_controller_.reset(); magnification_controller_.reset(); tooltip_controller_.reset(); event_client_.reset();
diff --git a/ash/wallpaper/wallpaper_controller.cc b/ash/wallpaper/wallpaper_controller.cc index 05e2b35..443791f 100644 --- a/ash/wallpaper/wallpaper_controller.cc +++ b/ash/wallpaper/wallpaper_controller.cc
@@ -28,6 +28,7 @@ #include "ash/wallpaper/wallpaper_window_state_manager.h" #include "base/bind.h" #include "base/command_line.h" +#include "base/files/file_enumerator.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram_macros.h" @@ -166,15 +167,6 @@ } } -// Saves wallpaper image raw |data| to |path| (absolute path) in file system. -// Returns true on success. -bool SaveWallpaperInternal(const base::FilePath& path, - const char* data, - int size) { - int written_bytes = base::WriteFile(path, data, size); - return written_bytes == size; -} - // Creates all new custom wallpaper directories for |wallpaper_files_id| if they // don't exist. void EnsureCustomWallpaperDirectories(const std::string& wallpaper_files_id) { @@ -259,8 +251,8 @@ *output = new base::RefCountedBytes(); if (layout == WALLPAPER_LAYOUT_CENTER_CROPPED) { - // Do not resize custom wallpaper if it is smaller than preferred size. - if (!(width > preferred_width && height > preferred_height)) + // Do not resize wallpaper if it is smaller than preferred size. + if (width < preferred_width || height < preferred_height) return false; double horizontal_ratio = static_cast<double>(preferred_width) / width; @@ -319,6 +311,71 @@ active_user_session->user_info->account_id == account_id; } +// Returns the file path of the wallpaper corresponding to |url| if it exists in +// local file system, otherwise returns an empty file path. +base::FilePath GetExistingOnlineWallpaperPath(const GURL& url) { + WallpaperController::WallpaperResolution resolution = + WallpaperController::GetAppropriateResolution(); + base::FilePath wallpaper_path = + WallpaperController::GetOnlineWallpaperPath(url, resolution); + if (base::PathExists(wallpaper_path)) + return wallpaper_path; + + // Falls back to the large wallpaper if the small one doesn't exist. + if (resolution == WallpaperController::WALLPAPER_RESOLUTION_SMALL) { + wallpaper_path = WallpaperController::GetOnlineWallpaperPath( + url, WallpaperController::WALLPAPER_RESOLUTION_LARGE); + if (base::PathExists(wallpaper_path)) + return wallpaper_path; + } + return base::FilePath(); +} + +// Saves the online wallpaper with both large and small sizes to local file +// system. +void SaveOnlineWallpaper(const GURL& url, + WallpaperLayout layout, + std::unique_ptr<gfx::ImageSkia> image) { + DCHECK(!dir_chrome_os_wallpapers_path.empty()); + if (!base::DirectoryExists(dir_chrome_os_wallpapers_path) && + !base::CreateDirectory(dir_chrome_os_wallpapers_path)) { + return; + } + WallpaperController::ResizeAndSaveWallpaper( + *image, + WallpaperController::GetOnlineWallpaperPath( + url, WallpaperController::WALLPAPER_RESOLUTION_LARGE), + layout, image->width(), image->height(), nullptr); + WallpaperController::ResizeAndSaveWallpaper( + *image, + WallpaperController::GetOnlineWallpaperPath( + url, WallpaperController::WALLPAPER_RESOLUTION_SMALL), + WALLPAPER_LAYOUT_CENTER_CROPPED, + WallpaperController::kSmallWallpaperMaxWidth, + WallpaperController::kSmallWallpaperMaxHeight, nullptr); +} + +// Implementation of |WallpaperController::GetOfflineWallpaper|. +std::vector<std::string> GetOfflineWallpaperListImpl() { + DCHECK(!dir_chrome_os_wallpapers_path.empty()); + std::vector<std::string> file_names; + if (base::DirectoryExists(dir_chrome_os_wallpapers_path)) { + base::FileEnumerator files(dir_chrome_os_wallpapers_path, + false /*recursive=*/, + base::FileEnumerator::FILES); + for (base::FilePath current = files.Next(); !current.empty(); + current = files.Next()) { + // Do not add file name of small resolution wallpaper to the list. + if (!base::EndsWith(current.BaseName().RemoveExtension().value(), + WallpaperController::kSmallWallpaperSuffix, + base::CompareCase::SENSITIVE)) { + file_names.push_back(current.BaseName().value()); + } + } + } + return file_names; +} + } // namespace const char WallpaperController::kSmallWallpaperSubDir[] = "small"; @@ -408,6 +465,20 @@ } // static +base::FilePath WallpaperController::GetOnlineWallpaperPath( + const GURL& url, + WallpaperResolution resolution) { + std::string file_name = url.ExtractFileName(); + if (resolution == WALLPAPER_RESOLUTION_SMALL) { + file_name = base::FilePath(file_name) + .InsertBeforeExtension(kSmallWallpaperSuffix) + .value(); + } + DCHECK(!dir_chrome_os_wallpapers_path.empty()); + return dir_chrome_os_wallpapers_path.Append(file_name); +} + +// static std::string WallpaperController::GetCustomWallpaperSubdirForCurrentResolution() { WallpaperResolution resolution = GetAppropriateResolution(); @@ -447,8 +518,10 @@ scoped_refptr<base::RefCountedBytes> data; if (ResizeImage(image, layout, preferred_width, preferred_height, &data, output_skia)) { - return SaveWallpaperInternal( - path, reinterpret_cast<const char*>(data->front()), data->size()); + // Saves |data| to |path| in local file system. + size_t written_bytes = + base::WriteFile(path, data->front_as<const char>(), data->size()); + return written_bytes == data->size(); } return false; } @@ -1039,31 +1112,45 @@ } } -void WallpaperController::SetOnlineWallpaper( +void WallpaperController::SetOnlineWallpaperIfExists( mojom::WallpaperUserInfoPtr user_info, - const gfx::ImageSkia& image, - const std::string& url, + const GURL& url, + WallpaperLayout layout, + bool preview_mode, + SetOnlineWallpaperIfExistsCallback callback) { + DCHECK(Shell::Get()->session_controller()->IsActiveUserSessionStarted()); + DCHECK(CanSetUserWallpaper(user_info->account_id, user_info->is_ephemeral)); + + const OnlineWallpaperParams params = {user_info->account_id, + user_info->is_ephemeral, url, layout, + preview_mode}; + base::PostTaskAndReplyWithResult( + sequenced_task_runner_.get(), FROM_HERE, + base::BindOnce(&GetExistingOnlineWallpaperPath, url), + base::BindOnce(&WallpaperController::SetOnlineWallpaperFromPath, + weak_factory_.GetWeakPtr(), std::move(callback), params)); +} + +void WallpaperController::SetOnlineWallpaperFromData( + mojom::WallpaperUserInfoPtr user_info, + const std::string& image_data, + const GURL& url, WallpaperLayout layout, bool preview_mode) { DCHECK(Shell::Get()->session_controller()->IsActiveUserSessionStarted()); if (!CanSetUserWallpaper(user_info->account_id, user_info->is_ephemeral)) return; - const bool is_active_user = IsActiveUser(user_info->account_id); - if (preview_mode) { - DCHECK(is_active_user); - confirm_preview_wallpaper_callback_ = - base::BindOnce(&WallpaperController::SetOnlineWallpaperImpl, - weak_factory_.GetWeakPtr(), image, url, layout, - std::move(user_info), false /*show_wallpaper=*/); - ShowWallpaperImage(image, - WallpaperInfo{std::string(), layout, ONLINE, - base::Time::Now().LocalMidnight()}, - true /*preview_mode=*/); - } else { - SetOnlineWallpaperImpl(image, url, layout, std::move(user_info), - is_active_user /*show_wallpaper=*/); - } + const OnlineWallpaperParams params = {user_info->account_id, + user_info->is_ephemeral, url, layout, + preview_mode}; + LoadedCallback callback = + base::Bind(&WallpaperController::OnOnlineWallpaperDecoded, + weak_factory_.GetWeakPtr(), params, true /*save_file=*/); + if (bypass_decode_for_testing_) + std::move(callback).Run(CreateSolidColorWallpaper()); + else + DecodeWallpaper(image_data, std::move(callback)); } void WallpaperController::SetDefaultWallpaper( @@ -1323,6 +1410,13 @@ SetDefaultWallpaper(std::move(user_info), wallpaper_files_id, show_wallpaper); } +void WallpaperController::GetOfflineWallpaperList( + GetOfflineWallpaperListCallback callback) { + base::PostTaskAndReplyWithResult(sequenced_task_runner_.get(), FROM_HERE, + base::BindOnce(&GetOfflineWallpaperListImpl), + std::move(callback)); +} + void WallpaperController::SetAnimationDuration( base::TimeDelta animation_duration) { animation_duration_ = animation_duration; @@ -1408,12 +1502,13 @@ SetProminentColors(colors); } -void WallpaperController::InitializePathsForTesting() { - dir_user_data_path = base::FilePath(FILE_PATH_LITERAL("user_data")); - dir_chrome_os_wallpapers_path = - base::FilePath(FILE_PATH_LITERAL("chrome_os_wallpapers")); - dir_chrome_os_custom_wallpapers_path = - base::FilePath(FILE_PATH_LITERAL("chrome_os_custom_wallpapers")); +void WallpaperController::InitializePathsForTesting( + const base::FilePath& user_data_path, + const base::FilePath& chromeos_wallpapers_path, + const base::FilePath& chromeos_custom_wallpapers_path) { + dir_user_data_path = user_data_path; + dir_chrome_os_wallpapers_path = chromeos_wallpapers_path; + dir_chrome_os_custom_wallpapers_path = chromeos_custom_wallpapers_path; } void WallpaperController::ShowDefaultWallpaperForTesting() { @@ -1533,30 +1628,68 @@ base::Bind(&DeleteWallpaperInList, file_to_remove)); } -void WallpaperController::SetOnlineWallpaperImpl( - const gfx::ImageSkia& image, - const std::string& url, - const WallpaperLayout& layout, - mojom::WallpaperUserInfoPtr user_info, - bool show_wallpaper) { +void WallpaperController::SetOnlineWallpaperFromPath( + SetOnlineWallpaperIfExistsCallback callback, + const OnlineWallpaperParams& params, + const base::FilePath& file_path) { + bool file_exists = !file_path.empty(); + std::move(callback).Run(file_exists); + if (file_exists) { + ReadAndDecodeWallpaper( + base::Bind(&WallpaperController::OnOnlineWallpaperDecoded, + weak_factory_.GetWeakPtr(), params, false /*save_file=*/), + sequenced_task_runner_, file_path); + } +} + +void WallpaperController::OnOnlineWallpaperDecoded( + const OnlineWallpaperParams& params, + bool save_file, + const gfx::ImageSkia& image) { if (image.isNull()) { - LOG(ERROR) << "The client provided an empty wallpaper image."; + LOG(ERROR) << "Failed to decode online wallpaper."; return; } - WallpaperInfo wallpaper_info = {url, layout, ONLINE, + if (save_file) { + image.EnsureRepsForSupportedScales(); + std::unique_ptr<gfx::ImageSkia> deep_copy(image.DeepCopy()); + sequenced_task_runner_->PostTask( + FROM_HERE, + base::BindOnce(&SaveOnlineWallpaper, params.url, params.layout, + base::Passed(std::move(deep_copy)))); + } + + const bool is_active_user = IsActiveUser(params.account_id); + if (params.preview_mode) { + DCHECK(is_active_user); + confirm_preview_wallpaper_callback_ = base::BindOnce( + &WallpaperController::SetOnlineWallpaperImpl, + weak_factory_.GetWeakPtr(), params, image, false /*show_wallpaper=*/); + ShowWallpaperImage(image, + WallpaperInfo{params.url.spec(), params.layout, ONLINE, + base::Time::Now().LocalMidnight()}, + true /*preview_mode=*/); + } else { + SetOnlineWallpaperImpl(params, image, is_active_user /*show_wallpaper=*/); + } +} + +void WallpaperController::SetOnlineWallpaperImpl( + const OnlineWallpaperParams& params, + const gfx::ImageSkia& image, + bool show_wallpaper) { + WallpaperInfo wallpaper_info = {params.url.spec(), params.layout, ONLINE, base::Time::Now().LocalMidnight()}; - if (!SetUserWallpaperInfo(user_info->account_id, wallpaper_info, - user_info->is_ephemeral)) { + if (!SetUserWallpaperInfo(params.account_id, wallpaper_info, + params.is_ephemeral)) { LOG(ERROR) << "Setting user wallpaper info fails. This should never happen " "except in tests."; } if (show_wallpaper) ShowWallpaperImage(image, wallpaper_info, false /*preview_mode=*/); - // TODO(wzang): Create a |GetOnlineWallpaperPath| method similar to - // |GetCustomWallpaperPath|. - wallpaper_cache_map_[user_info->account_id] = + wallpaper_cache_map_[params.account_id] = CustomWallpaperElement(base::FilePath(), image); } @@ -1586,18 +1719,9 @@ base::FilePath wallpaper_path; if (info.type == ONLINE) { - std::string file_name = GURL(info.location).ExtractFileName(); - WallpaperResolution resolution = GetAppropriateResolution(); - // Only solid color wallpapers have stretch layout and they have only - // one resolution. - if (info.layout != WALLPAPER_LAYOUT_STRETCH && - resolution == WALLPAPER_RESOLUTION_SMALL) { - file_name = base::FilePath(file_name) - .InsertBeforeExtension(kSmallWallpaperSuffix) - .value(); - } - DCHECK(!dir_chrome_os_wallpapers_path.empty()); - wallpaper_path = dir_chrome_os_wallpapers_path.Append(file_name); + const GURL url = GURL(info.location); + DCHECK(url.is_valid()); + wallpaper_path = GetOnlineWallpaperPath(url, GetAppropriateResolution()); // If the wallpaper exists and it already contains the correct image we // can return immediately.
diff --git a/ash/wallpaper/wallpaper_controller.h b/ash/wallpaper/wallpaper_controller.h index 818b6eb..85c5414 100644 --- a/ash/wallpaper/wallpaper_controller.h +++ b/ash/wallpaper/wallpaper_controller.h
@@ -109,6 +109,11 @@ // Returns the appropriate wallpaper resolution for all root windows. static WallpaperResolution GetAppropriateResolution(); + // Returns the path of the online wallpaper corresponding to |url| and + // |resolution|. + static base::FilePath GetOnlineWallpaperPath(const GURL& url, + WallpaperResolution resolution); + // Returns wallpaper subdirectory name for current resolution. static std::string GetCustomWallpaperSubdirForCurrentResolution(); @@ -311,11 +316,17 @@ WallpaperLayout layout, const gfx::ImageSkia& image, bool preview_mode) override; - void SetOnlineWallpaper(mojom::WallpaperUserInfoPtr user_info, - const gfx::ImageSkia& image, - const std::string& url, - WallpaperLayout layout, - bool preview_mode) override; + void SetOnlineWallpaperIfExists( + mojom::WallpaperUserInfoPtr user_info, + const GURL& url, + WallpaperLayout layout, + bool preview_mode, + SetOnlineWallpaperIfExistsCallback callback) override; + void SetOnlineWallpaperFromData(mojom::WallpaperUserInfoPtr user_info, + const std::string& image_data, + const GURL& url, + WallpaperLayout layout, + bool preview_mode) override; void SetDefaultWallpaper(mojom::WallpaperUserInfoPtr user_info, const std::string& wallpaper_files_id, bool show_wallpaper) override; @@ -342,6 +353,8 @@ const std::string& wallpaper_files_id) override; void RemovePolicyWallpaper(mojom::WallpaperUserInfoPtr user_info, const std::string& wallpaper_files_id) override; + void GetOfflineWallpaperList( + GetOfflineWallpaperListCallback callback) override; void SetAnimationDuration(base::TimeDelta animation_duration) override; void OpenWallpaperPickerIfAllowed() override; void MinimizeInactiveWindows(const std::string& user_id_hash) override; @@ -364,7 +377,10 @@ void OnColorCalculationComplete() override; // Sets dummy values for wallpaper directories. - void InitializePathsForTesting(); + void InitializePathsForTesting( + const base::FilePath& user_data_path, + const base::FilePath& chromeos_wallpapers_path, + const base::FilePath& chromeos_custom_wallpapers_path); // Shows a default wallpaper for testing, without changing users' wallpaper // info. @@ -396,6 +412,14 @@ base::FilePath file_path; }; + struct OnlineWallpaperParams { + AccountId account_id; + bool is_ephemeral; + GURL url; + WallpaperLayout layout; + bool preview_mode; + }; + // Creates a WallpaperWidgetController for |root_window|. void InstallDesktopController(aura::Window* root_window); @@ -417,12 +441,24 @@ void RemoveUserWallpaperImpl(const AccountId& account_id, const std::string& wallpaper_files_id); + // Used as the callback of checking ONLINE wallpaper existence in + // |SetOnlineWallpaperIfExists|. Initiates reading and decoding the wallpaper + // if |file_path| is not empty. + void SetOnlineWallpaperFromPath(SetOnlineWallpaperIfExistsCallback callback, + const OnlineWallpaperParams& params, + const base::FilePath& file_path); + + // Used as the callback of decoding wallpapers of type ONLINE. Saves the image + // to local file if |save_file| is true, and shows the wallpaper immediately + // if |params.account_id| is the active user. + void OnOnlineWallpaperDecoded(const OnlineWallpaperParams& params, + bool save_file, + const gfx::ImageSkia& image); + // Implementation of |SetOnlineWallpaper|. Shows the wallpaper on screen if // |show_wallpaper| is true. - void SetOnlineWallpaperImpl(const gfx::ImageSkia& image, - const std::string& url, - const WallpaperLayout& layout, - mojom::WallpaperUserInfoPtr user_info, + void SetOnlineWallpaperImpl(const OnlineWallpaperParams& params, + const gfx::ImageSkia& image, bool show_wallpaper); // Decodes |account_id|'s wallpaper. Shows the decoded wallpaper if @@ -459,10 +495,10 @@ const WallpaperInfo& info, bool show_wallpaper); - // Used as the callback of wallpaper decoding. (Wallpapers of type DEFAULT - // and DEVICE should use their corresponding |*Decoded|, and all other types - // should use this.) Shows the wallpaper now if |show_wallpaper| is true. - // Otherwise, only update the cache. + // Used as the callback of wallpaper decoding. (Wallpapers of type ONLINE, + // DEFAULT and DEVICE should use their corresponding |*Decoded|, and all other + // types should use this.) Shows the wallpaper immediately if |show_wallpaper| + // is true. Otherwise, only updates the cache. void OnWallpaperDecoded(const AccountId& account_id, const user_manager::UserType& user_type, const base::FilePath& path,
diff --git a/ash/wallpaper/wallpaper_controller_unittest.cc b/ash/wallpaper/wallpaper_controller_unittest.cc index 410ebddc..4280459a 100644 --- a/ash/wallpaper/wallpaper_controller_unittest.cc +++ b/ash/wallpaper/wallpaper_controller_unittest.cc
@@ -25,6 +25,7 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" +#include "base/task_scheduler/post_task.h" #include "base/task_scheduler/task_scheduler.h" #include "base/test/bind_test_util.h" #include "chromeos/chromeos_switches.h" @@ -77,7 +78,6 @@ return account_id.GetUserEmail() + "-file"; } -// Dummy account ids and file ids. constexpr char kUser1[] = "user1@test.com"; const AccountId account_id_1 = AccountId::FromUserEmail(kUser1); const std::string wallpaper_files_id_1 = GetDummyFileId(account_id_1); @@ -88,6 +88,16 @@ const std::string wallpaper_files_id_2 = GetDummyFileId(account_id_2); const std::string file_name_2 = GetDummyFileName(account_id_2); +const GURL kDummyUrl = GURL("https://best_wallpaper/1"); +const GURL kDummyUrl2 = GURL("https://best_wallpaper/2"); + +const base::FilePath user_data_dir = + base::FilePath(FILE_PATH_LITERAL("user_data")); +const base::FilePath wallpapers_dir = + base::FilePath(FILE_PATH_LITERAL("chrome_os_wallpapers")); +const base::FilePath custom_wallpapers_dir = + base::FilePath(FILE_PATH_LITERAL("chrome_os_custom_wallpapers")); + // Creates an image of size |size|. gfx::ImageSkia CreateImage(int width, int height, SkColor color) { SkBitmap bitmap; @@ -158,6 +168,12 @@ } } +void DeleteWallpaperDirectories() { + base::DeleteFile(user_data_dir, true /*recursive=*/); + base::DeleteFile(wallpapers_dir, true /*recursive=*/); + base::DeleteFile(custom_wallpapers_dir, true /*recursive=*/); +} + // Monitors if any task is processed by the message loop. class TaskObserver : public base::MessageLoop::TaskObserver { public: @@ -253,15 +269,15 @@ ->ResetWidgetsForTesting(); controller_ = Shell::Get()->wallpaper_controller(); controller_->set_wallpaper_reload_delay_for_test(0); - controller_->InitializePathsForTesting(); + controller_->InitializePathsForTesting(user_data_dir, wallpapers_dir, + custom_wallpapers_dir); } void TearDown() override { - // Remove the custom wallpaper directories that may be created. - controller_->RemoveUserWallpaper(InitializeUser(account_id_1), - wallpaper_files_id_1); - controller_->RemoveUserWallpaper(InitializeUser(account_id_2), - wallpaper_files_id_2); + base::PostTaskWithTraits(FROM_HERE, + {base::MayBlock(), base::TaskPriority::BACKGROUND, + base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}, + base::Bind(&DeleteWallpaperDirectories)); AshTestBase::TearDown(); } @@ -451,6 +467,20 @@ child_large_file, kWallpaperSize, kWallpaperSize, kWallpaperColor)); } + // A helper to test the behavior of setting online wallpaper after the image + // is decoded. This is needed because image decoding is not supported in unit + // tests (the connector for the mojo service manager is null). + void SetOnlineWallpaperFromImage(const AccountId& account_id, + const gfx::ImageSkia& image, + const GURL& url, + WallpaperLayout layout, + bool save_file, + bool preview_mode) { + const WallpaperController::OnlineWallpaperParams params = { + account_id, false /*is_ephemeral=*/, url, layout, preview_mode}; + controller_->OnOnlineWallpaperDecoded(params, save_file, image); + } + // Returns color of the current wallpaper. Note: this function assumes the // wallpaper has a solid color. SkColor GetWallpaperColor() { @@ -884,48 +914,97 @@ } TEST_F(WallpaperControllerTest, SetOnlineWallpaper) { + SetBypassDecode(); gfx::ImageSkia image = CreateImage(640, 480, kWallpaperColor); - const std::string url = "dummy_url"; - WallpaperLayout layout = WALLPAPER_LAYOUT_CENTER; - + WallpaperLayout layout = WALLPAPER_LAYOUT_CENTER_CROPPED; SimulateUserLogin(kUser1); - // Set an online wallpaper for |kUser1|. Verify the wallpaper is set - // successfully and wallpaper info is updated. - controller_->SetOnlineWallpaper(InitializeUser(account_id_1), image, url, - layout, false /*preview_mode=*/); + // Verify that there's no offline wallpaper available in the beginning. + std::unique_ptr<base::RunLoop> run_loop = std::make_unique<base::RunLoop>(); + controller_->GetOfflineWallpaperList(base::BindLambdaForTesting( + [&run_loop](const std::vector<std::string>& file_names) { + EXPECT_TRUE(file_names.empty()); + run_loop->Quit(); + })); + run_loop->Run(); + + // Verify that the attempt to set an online wallpaper without providing image + // data fails. + run_loop.reset(new base::RunLoop()); + controller_->SetOnlineWallpaperIfExists( + InitializeUser(account_id_1), kDummyUrl, layout, false /*preview_mode=*/, + base::BindLambdaForTesting([&run_loop](bool file_exists) { + EXPECT_FALSE(file_exists); + run_loop->Quit(); + })); + run_loop->Run(); + EXPECT_EQ(0, GetWallpaperCount()); + + // Set an online wallpaper with image data. Verify that the wallpaper is set + // successfully. + controller_->SetOnlineWallpaperFromData( + InitializeUser(account_id_1), std::string() /*image_data=*/, kDummyUrl, + layout, false /*preview_mode=*/); RunAllTasksUntilIdle(); EXPECT_EQ(1, GetWallpaperCount()); - EXPECT_EQ(kWallpaperColor, GetWallpaperColor()); EXPECT_EQ(controller_->GetWallpaperType(), ONLINE); + // Verify that the user wallpaper info is updated. WallpaperInfo wallpaper_info; EXPECT_TRUE(controller_->GetUserWallpaperInfo(account_id_1, &wallpaper_info, false /*is_ephemeral=*/)); - WallpaperInfo expected_wallpaper_info(url, layout, ONLINE, + WallpaperInfo expected_wallpaper_info(kDummyUrl.spec(), layout, ONLINE, base::Time::Now().LocalMidnight()); EXPECT_EQ(wallpaper_info, expected_wallpaper_info); - // Now set another online wallpaper for |kUser1|. Verify that the on-screen - // wallpaper doesn't change since |kUser1| is not active, but wallpaper info - // is updated properly. - SimulateUserLogin(kUser2); - const SkColor online_wallpaper_color = SK_ColorCYAN; - image = CreateImage(640, 480, online_wallpaper_color); - controller_->SetOnlineWallpaper(InitializeUser(account_id_1), image, url, - layout, false /*preview_mode=*/); - RunAllTasksUntilIdle(); - EXPECT_EQ(0, GetWallpaperCount()); - EXPECT_EQ(kWallpaperColor, GetWallpaperColor()); - EXPECT_TRUE(controller_->GetUserWallpaperInfo(account_id_1, &wallpaper_info, - false /*is_ephemeral=*/)); - EXPECT_EQ(wallpaper_info, expected_wallpaper_info); - - // Verify the updated wallpaper is shown after |kUser1| becomes active again. - SimulateUserLogin(kUser1); - controller_->ShowUserWallpaper(InitializeUser(account_id_1)); + // Change the on-screen wallpaper to a different one. (Otherwise the + // subsequent calls will be no-op since we intentionally prevent reloading the + // same wallpaper.) + controller_->SetCustomWallpaper( + InitializeUser(account_id_1), wallpaper_files_id_1, file_name_1, layout, + CreateImage(640, 480, kWallpaperColor), false /*preview_mode=*/); RunAllTasksUntilIdle(); EXPECT_EQ(1, GetWallpaperCount()); - EXPECT_EQ(online_wallpaper_color, GetWallpaperColor()); + EXPECT_EQ(controller_->GetWallpaperType(), CUSTOMIZED); + + // Attempt to set an online wallpaper without providing the image data. Verify + // it succeeds this time because |SetOnlineWallpaperFromData| has saved the + // file. + run_loop.reset(new base::RunLoop()); + controller_->SetOnlineWallpaperIfExists( + InitializeUser(account_id_1), kDummyUrl, layout, false /*preview_mode=*/, + base::BindLambdaForTesting([&run_loop](bool file_exists) { + EXPECT_TRUE(file_exists); + run_loop->Quit(); + })); + run_loop->Run(); + EXPECT_EQ(1, GetWallpaperCount()); + EXPECT_EQ(controller_->GetWallpaperType(), ONLINE); + + // Verify that the wallpaper with |url| is available offline, and the returned + // file name should not contain the small wallpaper suffix. + run_loop.reset(new base::RunLoop()); + controller_->GetOfflineWallpaperList(base::BindLambdaForTesting( + [&run_loop](const std::vector<std::string>& file_names) { + EXPECT_EQ(1U, file_names.size()); + EXPECT_EQ(kDummyUrl.ExtractFileName(), file_names[0]); + run_loop->Quit(); + })); + run_loop->Run(); + + // Log in |kUser2|, and set another online wallpaper for |kUser1|. Verify that + // the on-screen wallpaper doesn't change since |kUser1| is not active, but + // wallpaper info is updated properly. + SimulateUserLogin(kUser2); + controller_->SetOnlineWallpaperFromData( + InitializeUser(account_id_1), std::string() /*image_data=*/, kDummyUrl2, + layout, false /*preview_mode=*/); + RunAllTasksUntilIdle(); + EXPECT_EQ(0, GetWallpaperCount()); + EXPECT_TRUE(controller_->GetUserWallpaperInfo(account_id_1, &wallpaper_info, + false /*is_ephemeral=*/)); + WallpaperInfo expected_wallpaper_info_2(kDummyUrl2.spec(), layout, ONLINE, + base::Time::Now().LocalMidnight()); + EXPECT_EQ(wallpaper_info, expected_wallpaper_info_2); } TEST_F(WallpaperControllerTest, SetAndRemovePolicyWallpaper) { @@ -1278,11 +1357,11 @@ EXPECT_FALSE(controller_->GetUserWallpaperInfo(account_id_1, &wallpaper_info, false /*is_ephemeral=*/)); - // Verify that |SetOnlineWallpaper| doesn't set wallpaper in kiosk mode, and - // |account_id|'s wallpaper info is not updated. - controller_->SetOnlineWallpaper(InitializeUser(account_id_1), image, - "dummy_url", WALLPAPER_LAYOUT_CENTER, - false /*preview_mode=*/); + // Verify that |SetOnlineWallpaperFromData| doesn't set wallpaper in kiosk + // mode, and |account_id|'s wallpaper info is not updated. + controller_->SetOnlineWallpaperFromData( + InitializeUser(account_id_1), std::string() /*image_data=*/, kDummyUrl, + WALLPAPER_LAYOUT_CENTER, false /*preview_mode=*/); RunAllTasksUntilIdle(); EXPECT_EQ(0, GetWallpaperCount()); EXPECT_FALSE(controller_->GetUserWallpaperInfo(account_id_1, &wallpaper_info, @@ -1329,11 +1408,11 @@ base::Time::Now().LocalMidnight()); EXPECT_EQ(wallpaper_info, policy_wallpaper_info); - // Verify that |SetOnlineWallpaper| doesn't set wallpaper when policy is - // enforced, and the user wallpaper info is not updated. - controller_->SetOnlineWallpaper(InitializeUser(account_id_1), image, - "dummy_url", WALLPAPER_LAYOUT_CENTER, - false /*preview_mode=*/); + // Verify that |SetOnlineWallpaperFromData| doesn't set wallpaper when policy + // is enforced, and the user wallpaper info is not updated. + controller_->SetOnlineWallpaperFromData( + InitializeUser(account_id_1), std::string() /*image_data=*/, kDummyUrl, + WALLPAPER_LAYOUT_CENTER_CROPPED, false /*preview_mode=*/); RunAllTasksUntilIdle(); EXPECT_EQ(0, GetWallpaperCount()); EXPECT_TRUE(controller_->GetUserWallpaperInfo(account_id_1, &wallpaper_info, @@ -1353,6 +1432,7 @@ } TEST_F(WallpaperControllerTest, VerifyWallpaperCache) { + SetBypassDecode(); gfx::ImageSkia image = CreateImage(640, 480, kWallpaperColor); SimulateUserLogin(kUser1); @@ -1363,9 +1443,9 @@ base::FilePath path; EXPECT_FALSE(controller_->GetPathFromCache(account_id_1, &path)); - // Verify |SetOnlineWallpaper| updates wallpaper cache for |user1|. - controller_->SetOnlineWallpaper( - InitializeUser(account_id_1), image, "dummy_file_location", + // Verify |SetOnlineWallpaperFromData| updates wallpaper cache for |user1|. + controller_->SetOnlineWallpaperFromData( + InitializeUser(account_id_1), std::string() /*image_data=*/, kDummyUrl, WALLPAPER_LAYOUT_CENTER, false /*preview_mode=*/); RunAllTasksUntilIdle(); EXPECT_TRUE( @@ -1516,8 +1596,10 @@ } TEST_F(WallpaperControllerTest, UpdateCustomWallpaperLayout) { + SetBypassDecode(); gfx::ImageSkia image = CreateImage(640, 480, kSmallCustomWallpaperColor); - WallpaperLayout layout = WALLPAPER_LAYOUT_CENTER; + WallpaperLayout layout = WALLPAPER_LAYOUT_STRETCH; + WallpaperLayout new_layout = WALLPAPER_LAYOUT_CENTER; SimulateUserLogin(kUser1); // Set a custom wallpaper for the user. Verify that it's set successfully @@ -1531,42 +1613,42 @@ WallpaperInfo wallpaper_info; EXPECT_TRUE(controller_->GetUserWallpaperInfo(account_id_1, &wallpaper_info, false /*is_ephemeral=*/)); - WallpaperInfo expected_wallpaper_info( + WallpaperInfo expected_custom_wallpaper_info( base::FilePath(wallpaper_files_id_1).Append(file_name_1).value(), layout, CUSTOMIZED, base::Time::Now().LocalMidnight()); - EXPECT_EQ(wallpaper_info, expected_wallpaper_info); + EXPECT_EQ(wallpaper_info, expected_custom_wallpaper_info); // Now change to a different layout. Verify that the layout is updated for // both the current wallpaper and the saved wallpaper info. - layout = WALLPAPER_LAYOUT_CENTER_CROPPED; controller_->UpdateCustomWallpaperLayout(InitializeUser(account_id_1), - layout); + new_layout); RunAllTasksUntilIdle(); EXPECT_EQ(1, GetWallpaperCount()); - EXPECT_EQ(controller_->GetWallpaperLayout(), layout); + EXPECT_EQ(controller_->GetWallpaperLayout(), new_layout); EXPECT_TRUE(controller_->GetUserWallpaperInfo(account_id_1, &wallpaper_info, false /*is_ephemeral=*/)); - expected_wallpaper_info.layout = layout; - EXPECT_EQ(wallpaper_info, expected_wallpaper_info); + expected_custom_wallpaper_info.layout = new_layout; + EXPECT_EQ(wallpaper_info, expected_custom_wallpaper_info); // Now set an online wallpaper. Verify that it's set successfully and the // wallpaper info is updated. - const std::string url = "dummy_url"; image = CreateImage(640, 480, kWallpaperColor); - controller_->SetOnlineWallpaper(InitializeUser(account_id_1), image, url, - layout, false /*preview_mode=*/); + controller_->SetOnlineWallpaperFromData( + InitializeUser(account_id_1), std::string() /*image_data=*/, kDummyUrl, + layout, false /*preview_mode=*/); RunAllTasksUntilIdle(); EXPECT_EQ(1, GetWallpaperCount()); EXPECT_EQ(controller_->GetWallpaperType(), ONLINE); + EXPECT_EQ(controller_->GetWallpaperLayout(), layout); EXPECT_TRUE(controller_->GetUserWallpaperInfo(account_id_1, &wallpaper_info, false /*is_ephemeral=*/)); - expected_wallpaper_info.type = ONLINE; - expected_wallpaper_info.location = url; - EXPECT_EQ(wallpaper_info, expected_wallpaper_info); + WallpaperInfo expected_online_wallpaper_info( + kDummyUrl.spec(), layout, ONLINE, base::Time::Now().LocalMidnight()); + EXPECT_EQ(wallpaper_info, expected_online_wallpaper_info); // Now change the layout of the online wallpaper. Verify that it's a no-op. controller_->UpdateCustomWallpaperLayout(InitializeUser(account_id_1), - WALLPAPER_LAYOUT_CENTER); + new_layout); RunAllTasksUntilIdle(); // The wallpaper is not updated. EXPECT_EQ(0, GetWallpaperCount()); @@ -1574,7 +1656,7 @@ // The saved wallpaper info is not updated. EXPECT_TRUE(controller_->GetUserWallpaperInfo(account_id_1, &wallpaper_info, false /*is_ephemeral=*/)); - EXPECT_EQ(wallpaper_info, expected_wallpaper_info); + EXPECT_EQ(wallpaper_info, expected_online_wallpaper_info); } // Tests that if a user who has a custom wallpaper is removed from the device, @@ -1881,14 +1963,13 @@ // Now set an online wallpaper for the user and enable preview. Verify that // the wallpaper is changed to the expected color. - const std::string url = "dummy_url"; const SkColor online_wallpaper_color = SK_ColorCYAN; gfx::ImageSkia online_wallpaper = CreateImage(640, 480, online_wallpaper_color); EXPECT_NE(online_wallpaper_color, GetWallpaperColor()); - controller_->SetOnlineWallpaper(InitializeUser(account_id_1), - online_wallpaper, url, layout, - true /*preview_mode=*/); + ClearWallpaperCount(); + SetOnlineWallpaperFromImage(account_id_1, online_wallpaper, kDummyUrl, layout, + false /*save_file=*/, true /*preview_mode=*/); RunAllTasksUntilIdle(); EXPECT_EQ(1, GetWallpaperCount()); EXPECT_EQ(online_wallpaper_color, GetWallpaperColor()); @@ -1906,7 +1987,7 @@ EXPECT_EQ(online_wallpaper_color, GetWallpaperColor()); // Verify that the user wallpaper info is now updated to the online wallpaper // info. - WallpaperInfo online_wallpaper_info(url, layout, ONLINE, + WallpaperInfo online_wallpaper_info(kDummyUrl.spec(), layout, ONLINE, base::Time::Now().LocalMidnight()); EXPECT_TRUE(controller_->GetUserWallpaperInfo( account_id_1, &user_wallpaper_info, false /*is_ephemeral=*/)); @@ -1961,14 +2042,13 @@ // Now set an online wallpaper for the user and enable preview. Verify that // the wallpaper is changed to the expected color. - const std::string url = "dummy_url"; const SkColor online_wallpaper_color = SK_ColorCYAN; gfx::ImageSkia online_wallpaper = CreateImage(640, 480, online_wallpaper_color); EXPECT_NE(online_wallpaper_color, GetWallpaperColor()); - controller_->SetOnlineWallpaper(InitializeUser(account_id_1), - online_wallpaper, url, layout, - true /*preview_mode=*/); + ClearWallpaperCount(); + SetOnlineWallpaperFromImage(account_id_1, online_wallpaper, kDummyUrl, layout, + false /*save_file=*/, true /*preview_mode=*/); RunAllTasksUntilIdle(); EXPECT_EQ(1, GetWallpaperCount()); EXPECT_EQ(online_wallpaper_color, GetWallpaperColor()); @@ -2061,12 +2141,12 @@ // Repeat the above steps for online wallpapers: set a online wallpaper for // the user and enable preview. Verify that the wallpaper is changed to the // expected color. - const std::string preview_url = "preview_url"; gfx::ImageSkia online_wallpaper = CreateImage(640, 480, kWallpaperColor); EXPECT_NE(kWallpaperColor, GetWallpaperColor()); - controller_->SetOnlineWallpaper(InitializeUser(account_id_1), - online_wallpaper, preview_url, layout, - true /*preview_mode=*/); + + ClearWallpaperCount(); + SetOnlineWallpaperFromImage(account_id_1, online_wallpaper, kDummyUrl, layout, + false /*save_file=*/, true /*preview_mode=*/); RunAllTasksUntilIdle(); EXPECT_EQ(1, GetWallpaperCount()); EXPECT_EQ(kWallpaperColor, GetWallpaperColor()); @@ -2078,18 +2158,17 @@ // Now set another online wallpaper for the user and disable preview. Verify // there's no wallpaper change since preview mode shouldn't be interrupted. const SkColor synced_online_wallpaper_color = SK_ColorCYAN; - const std::string synced_url = "synced_url"; gfx::ImageSkia synced_online_wallpaper = CreateImage(640, 480, synced_online_wallpaper_color); ClearWallpaperCount(); - controller_->SetOnlineWallpaper(InitializeUser(account_id_1), - synced_online_wallpaper, synced_url, layout, - false /*preview_mode=*/); + SetOnlineWallpaperFromImage(account_id_1, synced_online_wallpaper, kDummyUrl2, + layout, false /*save_file=*/, + false /*preview_mode=*/); RunAllTasksUntilIdle(); EXPECT_EQ(0, GetWallpaperCount()); EXPECT_EQ(kWallpaperColor, GetWallpaperColor()); // However, the user wallpaper info should already be updated to the new info. - WallpaperInfo synced_online_wallpaper_info(synced_url, layout, ONLINE, + WallpaperInfo synced_online_wallpaper_info(kDummyUrl2.spec(), layout, ONLINE, base::Time::Now().LocalMidnight()); EXPECT_TRUE(controller_->GetUserWallpaperInfo( account_id_1, &user_wallpaper_info, false /*is_ephemeral=*/));
diff --git a/base/BUILD.gn b/base/BUILD.gn index 1c6bbbf0..8d9643b 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn
@@ -296,7 +296,6 @@ "debug/crash_logging.h", "debug/debugger.cc", "debug/debugger.h", - "debug/debugger_posix.cc", "debug/debugger_win.cc", "debug/dump_without_crashing.cc", "debug/dump_without_crashing.h", @@ -311,7 +310,6 @@ "debug/stack_trace.cc", "debug/stack_trace.h", "debug/stack_trace_android.cc", - "debug/stack_trace_posix.cc", "debug/stack_trace_win.cc", "debug/task_annotator.cc", "debug/task_annotator.h", @@ -324,7 +322,6 @@ "export_template.h", "feature_list.cc", "feature_list.h", - "file_descriptor_posix.h", "file_descriptor_store.cc", "file_descriptor_store.h", "file_version_info.h", @@ -334,14 +331,10 @@ "file_version_info_win.h", "files/dir_reader_fallback.h", "files/dir_reader_linux.h", - "files/dir_reader_posix.h", "files/file.cc", "files/file.h", - "files/file_descriptor_watcher_posix.cc", - "files/file_descriptor_watcher_posix.h", "files/file_enumerator.cc", "files/file_enumerator.h", - "files/file_enumerator_posix.cc", "files/file_enumerator_win.cc", "files/file_path.cc", "files/file_path.h", @@ -355,7 +348,6 @@ "files/file_path_watcher_linux.cc", "files/file_path_watcher_mac.cc", "files/file_path_watcher_win.cc", - "files/file_posix.cc", "files/file_proxy.cc", "files/file_proxy.h", "files/file_tracing.cc", @@ -365,7 +357,6 @@ "files/file_util_android.cc", "files/file_util_linux.cc", "files/file_util_mac.mm", - "files/file_util_posix.cc", "files/file_util_proxy.cc", "files/file_util_proxy.h", "files/file_util_win.cc", @@ -374,7 +365,6 @@ "files/important_file_writer.h", "files/memory_mapped_file.cc", "files/memory_mapped_file.h", - "files/memory_mapped_file_posix.cc", "files/memory_mapped_file_win.cc", "files/platform_file.h", "files/scoped_file.cc", @@ -515,7 +505,6 @@ "memory/protected_memory.cc", "memory/protected_memory.h", "memory/protected_memory_cfi.h", - "memory/protected_memory_posix.cc", "memory/protected_memory_win.cc", "memory/ptr_util.h", "memory/raw_scoped_refptr_mismatch_checker.h", @@ -564,15 +553,11 @@ "message_loop/message_pump_glib.h", "message_loop/message_pump_io_ios.cc", "message_loop/message_pump_io_ios.h", - "message_loop/message_pump_libevent.cc", - "message_loop/message_pump_libevent.h", "message_loop/message_pump_mac.h", "message_loop/message_pump_mac.mm", "message_loop/message_pump_win.cc", "message_loop/message_pump_win.h", "message_loop/timer_slack.h", - "message_loop/watchable_io_message_pump_posix.cc", - "message_loop/watchable_io_message_pump_posix.h", "metrics/bucket_ranges.cc", "metrics/bucket_ranges.h", "metrics/dummy_histogram.cc", @@ -625,7 +610,6 @@ "native_library.h", "native_library_ios.mm", "native_library_mac.mm", - "native_library_posix.cc", "native_library_win.cc", "nix/mime_util_xdg.cc", "nix/mime_util_xdg.h", @@ -646,14 +630,6 @@ "pending_task.h", "pickle.cc", "pickle.h", - "posix/eintr_wrapper.h", - "posix/file_descriptor_shuffle.cc", - "posix/file_descriptor_shuffle.h", - "posix/global_descriptors.cc", - "posix/global_descriptors.h", - "posix/safe_strerror.cc", - "posix/safe_strerror.h", - "posix/unix_domain_socket.h", "post_task_and_reply_with_result_internal.h", "power_monitor/power_monitor.cc", "power_monitor/power_monitor.h", @@ -667,13 +643,11 @@ "process/kill.cc", "process/kill.h", "process/kill_mac.cc", - "process/kill_posix.cc", "process/kill_win.cc", "process/launch.cc", "process/launch.h", "process/launch_ios.cc", "process/launch_mac.cc", - "process/launch_posix.cc", "process/launch_win.cc", "process/memory.cc", "process/memory.h", @@ -691,7 +665,6 @@ "process/process_handle_mac.cc", #"process/process_handle_openbsd.cc", # Unused in Chromium build. - "process/process_handle_posix.cc", "process/process_handle_win.cc", "process/process_info.h", "process/process_info_linux.cc", @@ -717,21 +690,17 @@ "process/process_metrics_mac.cc", #"process/process_metrics_openbsd.cc", # Unused in Chromium build. - "process/process_metrics_posix.cc", "process/process_metrics_win.cc", - "process/process_posix.cc", "process/process_win.cc", "profiler/native_stack_sampler.cc", "profiler/native_stack_sampler.h", "profiler/native_stack_sampler_mac.cc", - "profiler/native_stack_sampler_posix.cc", "profiler/native_stack_sampler_win.cc", "profiler/stack_sampling_profiler.cc", "profiler/stack_sampling_profiler.h", "rand_util.cc", "rand_util.h", "rand_util_nacl.cc", - "rand_util_posix.cc", "rand_util_win.cc", "run_loop.cc", "run_loop.h", @@ -777,14 +746,12 @@ "strings/string_util.cc", "strings/string_util.h", "strings/string_util_constants.cc", - "strings/string_util_posix.h", "strings/string_util_win.h", "strings/stringize_macros.h", "strings/stringprintf.cc", "strings/stringprintf.h", "strings/sys_string_conversions.h", "strings/sys_string_conversions_mac.mm", - "strings/sys_string_conversions_posix.cc", "strings/sys_string_conversions_win.cc", "strings/utf_offset_string_conversions.cc", "strings/utf_offset_string_conversions.h", @@ -795,26 +762,21 @@ "supports_user_data.cc", "supports_user_data.h", "sync_socket.h", - "sync_socket_posix.cc", "sync_socket_win.cc", "synchronization/atomic_flag.cc", "synchronization/atomic_flag.h", "synchronization/cancellation_flag.h", "synchronization/condition_variable.h", - "synchronization/condition_variable_posix.cc", "synchronization/condition_variable_win.cc", "synchronization/lock.cc", "synchronization/lock.h", "synchronization/lock_impl.h", - "synchronization/lock_impl_posix.cc", "synchronization/lock_impl_win.cc", "synchronization/spin_wait.h", "synchronization/waitable_event.h", "synchronization/waitable_event_mac.cc", - "synchronization/waitable_event_posix.cc", "synchronization/waitable_event_watcher.h", "synchronization/waitable_event_watcher_mac.cc", - "synchronization/waitable_event_watcher_posix.cc", "synchronization/waitable_event_watcher_win.cc", "synchronization/waitable_event_win.cc", "sys_byteorder.h", @@ -832,7 +794,6 @@ "sys_info_mac.mm", #"sys_info_openbsd.cc", # Unused in Chromium build. - "sys_info_posix.cc", "sys_info_win.cc", "system_monitor/system_monitor.cc", "system_monitor/system_monitor.h", @@ -887,8 +848,6 @@ "task_scheduler/task_scheduler_impl.h", "task_scheduler/task_tracker.cc", "task_scheduler/task_tracker.h", - "task_scheduler/task_tracker_posix.cc", - "task_scheduler/task_tracker_posix.h", "task_scheduler/task_traits.cc", "task_scheduler/task_traits.h", "task_scheduler/task_traits_details.h", @@ -906,11 +865,8 @@ "thread_annotations.h", "threading/platform_thread.h", "threading/platform_thread_android.cc", - "threading/platform_thread_internal_posix.cc", - "threading/platform_thread_internal_posix.h", "threading/platform_thread_linux.cc", "threading/platform_thread_mac.mm", - "threading/platform_thread_posix.cc", "threading/platform_thread_win.cc", "threading/post_task_and_reply_impl.cc", "threading/post_task_and_reply_impl.h", @@ -936,7 +892,6 @@ "threading/thread_local.h", "threading/thread_local_storage.cc", "threading/thread_local_storage.h", - "threading/thread_local_storage_posix.cc", "threading/thread_local_storage_win.cc", "threading/thread_restrictions.cc", "threading/thread_restrictions.h", @@ -961,7 +916,6 @@ "timer/elapsed_timer.cc", "timer/elapsed_timer.h", "timer/hi_res_timer_manager.h", - "timer/hi_res_timer_manager_posix.cc", "timer/hi_res_timer_manager_win.cc", "timer/mock_timer.cc", "timer/mock_timer.h", @@ -983,7 +937,6 @@ "trace_event/heap_profiler_allocation_context_tracker.h", "trace_event/heap_profiler_allocation_register.cc", "trace_event/heap_profiler_allocation_register.h", - "trace_event/heap_profiler_allocation_register_posix.cc", "trace_event/heap_profiler_allocation_register_win.cc", "trace_event/heap_profiler_event_filter.cc", "trace_event/heap_profiler_event_filter.h", @@ -1141,6 +1094,58 @@ jumbo_excluded_sources = [ "rand_util_win.cc" ] } + if (is_posix) { + sources += [ + "base_paths_posix.h", + "debug/debugger_posix.cc", + "debug/stack_trace_posix.cc", + "file_descriptor_posix.h", + "files/dir_reader_posix.h", + "files/file_descriptor_watcher_posix.cc", + "files/file_descriptor_watcher_posix.h", + "files/file_enumerator_posix.cc", + "files/file_posix.cc", + "files/file_util_posix.cc", + "files/memory_mapped_file_posix.cc", + "memory/protected_memory_posix.cc", + "message_loop/watchable_io_message_pump_posix.cc", + "message_loop/watchable_io_message_pump_posix.h", + "native_library_posix.cc", + "posix/eintr_wrapper.h", + "posix/file_descriptor_shuffle.cc", + "posix/file_descriptor_shuffle.h", + "posix/global_descriptors.cc", + "posix/global_descriptors.h", + "posix/safe_strerror.cc", + "posix/safe_strerror.h", + "posix/unix_domain_socket.cc", + "posix/unix_domain_socket.h", + "process/kill_posix.cc", + "process/launch_posix.cc", + "process/process_handle_posix.cc", + "process/process_metrics_posix.cc", + "process/process_posix.cc", + "profiler/native_stack_sampler_posix.cc", + "rand_util_posix.cc", + "strings/string_util_posix.h", + "strings/sys_string_conversions_posix.cc", + "sync_socket_posix.cc", + "synchronization/condition_variable_posix.cc", + "synchronization/lock_impl_posix.cc", + "synchronization/waitable_event_posix.cc", + "synchronization/waitable_event_watcher_posix.cc", + "sys_info_posix.cc", + "task_scheduler/task_tracker_posix.cc", + "task_scheduler/task_tracker_posix.h", + "threading/platform_thread_internal_posix.cc", + "threading/platform_thread_internal_posix.h", + "threading/platform_thread_posix.cc", + "threading/thread_local_storage_posix.cc", + "timer/hi_res_timer_manager_posix.cc", + "trace_event/heap_profiler_allocation_register_posix.cc", + ] + } + if (!is_nacl) { sources += [ "base_paths.cc", @@ -1154,7 +1159,6 @@ "base_paths_win.h", "metrics/persistent_histogram_storage.cc", "metrics/persistent_histogram_storage.h", - "posix/unix_domain_socket.cc", ] if (is_linux) { @@ -1296,30 +1300,22 @@ sources += [ "power_monitor/power_monitor_device_source_chromeos.cc" ] } + # Fuchsia. if (is_fuchsia) { - # These files have Fuchsia-specific implementations in the sources += block - # below, rather than using the generic POSIX or Linux-y ones. - sources -= [ - "debug/stack_trace_posix.cc", - "message_loop/message_pump_libevent.cc", - "message_loop/message_pump_libevent.h", - "native_library_posix.cc", - "posix/unix_domain_socket.cc", - "posix/unix_domain_socket.h", - "process/kill_posix.cc", - "process/launch_posix.cc", - "process/process_handle_posix.cc", - "process/process_posix.cc", - "rand_util_posix.cc", - "threading/platform_thread_internal_posix.cc", - "threading/platform_thread_internal_posix.h", - ] - sources += [ "base_paths_fuchsia.cc", "base_paths_fuchsia.h", + "debug/debugger_posix.cc", "debug/stack_trace_fuchsia.cc", + "file_descriptor_posix.h", + "files/dir_reader_posix.h", + "files/file_descriptor_watcher_posix.cc", + "files/file_descriptor_watcher_posix.h", + "files/file_enumerator_posix.cc", "files/file_path_watcher_fuchsia.cc", + "files/file_posix.cc", + "files/file_util_posix.cc", + "files/memory_mapped_file_posix.cc", "fuchsia/async_dispatcher.cc", "fuchsia/async_dispatcher.h", "fuchsia/default_job.cc", @@ -1328,11 +1324,21 @@ "fuchsia/fuchsia_logging.h", "fuchsia/scoped_zx_handle.h", "memory/platform_shared_memory_region_fuchsia.cc", + "memory/protected_memory_posix.cc", "memory/shared_memory_fuchsia.cc", "memory/shared_memory_handle_fuchsia.cc", "message_loop/message_pump_fuchsia.cc", "message_loop/message_pump_fuchsia.h", + "message_loop/watchable_io_message_pump_posix.cc", + "message_loop/watchable_io_message_pump_posix.h", "native_library_fuchsia.cc", + "posix/eintr_wrapper.h", + "posix/file_descriptor_shuffle.cc", + "posix/file_descriptor_shuffle.h", + "posix/global_descriptors.cc", + "posix/global_descriptors.h", + "posix/safe_strerror.cc", + "posix/safe_strerror.h", "process/kill_fuchsia.cc", "process/launch_fuchsia.cc", "process/memory_fuchsia.cc", @@ -1340,18 +1346,38 @@ "process/process_handle_fuchsia.cc", "process/process_iterator_fuchsia.cc", "process/process_metrics_fuchsia.cc", + "process/process_metrics_posix.cc", + "profiler/native_stack_sampler_posix.cc", "rand_util_fuchsia.cc", + "strings/string_util_posix.h", + "strings/sys_string_conversions_posix.cc", + "sync_socket_posix.cc", + "synchronization/condition_variable_posix.cc", + "synchronization/lock_impl_posix.cc", + "synchronization/waitable_event_posix.cc", + "synchronization/waitable_event_watcher_posix.cc", "sys_info_fuchsia.cc", + "sys_info_posix.cc", + "task_scheduler/task_tracker_posix.cc", + "task_scheduler/task_tracker_posix.h", "threading/platform_thread_fuchsia.cc", + "threading/platform_thread_posix.cc", + "threading/thread_local_storage_posix.cc", "time/time_conversion_posix.cc", "time/time_exploded_posix.cc", "time/time_fuchsia.cc", + "timer/hi_res_timer_manager_posix.cc", + "trace_event/heap_profiler_allocation_register_posix.cc", ] libs = [ "launchpad" ] - public_deps += [ "//third_party/fuchsia-sdk:async" ] deps += [ "//third_party/fuchsia-sdk:async_default" ] + } else { + sources += [ + "message_loop/message_pump_libevent.cc", + "message_loop/message_pump_libevent.h", + ] } # NaCl. @@ -1410,12 +1436,6 @@ ] if (is_nacl_nonsfi) { - set_sources_assignment_filter([]) - sources += [ - "posix/unix_domain_socket.cc", - "posix/unix_domain_socket.h", - ] - set_sources_assignment_filter(sources_assignment_filter) sources -= [ "rand_util_nacl.cc" ] configs += [ ":nacl_nonsfi_warnings" ] } else { @@ -1429,6 +1449,7 @@ "json/json_file_value_serializer.h", "message_loop/message_pump_libevent.cc", "message_loop/message_pump_libevent.h", + "posix/unix_domain_socket.cc", "process/kill_posix.cc", "process/launch.cc", "process/launch.h", @@ -1899,7 +1920,6 @@ sources = [ "message_loop/message_loop_perftest.cc", "message_loop/message_pump_perftest.cc", - "rand_util_perftest.cc", # "test/run_all_unittests.cc", "json/json_perftest.cc", @@ -2111,10 +2131,7 @@ "environment_unittest.cc", "feature_list_unittest.cc", "file_version_info_win_unittest.cc", - "files/dir_reader_posix_unittest.cc", - "files/file_descriptor_watcher_posix_unittest.cc", "files/file_enumerator_unittest.cc", - "files/file_locking_unittest.cc", "files/file_path_unittest.cc", "files/file_path_watcher_unittest.cc", "files/file_proxy_unittest.cc", @@ -2183,7 +2200,6 @@ "memory/shared_memory_win_unittest.cc", "memory/singleton_unittest.cc", "memory/weak_ptr_unittest.cc", - "message_loop/message_loop_io_posix_unittest.cc", "message_loop/message_loop_task_runner_unittest.cc", "message_loop/message_loop_unittest.cc", "message_loop/message_pump_glib_unittest.cc", @@ -2216,8 +2232,6 @@ "os_compat_android_unittest.cc", "path_service_unittest.cc", "pickle_unittest.cc", - "posix/file_descriptor_shuffle_unittest.cc", - "posix/unix_domain_socket_unittest.cc", "power_monitor/power_monitor_unittest.cc", "process/launch_unittest_win.cc", "process/memory_unittest.cc", @@ -2281,7 +2295,6 @@ "task_scheduler/sequence_sort_key_unittest.cc", "task_scheduler/sequence_unittest.cc", "task_scheduler/task_scheduler_impl_unittest.cc", - "task_scheduler/task_tracker_posix_unittest.cc", "task_scheduler/task_tracker_unittest.cc", "task_scheduler/task_traits_unittest.cc", "task_scheduler/task_unittest.cc", @@ -2414,6 +2427,17 @@ "test/data/", ] + if (is_posix) { + sources += [ + "files/dir_reader_posix_unittest.cc", + "files/file_descriptor_watcher_posix_unittest.cc", + "message_loop/message_loop_io_posix_unittest.cc", + "posix/file_descriptor_shuffle_unittest.cc", + "posix/unix_domain_socket_unittest.cc", + "task_scheduler/task_tracker_posix_unittest.cc", + ] + } + # Allow more direct string conversions on platforms with native utf8 # strings if (is_mac || is_ios || is_chromeos || is_chromecast || is_fuchsia) { @@ -2448,7 +2472,6 @@ if (is_ios) { sources -= [ - "files/file_locking_unittest.cc", "files/file_path_watcher_unittest.cc", "memory/discardable_shared_memory_unittest.cc", "memory/shared_memory_unittest.cc", @@ -2516,9 +2539,12 @@ } if (is_fuchsia) { - sources -= [ - "files/file_locking_unittest.cc", - "posix/unix_domain_socket_unittest.cc", + sources += [ + "files/dir_reader_posix_unittest.cc", + "files/file_descriptor_watcher_posix_unittest.cc", + "message_loop/message_loop_io_posix_unittest.cc", + "posix/file_descriptor_shuffle_unittest.cc", + "task_scheduler/task_tracker_posix_unittest.cc", ] sources += [ "fuchsia/async_dispatcher_unittest.cc" ] @@ -2528,6 +2554,10 @@ ] } + if (!is_fuchsia && !is_ios) { + sources += [ "files/file_locking_unittest.cc" ] + } + if (is_android) { deps += [ "//testing/android/native_test:native_test_native_code" ] set_sources_assignment_filter([])
diff --git a/base/containers/span.h b/base/containers/span.h index a136f0fd..8c025e8 100644 --- a/base/containers/span.h +++ b/base/containers/span.h
@@ -147,7 +147,6 @@ // std::byte // // Differences in constants and types: -// - no element_type type alias // - no index_type type alias // - no different_type type alias // - no extent constant @@ -168,6 +167,7 @@ template <typename T> class span { public: + using element_type = T; using value_type = std::remove_cv_t<T>; using pointer = T*; using reference = T&; @@ -187,31 +187,31 @@ } template <size_t N, typename = internal::EnableIfSpanCompatibleArray<T (&)[N], T>> - constexpr span(T (&array)[N]) noexcept : span(array, N) {} + constexpr span(T (&array)[N]) noexcept : span(base::data(array), N) {} template < size_t N, typename = internal::EnableIfSpanCompatibleArray<std::array<value_type, N>&, T>> constexpr span(std::array<value_type, N>& array) noexcept - : span(array.data(), array.size()) {} + : span(base::data(array), N) {} template <size_t N, typename = internal::EnableIfSpanCompatibleArray< const std::array<value_type, N>&, T>> constexpr span(const std::array<value_type, N>& array) noexcept - : span(array.data(), array.size()) {} + : span(base::data(array), N) {} // Conversion from a container that provides |T* data()| and |integral_type // size()|. template <typename Container, typename = internal::EnableIfSpanCompatibleContainer<Container&, T>> constexpr span(Container& container) - : span(base::data(container), container.size()) {} + : span(base::data(container), base::size(container)) {} template < typename Container, typename = internal::EnableIfSpanCompatibleContainer<const Container&, T>> span(const Container& container) - : span(base::data(container), container.size()) {} + : span(base::data(container), base::size(container)) {} constexpr span(const span& other) noexcept = default; // Conversions from spans of compatible types: this allows a span<T> to be // seamlessly used as a span<const T>, but not the other way around. @@ -365,6 +365,11 @@ return span<T>(container); } +template <typename T> +constexpr span<T> make_span(span<T> span) noexcept { + return span; +} + } // namespace base #endif // BASE_CONTAINERS_SPAN_H_
diff --git a/base/containers/span_unittest.cc b/base/containers/span_unittest.cc index 11702a1e1..c4694e2 100644 --- a/base/containers/span_unittest.cc +++ b/base/containers/span_unittest.cc
@@ -642,6 +642,20 @@ EXPECT_EQ(span, make_span(vector)); } +TEST(SpanTest, MakeSpanFromSpan) { + static constexpr int kArray[] = {1, 2, 3, 4, 5}; + constexpr span<const int> span(kArray); + static_assert(std::is_same<decltype(span)::element_type, + decltype(make_span(span))::element_type>::value, + "make_span(span) should have the same element_type as span"); + + static_assert(span.data() == make_span(span).data(), + "make_span(span) should have the same data() as span"); + + static_assert(span.size() == make_span(span).size(), + "make_span(span) should have the same size() as span"); +} + TEST(SpanTest, EnsureConstexprGoodness) { static constexpr int kArray[] = {5, 4, 3, 2, 1}; constexpr span<const int> constexpr_span(kArray);
diff --git a/base/mac/sdk_forward_declarations.h b/base/mac/sdk_forward_declarations.h index 7993870..82fa08e0 100644 --- a/base/mac/sdk_forward_declarations.h +++ b/base/mac/sdk_forward_declarations.h
@@ -293,23 +293,6 @@ - (BOOL)performRequests:(NSArray<VNRequest*>*)requests error:(NSError**)error; @end -// VNFaceLandmarks2D forward declarations. -@interface VNFaceLandmarkRegion : NSObject -@property(readonly) NSUInteger pointCount; -@end - -@interface VNFaceLandmarkRegion2D : VNFaceLandmarkRegion -@property(readonly, assign) - const CGPoint* normalizedPoints NS_RETURNS_INNER_POINTER; -@end - -@interface VNFaceLandmarks2D : NSObject -@property(readonly) VNFaceLandmarkRegion2D* leftEye; -@property(readonly) VNFaceLandmarkRegion2D* rightEye; -@property(readonly) VNFaceLandmarkRegion2D* outerLips; -@property(readonly) VNFaceLandmarkRegion2D* nose; -@end - // VNFaceObservation forward declarations. @interface VNObservation : NSObject<NSCopying, NSSecureCoding> @end @@ -319,7 +302,6 @@ @end @interface VNFaceObservation : VNDetectedObjectObservation -@property(readonly, nonatomic, strong) VNFaceLandmarks2D* landmarks; @end #endif // MAC_OS_X_VERSION_10_13
diff --git a/base/rand_util.cc b/base/rand_util.cc index b98ddb0..5881ef25 100644 --- a/base/rand_util.cc +++ b/base/rand_util.cc
@@ -7,64 +7,12 @@ #include <limits.h> #include <math.h> #include <stdint.h> -#include <algorithm> -#include <ctime> -#include <limits> -#include <random> -#include "base/lazy_instance.h" +#include <algorithm> +#include <limits> + #include "base/logging.h" #include "base/strings/string_util.h" -#include "base/threading/thread_local.h" - -namespace { - -class PrngThreadLocalStorage; - -base::LazyInstance< - base::ThreadLocalUniquePointer<PrngThreadLocalStorage>>::Leaky prng_tls = - LAZY_INSTANCE_INITIALIZER; - -// PrngThreadLocalStorage stores a pointer to the thread's seeded random number -// generator in the thread's local storage. Note that at most one generator can -// be bound to each thread at a time. -// Example Usage: -// prng = PrngThreadLocalStorage::GetGenerator(); -// prng -> GetRandomInteger(0,20); -class PrngThreadLocalStorage { - public: - PrngThreadLocalStorage() : prng_(time(nullptr)){}; - - ~PrngThreadLocalStorage() = default; - - // Returns true if a pseudo-random number generator has been assigned to - // the current thread. - static bool IsSet() { return prng_tls.Get().Get(); } - - // Returns the random generator bound to the current thread. If no such - // generator exist, it creates an instance and binds it to the thread. - static PrngThreadLocalStorage* GetGenerator() { - PrngThreadLocalStorage* instance = prng_tls.Get().Get(); - if (!instance) { - prng_tls.Get().Set(std::make_unique<PrngThreadLocalStorage>()); - instance = prng_tls.Get().Get(); - } - return instance; - } - - // Returns a uniformly distributed random integer in the range [start,end]. - int GetRandomInteger(int start, int end) { - std::uniform_int_distribution<> distribution(start, end); - return distribution(prng_); - } - - private: - std::mt19937 prng_; - - DISALLOW_COPY_AND_ASSIGN(PrngThreadLocalStorage); -}; - -} // namespace namespace base { @@ -77,9 +25,11 @@ int RandInt(int min, int max) { DCHECK_LE(min, max); - PrngThreadLocalStorage* prng = PrngThreadLocalStorage::GetGenerator(); - int result = prng->GetRandomInteger(min, max); - + uint64_t range = static_cast<uint64_t>(max) - min + 1; + // |range| is at most UINT_MAX + 1, so the result of RandGenerator(range) + // is at most UINT_MAX. Hence it's safe to cast it from uint64_t to int64_t. + int result = + static_cast<int>(min + static_cast<int64_t>(base::RandGenerator(range))); DCHECK_GE(result, min); DCHECK_LE(result, max); return result;
diff --git a/base/rand_util_perftest.cc b/base/rand_util_perftest.cc deleted file mode 100644 index 1246029..0000000 --- a/base/rand_util_perftest.cc +++ /dev/null
@@ -1,91 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "base/rand_util.h" - -#include <ctime> -#include <random> - -#include "base/time/time.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "testing/perf/perf_test.h" - -namespace { - -// Deprecated. Needed to benchmark the performance of the previous -// implementation of base::RandInt(). -int RandIntDeprecated(int min, int max) { - DCHECK_LE(min, max); - - uint64_t range = static_cast<uint64_t>(max) - min + 1; - // |range| is at most UINT_MAX + 1, so the result of RandGenerator(range) - // is at most UINT_MAX. Hence it's safe to cast it from uint64_t to int64_t. - int result = - static_cast<int>(min + static_cast<int64_t>(base::RandGenerator(range))); - - DCHECK_GE(result, min); - DCHECK_LE(result, max); - - return result; -} - -} // namespace - -namespace base { - -// Logs the average number of calls per second to base::RandInt(). Time is -// measured every 1000 calls and the total number of calls is normalized to -// reflect the average number of calls per second. -TEST(RandUtilPerfTest, AverageNumberOfCallsPerSecondToGetRandInt) { - base::TimeTicks start = base::TimeTicks::Now(); - base::TimeTicks now; - - size_t num_rounds = 0; - constexpr int kBatchSize = 1000; - - do { - int num_calls = 0; - while (num_calls < kBatchSize) { - RandInt(0, 1000); - ++num_calls; - } - now = base::TimeTicks::Now(); - ++num_rounds; - } while (now - start < base::TimeDelta::FromSeconds(1)); - - perf_test::PrintResult( - "Task", " (Time is measured after every 1000 function calls)", - "Average number of calls per second to base::GetRandInt", - static_cast<double>(num_rounds * kBatchSize) / (now - start).InSecondsF(), - "number of calls per second", true); -} - -// Logs the average number of calls per second to RandIntDeprecated(). Time is -// measured every 1000 calls and the total number of calls is normalized to -// reflect the average number of calls per second. -TEST(RandUtilPerfTest, AverageNumberOfCallsPerSecondToRandIntDeprecated) { - base::TimeTicks start = base::TimeTicks::Now(); - base::TimeTicks now; - - size_t num_rounds = 0; - constexpr int kBatchSize = 1000; - - do { - int num_calls = 0; - while (num_calls < kBatchSize) { - RandIntDeprecated(0, 1000); - ++num_calls; - } - now = base::TimeTicks::Now(); - ++num_rounds; - } while (now - start < base::TimeDelta::FromSeconds(1)); - - perf_test::PrintResult( - "Task", " (Time is measured after every 1000 function calls)", - "Average number of calls per second to RandIntDeprecated()", - static_cast<double>(num_rounds * kBatchSize) / (now - start).InSecondsF(), - "number of calls per second", true); -} - -} // namespace base
diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn index 73977c8..ddcb9b1 100644 --- a/base/test/BUILD.gn +++ b/base/test/BUILD.gn
@@ -79,8 +79,6 @@ "scoped_environment_variable_override.h", "scoped_feature_list.cc", "scoped_feature_list.h", - "scoped_locale.cc", - "scoped_locale.h", "scoped_mock_time_message_loop_task_runner.cc", "scoped_mock_time_message_loop_task_runner.h", "scoped_path_override.cc", @@ -102,7 +100,6 @@ "test_file_util_android.cc", "test_file_util_linux.cc", "test_file_util_mac.cc", - "test_file_util_posix.cc", "test_file_util_win.cc", "test_io_thread.cc", "test_io_thread.h", @@ -178,10 +175,11 @@ "//third_party/libxml", ] - if (!is_posix && !is_fuchsia) { - sources -= [ + if (is_posix || is_fuchsia) { + sources += [ "scoped_locale.cc", "scoped_locale.h", + "test_file_util_posix.cc", ] }
diff --git a/base/threading/thread_local.h b/base/threading/thread_local.h index f0d48f5..cad9add3 100644 --- a/base/threading/thread_local.h +++ b/base/threading/thread_local.h
@@ -50,8 +50,6 @@ #ifndef BASE_THREADING_THREAD_LOCAL_H_ #define BASE_THREADING_THREAD_LOCAL_H_ -#include <memory> - #include "base/macros.h" #include "base/threading/thread_local_storage.h" @@ -63,7 +61,9 @@ ThreadLocalPointer() = default; ~ThreadLocalPointer() = default; - Type* Get() { return static_cast<Type*>(slot_.Get()); } + Type* Get() { + return static_cast<Type*>(slot_.Get()); + } void Set(Type* ptr) { slot_.Set(const_cast<void*>(static_cast<const void*>(ptr))); @@ -75,38 +75,18 @@ DISALLOW_COPY_AND_ASSIGN(ThreadLocalPointer<Type>); }; -template <typename Type> -class ThreadLocalUniquePointer { - public: - ThreadLocalUniquePointer() - : slot_(ThreadLocalUniquePointer::ThreadLocalUniquePointerDestructor) {} - - ~ThreadLocalUniquePointer() = default; - - Type* Get() { return static_cast<Type*>(slot_.Get()); } - - void Set(std::unique_ptr<Type> ptr) { - slot_.Set(const_cast<void*>(static_cast<const void*>(ptr.release()))); - } - - private: - static void ThreadLocalUniquePointerDestructor(void* value) { - std::unique_ptr<Type> to_be_deleted(static_cast<Type*>(value)); - } - - ThreadLocalStorage::Slot slot_; - - DISALLOW_COPY_AND_ASSIGN(ThreadLocalUniquePointer<Type>); -}; - class ThreadLocalBoolean { public: ThreadLocalBoolean() = default; ~ThreadLocalBoolean() = default; - bool Get() { return tlp_.Get() != nullptr; } + bool Get() { + return tlp_.Get() != nullptr; + } - void Set(bool val) { tlp_.Set(val ? this : nullptr); } + void Set(bool val) { + tlp_.Set(val ? this : nullptr); + } private: ThreadLocalPointer<void> tlp_;
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc index e41bb02..6a8cc57 100644 --- a/cc/layers/texture_layer_unittest.cc +++ b/cc/layers/texture_layer_unittest.cc
@@ -105,7 +105,7 @@ const gpu::SyncToken& sync_token, bool lost_resource)); MOCK_METHOD3(Release2, - void(viz::SharedBitmap* shared_bitmap, + void(const viz::SharedBitmapId& shared_bitmap_id, const gpu::SyncToken& sync_token, bool lost_resource)); }; @@ -133,14 +133,12 @@ resource2_ = viz::TransferableResource::MakeGL( mailbox_name2_, GL_LINEAR, arbitrary_target2, sync_token2_); gfx::Size size(128, 128); - shared_bitmap_ = manager->AllocateSharedBitmap(size, viz::RGBA_8888); - DCHECK(shared_bitmap_); + shared_bitmap_id_ = viz::SharedBitmap::GenerateId(); release_callback3_ = base::Bind(&MockReleaseCallback::Release2, - base::Unretained(&mock_callback_), shared_bitmap_.get()); + base::Unretained(&mock_callback_), shared_bitmap_id_); resource3_ = viz::TransferableResource::MakeSoftware( - shared_bitmap_->id(), shared_bitmap_->sequence_number(), size, - viz::RGBA_8888); + shared_bitmap_id_, /*sequence_number=*/0, size, viz::RGBA_8888); } using RepeatingReleaseCallback = @@ -155,7 +153,7 @@ RepeatingReleaseCallback release_callback3_; gpu::SyncToken sync_token1_; gpu::SyncToken sync_token2_; - std::unique_ptr<viz::SharedBitmap> shared_bitmap_; + viz::SharedBitmapId shared_bitmap_id_; viz::TransferableResource resource1_; viz::TransferableResource resource2_; viz::TransferableResource resource3_; @@ -281,7 +279,7 @@ EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(AtLeast(1)); EXPECT_CALL(test_data_.mock_callback_, - Release2(test_data_.shared_bitmap_.get(), _, false)) + Release2(test_data_.shared_bitmap_id_, _, false)) .Times(1); test_layer->ClearTexture(); Mock::VerifyAndClearExpectations(layer_tree_host_.get()); @@ -781,9 +779,8 @@ test_data_.mock_callback_, Release(test_data_.mailbox_name1_, test_data_.sync_token1_, false)) .Times(AnyNumber()); - EXPECT_CALL( - test_data_.mock_callback_, - Release2(test_data_.shared_bitmap_.get(), gpu::SyncToken(), false)) + EXPECT_CALL(test_data_.mock_callback_, + Release2(test_data_.shared_bitmap_id_, gpu::SyncToken(), false)) .Times(AnyNumber()); // Hardware mode. {
diff --git a/cc/resources/display_resource_provider_unittest.cc b/cc/resources/display_resource_provider_unittest.cc index c95c2730..62bc95b 100644 --- a/cc/resources/display_resource_provider_unittest.cc +++ b/cc/resources/display_resource_provider_unittest.cc
@@ -19,8 +19,11 @@ #include "base/bind_helpers.h" #include "base/logging.h" #include "base/memory/ref_counted.h" +#include "base/memory/shared_memory.h" #include "cc/test/render_pass_test_utils.h" #include "cc/test/resource_provider_test_utils.h" +#include "components/viz/common/quads/shared_bitmap.h" +#include "components/viz/common/resources/bitmap_allocation.h" #include "components/viz/common/resources/resource_format_utils.h" #include "components/viz/common/resources/returned_resource.h" #include "components/viz/common/resources/shared_bitmap_manager.h" @@ -49,30 +52,33 @@ return other == sync_token; } -static void ReleaseSharedBitmapCallback( - std::unique_ptr<viz::SharedBitmap> shared_bitmap, - bool* release_called, - gpu::SyncToken* release_sync_token, - bool* lost_resource_result, - const gpu::SyncToken& sync_token, - bool lost_resource) { +static void ReleaseSharedBitmapCallback(viz::SharedBitmapId shared_bitmap_id, + bool* release_called, + gpu::SyncToken* release_sync_token, + bool* lost_resource_result, + const gpu::SyncToken& sync_token, + bool lost_resource) { *release_called = true; *release_sync_token = sync_token; *lost_resource_result = lost_resource; } -static std::unique_ptr<viz::SharedBitmap> CreateAndFillSharedBitmap( +static viz::SharedBitmapId CreateAndFillSharedBitmap( viz::SharedBitmapManager* manager, const gfx::Size& size, viz::ResourceFormat format, uint32_t value) { - std::unique_ptr<viz::SharedBitmap> shared_bitmap = - manager->AllocateSharedBitmap(size, format); - CHECK(shared_bitmap); - uint32_t* pixels = reinterpret_cast<uint32_t*>(shared_bitmap->pixels()); - CHECK(pixels); - std::fill_n(pixels, size.GetArea(), value); - return shared_bitmap; + viz::SharedBitmapId shared_bitmap_id = viz::SharedBitmap::GenerateId(); + + std::unique_ptr<base::SharedMemory> shm = + viz::bitmap_allocation::AllocateMappedBitmap(size, viz::RGBA_8888); + manager->ChildAllocatedSharedBitmap( + viz::bitmap_allocation::DuplicateAndCloseMappedBitmap(shm.get(), size, + viz::RGBA_8888), + shared_bitmap_id); + + std::fill_n(static_cast<uint32_t*>(shm->memory()), size.GetArea(), value); + return shared_bitmap_id; } static viz::ResourceSettings CreateResourceSettings() { @@ -411,10 +417,9 @@ child_context_->genSyncToken(sync_token->GetData()); EXPECT_TRUE(sync_token->HasData()); - std::unique_ptr<viz::SharedBitmap> shared_bitmap; std::unique_ptr<viz::SingleReleaseCallback> callback = viz::SingleReleaseCallback::Create(base::BindRepeating( - ReleaseSharedBitmapCallback, base::Passed(&shared_bitmap), + ReleaseSharedBitmapCallback, viz::SharedBitmapId(), release_called, release_sync_token, lost_resource)); viz::TransferableResource gl_resource = viz::TransferableResource::MakeGL( gpu_mailbox, GL_LINEAR, GL_TEXTURE_2D, *sync_token); @@ -423,19 +428,16 @@ std::move(callback)); } else { gfx::Size size(64, 64); - std::unique_ptr<viz::SharedBitmap> shared_bitmap( - CreateAndFillSharedBitmap(shared_bitmap_manager_.get(), size, format, - 0)); + viz::SharedBitmapId shared_bitmap_id = CreateAndFillSharedBitmap( + shared_bitmap_manager_.get(), size, format, 0); - viz::SharedBitmap* shared_bitmap_ptr = shared_bitmap.get(); std::unique_ptr<viz::SingleReleaseCallback> callback = viz::SingleReleaseCallback::Create(base::BindRepeating( - ReleaseSharedBitmapCallback, base::Passed(&shared_bitmap), - release_called, release_sync_token, lost_resource)); + ReleaseSharedBitmapCallback, shared_bitmap_id, release_called, + release_sync_token, lost_resource)); return child_resource_provider_->ImportResource( viz::TransferableResource::MakeSoftware( - shared_bitmap_ptr->id(), shared_bitmap_ptr->sequence_number(), - size, format), + shared_bitmap_id, /*sequence_number=*/0, size, format), std::move(callback)); } }
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc index 9e7cd1d..e0b0ed0 100644 --- a/cc/resources/resource_provider_unittest.cc +++ b/cc/resources/resource_provider_unittest.cc
@@ -19,8 +19,11 @@ #include "base/bind_helpers.h" #include "base/logging.h" #include "base/memory/ref_counted.h" +#include "base/memory/shared_memory.h" #include "cc/test/render_pass_test_utils.h" #include "cc/test/resource_provider_test_utils.h" +#include "components/viz/common/quads/shared_bitmap.h" +#include "components/viz/common/resources/bitmap_allocation.h" #include "components/viz/common/resources/resource_format_utils.h" #include "components/viz/common/resources/returned_resource.h" #include "components/viz/common/resources/shared_bitmap_manager.h" @@ -65,7 +68,7 @@ } static void ReleaseSharedBitmapCallback( - std::unique_ptr<viz::SharedBitmap> shared_bitmap, + const viz::SharedBitmapId& shared_bitmap_id, bool* release_called, gpu::SyncToken* release_sync_token, bool* lost_resource_result, @@ -76,18 +79,22 @@ *lost_resource_result = lost_resource; } -static std::unique_ptr<viz::SharedBitmap> CreateAndFillSharedBitmap( +static viz::SharedBitmapId CreateAndFillSharedBitmap( viz::SharedBitmapManager* manager, const gfx::Size& size, viz::ResourceFormat format, uint32_t value) { - std::unique_ptr<viz::SharedBitmap> shared_bitmap = - manager->AllocateSharedBitmap(size, format); - CHECK(shared_bitmap); - uint32_t* pixels = reinterpret_cast<uint32_t*>(shared_bitmap->pixels()); - CHECK(pixels); - std::fill_n(pixels, size.GetArea(), value); - return shared_bitmap; + viz::SharedBitmapId shared_bitmap_id = viz::SharedBitmap::GenerateId(); + + std::unique_ptr<base::SharedMemory> shm = + viz::bitmap_allocation::AllocateMappedBitmap(size, viz::RGBA_8888); + manager->ChildAllocatedSharedBitmap( + viz::bitmap_allocation::DuplicateAndCloseMappedBitmap(shm.get(), size, + viz::RGBA_8888), + shared_bitmap_id); + + std::fill_n(static_cast<uint32_t*>(shm->memory()), size.GetArea(), value); + return shared_bitmap_id; } static viz::ResourceSettings CreateResourceSettings() { @@ -453,10 +460,9 @@ child_context_->genSyncToken(sync_token->GetData()); EXPECT_TRUE(sync_token->HasData()); - std::unique_ptr<viz::SharedBitmap> shared_bitmap; std::unique_ptr<viz::SingleReleaseCallback> callback = - viz::SingleReleaseCallback::Create(base::Bind( - ReleaseSharedBitmapCallback, base::Passed(&shared_bitmap), + viz::SingleReleaseCallback::Create(base::BindOnce( + ReleaseSharedBitmapCallback, viz::SharedBitmapId(), release_called, release_sync_token, lost_resource)); viz::TransferableResource gl_resource = viz::TransferableResource::MakeGL( gpu_mailbox, GL_LINEAR, GL_TEXTURE_2D, *sync_token); @@ -465,19 +471,16 @@ std::move(callback)); } else { gfx::Size size(64, 64); - std::unique_ptr<viz::SharedBitmap> shared_bitmap( - CreateAndFillSharedBitmap(shared_bitmap_manager_.get(), size, format, - 0)); + viz::SharedBitmapId shared_bitmap_id = CreateAndFillSharedBitmap( + shared_bitmap_manager_.get(), size, format, 0); - viz::SharedBitmap* shared_bitmap_ptr = shared_bitmap.get(); std::unique_ptr<viz::SingleReleaseCallback> callback = - viz::SingleReleaseCallback::Create(base::Bind( - ReleaseSharedBitmapCallback, base::Passed(&shared_bitmap), - release_called, release_sync_token, lost_resource)); + viz::SingleReleaseCallback::Create(base::BindOnce( + ReleaseSharedBitmapCallback, shared_bitmap_id, release_called, + release_sync_token, lost_resource)); return child_resource_provider_->ImportResource( viz::TransferableResource::MakeSoftware( - shared_bitmap_ptr->id(), shared_bitmap_ptr->sequence_number(), - size, format), + shared_bitmap_id, /*sequence_number=*/0, size, format), std::move(callback)); } } @@ -1278,11 +1281,11 @@ gfx::Size size(64, 64); viz::ResourceFormat format = viz::RGBA_8888; const uint32_t kBadBeef = 0xbadbeef; - std::unique_ptr<viz::SharedBitmap> shared_bitmap(CreateAndFillSharedBitmap( - shared_bitmap_manager_.get(), size, format, kBadBeef)); + viz::SharedBitmapId shared_bitmap_id = CreateAndFillSharedBitmap( + shared_bitmap_manager_.get(), size, format, kBadBeef); - auto resource_provider(std::make_unique<DisplayResourceProvider>( - nullptr, shared_bitmap_manager_.get())); + auto resource_provider = std::make_unique<DisplayResourceProvider>( + nullptr, shared_bitmap_manager_.get()); auto child_resource_provider(std::make_unique<LayerTreeResourceProvider>( nullptr, nullptr, kDelegatedSyncPointsRequired, @@ -1294,7 +1297,7 @@ viz::SingleReleaseCallback::Create( base::Bind(&ReleaseCallback, &release_sync_token, &lost_resource)); auto resource = viz::TransferableResource::MakeSoftware( - shared_bitmap->id(), shared_bitmap->sequence_number(), size, format); + shared_bitmap_id, /*sequence_number=*/0, size, format); viz::ResourceId resource_id = child_resource_provider->ImportResource(resource, std::move(callback));
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index a8d59caa..3cba883 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn
@@ -1256,7 +1256,7 @@ additional_apks = [ "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service:apk_with_webapk_service", - "//chrome/android/webapk/shell_apk:webapk", + "//chrome/android/webapk/shell_apk:http_webapk", "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk", "//chrome/test/android/chrome_public_test_support:chrome_public_test_support_apk", "//net/android:net_test_support_apk",
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java index 4e084ac8..c039b0d4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -131,7 +131,6 @@ import org.chromium.chrome.browser.widget.OverviewListLayout; import org.chromium.chrome.browser.widget.ViewHighlighter; import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet; -import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.StateChangeReason; import org.chromium.chrome.browser.widget.emptybackground.EmptyBackgroundViewWrapper; import org.chromium.chrome.browser.widget.textbubble.TextBubble; import org.chromium.components.feature_engagement.EventConstants; @@ -1189,19 +1188,6 @@ boolean fromLauncherShortcut = IntentUtils.safeGetBooleanExtra( intent, IntentHandler.EXTRA_INVOKED_FROM_SHORTCUT, false); - if (getBottomSheet() != null) { - // Either a url is being loaded in a new tab, a tab is being clobbered, or a tab - // is being brought to the front. In all scenarios, the bottom sheet should be - // closed. If a tab is being brought to the front, this indicates the user is coming - // back to Chrome through external means (e.g. homescreen shortcut, media - // notification) and animating the sheet closing is extraneous. - boolean animateSheetClose = tabOpenType == TabOpenType.CLOBBER_CURRENT_TAB - || tabOpenType == TabOpenType.OPEN_NEW_TAB - || tabOpenType == TabOpenType.OPEN_NEW_INCOGNITO_TAB; - getBottomSheet().setSheetState(BottomSheet.SHEET_STATE_PEEK, animateSheetClose, - StateChangeReason.NAVIGATION); - } - TabModel tabModel = getCurrentTabModel(); switch (tabOpenType) { case REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB:
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextual_suggestions/EnabledStateMonitor.java b/chrome/android/java/src/org/chromium/chrome/browser/contextual_suggestions/EnabledStateMonitor.java index a759406..274ff07 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextual_suggestions/EnabledStateMonitor.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextual_suggestions/EnabledStateMonitor.java
@@ -5,6 +5,7 @@ package org.chromium.chrome.browser.contextual_suggestions; import org.chromium.base.VisibleForTesting; +import org.chromium.base.metrics.RecordHistogram; import org.chromium.chrome.browser.locale.LocaleManager; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.preferences.PrefChangeRegistrar; @@ -70,6 +71,8 @@ SigninManager.get().addSignInStateObserver(this); TemplateUrlService.getInstance().addObserver(this); updateEnabledState(); + recordPreferenceEnabled( + PrefServiceBridge.getInstance().getBoolean(Pref.CONTEXTUAL_SUGGESTIONS_ENABLED)); } /** Destroys the EnabledStateMonitor. */ @@ -106,6 +109,14 @@ && PrefServiceBridge.getInstance().getBoolean(Pref.CONTEXTUAL_SUGGESTIONS_ENABLED); } + public static void recordEnabled(boolean enabled) { + RecordHistogram.recordBooleanHistogram("ContextualSuggestions.EnabledState", enabled); + } + + public static void recordPreferenceEnabled(boolean enabled) { + RecordHistogram.recordBooleanHistogram("ContextualSuggestions.Preference.State", enabled); + } + /** Called when accessibility mode changes. */ void onAccessibilityModeChanged() { updateEnabledState(); @@ -151,7 +162,10 @@ mObserver.onSettingsStateChanged(mSettingsEnabled); } - if (mEnabled != previousState) mObserver.onEnabledStateChanged(mEnabled); + if (mEnabled != previousState) { + mObserver.onEnabledStateChanged(mEnabled); + recordEnabled(mEnabled); + } } private static boolean isDSEConditionMet() {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InstallableAmbientBadgeInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InstallableAmbientBadgeInfoBar.java index 5a81ca8..e0f9dcf 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InstallableAmbientBadgeInfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InstallableAmbientBadgeInfoBar.java
@@ -6,9 +6,6 @@ import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO; -import android.content.ActivityNotFoundException; -import android.content.Context; -import android.content.Intent; import android.content.res.Resources; import android.graphics.Bitmap; import android.util.TypedValue; @@ -18,15 +15,10 @@ import android.widget.TextView; import org.chromium.base.ApiCompatibilityUtils; -import org.chromium.base.ContextUtils; import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.ResourceId; -import org.chromium.chrome.browser.metrics.WebApkUma; import org.chromium.chrome.browser.widget.accessibility.AccessibleTextView; -import org.chromium.ui.widget.Toast; -import org.chromium.webapk.lib.client.WebApkNavigationClient; -import org.chromium.webapk.lib.client.WebApkValidator; /** * An ambient infobar to tell the user that the current site they are visiting is a PWA. @@ -34,15 +26,13 @@ public class InstallableAmbientBadgeInfoBar extends InfoBar implements View.OnClickListener { private String mMessageText; private String mUrl; - private boolean mIsInstalled; private boolean mIsHiding; @CalledByNative - private static InfoBar show(int enumeratedIconId, Bitmap iconBitmap, String messageText, - String url, boolean isInstalled) { + private static InfoBar show( + int enumeratedIconId, Bitmap iconBitmap, String messageText, String url) { int drawableId = ResourceId.mapToDrawableId(enumeratedIconId); - return new InstallableAmbientBadgeInfoBar( - drawableId, iconBitmap, messageText, url, isInstalled); + return new InstallableAmbientBadgeInfoBar(drawableId, iconBitmap, messageText, url); } @Override @@ -85,21 +75,7 @@ public void onClick(View v) { if (getNativeInfoBarPtr() == 0 || mIsHiding) return; - if (mIsInstalled) { - Context context = ContextUtils.getApplicationContext(); - String packageName = WebApkValidator.queryWebApkPackage(context, mUrl); - Intent launchIntent = - WebApkNavigationClient.createLaunchWebApkIntent(packageName, mUrl, false); - try { - context.startActivity(launchIntent); - WebApkUma.recordWebApkOpenAttempt(WebApkUma.WEBAPK_OPEN_LAUNCH_SUCCESS); - } catch (ActivityNotFoundException e) { - WebApkUma.recordWebApkOpenAttempt(WebApkUma.WEBAPK_OPEN_ACTIVITY_NOT_FOUND); - Toast.makeText(context, R.string.open_webapk_failed, Toast.LENGTH_SHORT).show(); - } - } else { - nativeAddToHomescreen(getNativeInfoBarPtr()); - } + nativeAddToHomescreen(getNativeInfoBarPtr()); } /** @@ -107,14 +83,12 @@ * @param iconDrawableId Drawable ID corresponding to the icon that the infobar will show. * @param iconBitmap Bitmap of the icon to display in the infobar. * @param messageText String to display - * @param isInstalled Whether the associated app is installed. */ - private InstallableAmbientBadgeInfoBar(int iconDrawableId, Bitmap iconBitmap, - String messageText, String url, boolean isInstalled) { + private InstallableAmbientBadgeInfoBar( + int iconDrawableId, Bitmap iconBitmap, String messageText, String url) { super(iconDrawableId, iconBitmap, null); mMessageText = messageText; mUrl = url; - mIsInstalled = isInstalled; } private native void nativeAddToHomescreen(long nativeInstallableAmbientBadgeInfoBar);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java index 4a9c484c..2db1e23 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java
@@ -53,6 +53,8 @@ private Bitmap mPageMediaImage; @VisibleForTesting Bitmap mFavicon; + // Set to true if favicon update callback was called at least once for the current tab. + private boolean mMaybeHasFavicon; private Bitmap mCurrentMediaImage; private String mOrigin; @VisibleForTesting @@ -444,6 +446,8 @@ private void updateFavicon(Bitmap icon) { if (icon == null) return; + mMaybeHasFavicon = true; + // Store the favicon only if notification is being shown. Otherwise the favicon is // obtained from large icon bridge when needed. if (isNotificationHiddingOrHidden() || mPageMediaImage != null) return; @@ -537,6 +541,10 @@ * @return if the favicon will be updated. */ private boolean fetchFaviconImage() { + // The page does not have a favicon yet to fetch since onFaviconUpdated was never called. + // Don't waste time trying to find it. + if (!mMaybeHasFavicon) return false; + if (mTab == null) return false; WebContents webContents = mTab.getWebContents(); if (webContents == null) return false;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsCategoryInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsCategoryInfo.java index 9eeff0f..ae134398 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsCategoryInfo.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsCategoryInfo.java
@@ -136,7 +136,7 @@ case KnownCategories.FOREIGN_TABS: navigationDelegate.navigateToRecentTabs(); break; - case KnownCategories.PHYSICAL_WEB_PAGES: + case KnownCategories.PHYSICAL_WEB_PAGES_DEPRECATED: case KnownCategories.RECENT_TABS: case KnownCategories.ARTICLES: default:
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ContextualSuggestionsPreference.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ContextualSuggestionsPreference.java index a622361..8972603 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ContextualSuggestionsPreference.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ContextualSuggestionsPreference.java
@@ -14,6 +14,7 @@ import android.view.View; import org.chromium.base.VisibleForTesting; +import org.chromium.base.metrics.RecordUserAction; import org.chromium.chrome.R; import org.chromium.chrome.browser.contextual_suggestions.ContextualSuggestionsBridge; import org.chromium.chrome.browser.contextual_suggestions.EnabledStateMonitor; @@ -96,8 +97,16 @@ updateSwitch(); mSwitch.setOnPreferenceChangeListener((preference, newValue) -> { + boolean enabled = (boolean) newValue; PrefServiceBridge.getInstance().setBoolean( - Pref.CONTEXTUAL_SUGGESTIONS_ENABLED, (boolean) newValue); + Pref.CONTEXTUAL_SUGGESTIONS_ENABLED, enabled); + + EnabledStateMonitor.recordPreferenceEnabled(enabled); + if (enabled) { + RecordUserAction.record("ContextualSuggestions.Preference.Enabled"); + } else { + RecordUserAction.record("ContextualSuggestions.Preference.Disabled"); + } return true; }); mSwitch.setManagedPreferenceDelegate(new ManagedPreferenceDelegate() {
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/profiling_host/ProfilingProcessHostAndroidTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/profiling_host/ProfilingProcessHostAndroidTest.java index 0542d867..ab762a1 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/profiling_host/ProfilingProcessHostAndroidTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/profiling_host/ProfilingProcessHostAndroidTest.java
@@ -13,6 +13,7 @@ import org.junit.runner.RunWith; import org.chromium.base.test.util.CommandLineFlags; +import org.chromium.base.test.util.DisabledTest; import org.chromium.chrome.browser.ChromeActivity; import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.test.ChromeActivityTestRule; @@ -60,6 +61,9 @@ // Non-browser processes must be profiled with a command line flag, since // otherwise, profiling will start after the relevant processes have been // created, thus that process will be not be profiled. + // TODO(erikchen): Figure out what makes this test flaky and re-enable. + // https://crbug.com/833590. + @DisabledTest @Test @MediumTest @CommandLineFlags.Add({"memlog=all-renderers", "memlog-stack-mode=pseudo"})
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.java index d3c7aa0..a134f7a66 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.java
@@ -5,6 +5,7 @@ package org.chromium.chrome.browser.webapps; import android.content.Intent; +import android.net.Uri; import android.support.test.InstrumentationRegistry; import android.support.test.filters.LargeTest; @@ -14,11 +15,10 @@ import org.junit.Test; import org.junit.runner.RunWith; -import org.chromium.base.ApplicationStatus; +import org.chromium.base.CommandLine; import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.Feature; -import org.chromium.base.test.util.FlakyTest; import org.chromium.base.test.util.ScalableTimeout; import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.browser.DeferredStartupHandler; @@ -36,8 +36,7 @@ /** Integration tests for WebAPK feature. */ @RunWith(ChromeJUnit4ClassRunner.class) -@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE, - ContentSwitches.HOST_RESOLVER_RULES + "=MAP * 127.0.0.1"}) +@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE}) public class WebApkIntegrationTest { @Rule public final ChromeActivityTestRule<WebApkActivity> mActivityTestRule = @@ -94,9 +93,17 @@ return WebappRegistry.getInstance().getWebappDataStorage(webappId); } + /** Returns URL for the passed-in host which maps to a page on the EmbeddedTestServer. */ + private String getUrlForHost(String host) { + return "http://" + host + "/defaultresponse"; + } + @Before public void setUp() throws Exception { WebApkUpdateManager.setUpdatesEnabledForTesting(false); + Uri mapToUri = Uri.parse(mTestServerRule.getServer().getURL("/")); + CommandLine.getInstance().appendSwitchWithValue( + ContentSwitches.HOST_RESOLVER_RULES, "MAP * " + mapToUri.getAuthority()); } /** @@ -106,18 +113,20 @@ @LargeTest @Feature({"Webapps"}) public void testWebApkLaunchesByLauncherActivity() { + String pwaRocksUrl = getUrlForHost("pwa.rocks"); + Intent intent = new Intent(); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setPackage(InstrumentationRegistry.getTargetContext().getPackageName()); intent.setAction(WebappLauncherActivity.ACTION_START_WEBAPP); - intent.putExtra(WebApkConstants.EXTRA_URL, "https://pwa.rocks/") - .putExtra(WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME, "org.chromium.webapk"); + intent.putExtra(WebApkConstants.EXTRA_URL, pwaRocksUrl) + .putExtra(WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME, "org.chromium.webapk.http"); WebApkValidator.disableValidationForTesting(); mActivityTestRule.startActivityCompletely(intent); WebApkActivity lastActivity = (WebApkActivity) mActivityTestRule.getActivity(); - Assert.assertEquals("https://pwa.rocks/", lastActivity.getWebappInfo().uri().toString()); + Assert.assertEquals(pwaRocksUrl, lastActivity.getWebappInfo().uri().toString()); } /** @@ -127,19 +136,19 @@ @Test @LargeTest @Feature({"WebApk"}) - @FlakyTest(message = "https://crbug.com/834466") public void testLaunchAndNavigateOffOrigin() throws Exception { - startWebApkActivity("org.chromium.webapk", "https://pwa.rocks/"); + startWebApkActivity("org.chromium.webapk.http", getUrlForHost("pwa.rocks")); waitUntilSplashscreenHides(); + WebApkActivity webApkActivity = (WebApkActivity) mActivityTestRule.getActivity(); + WebappActivityTestRule.assertToolbarShowState(webApkActivity, false); // We navigate outside origin and expect CCT toolbar to show on top of WebApkActivity. + String googleUrl = getUrlForHost("www.google.com"); mActivityTestRule.runJavaScriptCodeInCurrentTab( - "window.top.location = 'https://www.google.com/'"); + "window.top.location = '" + googleUrl + "'"); - ChromeTabUtils.waitForTabPageLoaded( - mActivityTestRule.getActivity().getActivityTab(), "https://www.google.com/"); - WebappActivityTestRule.assertToolbarShowState( - (WebappActivity) ApplicationStatus.getLastTrackedFocusedActivity(), true); + ChromeTabUtils.waitForTabPageLoaded(webApkActivity.getActivityTab(), googleUrl); + WebappActivityTestRule.assertToolbarShowState(webApkActivity, true); } /** @@ -153,8 +162,8 @@ @Feature({"WebApk"}) public void testLaunchIntervalHistogramNotRecordedOnFirstLaunch() throws Exception { final String histogramName = "WebApk.LaunchInterval"; - final String packageName = "org.chromium.webapk"; - startWebApkActivity(packageName, "https://pwa.rocks/"); + final String packageName = "org.chromium.webapk.http"; + startWebApkActivity(packageName, getUrlForHost("pwa.rocks")); CriteriaHelper.pollUiThread(new Criteria("Deferred startup never completed") { @Override @@ -176,7 +185,7 @@ mNativeLibraryTestRule.loadNativeLibraryNoBrowserProcess(); final String histogramName = "WebApk.LaunchInterval2"; - final String packageName = "org.chromium.webapk"; + final String packageName = "org.chromium.webapk.http"; WebappDataStorage storage = registerWithStorage(WebApkConstants.WEBAPK_ID_PREFIX + packageName); @@ -184,7 +193,7 @@ storage.updateLastUsedTime(); Assert.assertEquals(0, RecordHistogram.getHistogramTotalCountForTesting(histogramName)); - startWebApkActivity(packageName, "https://pwa.rocks/"); + startWebApkActivity(packageName, getUrlForHost("pwa.rocks")); CriteriaHelper.pollUiThread(new Criteria("Deferred startup never completed") { @Override
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationFaviconTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationFaviconTest.java index ce24ab7..d444ec4 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationFaviconTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationFaviconTest.java
@@ -5,6 +5,8 @@ package org.chromium.chrome.browser.media.ui; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doCallRealMethod; @@ -49,10 +51,16 @@ // Mock LargeIconBridge that runs callback using the given favicon. private class TestLargeIconBridge extends LargeIconBridge { private LargeIconCallback mCallback; + private boolean mGetIconCalledAtLeastOnce; + + public boolean getIconCalledAtLeastOnce() { + return mGetIconCalledAtLeastOnce; + } @Override public boolean getLargeIconForUrl( final String pageUrl, int desiredSizePx, final LargeIconCallback callback) { + mGetIconCalledAtLeastOnce = true; mCallback = callback; return true; } @@ -115,22 +123,34 @@ TestLargeIconBridge largeIconBridge = new TestLargeIconBridge(); mTabHolder.mMediaSessionTabHelper.mLargeIconBridge = largeIconBridge; + // Simulate and hide notification. + mTabHolder.simulateMediaSessionStateChanged(true, false); + assertEquals(null, getDisplayedIcon()); + mTabHolder.simulateMediaSessionStateChanged(false, false); + + // Since the onFaviconUpdated was never called with valid favicon, the helper does not try + // to fetch favicon. + assertFalse(largeIconBridge.getIconCalledAtLeastOnce()); + mTabHolder.simulateFaviconUpdated(mFavicon); + mTabHolder.simulateMediaSessionStateChanged(true, false); assertEquals(null, getDisplayedIcon()); + assertTrue(largeIconBridge.getIconCalledAtLeastOnce()); largeIconBridge.runCallback(null); assertEquals(null, getDisplayedIcon()); } @Test public void testGetNotificationIcon() { - mTabHolder.simulateFaviconUpdated(null); + mTabHolder.simulateFaviconUpdated(mFavicon); TestLargeIconBridge largeIconBridge = new TestLargeIconBridge(); mTabHolder.mMediaSessionTabHelper.mLargeIconBridge = largeIconBridge; mTabHolder.simulateMediaSessionStateChanged(true, false); assertEquals(null, getDisplayedIcon()); + assertTrue(largeIconBridge.getIconCalledAtLeastOnce()); largeIconBridge.runCallback(mFavicon); assertEquals(mFavicon, getDisplayedIcon()); }
diff --git a/chrome/android/webapk/shell_apk/BUILD.gn b/chrome/android/webapk/shell_apk/BUILD.gn index 688dc490..019d3ac 100644 --- a/chrome/android/webapk/shell_apk/BUILD.gn +++ b/chrome/android/webapk/shell_apk/BUILD.gn
@@ -11,6 +11,8 @@ "$target_gen_dir/unbound_shell_apk_manifest/AndroidManifest.xml" maps_go_apk_manifest = "$target_gen_dir/maps_go_apk_manifest/AndroidManifest.xml" +shell_apk_http_manifest = + "$target_gen_dir/shell_apk_http_manifest/AndroidManifest.xml" manifest_processor_template("shell_apk_manifest") { input = "AndroidManifest.xml" @@ -36,6 +38,14 @@ extra_variables = [ "shell_apk_version=$template_shell_apk_version" ] } +manifest_processor_template("shell_apk_http_manifest") { + input = "AndroidManifest.xml" + config_file = "http_manifest_config.json" + output = shell_apk_http_manifest + + extra_variables = [ "shell_apk_version=$template_shell_apk_version" ] +} + android_resources("shell_apk_resources") { resource_dirs = [ "res" ] custom_package = "org.chromium.webapk.shell_apk" @@ -185,6 +195,12 @@ apk_name = "UnboundWebApk" } +webapk_tmpl("http_webapk") { + android_manifest = shell_apk_http_manifest + android_manifest_dep = ":shell_apk_http_manifest" + apk_name = "HttpWebApk" +} + android_library("shell_apk_javatests") { testonly = true java_files =
diff --git a/chrome/android/webapk/shell_apk/http_manifest_config.json b/chrome/android/webapk/shell_apk/http_manifest_config.json new file mode 100644 index 0000000..d99448a --- /dev/null +++ b/chrome/android/webapk/shell_apk/http_manifest_config.json
@@ -0,0 +1,34 @@ +{ + "manifest_package": "org.chromium.webapk.http", + "scope_url": "http://pwa.rocks/", + "intent_filters": { + "scope_url_scheme": "http", + "scope_url_host": "pwa.rocks", + "scope_url_path_type": "android:pathPrefix", + "scope_url_path": "/" + }, + "start_url": "http://pwa.rocks/", + "display_mode": "standalone", + "orientation": "portrait", + "theme_color": "2147483648L", + "background_color": "2147483648L", + "splash_screen_icon": "@mipmap/app_icon", + "icon_urls_and_icon_murmur2_hashes": "http://www.pwa.rocks/icon1.png 0 http://www.pwa.rocks/icon2.png 0", + "web_manifest_url": "https://pwa.rocks/pwa.webmanifest", + "version_code": "1", + "version_name": "1.0", + "bound_webapk": { + "runtime_host": "com.google.android.apps.chrome", + "runtime_host_application_name": "Chromium" + }, + "share_template": [{ + "index": "0", + "title": "Share All", + "url_template": "http://pwa.rocks/share_public?title={title}&text={text}&url={url}" + }, + { + "index": "1", + "title": "Share Title", + "url_template": "http://pwa.rocks/share_private?title={title}" + }] +}
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn index dae7057..2db768a0f 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn
@@ -21,10 +21,12 @@ # TODO: put back in chrome/browser if necessary. http://crbug.com/771801. source_set("shutdown_signal_handlers") { - sources = [ - "shutdown_signal_handlers_posix.cc", - "shutdown_signal_handlers_posix.h", - ] + if (is_posix || is_fuchsia) { + sources = [ + "shutdown_signal_handlers_posix.cc", + "shutdown_signal_handlers_posix.h", + ] + } deps = [ "//base", ]
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index a53f062..c98b318 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd
@@ -1914,9 +1914,6 @@ <message name="IDS_AMBIENT_BADGE_INSTALL" desc="String for the ambient badge promoting an app installation"> Add <ph name="APP_NAME">$1<ex>Google Maps</ex></ph> to Home screen </message> - <message name="IDS_AMBIENT_BADGE_OPEN" desc="String for the ambient badge promoting opening an installed app"> - Open <ph name="APP_NAME">$1<ex>Google Maps</ex></ph> - </message> </if> <!-- Bookmark app bubble --> <if expr="use_titlecase">
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp index d0bbd85..1be9c88 100644 --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp
@@ -2161,6 +2161,9 @@ <message name="IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_TITLE" desc="Title for the currently used language in the header for the collapsible list of languages."> Language </message> + <message name="IDS_SETTINGS_LANGUAGE_SEARCH" desc="Placeholder/label for the text input field that allows a user to filter languages."> + Search languages + </message> <message name="IDS_SETTINGS_LANGUAGES_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the language options. Only visible by screen reader software."> Show language options </message>
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 1ca95443..705d6a0bb 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -429,7 +429,6 @@ "download/save_package_file_picker.h", "download/trusted_sources_manager.cc", "download/trusted_sources_manager.h", - "download/trusted_sources_manager_posix.cc", "download/trusted_sources_manager_win.cc", "engagement/important_sites_usage_counter.cc", "engagement/important_sites_usage_counter.h", @@ -507,7 +506,6 @@ "google/google_brand.h", "google/google_brand_chromeos.cc", "google/google_brand_chromeos.h", - "google/google_update_settings_posix.cc", "google/google_url_tracker_factory.cc", "google/google_url_tracker_factory.h", "gpu/gpu_mode_manager.cc", @@ -759,7 +757,6 @@ "net/loading_predictor_observer.cc", "net/loading_predictor_observer.h", "net/net_error_diagnostics_dialog.h", - "net/net_error_diagnostics_dialog_posix.cc", "net/net_error_diagnostics_dialog_win.cc", "net/net_error_tab_helper.cc", "net/net_error_tab_helper.h", @@ -1834,6 +1831,14 @@ "//ui/web_dialogs", ] + if (is_posix || is_fuchsia) { + sources += [ + "download/trusted_sources_manager_posix.cc", + "google/google_update_settings_posix.cc", + "net/net_error_diagnostics_dialog_posix.cc", + ] + } + if (is_android) { sources += [ "after_startup_task_utils_android.cc", @@ -2375,8 +2380,6 @@ "certificate_viewer.h", "chrome_browser_field_trials_desktop.cc", "chrome_browser_field_trials_desktop.h", - "chrome_browser_main_posix.cc", - "chrome_browser_main_posix.h", "chrome_process_singleton.cc", "chrome_process_singleton.h", "custom_handlers/register_protocol_handler_permission_request.cc", @@ -2436,7 +2439,6 @@ "first_run/first_run_internal.h", "first_run/first_run_internal_linux.cc", "first_run/first_run_internal_mac.mm", - "first_run/first_run_internal_posix.cc", "first_run/first_run_internal_win.cc", "first_run/upgrade_util.h", "first_run/upgrade_util_mac.cc", @@ -2450,7 +2452,6 @@ "importer/external_process_importer_host.h", "importer/firefox_profile_lock.cc", "importer/firefox_profile_lock.h", - "importer/firefox_profile_lock_posix.cc", "importer/firefox_profile_lock_win.cc", "importer/importer_list.cc", "importer/importer_list.h", @@ -2566,7 +2567,6 @@ "policy/local_sync_policy_handler.h", "process_singleton_modal_dialog_lock.cc", "process_singleton_modal_dialog_lock.h", - "process_singleton_posix.cc", "process_singleton_startup_lock.cc", "process_singleton_startup_lock.h", "profile_resetter/brandcode_config_fetcher.cc", @@ -2744,7 +2744,6 @@ "task_manager/providers/web_contents/web_contents_task_provider.cc", "task_manager/providers/web_contents/web_contents_task_provider.h", "task_manager/sampling/shared_sampler.h", - "task_manager/sampling/shared_sampler_posix.cc", "task_manager/sampling/shared_sampler_win.cc", "task_manager/sampling/shared_sampler_win_defines.h", "task_manager/sampling/task_group.cc", @@ -2796,6 +2795,17 @@ "//components/zoom", "//net:net", ] + + if (is_posix || is_fuchsia) { + sources += [ + "chrome_browser_main_posix.cc", + "chrome_browser_main_posix.h", + "first_run/first_run_internal_posix.cc", + "importer/firefox_profile_lock_posix.cc", + "process_singleton_posix.cc", + "task_manager/sampling/shared_sampler_posix.cc", + ] + } } if (is_chromeos) { @@ -3339,7 +3349,6 @@ "printing/background_printing_manager.h", "printing/print_dialog_cloud.cc", "printing/print_dialog_cloud.h", - "printing/print_dialog_cloud_posix.cc", "printing/print_dialog_cloud_win.cc", "printing/print_error_dialog.cc", "printing/print_error_dialog.h", @@ -3357,6 +3366,10 @@ "printing/pwg_raster_converter.h", ] + if (is_posix || is_fuchsia) { + sources += [ "printing/print_dialog_cloud_posix.cc" ] + } + if (!is_chromeos) { sources += [ "printing/cloud_print/cloud_print_proxy_service.cc",
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index eeb7eaf..8bf20a2 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -3245,11 +3245,6 @@ kOmniboxUIMaxAutocompleteMatchesVariations, "OmniboxUIMaxAutocompleteVariations")}, - {"omnibox-ui-vertical-layout", - flag_descriptions::kOmniboxUIVerticalLayoutName, - flag_descriptions::kOmniboxUIVerticalLayoutDescription, kOsDesktop, - FEATURE_VALUE_TYPE(omnibox::kUIExperimentVerticalLayout)}, - {"omnibox-ui-narrow-dropdown", flag_descriptions::kOmniboxUINarrowDropdownName, flag_descriptions::kOmniboxUINarrowDropdownDescription, kOsDesktop, @@ -3807,6 +3802,14 @@ flag_descriptions::kAutofillDynamicFormsDescription, kOsAll, FEATURE_VALUE_TYPE(autofill::features::kAutofillDynamicForms)}, + {"autofill-restrict-formless-form-extraction", + flag_descriptions::kAutofillRestrictUnownedFieldsToFormlessCheckoutName, + flag_descriptions:: + kAutofillRestrictUnownedFieldsToFormlessCheckoutDescription, + kOsAll, + FEATURE_VALUE_TYPE( + autofill::features::kAutofillRestrictUnownedFieldsToFormlessCheckout)}, + #if defined(TOOLKIT_VIEWS) {"views-cast-dialog", flag_descriptions::kViewsCastDialogName, flag_descriptions::kViewsCastDialogDescription, kOsDesktop, @@ -3853,9 +3856,29 @@ {"enable-settings-shortcut-search", flag_descriptions::kEnableSettingsShortcutSearchName, flag_descriptions::kEnableSettingsShortcutSearchDescription, kOsCrOS, - FEATURE_VALUE_TYPE(app_list::features::kEnableSettingsShortcutSearch)} + FEATURE_VALUE_TYPE(app_list::features::kEnableSettingsShortcutSearch)}, #endif // OS_CHROMEOS + {"autofill-enforce-min-required-fields-for-heuristics", + flag_descriptions::kAutofillEnforceMinRequiredFieldsForHeuristicsName, + flag_descriptions:: + kAutofillEnforceMinRequiredFieldsForHeuristicsDescription, + kOsAll, + FEATURE_VALUE_TYPE( + autofill::features::kAutofillEnforceMinRequiredFieldsForHeuristics)}, + {"autofill-enforce-min-required-fields-for-query", + flag_descriptions::kAutofillEnforceMinRequiredFieldsForQueryName, + flag_descriptions::kAutofillEnforceMinRequiredFieldsForQueryDescription, + kOsAll, + FEATURE_VALUE_TYPE( + autofill::features::kAutofillEnforceMinRequiredFieldsForQuery)}, + {"autofill-enforce-min-required-fields-for-upload", + flag_descriptions::kAutofillEnforceMinRequiredFieldsForUploadName, + flag_descriptions::kAutofillEnforceMinRequiredFieldsForUploadDescription, + kOsAll, + FEATURE_VALUE_TYPE( + autofill::features::kAutofillEnforceMinRequiredFieldsForUpload)}, + // NOTE: Adding a new flag requires adding a corresponding entry to enum // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag // Histograms" in tools/metrics/histograms/README.md (run the
diff --git a/chrome/browser/android/vr/vr_shell_gl.cc b/chrome/browser/android/vr/vr_shell_gl.cc index 4af9797..5dea9a3 100644 --- a/chrome/browser/android/vr/vr_shell_gl.cc +++ b/chrome/browser/android/vr/vr_shell_gl.cc
@@ -64,10 +64,10 @@ constexpr float kZFar = 10000.0f; // GVR buffer indices for use with viewport->SetSourceBufferIndex -// or frame.BindBuffer. We use one for world content (with reprojection) -// including main VrShell and WebVR content plus world-space UI. -constexpr int kFramePrimaryBuffer = 0; -constexpr int kFrameWebVrBrowserUiBuffer = 1; +// or frame.BindBuffer. We use one for multisampled contents (Browser UI), and +// one for non-multisampled content (webVR or quad layer). +constexpr int kMultiSampleBuffer = 0; +constexpr int kNoMultiSampleBuffer = 1; // When display UI on top of WebVR, we use a seperate buffer. Normally, the // buffer is set to recommended size to get best visual (i.e the buffer for @@ -119,16 +119,24 @@ // Drop at most one frame in MaxDropRate. constexpr int kWebVrUnstuffMaxDropRate = 7; -constexpr int kNumSamplesPerPixelBrowserUi = 2; -constexpr int kNumSamplesPerPixelWebVr = 1; - constexpr float kRedrawSceneAngleDeltaDegrees = 1.0; +// Taken from the GVR source code, this is the default vignette border fraction. +constexpr float kContentVignetteBorder = 0.04; +constexpr float kContentVignetteScale = 1.0 + (kContentVignetteBorder * 2.0); +constexpr gvr::Rectf kContentUv = {0, 1.0, 0, 1.0}; + // If we're not using the SurfaceTexture, use this matrix instead of // webvr_surface_texture_uv_transform_ for drawing to GVR. constexpr float kWebVrIdentityUvTransform[16] = {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1}; +// TODO(mthiesse, https://crbug.com/834985): We should be reading this transform +// from the surface, but it appears to be wrong for a few frames and the content +// window ends up upside-down for a few frames... +constexpr float kContentUvTransform[16] = {1, 0, 0, 0, 0, -1, 0, 0, + 0, 0, 1, 0, 0, 1, 0, 1}; + gfx::Transform PerspectiveMatrixFromView(const gvr::Rectf& fov, float z_near, float z_far) { @@ -384,13 +392,13 @@ unsigned int textures[4]; glGenTextures(4, textures); webvr_texture_id_ = textures[0]; - unsigned int content_texture_id = textures[1]; - unsigned int content_overlay_texture_id = textures[2]; + content_texture_id_ = textures[1]; + content_overlay_texture_id_ = textures[2]; unsigned int ui_texture_id = textures[3]; - content_surface_texture_ = gl::SurfaceTexture::Create(content_texture_id); + content_surface_texture_ = gl::SurfaceTexture::Create(content_texture_id_); content_overlay_surface_texture_ = - gl::SurfaceTexture::Create(content_overlay_texture_id); + gl::SurfaceTexture::Create(content_overlay_texture_id_); ui_surface_texture_ = gl::SurfaceTexture::Create(ui_texture_id); webvr_surface_texture_ = gl::SurfaceTexture::Create(webvr_texture_id_); @@ -434,8 +442,8 @@ InitializeRenderer(); ui_->OnGlInitialized( - content_texture_id, UiElementRenderer::kTextureLocationExternal, - content_overlay_texture_id, UiElementRenderer::kTextureLocationExternal, + content_texture_id_, UiElementRenderer::kTextureLocationExternal, + content_overlay_texture_id_, UiElementRenderer::kTextureLocationExternal, ui_texture_id, true); webvr_vsync_align_ = base::FeatureList::IsEnabled(features::kWebVrVsyncAlign); @@ -1098,28 +1106,22 @@ device::GvrDelegate::GetGvrPoseWithNeckModel(gvr_api_.get(), &head_pose); webxr_ = std::make_unique<WebXrPresentationState>(); - // For kFramePrimaryBuffer (primary VrShell and WebVR content) + // Create multisampled and non-multisampled buffers. specs_.push_back(gvr_api_->CreateBufferSpec()); specs_.push_back(gvr_api_->CreateBufferSpec()); - gvr::Sizei render_size_default = specs_[kFramePrimaryBuffer].GetSize(); - render_size_default_ = {render_size_default.width, - render_size_default.height}; + gvr::Sizei default_size = specs_[0].GetSize(); + render_size_default_ = {default_size.width, default_size.height}; + render_size_webvr_ui_ = {default_size.width / kWebVrBrowserUiSizeFactor, + default_size.height / kWebVrBrowserUiSizeFactor}; - specs_[kFramePrimaryBuffer].SetSamples( - web_vr_mode_ ? kNumSamplesPerPixelWebVr : kNumSamplesPerPixelBrowserUi); - specs_[kFramePrimaryBuffer].SetDepthStencilFormat( + specs_[kMultiSampleBuffer].SetSamples(2); + specs_[kMultiSampleBuffer].SetDepthStencilFormat( GVR_DEPTH_STENCIL_FORMAT_NONE); - specs_[kFrameWebVrBrowserUiBuffer].SetSize( - {render_size_default.width / kWebVrBrowserUiSizeFactor, - render_size_default.height / kWebVrBrowserUiSizeFactor}); - specs_[kFrameWebVrBrowserUiBuffer].SetSamples(2); - specs_[kFrameWebVrBrowserUiBuffer].SetDepthStencilFormat( + specs_[kNoMultiSampleBuffer].SetSamples(1); + specs_[kNoMultiSampleBuffer].SetDepthStencilFormat( GVR_DEPTH_STENCIL_FORMAT_NONE); - render_size_webvr_ui_ = { - render_size_default.width / kWebVrBrowserUiSizeFactor, - render_size_default.height / kWebVrBrowserUiSizeFactor}; swap_chain_ = gvr_api_->CreateSwapChain(specs_); @@ -1145,12 +1147,18 @@ // own UV bounds. viewport_list.GetBufferViewport(0, &webvr_viewport_.left); viewport_list.GetBufferViewport(1, &webvr_viewport_.right); + // Set up Content UI viewports. Content will be shown as a quad layer to get + // the best possible quality. + viewport_list.GetBufferViewport(0, &content_underlay_viewport_.left); + viewport_list.GetBufferViewport(1, &content_underlay_viewport_.right); viewport_list.GetBufferViewport(0, &webvr_overlay_viewport_.left); viewport_list.GetBufferViewport(1, &webvr_overlay_viewport_.right); - main_viewport_.SetSourceBufferIndex(kFramePrimaryBuffer); - webvr_viewport_.SetSourceBufferIndex(kFramePrimaryBuffer); - webvr_overlay_viewport_.SetSourceBufferIndex(kFrameWebVrBrowserUiBuffer); + main_viewport_.SetSourceBufferIndex(kMultiSampleBuffer); + webvr_overlay_viewport_.SetSourceBufferIndex(kMultiSampleBuffer); + webvr_viewport_.SetSourceBufferIndex(kNoMultiSampleBuffer); + content_underlay_viewport_.SetSourceBufferIndex(kNoMultiSampleBuffer); + content_underlay_viewport_.SetSourceUv(kContentUv); } void VrShellGl::UpdateController(const RenderInfo& render_info, @@ -1336,36 +1344,32 @@ CreateOrResizeWebVRSurface(bounds.source_size); pending_bounds_.pop(); } - if (render_info_primary_.surface_texture_size != webvr_surface_size_) { - if (!webvr_surface_size_.width()) { - // Don't try to resize to 0x0 pixels, drop frames until we get a valid - // size. - return false; - } - render_info_primary_.surface_texture_size = webvr_surface_size_; - DVLOG(1) << __FUNCTION__ << ": resize GVR to " - << webvr_surface_size_.width() << "x" - << webvr_surface_size_.height(); - swap_chain_.ResizeBuffer( - kFramePrimaryBuffer, - {webvr_surface_size_.width(), webvr_surface_size_.height()}); + // Resize the webvr overlay buffer, which may have been used by the content + // quad buffer previously. + gvr::Sizei size = swap_chain_.GetBufferSize(kMultiSampleBuffer); + gfx::Size target_size = render_size_webvr_ui_; + if (size.width != target_size.width() || + size.height != target_size.height()) { + swap_chain_.ResizeBuffer(kMultiSampleBuffer, + {target_size.width(), target_size.height()}); + } + + size = swap_chain_.GetBufferSize(kNoMultiSampleBuffer); + target_size = webvr_surface_size_; + if (!target_size.width()) { + // Don't try to resize to 0x0 pixels, drop frames until we get a valid + // size. + return false; + } + if (size.width != target_size.width() || + size.height != target_size.height()) { + swap_chain_.ResizeBuffer(kNoMultiSampleBuffer, + {target_size.width(), target_size.height()}); } return true; } -void VrShellGl::UpdateSamples() { - // It is illegal to call SetSamples on the swap change if we have an acquired - // frame outstanding. Ensure that this is not the case here. - CHECK(!acquired_frame_); - int required_samples = ShouldDrawWebVr() ? kNumSamplesPerPixelWebVr - : kNumSamplesPerPixelBrowserUi; - if (specs_[kFramePrimaryBuffer].GetSamples() != required_samples) { - specs_[kFramePrimaryBuffer].SetSamples(required_samples); - swap_chain_ = gvr_api_->CreateSwapChain(specs_); - } -} - void VrShellGl::UpdateEyeInfos(const gfx::Transform& head_pose, Viewport& viewport, const gfx::Size& render_size, @@ -1393,6 +1397,28 @@ } } +void VrShellGl::UpdateContentViewportTransforms( + const gfx::Transform& head_pose) { + gfx::Transform quad_transform = ui_->GetContentWorldSpaceTransform(); + // The Texture Quad renderer draws quads that extend from -0.5 to 0.5 in X and + // Y, while Daydream's quad layers are implicitly -1.0 to 1.0. Thus to ensure + // things line up we have to scale by 0.5. + quad_transform.Scale3d(0.5f * kContentVignetteScale, + 0.5f * kContentVignetteScale, 1.0f); + + for (auto eye : {GVR_LEFT_EYE, GVR_RIGHT_EYE}) { + CameraModel camera = (eye == GVR_LEFT_EYE) ? render_info_.left_eye_model + : render_info_.right_eye_model; + gfx::Transform transform = camera.view_matrix * quad_transform; + gvr::Mat4f viewport_transform; + TransformToGvrMat(transform, &viewport_transform); + gvr::BufferViewport& viewport = (eye == GVR_LEFT_EYE) + ? content_underlay_viewport_.left + : content_underlay_viewport_.right; + viewport.SetTransform(viewport_transform); + } +} + void VrShellGl::DrawFrame(int16_t frame_index, base::TimeTicks current_time) { TRACE_EVENT1("gpu", "VrShellGl::DrawFrame", "frame", frame_index); if (!webvr_delayed_gvr_submit_.IsCancelled()) { @@ -1435,29 +1461,6 @@ CHECK(!acquired_frame_); - UpdateViewports(); - - // We may need to recreate the swap chain if we've switched between web vr and - // browsing mode. - UpdateSamples(); - - // If needed, resize the primary buffer for use with WebVR. Resizing - // needs to happen before acquiring a frame. - if (is_webvr_frame) { - if (!ResizeForWebVR(frame_index)) { - // We don't have a valid size yet, can't draw. - return; - } - } else { - if (render_info_primary_.surface_texture_size != render_size_default_) { - render_info_primary_.surface_texture_size = render_size_default_; - swap_chain_.ResizeBuffer( - kFramePrimaryBuffer, - {render_info_primary_.surface_texture_size.width(), - render_info_primary_.surface_texture_size.height()}); - } - } - // When using async reprojection, we need to know which pose was // used in the WebVR app for drawing this frame and supply it when // submitting. Technically we don't need a pose if not reprojecting, @@ -1466,24 +1469,24 @@ if (is_webvr_frame && webxr_->HaveProcessingFrame()) { // Copy into render info for overlay UI. WebVR doesn't use this. WebXrFrame* frame = webxr_->GetProcessingFrame(); - render_info_primary_.head_pose = frame->head_pose; + render_info_.head_pose = frame->head_pose; } else { - device::GvrDelegate::GetGvrPoseWithNeckModel( - gvr_api_.get(), &render_info_primary_.head_pose); + device::GvrDelegate::GetGvrPoseWithNeckModel(gvr_api_.get(), + &render_info_.head_pose); } // Update the render position of all UI elements (including desktop). TRACE_EVENT_BEGIN0("gpu", "SceneUpdate"); base::TimeTicks scene_start = base::TimeTicks::Now(); bool scene_changed = - ui_->scene()->OnBeginFrame(current_time, render_info_primary_.head_pose); + ui_->scene()->OnBeginFrame(current_time, render_info_.head_pose); // WebVR handles controller input in OnVsync. base::TimeDelta controller_time = base::TimeDelta(); if (!is_webvr_frame) { TRACE_EVENT0("gpu", "Controller"); base::TimeTicks controller_start = base::TimeTicks::Now(); - UpdateController(render_info_primary_, current_time); + UpdateController(render_info_, current_time); controller_time = base::TimeTicks::Now() - controller_start; ui_controller_update_time_.AddSample(controller_time); } @@ -1501,9 +1504,9 @@ bool redraw_needed = controller_dirty || scene_changed || textures_changed || content_frame_available_; - bool head_moved = HeadMoveExceedsThreshold(last_used_head_pose_, - render_info_primary_.head_pose, - kRedrawSceneAngleDeltaDegrees); + bool head_moved = + HeadMoveExceedsThreshold(last_used_head_pose_, render_info_.head_pose, + kRedrawSceneAngleDeltaDegrees); bool dirty = is_webvr_frame || head_moved || redraw_needed; @@ -1515,6 +1518,33 @@ if (!dirty && ui_->SkipsRedrawWhenNotDirty()) return; + UpdateViewports(); + + // If needed, resize the primary buffer for use with WebVR. Resizing + // needs to happen before acquiring a frame. + if (is_webvr_frame) { + if (!ResizeForWebVR(frame_index)) { + // We don't have a valid size yet, can't draw. + return; + } + } else { + gvr::Sizei size = swap_chain_.GetBufferSize(kMultiSampleBuffer); + gfx::Size target_size = render_size_default_; + if (size.width != target_size.width() || + size.height != target_size.height()) { + swap_chain_.ResizeBuffer(kMultiSampleBuffer, + {target_size.width(), target_size.height()}); + } + size = swap_chain_.GetBufferSize(kNoMultiSampleBuffer); + target_size = {content_tex_buffer_size_.width() * kContentVignetteScale, + content_tex_buffer_size_.height() * kContentVignetteScale}; + if (size.width != target_size.width() || + size.height != target_size.height()) { + swap_chain_.ResizeBuffer(kNoMultiSampleBuffer, + {target_size.width(), target_size.height()}); + } + } + TRACE_EVENT_BEGIN0("gpu", "VrShellGl::AcquireFrame"); base::TimeTicks acquire_start = base::TimeTicks::Now(); acquired_frame_ = swap_chain_.AcquireFrame(); @@ -1529,47 +1559,85 @@ void VrShellGl::DrawIntoAcquiredFrame(int16_t frame_index, base::TimeTicks current_time) { TRACE_EVENT1("gpu", "VrShellGl::DrawIntoAcquiredFrame", "frame", frame_index); - last_used_head_pose_ = render_info_primary_.head_pose; - - UpdateEyeInfos(render_info_primary_.head_pose, main_viewport_, - render_info_primary_.surface_texture_size, - &render_info_primary_); - ui_->OnProjMatrixChanged(render_info_primary_.left_eye_model.proj_matrix); + last_used_head_pose_ = render_info_.head_pose; bool is_webvr_frame = frame_index >= 0; DCHECK(!is_webvr_frame || webxr_->HaveProcessingFrame()); + gvr::Sizei primary_render_size = + is_webvr_frame ? swap_chain_.GetBufferSize(kNoMultiSampleBuffer) + : swap_chain_.GetBufferSize(kMultiSampleBuffer); + UpdateEyeInfos(render_info_.head_pose, main_viewport_, + {primary_render_size.width, primary_render_size.height}, + &render_info_); + ui_->OnProjMatrixChanged(render_info_.left_eye_model.proj_matrix); + + // Content quad can't have transparency when using the quad layer because we + // can't blend with the quad layer. + bool use_quad_layer = ui_->IsContentVisibleAndOpaque(); + + // We can't use webvr and the quad layer at the same time because they + // currently share the same non-multisampled buffer. + DCHECK(!is_webvr_frame || !use_quad_layer); + viewport_list_ = gvr_api_->CreateEmptyBufferViewportList(); - acquired_frame_.BindBuffer(kFramePrimaryBuffer); + ui_->SetContentUsesQuadLayer(use_quad_layer); + if (use_quad_layer) { + // This should be the first layer as it needs to be rendered behind the + // rest of the browser UI, which punches a transparent hole through to this + // layer. + DCHECK(viewport_list_.GetSize() == 0); - // We're redrawing over the entire viewport, but it's generally more - // efficient on mobile tiling GPUs to clear anyway as a hint that - // we're done with the old content. TODO(klausw, https://crbug.com/700389): - // investigate using glDiscardFramebufferEXT here since that's more - // efficient on desktop, but it would need a capability check since - // it's not supported on older devices such as Nexus 5X. - glClear(GL_COLOR_BUFFER_BIT); + UpdateContentViewportTransforms(render_info_.head_pose); - DCHECK(viewport_list_.GetSize() == 0); + viewport_list_.SetBufferViewport(viewport_list_.GetSize(), + content_underlay_viewport_.left); + viewport_list_.SetBufferViewport(viewport_list_.GetSize(), + content_underlay_viewport_.right); + + // Draw the main browser content to a quad layer. + acquired_frame_.BindBuffer(kNoMultiSampleBuffer); + + glClear(GL_COLOR_BUFFER_BIT); + + DrawContentQuad(!ui_->IsContentOverlayTextureEmpty()); + + acquired_frame_.Unbind(); + } + if (is_webvr_frame) { + DCHECK(viewport_list_.GetSize() == 0); viewport_list_.SetBufferViewport(0, webvr_viewport_.left); viewport_list_.SetBufferViewport(1, webvr_viewport_.right); + acquired_frame_.BindBuffer(kNoMultiSampleBuffer); + // We're redrawing over the entire viewport, but it's generally more + // efficient on mobile tiling GPUs to clear anyway as a hint that + // we're done with the old content. TODO(klausw, https://crbug.com/700389): + // investigate using glDiscardFramebufferEXT here since that's more + // efficient on desktop, but it would need a capability check since + // it's not supported on older devices such as Nexus 5X. + glClear(GL_COLOR_BUFFER_BIT); DrawWebVr(); + acquired_frame_.Unbind(); } else { - viewport_list_.SetBufferViewport(0, main_viewport_.left); - viewport_list_.SetBufferViewport(1, main_viewport_.right); - + DCHECK(viewport_list_.GetSize() <= 2); + viewport_list_.SetBufferViewport(viewport_list_.GetSize(), + main_viewport_.left); + viewport_list_.SetBufferViewport(viewport_list_.GetSize(), + main_viewport_.right); + acquired_frame_.BindBuffer(kMultiSampleBuffer); + glClear(GL_COLOR_BUFFER_BIT); // At this point, we draw non-WebVR content that could, potentially, fill // the viewport. NB: this is not just 2d browsing stuff, we may have a // splash screen showing in WebVR mode that must also fill the screen. That // said, while the splash screen is up ShouldDrawWebVr() will return false, // and we only draw UI frames, not WebVR frames. - ui_->ui_renderer()->Draw(render_info_primary_); + ui_->ui_renderer()->Draw(render_info_); + acquired_frame_.Unbind(); } content_frame_available_ = false; - acquired_frame_.Unbind(); std::vector<const UiElement*> overlay_elements; if (is_webvr_frame) { @@ -1581,8 +1649,8 @@ if (!overlay_elements.empty() && is_webvr_frame) { // WebVR content may use an arbitrary size buffer. We need to draw browser // UI on a different buffer to make sure that our UI has enough resolution. - acquired_frame_.BindBuffer(kFrameWebVrBrowserUiBuffer); - + acquired_frame_.BindBuffer(kMultiSampleBuffer); + glClear(GL_COLOR_BUFFER_BIT); // Update recommended fov and uv per frame. const gvr::Rectf& fov_recommended_left = main_viewport_.left.GetSourceFov(); const gvr::Rectf& fov_recommended_right = @@ -1591,7 +1659,7 @@ // Set render info to recommended setting. It will be used as our base for // optimization. RenderInfo render_info_webvr_browser_ui; - render_info_webvr_browser_ui.head_pose = render_info_primary_.head_pose; + render_info_webvr_browser_ui.head_pose = render_info_.head_pose; webvr_overlay_viewport_.left.SetSourceFov(fov_recommended_left); webvr_overlay_viewport_.right.SetSourceFov(fov_recommended_right); @@ -1624,12 +1692,12 @@ // GVR submit needs the exact head pose that was used for rendering. gfx::Transform submit_head_pose; if (is_webvr_frame) { - // Don't use render_info_primary_.head_pose here, that may have been + // Don't use render_info_.head_pose here, that may have been // overwritten by OnVSync's controller handling. We need the pose that was // sent to JS. submit_head_pose = webxr_->GetProcessingFrame()->head_pose; } else { - submit_head_pose = render_info_primary_.head_pose; + submit_head_pose = render_info_.head_pose; } std::unique_ptr<gl::GLFenceEGL> fence = nullptr; if (is_webvr_frame && surfaceless_rendering_) { @@ -1883,11 +1951,40 @@ // Use an identity UV transform, the image is already oriented correctly. ui_->ui_element_renderer()->DrawWebVr(buffer->local_texture, - kWebVrIdentityUvTransform); + kWebVrIdentityUvTransform, 0, 0); } else { // Apply the UV transform from the SurfaceTexture, that's usually a Y flip. - ui_->ui_element_renderer()->DrawWebVr(webvr_texture_id_, - webvr_surface_texture_uv_transform_); + ui_->ui_element_renderer()->DrawWebVr( + webvr_texture_id_, webvr_surface_texture_uv_transform_, 0, 0); + } +} + +void VrShellGl::DrawContentQuad(bool draw_overlay_texture) { + // Add a 2 pixel border to avoid aliasing issues at the edge of the texture. + constexpr float kBorder = 2; + TRACE_EVENT0("gpu", "VrShellGl::DrawContentQuad"); + // Don't need face culling, depth testing, blending, etc. Turn it all off. + glDisable(GL_CULL_FACE); + glDisable(GL_SCISSOR_TEST); + glDisable(GL_POLYGON_OFFSET_FILL); + glClear(GL_COLOR_BUFFER_BIT); + + glViewport( + content_tex_buffer_size_.width() * kContentVignetteBorder - kBorder, + content_tex_buffer_size_.height() * kContentVignetteBorder - kBorder, + content_tex_buffer_size_.width() + 2 * kBorder, + content_tex_buffer_size_.height() + 2 * kBorder); + ui_->ui_element_renderer()->DrawWebVr( + content_texture_id_, kContentUvTransform, + kBorder / content_tex_buffer_size_.width(), + kBorder / content_tex_buffer_size_.height()); + if (draw_overlay_texture) { + glEnable(GL_BLEND); + glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); + ui_->ui_element_renderer()->DrawWebVr( + content_overlay_texture_id_, kContentUvTransform, + kBorder / content_tex_buffer_size_.width(), + kBorder / content_tex_buffer_size_.height()); } } @@ -2114,9 +2211,9 @@ // DrawFrame. TRACE_EVENT0("gpu", "Controller"); base::TimeTicks controller_start = base::TimeTicks::Now(); - device::GvrDelegate::GetGvrPoseWithNeckModel( - gvr_api_.get(), &render_info_primary_.head_pose); - UpdateController(render_info_primary_, frame_time); + device::GvrDelegate::GetGvrPoseWithNeckModel(gvr_api_.get(), + &render_info_.head_pose); + UpdateController(render_info_, frame_time); if (report_webxr_input_) { input_states_.push_back(controller_->GetInputSourceState()); }
diff --git a/chrome/browser/android/vr/vr_shell_gl.h b/chrome/browser/android/vr/vr_shell_gl.h index 5cbde27..4be7076 100644 --- a/chrome/browser/android/vr/vr_shell_gl.h +++ b/chrome/browser/android/vr/vr_shell_gl.h
@@ -334,6 +334,7 @@ Viewport& viewport, const gfx::Size& render_size, RenderInfo* out_render_info); + void UpdateContentViewportTransforms(const gfx::Transform& head_pose); void DrawFrame(int16_t frame_index, base::TimeTicks current_time); void DrawIntoAcquiredFrame(int16_t frame_index, base::TimeTicks current_time); void DrawFrameSubmitWhenReady(int16_t frame_index, @@ -342,6 +343,7 @@ void DrawFrameSubmitNow(int16_t frame_index, const gfx::Transform& head_pose); bool ShouldDrawWebVr(); void DrawWebVr(); + void DrawContentQuad(bool draw_overlay_texture); bool ShouldSendGesturesToWebVr(); bool WebVrPoseByteIsValid(int pose_index_byte); @@ -437,6 +439,8 @@ // samplerExternalOES texture data for WebVR content image. int webvr_texture_id_ = 0; + int content_texture_id_ = 0; + int content_overlay_texture_id_ = 0; // Set from feature flags. bool webvr_vsync_align_; @@ -457,6 +461,7 @@ Viewport main_viewport_; Viewport webvr_viewport_; Viewport webvr_overlay_viewport_; + Viewport content_underlay_viewport_; bool viewports_need_updating_; gvr::SwapChain swap_chain_; gvr::Frame acquired_frame_; @@ -562,7 +567,7 @@ gfx::Point3F pointer_start_; - RenderInfo render_info_primary_; + RenderInfo render_info_; AndroidVSyncHelper vsync_helper_;
diff --git a/chrome/browser/banners/app_banner_manager_android.cc b/chrome/browser/banners/app_banner_manager_android.cc index 91ef633..b596e64 100644 --- a/chrome/browser/banners/app_banner_manager_android.cc +++ b/chrome/browser/banners/app_banner_manager_android.cc
@@ -130,7 +130,7 @@ // If we are dismissing the banner, the site can't be installed. if (IsExperimentalAppBannersEnabled()) - ShowAmbientBadge(false /* is_installed */); + ShowAmbientBadge(); } void AppBannerManagerAndroid::AddToHomescreenFromBadge() { @@ -155,8 +155,8 @@ bool AppBannerManagerAndroid::CheckIfInstalled() { bool is_installed = AppBannerManager::CheckIfInstalled(); - if (IsExperimentalAppBannersEnabled()) - ShowAmbientBadge(is_installed); + if (IsExperimentalAppBannersEnabled() && !is_installed) + ShowAmbientBadge(); return is_installed; } @@ -242,7 +242,7 @@ // We will not reach this point if the app is already installed since querying // for native app details will return nothing. if (IsExperimentalAppBannersEnabled()) - ShowAmbientBadge(false /*is_installed*/); + ShowAmbientBadge(); // If we triggered the installability check on page load, then it's possible // we don't have enough engagement yet. If that's the case, return here but @@ -372,13 +372,13 @@ return native_app_title_; } -void AppBannerManagerAndroid::ShowAmbientBadge(bool is_installed) { +void AppBannerManagerAndroid::ShowAmbientBadge() { InfoBarService* infobar_service = InfoBarService::FromWebContents(web_contents()); if (GetVisibleAmbientBadgeInfoBar(infobar_service) == nullptr) { - InstallableAmbientBadgeInfoBarDelegate::Create( - web_contents(), GetWeakPtr(), GetAppName(), primary_icon_, - manifest_.start_url, is_installed); + InstallableAmbientBadgeInfoBarDelegate::Create(web_contents(), GetWeakPtr(), + GetAppName(), primary_icon_, + manifest_.start_url); } }
diff --git a/chrome/browser/banners/app_banner_manager_android.h b/chrome/browser/banners/app_banner_manager_android.h index a09a7344..42224ff6 100644 --- a/chrome/browser/banners/app_banner_manager_android.h +++ b/chrome/browser/banners/app_banner_manager_android.h
@@ -130,7 +130,7 @@ // Shows the ambient badge if the current page advertises a native app or is // a PWA. - void ShowAmbientBadge(bool is_installed); + void ShowAmbientBadge(); // Hides the ambient badge if it is showing. void HideAmbientBadge();
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc index 185f8bd..72eeea7e 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -206,30 +206,26 @@ } #endif -void ClearCookiesOnIOThread(base::Time delete_begin, - base::Time delete_end, +void ClearCookiesOnIOThread(const net::CookieStore::TimeRange& creation_range, net::URLRequestContextGetter* rq_context, base::OnceClosure callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO); net::CookieStore* cookie_store = rq_context->GetURLRequestContext()->cookie_store(); - cookie_store->DeleteAllCreatedBetweenAsync( - delete_begin, delete_end, - base::AdaptCallbackForRepeating( - IgnoreArgument<uint32_t>(std::move(callback)))); + cookie_store->DeleteAllCreatedInTimeRangeAsync( + creation_range, base::AdaptCallbackForRepeating( + IgnoreArgument<uint32_t>(std::move(callback)))); } -void ClearCookiesWithPredicateOnIOThread( - base::Time delete_begin, - base::Time delete_end, - net::CookieStore::CookiePredicate predicate, +void ClearCookiesMatchingInfoOnIOThread( + net::CookieStore::CookieDeletionInfo delete_info, net::URLRequestContextGetter* rq_context, base::OnceClosure callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO); net::CookieStore* cookie_store = rq_context->GetURLRequestContext()->cookie_store(); - cookie_store->DeleteAllCreatedBetweenWithPredicateAsync( - delete_begin, delete_end, predicate, + cookie_store->DeleteAllMatchingInfoAsync( + std::move(delete_info), base::AdaptCallbackForRepeating( IgnoreArgument<uint32_t>(std::move(callback)))); } @@ -721,18 +717,22 @@ BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::BindOnce( - &ClearCookiesOnIOThread, delete_begin_, delete_end_, + &ClearCookiesOnIOThread, + net::CookieStore::TimeRange(delete_begin_, delete_end_), base::RetainedRef(std::move(sb_context)), UIThreadTrampoline(base::BindOnce( &ChromeBrowsingDataRemoverDelegate::OnClearedCookies, weak_ptr_factory_.GetWeakPtr(), CreatePendingTaskCompletionClosure())))); } else { + net::CookieStore::CookieDeletionInfo delete_info = + filter_builder.BuildCookieDeletionInfo(); + delete_info.creation_range.SetStart(delete_begin_); + delete_info.creation_range.SetEnd(delete_end_); BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::BindOnce( - &ClearCookiesWithPredicateOnIOThread, delete_begin_, - delete_end_, filter_builder.BuildCookieFilter(), + &ClearCookiesMatchingInfoOnIOThread, std::move(delete_info), base::RetainedRef(std::move(sb_context)), UIThreadTrampoline(base::BindOnce( &ChromeBrowsingDataRemoverDelegate::OnClearedCookies,
diff --git a/chrome/browser/chromeos/extensions/wallpaper_function_base.cc b/chrome/browser/chromeos/extensions/wallpaper_function_base.cc index cdfa5d3..ff5e779 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_function_base.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
@@ -158,14 +158,8 @@ } void WallpaperFunctionBase::OnFailure(const std::string& error) { - OnFailureWithArguments(nullptr, error); -} - -void WallpaperFunctionBase::OnFailureWithArguments( - std::unique_ptr<base::ListValue> args, - const std::string& error) { unsafe_wallpaper_decoder_ = nullptr; - Respond(args ? ErrorWithArguments(std::move(args), error) : Error(error)); + Respond(Error(error)); } void WallpaperFunctionBase::GenerateThumbnail(
diff --git a/chrome/browser/chromeos/extensions/wallpaper_function_base.h b/chrome/browser/chromeos/extensions/wallpaper_function_base.h index 8398330..f3bf52b9 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_function_base.h +++ b/chrome/browser/chromeos/extensions/wallpaper_function_base.h
@@ -66,13 +66,6 @@ // Handles failure case. Sets error message. void OnFailure(const std::string& error); - // Handles failure case with setting an error message with results argument. - // TODO(wzang): This is a bug, we shouldn't be sending arguments when the - // function fails. Only used in setWallpaperIfExists function. See - // https://crbug.com/830212 for details. - void OnFailureWithArguments(std::unique_ptr<base::ListValue> args, - const std::string& error); - // Resize the image to |size|, encode it and save to |thumbnail_data_out|. void GenerateThumbnail( const gfx::ImageSkia& image,
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc index 28bf63c..e14be35 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -11,10 +11,8 @@ #include <utility> #include <vector> -#include "ash/wallpaper/wallpaper_controller.h" #include "base/command_line.h" #include "base/files/file_enumerator.h" -#include "base/files/file_util.h" #include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram_macros.h" @@ -43,9 +41,9 @@ #include "extensions/browser/event_router.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/web_ui_util.h" +#include "ui/display/display.h" #include "ui/display/screen.h" #include "ui/strings/grit/app_locale_settings.h" -#include "url/gurl.h" using base::Value; using content::BrowserThread; @@ -334,86 +332,35 @@ ExtensionFunction::ResponseAction WallpaperPrivateSetWallpaperIfExistsFunction::Run() { - params = set_wallpaper_if_exists::Params::Create(*args_); + std::unique_ptr< + extensions::api::wallpaper_private::SetWallpaperIfExists::Params> + params = set_wallpaper_if_exists::Params::Create(*args_); EXTENSION_FUNCTION_VALIDATE(params); - // Gets account id from the caller, ensuring multiprofile compatibility. - const user_manager::User* user = GetUserFromBrowserContext(browser_context()); - account_id_ = user->GetAccountId(); - - base::FilePath wallpaper_path; - base::FilePath fallback_path; - ash::WallpaperController::WallpaperResolution resolution = - ash::WallpaperController::GetAppropriateResolution(); - - std::string file_name = GURL(params->url).ExtractFileName(); - CHECK(PathService::Get(chrome::DIR_CHROMEOS_WALLPAPERS, - &wallpaper_path)); - fallback_path = wallpaper_path.Append(file_name); - if (params->layout != wallpaper_base::WALLPAPER_LAYOUT_STRETCH && - resolution == ash::WallpaperController::WALLPAPER_RESOLUTION_SMALL) { - file_name = base::FilePath(file_name) - .InsertBeforeExtension( - ash::WallpaperController::kSmallWallpaperSuffix) - .value(); - } - wallpaper_path = wallpaper_path.Append(file_name); - - GetNonBlockingTaskRunner()->PostTask( - FROM_HERE, base::BindOnce(&WallpaperPrivateSetWallpaperIfExistsFunction:: - ReadFileAndInitiateStartDecode, - this, wallpaper_path, fallback_path)); + WallpaperControllerClient::Get()->SetOnlineWallpaperIfExists( + GetUserFromBrowserContext(browser_context())->GetAccountId(), + GURL(params->url), + wallpaper_api_util::GetLayoutEnum( + wallpaper_base::ToString(params->layout)), + params->preview_mode, + base::BindOnce(&WallpaperPrivateSetWallpaperIfExistsFunction:: + OnSetOnlineWallpaperIfExistsCallback, + this)); return RespondLater(); } void WallpaperPrivateSetWallpaperIfExistsFunction:: - ReadFileAndInitiateStartDecode(const base::FilePath& file_path, - const base::FilePath& fallback_path) { - AssertCalledOnWallpaperSequence(GetNonBlockingTaskRunner()); - base::FilePath path = file_path; - - if (!base::PathExists(file_path)) - path = fallback_path; - - std::string data; - if (base::PathExists(path) && - base::ReadFileToString(path, &data)) { - BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, - base::BindOnce( - &WallpaperPrivateSetWallpaperIfExistsFunction::StartDecode, this, - std::vector<char>(data.begin(), data.end()))); - return; + OnSetOnlineWallpaperIfExistsCallback(bool file_exists) { + if (file_exists) { + Respond(OneArgument(std::make_unique<base::Value>(true))); + } else { + auto args = std::make_unique<base::ListValue>(); + // TODO(crbug.com/830212): Do not send arguments when the function fails. + // Call sites should inspect chrome.runtime.lastError instead. + args->AppendBoolean(false); + Respond(ErrorWithArguments( + std::move(args), "The wallpaper doesn't exist in local file system.")); } - std::string error = base::StringPrintf( - "Failed to set wallpaper %s from file system.", - path.BaseName().value().c_str()); - BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, - base::BindOnce( - &WallpaperPrivateSetWallpaperIfExistsFunction::OnFileNotExists, this, - error)); -} - -void WallpaperPrivateSetWallpaperIfExistsFunction::OnWallpaperDecoded( - const gfx::ImageSkia& image) { - // Set unsafe_wallpaper_decoder_ to null since the decoding already finished. - unsafe_wallpaper_decoder_ = nullptr; - - ash::WallpaperLayout layout = wallpaper_api_util::GetLayoutEnum( - wallpaper_base::ToString(params->layout)); - - WallpaperControllerClient::Get()->SetOnlineWallpaper( - account_id_, image, params->url, layout, params->preview_mode); - - Respond(OneArgument(std::make_unique<base::Value>(true))); -} - -void WallpaperPrivateSetWallpaperIfExistsFunction::OnFileNotExists( - const std::string& error) { - auto args = std::make_unique<base::ListValue>(); - args->AppendBoolean(false); - OnFailureWithArguments(std::move(args), error); } WallpaperPrivateSetWallpaperFunction::WallpaperPrivateSetWallpaperFunction() { @@ -423,73 +370,19 @@ } ExtensionFunction::ResponseAction WallpaperPrivateSetWallpaperFunction::Run() { - params = set_wallpaper::Params::Create(*args_); + std::unique_ptr<extensions::api::wallpaper_private::SetWallpaper::Params> + params = set_wallpaper::Params::Create(*args_); EXTENSION_FUNCTION_VALIDATE(params); - // Gets account id from the caller, ensuring multiprofile compatibility. - const user_manager::User* user = GetUserFromBrowserContext(browser_context()); - account_id_ = user->GetAccountId(); + WallpaperControllerClient::Get()->SetOnlineWallpaperFromData( + GetUserFromBrowserContext(browser_context())->GetAccountId(), + std::string(params->wallpaper.begin(), params->wallpaper.end()), + GURL(params->url), + wallpaper_api_util::GetLayoutEnum( + wallpaper_base::ToString(params->layout)), + params->preview_mode); - StartDecode(params->wallpaper); - return RespondLater(); -} - -void WallpaperPrivateSetWallpaperFunction::OnWallpaperDecoded( - const gfx::ImageSkia& image) { - wallpaper_ = image; - // Set unsafe_wallpaper_decoder_ to null since the decoding already finished. - unsafe_wallpaper_decoder_ = nullptr; - - GetBlockingTaskRunner()->PostTask( - FROM_HERE, - base::BindOnce(&WallpaperPrivateSetWallpaperFunction::SaveToFile, this)); -} - -void WallpaperPrivateSetWallpaperFunction::SaveToFile() { - AssertCalledOnWallpaperSequence(GetBlockingTaskRunner()); - std::string file_name = GURL(params->url).ExtractFileName(); - if (SaveData(chrome::DIR_CHROMEOS_WALLPAPERS, file_name, params->wallpaper)) { - wallpaper_.EnsureRepsForSupportedScales(); - std::unique_ptr<gfx::ImageSkia> deep_copy(wallpaper_.DeepCopy()); - // ImageSkia is not RefCountedThreadSafe. Use a deep copied ImageSkia if - // post to another thread. - BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, - base::BindOnce( - &WallpaperPrivateSetWallpaperFunction::SetDecodedWallpaper, this, - std::move(deep_copy))); - - base::FilePath wallpaper_dir; - CHECK(PathService::Get(chrome::DIR_CHROMEOS_WALLPAPERS, &wallpaper_dir)); - base::FilePath file_path = - wallpaper_dir.Append(file_name).InsertBeforeExtension( - ash::WallpaperController::kSmallWallpaperSuffix); - if (base::PathExists(file_path)) - return; - // Generates and saves small resolution wallpaper. Uses CENTER_CROPPED to - // maintain the aspect ratio after resize. - ash::WallpaperController::ResizeAndSaveWallpaper( - wallpaper_, file_path, ash::WALLPAPER_LAYOUT_CENTER_CROPPED, - ash::WallpaperController::kSmallWallpaperMaxWidth, - ash::WallpaperController::kSmallWallpaperMaxHeight, nullptr); - } else { - std::string error = base::StringPrintf( - "Failed to create/write wallpaper to %s.", file_name.c_str()); - BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, - base::BindOnce(&WallpaperPrivateSetWallpaperFunction::OnFailure, this, - error)); - } -} - -void WallpaperPrivateSetWallpaperFunction::SetDecodedWallpaper( - std::unique_ptr<gfx::ImageSkia> image) { - ash::WallpaperLayout layout = wallpaper_api_util::GetLayoutEnum( - wallpaper_base::ToString(params->layout)); - - WallpaperControllerClient::Get()->SetOnlineWallpaper( - account_id_, *image.get(), params->url, layout, params->preview_mode); - Respond(NoArguments()); + return RespondNow(NoArguments()); } WallpaperPrivateResetWallpaperFunction:: @@ -739,44 +632,17 @@ ExtensionFunction::ResponseAction WallpaperPrivateGetOfflineWallpaperListFunction::Run() { - WallpaperFunctionBase::GetNonBlockingTaskRunner()->PostTask( - FROM_HERE, - base::BindOnce(&WallpaperPrivateGetOfflineWallpaperListFunction::GetList, + WallpaperControllerClient::Get()->GetOfflineWallpaperList( + base::BindOnce(&WallpaperPrivateGetOfflineWallpaperListFunction:: + OnOfflineWallpaperListReturned, this)); - // OnComplete() responds asynchronously. return RespondLater(); } -void WallpaperPrivateGetOfflineWallpaperListFunction::GetList() { - WallpaperFunctionBase::AssertCalledOnWallpaperSequence( - WallpaperFunctionBase::GetNonBlockingTaskRunner()); - std::vector<std::string> file_list; - base::FilePath wallpaper_dir; - CHECK(PathService::Get(chrome::DIR_CHROMEOS_WALLPAPERS, &wallpaper_dir)); - if (base::DirectoryExists(wallpaper_dir)) { - base::FileEnumerator files(wallpaper_dir, false, - base::FileEnumerator::FILES); - for (base::FilePath current = files.Next(); !current.empty(); - current = files.Next()) { - std::string file_name = current.BaseName().RemoveExtension().value(); - // Do not add file name of small resolution wallpaper to the list. - if (!base::EndsWith(file_name, - ash::WallpaperController::kSmallWallpaperSuffix, - base::CompareCase::SENSITIVE)) - file_list.push_back(current.BaseName().value()); - } - } - BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, - base::BindOnce( - &WallpaperPrivateGetOfflineWallpaperListFunction::OnComplete, this, - file_list)); -} - -void WallpaperPrivateGetOfflineWallpaperListFunction::OnComplete( - const std::vector<std::string>& file_list) { +void WallpaperPrivateGetOfflineWallpaperListFunction:: + OnOfflineWallpaperListReturned(const std::vector<std::string>& file_names) { auto results = std::make_unique<base::ListValue>(); - results->AppendStrings(file_list); + results->AppendStrings(file_names); Respond(OneArgument(std::move(results))); }
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.h b/chrome/browser/chromeos/extensions/wallpaper_private_api.h index 0c4b8b1fc..217c523 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.h +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.h
@@ -60,7 +60,7 @@ }; class WallpaperPrivateSetWallpaperIfExistsFunction - : public WallpaperFunctionBase { + : public UIThreadExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("wallpaperPrivate.setWallpaperIfExists", WALLPAPERPRIVATE_SETWALLPAPERIFEXISTS) @@ -74,25 +74,13 @@ ResponseAction Run() override; private: - void OnWallpaperDecoded(const gfx::ImageSkia& image) override; + // Responds with the |file_exists| result. + void OnSetOnlineWallpaperIfExistsCallback(bool file_exists); - // File doesn't exist. Sets javascript callback parameter to false. - void OnFileNotExists(const std::string& error); - - // Reads file specified by |file_path|. If success, post a task to start - // decoding the file. - void ReadFileAndInitiateStartDecode(const base::FilePath& file_path, - const base::FilePath& fallback_path); - - std::unique_ptr< - extensions::api::wallpaper_private::SetWallpaperIfExists::Params> - params; - - // User id of the active user when this api is been called. - AccountId account_id_ = EmptyAccountId(); + DISALLOW_COPY_AND_ASSIGN(WallpaperPrivateSetWallpaperIfExistsFunction); }; -class WallpaperPrivateSetWallpaperFunction : public WallpaperFunctionBase { +class WallpaperPrivateSetWallpaperFunction : public UIThreadExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("wallpaperPrivate.setWallpaper", WALLPAPERPRIVATE_SETWALLPAPER) @@ -106,23 +94,7 @@ ResponseAction Run() override; private: - void OnWallpaperDecoded(const gfx::ImageSkia& image) override; - - // Saves the image data to a file. - void SaveToFile(); - - // Sets wallpaper to the decoded image. - void SetDecodedWallpaper(std::unique_ptr<gfx::ImageSkia> image); - - std::unique_ptr<extensions::api::wallpaper_private::SetWallpaper::Params> - params; - - // The decoded wallpaper. It may accessed from UI thread to set wallpaper or - // FILE thread to resize and save wallpaper to disk. - gfx::ImageSkia wallpaper_; - - // User account id of the active user when this api is been called. - AccountId account_id_ = EmptyAccountId(); + DISALLOW_COPY_AND_ASSIGN(WallpaperPrivateSetWallpaperFunction); }; class WallpaperPrivateResetWallpaperFunction @@ -276,12 +248,11 @@ ResponseAction Run() override; private: - // Enumerates the list of files in online wallpaper directory. - void GetList(); + // Responds with the list of urls. + void OnOfflineWallpaperListReturned( + const std::vector<std::string>& file_names); - // Sends the list of files to extension api caller. If no files or no - // directory, sends empty list. - void OnComplete(const std::vector<std::string>& file_list); + DISALLOW_COPY_AND_ASSIGN(WallpaperPrivateGetOfflineWallpaperListFunction); }; // The wallpaper UMA is recorded when a new wallpaper is set, either by the
diff --git a/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chrome/browser/component_updater/widevine_cdm_component_installer.cc index 69e50b8..fec1d2c 100644 --- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc +++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -147,19 +147,17 @@ } // Returns whether the CDM's API versions, as specified in the manifest, are -// compatible with this Chrome binary. +// supported in this Chrome binary and not disabled at run time. // Checks the module API, CDM interface API, and Host API. // This should never fail except in rare cases where the component has not been // updated recently or the user downgrades Chrome. bool IsCompatibleWithChrome(const base::DictionaryValue& manifest) { - return CheckForCompatibleVersion(manifest, - kCdmModuleVersionsName, + return CheckForCompatibleVersion(manifest, kCdmModuleVersionsName, media::IsSupportedCdmModuleVersion) && - CheckForCompatibleVersion(manifest, - kCdmInterfaceVersionsName, - media::IsSupportedCdmInterfaceVersion) && - CheckForCompatibleVersion(manifest, - kCdmHostVersionsName, + CheckForCompatibleVersion( + manifest, kCdmInterfaceVersionsName, + media::IsSupportedAndEnabledCdmInterfaceVersion) && + CheckForCompatibleVersion(manifest, kCdmHostVersionsName, media::IsSupportedCdmHostVersion); } @@ -237,9 +235,8 @@ const base::DictionaryValue& manifest, const base::FilePath& install_dir) override; void OnCustomUninstall() override; - bool VerifyInstallation( - const base::DictionaryValue& manifest, - const base::FilePath& install_dir) const override; + bool VerifyInstallation(const base::DictionaryValue& manifest, + const base::FilePath& install_dir) const override; void ComponentReady(const base::Version& version, const base::FilePath& path, std::unique_ptr<base::DictionaryValue> manifest) override;
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index ea75093..317a58f 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc
@@ -912,17 +912,18 @@ DevToolsWindow::DevToolsWindow(FrontendType frontend_type, Profile* profile, - WebContents* main_web_contents, + std::unique_ptr<WebContents> main_web_contents, DevToolsUIBindings* bindings, WebContents* inspected_web_contents, bool can_dock) : frontend_type_(frontend_type), profile_(profile), - main_web_contents_(main_web_contents), + main_web_contents_(main_web_contents.get()), toolbox_web_contents_(nullptr), bindings_(bindings), browser_(nullptr), is_docked_(true), + owned_main_web_contents_(std::move(main_web_contents)), can_dock_(can_dock), close_on_detach_(true), // This initialization allows external front-end to work without changes. @@ -1021,8 +1022,9 @@ return nullptr; if (!settings.empty()) SetPreferencesFromJson(profile, settings); - return new DevToolsWindow(frontend_type, profile, main_web_contents.release(), - bindings, inspected_web_contents, can_dock); + return new DevToolsWindow(frontend_type, profile, + std::move(main_web_contents), bindings, + inspected_web_contents, can_dock); } // static @@ -1199,7 +1201,8 @@ // In case of docked main_web_contents_, we own it so delete here. // Embedding DevTools window will be deleted as a result of // DevToolsUIBindings destruction. - delete main_web_contents_; + CHECK(owned_main_web_contents_); + owned_main_web_contents_.reset(); } void DevToolsWindow::ContentsZoomChange(bool zoom_in) { @@ -1339,9 +1342,15 @@ // Detach window from the external devtools browser. It will lead to // the browser object's close and delete. Remove observer first. TabStripModel* tab_strip_model = browser_->tab_strip_model(); - tab_strip_model->DetachWebContentsAt( - tab_strip_model->GetIndexOfWebContents(main_web_contents_)); + DCHECK(!owned_main_web_contents_); + + // Removing the only WebContents from the tab strip of browser_ will + // eventually lead to the destruction of browser_ as well, which is why it's + // okay to just null the raw pointer here. browser_ = NULL; + + owned_main_web_contents_ = tab_strip_model->DetachWebContentsAt( + tab_strip_model->GetIndexOfWebContents(main_web_contents_)); } else if (!dock_requested && was_docked) { UpdateBrowserWindow(); } @@ -1536,7 +1545,7 @@ browser_ = new Browser(Browser::CreateParams::CreateForDevTools(profile_)); browser_->tab_strip_model()->AddWebContents( - main_web_contents_, -1, ui::PAGE_TRANSITION_AUTO_TOPLEVEL, + owned_main_web_contents_.release(), -1, ui::PAGE_TRANSITION_AUTO_TOPLEVEL, TabStripModel::ADD_ACTIVE); main_web_contents_->GetRenderViewHost()->SyncRendererPrefs(); }
diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h index 928fea3..c8cb1bed 100644 --- a/chrome/browser/devtools/devtools_window.h +++ b/chrome/browser/devtools/devtools_window.h
@@ -254,7 +254,7 @@ DevToolsWindow(FrontendType frontend_type, Profile* profile, - content::WebContents* main_web_contents, + std::unique_ptr<content::WebContents> main_web_contents, DevToolsUIBindings* bindings, content::WebContents* inspected_web_contents, bool can_dock); @@ -348,6 +348,9 @@ void ShowCertificateViewer(const std::string& cert_viewer) override; void ColorPickedInEyeDropper(int r, int g, int b, int a); + + // This method create a new Browser object, and passes ownership of + // owned_main_web_contents_ to the tab strip of the Browser. void CreateDevToolsBrowser(); BrowserWindow* GetInspectedBrowserWindow(); void ScheduleShow(const DevToolsToggleAction& action); @@ -365,7 +368,13 @@ content::WebContents* toolbox_web_contents_; DevToolsUIBindings* bindings_; Browser* browser_; + + // When DevToolsWindow is docked, it owns main_web_contents_. When it isn't + // docked, the tab strip model owns the main_web_contents_. + // TODO(erikchen): This needs more careful thinking about. bool is_docked_; + std::unique_ptr<content::WebContents> owned_main_web_contents_; + const bool can_dock_; bool close_on_detach_; LifeStage life_stage_;
diff --git a/chrome/browser/download/notification/download_item_notification.cc b/chrome/browser/download/notification/download_item_notification.cc index e11aecb..8086a04d 100644 --- a/chrome/browser/download/notification/download_item_notification.cc +++ b/chrome/browser/download/notification/download_item_notification.cc
@@ -333,15 +333,14 @@ auto download_state = item_->GetState(); // When the download is just completed, interrupted or transitions to - // dangerous, increase the priority over its previous value to make sure it - // pops up again. - bool popup = + // dangerous, make sure it pops up again. + bool pop_up = ((item_->IsDangerous() && !previous_dangerous_state_) || (download_state == download::DownloadItem::COMPLETE && previous_download_state_ != download::DownloadItem::COMPLETE) || (download_state == download::DownloadItem::INTERRUPTED && previous_download_state_ != download::DownloadItem::INTERRUPTED)); - UpdateNotificationData(!closed_ || show_next_ || popup, popup); + UpdateNotificationData(!closed_ || show_next_ || pop_up, pop_up); show_next_ = false; previous_download_state_ = item_->GetState(); @@ -349,7 +348,7 @@ } void DownloadItemNotification::UpdateNotificationData(bool display, - bool bump_priority) { + bool force_pop_up) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); if (item_->GetState() == download::DownloadItem::CANCELLED) { @@ -427,12 +426,10 @@ } notification_->set_buttons(notification_actions); + notification_->set_renotify(force_pop_up); + if (display) { closed_ = false; - if (bump_priority && - notification_->priority() < message_center::HIGH_PRIORITY) { - notification_->set_priority(notification_->priority() + 1); - } NotificationDisplayServiceFactory::GetForProfile(profile())->Display( NotificationHandler::Type::TRANSIENT, *notification_); }
diff --git a/chrome/browser/download/notification/download_item_notification.h b/chrome/browser/download/notification/download_item_notification.h index c79abb8..447f9c0 100644 --- a/chrome/browser/download/notification/download_item_notification.h +++ b/chrome/browser/download/notification/download_item_notification.h
@@ -56,7 +56,7 @@ void CloseNotification(); void Update(); - void UpdateNotificationData(bool display, bool bump_priority); + void UpdateNotificationData(bool display, bool force_pop_up); SkColor GetNotificationIconColor(); // Set preview image of the notification. Must be called on IO thread.
diff --git a/chrome/browser/download/notification/download_notification_interactive_uitest.cc b/chrome/browser/download/notification/download_notification_interactive_uitest.cc index 7ab1562..a9b3c743 100644 --- a/chrome/browser/download/notification/download_notification_interactive_uitest.cc +++ b/chrome/browser/download/notification/download_notification_interactive_uitest.cc
@@ -572,12 +572,10 @@ EXPECT_FALSE(notification_id2.empty()); // Confirms that the old one is low priority, and the new one is default. - const int in_progress_priority1 = - GetNotification(notification_id1)->priority(); - const int in_progress_priority2 = - GetNotification(notification_id2)->priority(); - EXPECT_EQ(message_center::LOW_PRIORITY, in_progress_priority1); - EXPECT_EQ(message_center::DEFAULT_PRIORITY, in_progress_priority2); + EXPECT_EQ(message_center::LOW_PRIORITY, + GetNotification(notification_id1)->priority()); + EXPECT_EQ(message_center::DEFAULT_PRIORITY, + GetNotification(notification_id2)->priority()); // Confirms that the updates of both download are delivered to the // notifications. @@ -599,11 +597,15 @@ ASSERT_TRUE(GetNotification(notification_id1)); ASSERT_TRUE(GetNotification(notification_id2)); - // Confirms that both increase in priority when finished. - EXPECT_GT(GetNotification(notification_id1)->priority(), - in_progress_priority1); - EXPECT_GT(GetNotification(notification_id2)->priority(), - in_progress_priority2); + // Confirms that both ask to be re-shown when finished. + EXPECT_TRUE(GetNotification(notification_id1)->renotify()); + EXPECT_TRUE(GetNotification(notification_id2)->renotify()); + + // Confirms that both are default priority after finishing. + EXPECT_EQ(message_center::DEFAULT_PRIORITY, + GetNotification(notification_id1)->priority()); + EXPECT_EQ(message_center::DEFAULT_PRIORITY, + GetNotification(notification_id2)->priority()); // Confirms the types of download notifications are correct. EXPECT_EQ(message_center::NOTIFICATION_TYPE_BASE_FORMAT,
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn index 85aa64b..9d47c0b 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn
@@ -251,6 +251,8 @@ "api/media_galleries/blob_data_source_factory.h", "api/media_galleries/media_galleries_api.cc", "api/media_galleries/media_galleries_api.h", + "api/media_galleries/media_galleries_api_util.cc", + "api/media_galleries/media_galleries_api_util.h", "api/messaging/chrome_messaging_delegate.cc", "api/messaging/chrome_messaging_delegate.h", "api/messaging/incognito_connectability.cc", @@ -1020,12 +1022,14 @@ "api/messaging/native_message_process_host.h", "api/messaging/native_process_launcher.cc", "api/messaging/native_process_launcher.h", - "api/messaging/native_process_launcher_posix.cc", "api/messaging/native_process_launcher_win.cc", "chrome_kiosk_delegate.cc", "default_apps.cc", "default_apps.h", ] + if (is_posix) { + sources += [ "api/messaging/native_process_launcher_posix.cc" ] + } } if (use_x11) {
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index e642ef8..bbda385 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
@@ -552,7 +552,8 @@ if (!EditBookmarksEnabled()) return false; - if (GetViewType(GetSenderWebContents()) != VIEW_TYPE_TAB_CONTENTS) { + content::WebContents* web_contents = GetSenderWebContents(); + if (GetViewType(web_contents) != VIEW_TYPE_TAB_CONTENTS) { NOTREACHED(); return false; } @@ -566,9 +567,6 @@ if (!GetNodesFromVector(model, params->id_list, &nodes)) return false; - content::WebContents* web_contents = GetAssociatedWebContentsDeprecated(); - CHECK(web_contents); - ui::DragDropTypes::DragEventSource source = ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE; if (params->is_from_touch) @@ -594,7 +592,8 @@ if (!CanBeModified(drop_parent)) return false; - if (GetViewType(GetSenderWebContents()) != VIEW_TYPE_TAB_CONTENTS) { + content::WebContents* web_contents = GetSenderWebContents(); + if (GetViewType(web_contents) != VIEW_TYPE_TAB_CONTENTS) { NOTREACHED(); return false; } @@ -605,8 +604,6 @@ else drop_index = drop_parent->child_count(); - WebContents* web_contents = GetAssociatedWebContentsDeprecated(); - CHECK(web_contents); BookmarkManagerPrivateDragEventRouter* router = BookmarkManagerPrivateDragEventRouter::FromWebContents(web_contents);
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index bebf539..a3b5d74d 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
@@ -733,7 +733,7 @@ // either FileSelectionCanceled, MultiFilesSelected, or FileSelected AddRef(); - WebContents* web_contents = GetAssociatedWebContentsDeprecated(); + WebContents* web_contents = GetSenderWebContents(); select_file_dialog_ = ui::SelectFileDialog::Create( this, std::make_unique<ChromeSelectFilePolicy>(web_contents));
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc index d980c81c..75ffefb 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
@@ -48,6 +48,7 @@ #include "components/user_manager/user_manager.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/browser_context_keyed_api_factory.h" +#include "extensions/browser/view_type_utils.h" #include "ui/base/l10n/l10n_util.h" #include "ui/chromeos/devicetype_utils.h" #include "ui/gfx/geometry/rect.h" @@ -313,9 +314,10 @@ ExtensionFunction::ResponseAction EasyUnlockPrivateShowErrorBubbleFunction::Run() { - content::WebContents* web_contents = GetAssociatedWebContentsDeprecated(); - if (!web_contents) + content::WebContents* web_contents = GetSenderWebContents(); + if (!web_contents || GetViewType(web_contents) != VIEW_TYPE_APP_WINDOW) { return RespondNow(Error("A foreground app window is required.")); + } std::unique_ptr<easy_unlock_private::ShowErrorBubble::Params> params( easy_unlock_private::ShowErrorBubble::Params::Create(*args_));
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc index c78a9645..efe4a63 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
@@ -25,6 +25,7 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/media_galleries/blob_data_source_factory.h" +#include "chrome/browser/extensions/api/media_galleries/media_galleries_api_util.h" #include "chrome/browser/extensions/chrome_extension_function_details.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/media_galleries/gallery_watch_manager.h" @@ -691,7 +692,7 @@ void MediaGalleriesGetMetadataFunction::OnSafeMediaMetadataParserDone( std::unique_ptr<SafeMediaMetadataParser> parser_keep_alive, bool parse_success, - std::unique_ptr<base::DictionaryValue> metadata_dictionary, + chrome::mojom::MediaMetadataPtr metadata, std::unique_ptr<std::vector<metadata::AttachedImage>> attached_images) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -700,12 +701,13 @@ return; } - DCHECK(metadata_dictionary.get()); - DCHECK(attached_images.get()); + DCHECK(metadata); + DCHECK(attached_images); std::unique_ptr<base::DictionaryValue> result_dictionary( new base::DictionaryValue); - result_dictionary->Set(kMetadataKey, std::move(metadata_dictionary)); + result_dictionary->Set(kMetadataKey, + SerializeMediaMetadata(std::move(metadata))); if (attached_images->empty()) { SetResult(std::move(result_dictionary));
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.h b/chrome/browser/extensions/api/media_galleries/media_galleries_api.h index 003d607..ebe708a 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.h +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.h
@@ -22,6 +22,7 @@ #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/common/extensions/api/media_galleries.h" #include "chrome/common/media_galleries/metadata_types.h" +#include "chrome/services/media_gallery_util/public/mojom/media_parser.mojom.h" #include "components/storage_monitor/media_storage_util.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/event_router.h" @@ -181,7 +182,7 @@ void OnSafeMediaMetadataParserDone( std::unique_ptr<SafeMediaMetadataParser> parser_keep_alive, bool parse_success, - std::unique_ptr<base::DictionaryValue> result_dictionary, + chrome::mojom::MediaMetadataPtr metadata, std::unique_ptr<std::vector<metadata::AttachedImage>> attached_images); void ConstructNextBlob(
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api_util.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api_util.cc new file mode 100644 index 0000000..c0d399bb --- /dev/null +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api_util.cc
@@ -0,0 +1,62 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/extensions/api/media_galleries/media_galleries_api_util.h" + +#include "base/logging.h" +#include "chrome/common/extensions/api/media_galleries.h" + +namespace extensions { + +template <class T> +void SetValueScopedPtr(T value, std::unique_ptr<T>* destination) { + DCHECK(destination); + if (value >= 0) + destination->reset(new T(value)); +} + +template <> +void SetValueScopedPtr(std::string value, + std::unique_ptr<std::string>* destination) { + DCHECK(destination); + if (!value.empty()) + destination->reset(new std::string(std::move(value))); +} + +std::unique_ptr<base::DictionaryValue> SerializeMediaMetadata( + chrome::mojom::MediaMetadataPtr metadata) { + DCHECK(metadata); + extensions::api::media_galleries::MediaMetadata extension_metadata; + extension_metadata.mime_type = std::move(metadata->mime_type); + if (metadata->height >= 0 && metadata->width >= 0) { + extension_metadata.height.reset(new int(metadata->height)); + extension_metadata.width.reset(new int(metadata->width)); + } + + SetValueScopedPtr(metadata->duration, &extension_metadata.duration); + SetValueScopedPtr(std::move(metadata->artist), &extension_metadata.artist); + SetValueScopedPtr(std::move(metadata->album), &extension_metadata.album); + SetValueScopedPtr(std::move(metadata->comment), &extension_metadata.comment); + SetValueScopedPtr(std::move(metadata->copyright), + &extension_metadata.copyright); + SetValueScopedPtr(metadata->disc, &extension_metadata.disc); + SetValueScopedPtr(std::move(metadata->genre), &extension_metadata.genre); + SetValueScopedPtr(std::move(metadata->language), + &extension_metadata.language); + SetValueScopedPtr(metadata->rotation, &extension_metadata.rotation); + SetValueScopedPtr(std::move(metadata->title), &extension_metadata.title); + SetValueScopedPtr(metadata->track, &extension_metadata.track); + + for (const chrome::mojom::MediaStreamInfoPtr& info : metadata->raw_tags) { + extensions::api::media_galleries::StreamInfo stream_info; + stream_info.type = std::move(info->type); + stream_info.tags.additional_properties.Swap( + info->additional_properties.get()); + extension_metadata.raw_tags.push_back(std::move(stream_info)); + } + + return extension_metadata.ToValue(); +} + +} // namespace extensions
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api_util.h b/chrome/browser/extensions/api/media_galleries/media_galleries_api_util.h new file mode 100644 index 0000000..c768acde --- /dev/null +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api_util.h
@@ -0,0 +1,25 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_EXTENSIONS_API_MEDIA_GALLERIES_MEDIA_GALLERIES_API_UTIL_H_ +#define CHROME_BROWSER_EXTENSIONS_API_MEDIA_GALLERIES_MEDIA_GALLERIES_API_UTIL_H_ + +#include <memory> + +#include "chrome/services/media_gallery_util/public/mojom/media_parser.mojom.h" + +namespace base { +class DictionaryValue; +} // namespace base + +namespace extensions { + +// Converts a mojo media metadata struct into a dictionary. Internally uses +// extension's auto generated serializer. +std::unique_ptr<base::DictionaryValue> SerializeMediaMetadata( + chrome::mojom::MediaMetadataPtr metadata); + +} // namespace extensions + +#endif // CHROME_BROWSER_EXTENSIONS_API_MEDIA_GALLERIES_MEDIA_GALLERIES_API_UTIL_H_
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index 9a27512..0bd12656 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -640,11 +640,12 @@ // a tabbed window. if ((window_type == Browser::TYPE_POPUP && urls.empty()) || window_type == Browser::TYPE_TABBED) { - if (source_tab_strip) - contents = source_tab_strip->DetachWebContentsAt(tab_index); - if (contents) { + if (source_tab_strip) { + std::unique_ptr<content::WebContents> detached_tab = + source_tab_strip->DetachWebContentsAt(tab_index); + contents = detached_tab.get(); TabStripModel* target_tab_strip = new_window->tab_strip_model(); - target_tab_strip->InsertWebContentsAt(urls.size(), contents, + target_tab_strip->InsertWebContentsAt(urls.size(), detached_tab.release(), TabStripModel::ADD_NONE); } } @@ -1564,7 +1565,7 @@ if (ExtensionTabUtil::GetWindowId(target_browser) != ExtensionTabUtil::GetWindowId(source_browser)) { TabStripModel* target_tab_strip = target_browser->tab_strip_model(); - WebContents* web_contents = + std::unique_ptr<content::WebContents> web_contents = source_tab_strip->DetachWebContentsAt(tab_index); if (!web_contents) { *error = ErrorUtils::FormatErrorMessage(keys::kTabNotFoundError, @@ -1578,12 +1579,13 @@ if (*new_index > target_tab_strip->count() || *new_index < 0) *new_index = target_tab_strip->count(); - target_tab_strip->InsertWebContentsAt( - *new_index, web_contents, TabStripModel::ADD_NONE); + content::WebContents* web_contents_raw = web_contents.get(); + target_tab_strip->InsertWebContentsAt(*new_index, web_contents.release(), + TabStripModel::ADD_NONE); if (has_callback()) { tab_values->Append(ExtensionTabUtil::CreateTabObject( - web_contents, ExtensionTabUtil::kScrubTab, + web_contents_raw, ExtensionTabUtil::kScrubTab, extension(), target_tab_strip, *new_index) ->ToValue()); }
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 3d93611d..2b7b70a 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -8,6 +8,7 @@ #include <utility> #include <vector> +#include "base/base64.h" #include "base/bind.h" #include "base/lazy_instance.h" #include "base/macros.h" @@ -17,11 +18,14 @@ #include "base/values.h" #include "base/version.h" #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" +#include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager.h" +#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/ui/app_list/app_list_util.h" #include "chrome/common/extensions/extension_constants.h" @@ -44,6 +48,8 @@ #include "chrome/browser/supervised_user/supervised_user_service_factory.h" #endif +using safe_browsing::SafeBrowsingNavigationObserverManager; + namespace extensions { namespace BeginInstallWithManifest3 = @@ -60,6 +66,7 @@ namespace IsInIncognitoMode = api::webstore_private::IsInIncognitoMode; namespace LaunchEphemeralApp = api::webstore_private::LaunchEphemeralApp; namespace SetStoreLogin = api::webstore_private::SetStoreLogin; +namespace GetReferrerChain = api::webstore_private::GetReferrerChain; namespace { @@ -140,6 +147,9 @@ const char kEphemeralAppLaunchingNotSupported[] = "Ephemeral launching of apps is no longer supported."; +// The number of user gestures to trace back for the referrer chain. +const int kExtensionReferrerUserGestureLimit = 2; + WebstoreInstaller::Delegate* test_webstore_installer_delegate = nullptr; // We allow the web store to set a string containing login information when a @@ -657,4 +667,57 @@ return OneArgument(std::make_unique<base::Value>(result)); } +WebstorePrivateGetReferrerChainFunction:: + WebstorePrivateGetReferrerChainFunction() + : chrome_details_(this) {} + +WebstorePrivateGetReferrerChainFunction:: + ~WebstorePrivateGetReferrerChainFunction() {} + +ExtensionFunction::ResponseAction +WebstorePrivateGetReferrerChainFunction::Run() { + Profile* profile = chrome_details_.GetProfile(); + if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(profile)) + return RespondNow(ArgumentList(GetReferrerChain::Results::Create(""))); + + content::WebContents* web_contents = GetSenderWebContents(); + if (!web_contents) { + return RespondNow(ErrorWithArguments(GetReferrerChain::Results::Create(""), + kUserCancelledError)); + } + + scoped_refptr<SafeBrowsingNavigationObserverManager> + navigation_observer_manager = g_browser_process->safe_browsing_service() + ->navigation_observer_manager(); + + safe_browsing::ReferrerChain referrer_chain; + SafeBrowsingNavigationObserverManager::AttributionResult result = + navigation_observer_manager->IdentifyReferrerChainByWebContents( + web_contents, kExtensionReferrerUserGestureLimit, &referrer_chain); + + // If the referrer chain is incomplete we'll append the most recent + // navigations to referrer chain for diagnostic purposes. This only happens if + // the user is not in incognito mode and has opted into extended reporting or + // Scout reporting. Otherwise, |CountOfRecentNavigationsToAppend| returns 0. + int recent_navigations_to_collect = + SafeBrowsingNavigationObserverManager::CountOfRecentNavigationsToAppend( + *profile, result); + if (recent_navigations_to_collect > 0) { + navigation_observer_manager->AppendRecentNavigations( + recent_navigations_to_collect, &referrer_chain); + } + + safe_browsing::ExtensionWebStoreInstallRequest request; + request.mutable_referrer_chain()->Swap(&referrer_chain); + request.mutable_referrer_chain_options()->set_recent_navigations_to_collect( + recent_navigations_to_collect); + + std::string serialized_referrer_proto = request.SerializeAsString(); + // Base64 encode the proto to avoid issues with base::Value rejecting strings + // which are not valid UTF8. + base::Base64Encode(serialized_referrer_proto, &serialized_referrer_proto); + return RespondNow(ArgumentList( + GetReferrerChain::Results::Create(serialized_referrer_proto))); +} + } // namespace extensions
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h index 8af8ccc..c131838 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h
@@ -304,6 +304,25 @@ ChromeExtensionFunctionDetails chrome_details_; }; +class WebstorePrivateGetReferrerChainFunction + : public UIThreadExtensionFunction { + public: + DECLARE_EXTENSION_FUNCTION("webstorePrivate.getReferrerChain", + WEBSTOREPRIVATE_GETREFERRERCHAIN) + + WebstorePrivateGetReferrerChainFunction(); + + private: + ~WebstorePrivateGetReferrerChainFunction() override; + + // ExtensionFunction: + ExtensionFunction::ResponseAction Run() override; + + ChromeExtensionFunctionDetails chrome_details_; + + DISALLOW_COPY_AND_ASSIGN(WebstorePrivateGetReferrerChainFunction); +}; + } // namespace extensions #endif // CHROME_BROWSER_EXTENSIONS_API_WEBSTORE_PRIVATE_WEBSTORE_PRIVATE_API_H_
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc index f33655ac..38d6b03 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
@@ -432,4 +432,50 @@ RunTest(webgl_allowed); } +class ExtensionWebstorePrivateGetReferrerChainApiTest + : public ExtensionWebstorePrivateApiTest { + public: + void SetUpOnMainThread() override { + host_resolver()->AddRule("redirect1.com", "127.0.0.1"); + host_resolver()->AddRule("redirect2.com", "127.0.0.1"); + + ExtensionWebstorePrivateApiTest::SetUpOnMainThread(); + } + + GURL GetTestServerURLWithReferrers(const std::string& path) { + // Hand craft a url that will cause the test server to issue redirects. + const std::vector<std::string> redirects = {"redirect1.com", + "redirect2.com"}; + net::HostPortPair host_port = embedded_test_server()->host_port_pair(); + std::string redirect_chain; + for (const auto& redirect : redirects) { + std::string redirect_url = base::StringPrintf( + "http://%s:%d/server-redirect?", redirect.c_str(), host_port.port()); + redirect_chain += redirect_url; + } + + return GURL(redirect_chain + GetTestServerURL(path).spec()); + } +}; + +// Tests that the GetReferrerChain API returns the redirect information. +IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, + GetReferrerChain) { + GURL page_url = GetTestServerURLWithReferrers("referrer_chain.html"); + ASSERT_TRUE(RunPageTest(page_url.spec())); +} + +// Tests that the GetReferrerChain API returns an empty string for profiles +// opted out of SafeBrowsing. +IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, + GetReferrerChainForNonSafeBrowsingUser) { + PrefService* pref_service = browser()->profile()->GetPrefs(); + EXPECT_TRUE(pref_service->GetBoolean(prefs::kSafeBrowsingEnabled)); + // Disable SafeBrowsing. + pref_service->SetBoolean(prefs::kSafeBrowsingEnabled, false); + + GURL page_url = GetTestServerURLWithReferrers("empty_referrer_chain.html"); + ASSERT_TRUE(RunPageTest(page_url.spec())); +} + } // namespace extensions
diff --git a/chrome/browser/extensions/bookmark_app_navigation_throttle_utils.cc b/chrome/browser/extensions/bookmark_app_navigation_throttle_utils.cc index 94ee3ff..ee5388e 100644 --- a/chrome/browser/extensions/bookmark_app_navigation_throttle_utils.cc +++ b/chrome/browser/extensions/bookmark_app_navigation_throttle_utils.cc
@@ -126,7 +126,8 @@ Browser* popup_browser = new Browser(browser_params); TabStripModel* source_tabstrip = source_browser->tab_strip_model(); popup_browser->tab_strip_model()->AppendWebContents( - source_tabstrip->DetachWebContentsAt(source_tabstrip->active_index()), + source_tabstrip->DetachWebContentsAt(source_tabstrip->active_index()) + .release(), true /* foreground */); popup_browser->window()->Show(); }
diff --git a/chrome/browser/extensions/chromeos_component_extensions_browsertest.cc b/chrome/browser/extensions/chromeos_component_extensions_browsertest.cc new file mode 100644 index 0000000..4d5dd2f --- /dev/null +++ b/chrome/browser/extensions/chromeos_component_extensions_browsertest.cc
@@ -0,0 +1,22 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/extensions/extension_browsertest.h" +#include "extensions/browser/extension_registry.h" + +namespace extensions { + +using ComponentExtensionsTest = ExtensionBrowserTest; + +// Tests that the mobile_app component extension loads. It would be nice to get +// rid of this (see https://crbug.com/835391), but for now let's at least make +// sure it is added correctly. +IN_PROC_BROWSER_TEST_F(ComponentExtensionsTest, LoadsMobileAppExtension) { + constexpr char kMobileActivationExtensionId[] = + "iadeocfgjdjdmpenejdbfeaocpbikmab"; + EXPECT_TRUE(ExtensionRegistry::Get(profile())->enabled_extensions().Contains( + kMobileActivationExtensionId)); +} + +} // namespace extensions
diff --git a/chrome/browser/extensions/data_deleter.cc b/chrome/browser/extensions/data_deleter.cc index d0bccaf..1b28802 100644 --- a/chrome/browser/extensions/data_deleter.cc +++ b/chrome/browser/extensions/data_deleter.cc
@@ -35,19 +35,14 @@ namespace { -bool DoesCookieMatchHost(const std::string& host, - const net::CanonicalCookie& cookie) { - return cookie.IsHostCookie() && cookie.IsDomainMatch(host); -} - void ClearCookiesOnIOThread(scoped_refptr<net::URLRequestContextGetter> context, const GURL& origin) { net::CookieStore* cookie_store = context->GetURLRequestContext()->cookie_store(); - cookie_store->DeleteAllCreatedBetweenWithPredicateAsync( - base::Time(), base::Time::Max(), - base::BindRepeating(&DoesCookieMatchHost, origin.host()), - net::CookieStore::DeleteCallback()); + net::CookieStore::CookieDeletionInfo delete_info; + delete_info.host = origin.host(); + cookie_store->DeleteAllMatchingInfoAsync(std::move(delete_info), + net::CookieStore::DeleteCallback()); } // Helper function that deletes data of a given |storage_origin| in a given
diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc index e46ff5b3..8249cffa 100644 --- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc +++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
@@ -8,8 +8,6 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/chrome_switches.h" -#include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/navigation_handle.h" #include "content/public/browser/notification_service.h" @@ -17,19 +15,12 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/test/browser_test_utils.h" -#include "extensions/common/switches.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" class ExtensionResourceRequestPolicyTest : public ExtensionApiTest { protected: - void SetUpCommandLine(base::CommandLine* command_line) override { - ExtensionApiTest::SetUpCommandLine(command_line); - command_line->AppendSwitch( - extensions::switches::kAllowLegacyExtensionManifests); - } - void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); host_resolver()->AddRule("*", "127.0.0.1");
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index a62f30b..06bdc647 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -59,6 +59,29 @@ const char kAutofillDynamicFormsDescription[] = "Allows autofill to fill dynamically changing forms"; +const char kAutofillEnforceMinRequiredFieldsForHeuristicsName[] = + "Autofill Enforce Min Required Fields For Heuristics"; +const char kAutofillEnforceMinRequiredFieldsForHeuristicsDescription[] = + "When enabled, autofill will generally require a form to have at least 3 " + "fields before allowing heuristic field-type prediction to occur."; + +const char kAutofillEnforceMinRequiredFieldsForQueryName[] = + "Autofill Enforce Min Required Fields For Query"; +const char kAutofillEnforceMinRequiredFieldsForQueryDescription[] = + "When enabled, autofill will generally require a form to have at least 3 " + "fields before querying the autofill server for field-type predictions."; + +const char kAutofillEnforceMinRequiredFieldsForUploadName[] = + "Autofill Enforce Min Required Fields For Upload"; +const char kAutofillEnforceMinRequiredFieldsForUploadDescription[] = + "When enabled, autofill will generally require a form to have at least 3 " + "fillable fields before uploading field-type votes for that form."; + +const char kAutofillRestrictUnownedFieldsToFormlessCheckoutName[] = + "Restrict formless form extraction"; +const char kAutofillRestrictUnownedFieldsToFormlessCheckoutDescription[] = + "Restrict extraction of formless forms to checkout flows"; + const char kAutoplayPolicyName[] = "Autoplay policy"; const char kAutoplayPolicyDescription[] = "Policy used when deciding if audio or video is allowed to autoplay."; @@ -1084,10 +1107,6 @@ "In the omnibox dropdown, shows titles before URLs when both are " "available."; -const char kOmniboxUIVerticalLayoutName[] = "Omnibox UI Vertical Layout"; -const char kOmniboxUIVerticalLayoutDescription[] = - "Displays Omnibox sugestions in 2 lines - title over origin."; - const char kOmniboxUIVerticalMarginName[] = "Omnibox UI Vertical Margin"; const char kOmniboxUIVerticalMarginDescription[] = "Changes the vertical margin in the Omnibox UI.";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h index 731d442..01c1c67 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -67,6 +67,17 @@ extern const char kAutofillDynamicFormsName[]; extern const char kAutofillDynamicFormsDescription[]; +// Enforcing restrictions to enable/disable autofill small form support. +extern const char kAutofillEnforceMinRequiredFieldsForHeuristicsName[]; +extern const char kAutofillEnforceMinRequiredFieldsForHeuristicsDescription[]; +extern const char kAutofillEnforceMinRequiredFieldsForQueryName[]; +extern const char kAutofillEnforceMinRequiredFieldsForQueryDescription[]; +extern const char kAutofillEnforceMinRequiredFieldsForUploadName[]; +extern const char kAutofillEnforceMinRequiredFieldsForUploadDescription[]; + +extern const char kAutofillRestrictUnownedFieldsToFormlessCheckoutName[]; +extern const char kAutofillRestrictUnownedFieldsToFormlessCheckoutDescription[]; + extern const char kAutoplayPolicyName[]; extern const char kAutoplayPolicyDescription[]; @@ -682,9 +693,6 @@ extern const char kOmniboxUISwapTitleAndUrlName[]; extern const char kOmniboxUISwapTitleAndUrlDescription[]; -extern const char kOmniboxUIVerticalLayoutName[]; -extern const char kOmniboxUIVerticalLayoutDescription[]; - extern const char kOmniboxUIVerticalMarginName[]; extern const char kOmniboxUIVerticalMarginDescription[];
diff --git a/chrome/browser/installable/installable_ambient_badge_infobar_delegate.cc b/chrome/browser/installable/installable_ambient_badge_infobar_delegate.cc index 31f8eb2f..6ac29f14 100644 --- a/chrome/browser/installable/installable_ambient_badge_infobar_delegate.cc +++ b/chrome/browser/installable/installable_ambient_badge_infobar_delegate.cc
@@ -20,14 +20,12 @@ base::WeakPtr<Client> weak_client, const base::string16& app_name, const SkBitmap& primary_icon, - const GURL& start_url, - bool is_installed) { + const GURL& start_url) { InfoBarService::FromWebContents(web_contents) ->AddInfoBar(std::make_unique<InstallableAmbientBadgeInfoBar>( std::unique_ptr<InstallableAmbientBadgeInfoBarDelegate>( new InstallableAmbientBadgeInfoBarDelegate( - weak_client, app_name, primary_icon, start_url, - is_installed)))); + weak_client, app_name, primary_icon, start_url)))); } void InstallableAmbientBadgeInfoBarDelegate::AddToHomescreen() { @@ -39,9 +37,7 @@ const base::string16 InstallableAmbientBadgeInfoBarDelegate::GetMessageText() const { - return l10n_util::GetStringFUTF16( - is_installed_ ? IDS_AMBIENT_BADGE_OPEN : IDS_AMBIENT_BADGE_INSTALL, - app_name_); + return l10n_util::GetStringFUTF16(IDS_AMBIENT_BADGE_INSTALL, app_name_); } const SkBitmap& InstallableAmbientBadgeInfoBarDelegate::GetPrimaryIcon() const { @@ -52,14 +48,12 @@ base::WeakPtr<Client> weak_client, const base::string16& app_name, const SkBitmap& primary_icon, - const GURL& start_url, - bool is_installed) + const GURL& start_url) : infobars::InfoBarDelegate(), weak_client_(weak_client), app_name_(app_name), primary_icon_(primary_icon), - start_url_(start_url), - is_installed_(is_installed) {} + start_url_(start_url) {} infobars::InfoBarDelegate::InfoBarIdentifier InstallableAmbientBadgeInfoBarDelegate::GetIdentifier() const {
diff --git a/chrome/browser/installable/installable_ambient_badge_infobar_delegate.h b/chrome/browser/installable/installable_ambient_badge_infobar_delegate.h index 683bc88..bf9f45f 100644 --- a/chrome/browser/installable/installable_ambient_badge_infobar_delegate.h +++ b/chrome/browser/installable/installable_ambient_badge_infobar_delegate.h
@@ -36,21 +36,18 @@ base::WeakPtr<Client> weak_client, const base::string16& app_name, const SkBitmap& primary_icon, - const GURL& start_url, - bool is_installed); + const GURL& start_url); void AddToHomescreen(); const base::string16 GetMessageText() const; const SkBitmap& GetPrimaryIcon() const; const GURL& GetUrl() const { return start_url_; } - bool is_installed() const { return is_installed_; } private: InstallableAmbientBadgeInfoBarDelegate(base::WeakPtr<Client> weak_client, const base::string16& app_name, const SkBitmap& primary_icon, - const GURL& start_url, - bool is_installed); + const GURL& start_url); // InfoBarDelegate overrides: infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override; @@ -60,9 +57,6 @@ const SkBitmap primary_icon_; const GURL& start_url_; - // Whether the current site is already installed. - bool is_installed_; - DISALLOW_COPY_AND_ASSIGN(InstallableAmbientBadgeInfoBarDelegate); };
diff --git a/chrome/browser/media/DEPS b/chrome/browser/media/DEPS index 2c463fe8..612fdac 100644 --- a/chrome/browser/media/DEPS +++ b/chrome/browser/media/DEPS
@@ -2,6 +2,7 @@ "+media/audio", "+media/base", "+media/cast", + "+media/cdm/supported_cdm_versions.h", "+media/media_buildflags.h", "+media/mojo/interfaces", # safe_dial_device_description_parser_unittest.cc needs DataDecoderService.
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc index d9cd07d..7b97a96 100644 --- a/chrome/browser/media/encrypted_media_browsertest.cc +++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -28,6 +28,7 @@ #include "content/public/test/browser_test_utils.h" #include "media/base/key_system_names.h" #include "media/base/media_switches.h" +#include "media/cdm/supported_cdm_versions.h" #include "media/media_buildflags.h" #include "testing/gtest/include/gtest/gtest-spi.h" @@ -291,7 +292,6 @@ #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) void SetUpCommandLineForKeySystem(const std::string& key_system, - bool support_experimental_cdm_interface, base::CommandLine* command_line) { if (GetServerConfig(key_system)) // Since the web and license servers listen on different ports, we need to @@ -304,8 +304,6 @@ RegisterClearKeyCdm(command_line); std::vector<base::Feature> enabled_features = { media::kExternalClearKeyForTesting}; - if (support_experimental_cdm_interface) - enabled_features.push_back(media::kSupportExperimentalCdmInterface); scoped_feature_list_.InitWithFeatures(enabled_features, {}); } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) @@ -315,10 +313,14 @@ }; #if BUILDFLAG(ENABLE_LIBRARY_CDMS) -// Tests encrypted media playback using ExternalClearKey key system in -// decrypt-and-decode mode. -class ECKEncryptedMediaTest : public EncryptedMediaTestBase { +// Tests encrypted media playback using ExternalClearKey key system with a +// specific library CDM interface version as test parameter: +// - int: CDM interface version to test +class ECKEncryptedMediaTest : public EncryptedMediaTestBase, + public testing::WithParamInterface<int> { public: + int GetCdmInterfaceVersion() { return GetParam(); } + // We use special |key_system| names to do non-playback related tests, // e.g. kExternalClearKeyFileIOTestKeySystem is used to test file IO. void TestNonPlaybackCases(const std::string& key_system, @@ -343,42 +345,6 @@ expected_title); } - protected: - void SetUpCommandLine(base::CommandLine* command_line) override { - EncryptedMediaTestBase::SetUpCommandLine(command_line); - SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, false, - command_line); - } -}; - -// Tests encrypted media playback using experimental CDM interface. Note that -// experimental CDM interface is only supported by ExternalClearKey key system. -class EncryptedMediaTestExperimentalCdmInterface - : public EncryptedMediaTestBase { - public: - // We use special |key_system| names to do non-playback related tests, - // e.g. kExternalClearKeyFileIOTestKeySystem is used to test file IO. - // TODO(xhwang): Deduplicate EncryptedMediaTestExperimentalCdmInterface and - // ECKEncryptedMediaTest. - void TestNonPlaybackCases(const std::string& key_system, - const std::string& expected_title) { - // Since we do not test playback, arbitrarily choose a test file and source - // type. - RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm", - kWebMVorbisAudioOnly, key_system, SrcType::SRC, - kNoSessionToLoad, false, PlayCount::ONCE, - expected_title); - } - - void TestPlaybackCase(const std::string& key_system, - const std::string& session_to_load, - const std::string& expected_title) { - RunEncryptedMediaTest(kDefaultEmePlayer, "bear-320x240-v_enc-v.webm", - kWebMVP8VideoOnly, key_system, SrcType::MSE, - session_to_load, false, PlayCount::ONCE, - expected_title); - } - #if BUILDFLAG(USE_PROPRIETARY_CODECS) void TestMP4EncryptionPlayback(const std::string& key_system, const std::string& media_file, @@ -393,8 +359,11 @@ protected: void SetUpCommandLine(base::CommandLine* command_line) override { EncryptedMediaTestBase::SetUpCommandLine(command_line); - SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, true, - command_line); + SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line); + // Override enabled CDM interface version for testing. + command_line->AppendSwitchASCII( + switches::kOverrideEnabledCdmInterfaceVersion, + base::IntToString(GetCdmInterfaceVersion())); } }; @@ -404,9 +373,11 @@ // - char*: Key system name. // - SrcType: Use MSE or SRC. // -// Note: Only parameterized (*_P) tests can be used. Non-parameterized (*_F) -// tests will crash at GetParam(). To add non-parameterized tests, use -// EncryptedMediaTestBase or one of its subclasses (e.g. WVEncryptedMediaTest). +// Note: +// 1. Only parameterized (*_P) tests can be used. Non-parameterized (*_F) +// tests will crash at GetParam(). +// 2. For key systems backed by library CDMs, the latest CDM interface version +// supported by both the CDM and Chromium will be used. class EncryptedMediaTest : public EncryptedMediaTestBase, public testing::WithParamInterface<std::tuple<const char*, SrcType>> { @@ -515,7 +486,7 @@ protected: void SetUpCommandLine(base::CommandLine* command_line) override { EncryptedMediaTestBase::SetUpCommandLine(command_line); - SetUpCommandLineForKeySystem(CurrentKeySystem(), false, command_line); + SetUpCommandLineForKeySystem(CurrentKeySystem(), command_line); } }; @@ -720,7 +691,14 @@ #if BUILDFLAG(ENABLE_LIBRARY_CDMS) -IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, InitializeCDMFail) { +// Test both CDM_9 and CDM_10. +static_assert(media::CheckSupportedCdmInterfaceVersions(9, 11), + "Mismatch between implementation and test coverage"); +INSTANTIATE_TEST_CASE_P(CDM_9, ECKEncryptedMediaTest, Values(9)); +INSTANTIATE_TEST_CASE_P(CDM_10, ECKEncryptedMediaTest, Values(10)); +INSTANTIATE_TEST_CASE_P(CDM_11, ECKEncryptedMediaTest, Values(11)); + +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, InitializeCDMFail) { TestNonPlaybackCases(kExternalClearKeyInitializeFailKeySystem, kEmeNotSupportedError); } @@ -728,24 +706,24 @@ // When CDM crashes, we should still get a decode error and all sessions should // be closed. // Flaky: crbug.com/832800 -IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, DISABLED_CDMCrashDuringDecode) { +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, DISABLED_CDMCrashDuringDecode) { IgnorePluginCrash(); TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kEmeSessionClosedAndError); } -IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, FileIOTest) { +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, FileIOTest) { TestNonPlaybackCases(kExternalClearKeyFileIOTestKeySystem, kUnitTestSuccess); } // TODO(xhwang): Investigate how to fake capturing activities to test the // network link detection logic in OutputProtectionProxy. -IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, OutputProtectionTest) { +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, OutputProtectionTest) { TestNonPlaybackCases(kExternalClearKeyOutputProtectionTestKeySystem, kUnitTestSuccess); } -IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, PlatformVerificationTest) { +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, PlatformVerificationTest) { TestNonPlaybackCases(kExternalClearKeyPlatformVerificationTestKeySystem, kUnitTestSuccess); } @@ -756,26 +734,27 @@ #else #define MAYBE_MessageTypeTest MessageTypeTest #endif -IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, MAYBE_MessageTypeTest) { +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, MAYBE_MessageTypeTest) { TestPlaybackCase(kExternalClearKeyMessageTypeTestKeySystem, kNoSessionToLoad, media::kEnded); - // Check whether all 2 expected message types are received ('license-request' - // and 'license-renewal'). int num_received_message_types = 0; EXPECT_TRUE(content::ExecuteScriptAndExtractInt( browser()->tab_strip_model()->GetActiveWebContents(), "window.domAutomationController.send(" "document.querySelector('video').receivedMessageTypes.size);", &num_received_message_types)); - EXPECT_EQ(2, num_received_message_types); + + // CDM_9: expects 2 message types 'license-request' and 'license-renewal'. + // CDM_10 and above: one more message type 'individualization-request'. + EXPECT_EQ(GetCdmInterfaceVersion() == 9 ? 2 : 3, num_received_message_types); } -IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) { +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, LoadLoadableSession) { TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, media::kEnded); } -IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) { +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, LoadUnknownSession) { TestPlaybackCase(kExternalClearKeyKeySystem, kUnknownSession, kEmeSessionNotFound); } @@ -783,87 +762,72 @@ const char kExternalClearKeyDecryptOnlyKeySystem[] = "org.chromium.externalclearkey.decryptonly"; -IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, DecryptOnly_VideoAudio_WebM) { +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, DecryptOnly_VideoAudio_WebM) { RunSimpleEncryptedMediaTest( "bear-320x240-av_enc-av.webm", kWebMVorbisAudioVP8Video, kExternalClearKeyDecryptOnlyKeySystem, SrcType::MSE); } #if BUILDFLAG(USE_PROPRIETARY_CODECS) -IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, DecryptOnly_VideoOnly_MP4_VP9) { + +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, DecryptOnly_VideoOnly_MP4_VP9) { RunSimpleEncryptedMediaTest( "bear-320x240-v_frag-vp9-cenc.mp4", kMP4VideoVp9Only, kExternalClearKeyDecryptOnlyKeySystem, SrcType::MSE); } + +// Encryption Scheme tests. ClearKey key system is covered in +// content/browser/media/encrypted_media_browsertest.cc. +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, Playback_Encryption_CENC) { + TestMP4EncryptionPlayback(kExternalClearKeyKeySystem, + "bear-640x360-v_frag-cenc.mp4", media::kEnded); +} + +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, Playback_Encryption_CBC1) { + TestMP4EncryptionPlayback(kExternalClearKeyKeySystem, + "bear-640x360-v_frag-cbc1.mp4", media::kError); +} + +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, Playback_Encryption_CENS) { + TestMP4EncryptionPlayback(kExternalClearKeyKeySystem, + "bear-640x360-v_frag-cens.mp4", media::kError); +} + +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, Playback_Encryption_CBCS) { + TestMP4EncryptionPlayback(kExternalClearKeyKeySystem, + "bear-640x360-v_frag-cbcs.mp4", media::kError); +} + #endif // BUILDFLAG(USE_PROPRIETARY_CODECS) #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) -IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyCdmHostTest) { +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, VerifyCdmHostTest) { TestNonPlaybackCases(kExternalClearKeyVerifyCdmHostTestKeySystem, kUnitTestSuccess); } #endif // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) -IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, StorageIdTest) { +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, StorageIdTest) { TestNonPlaybackCases(kExternalClearKeyStorageIdTestKeySystem, kUnitTestSuccess); } -IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, MultipleCdmTypes) { +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, MultipleCdmTypes) { base::StringPairs empty_query_params; RunMediaTestPage("multiple_cdm_types.html", empty_query_params, media::kEnded, true); } -// Tests using experimental CDM interface. +// Tests that only works on newer CDM interfaces. -IN_PROC_BROWSER_TEST_F(EncryptedMediaTestExperimentalCdmInterface, CdmProxy) { +IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, CdmProxy) { + if (GetCdmInterfaceVersion() < 11) { + DVLOG(0) << "Skipping test; CdmProxy only supported on CDM_11 and above."; + return; + } + TestNonPlaybackCases(kExternalClearKeyCdmProxyTestKeySystem, kUnitTestSuccess); } -IN_PROC_BROWSER_TEST_F(EncryptedMediaTestExperimentalCdmInterface, - MessageTypeTest) { - TestPlaybackCase(kExternalClearKeyMessageTypeTestKeySystem, kNoSessionToLoad, - media::kEnded); - - // Check whether all 3 expected message types are received ('license-request', - // 'license-renewal' and 'individualization-request'). - int num_received_message_types = 0; - EXPECT_TRUE(content::ExecuteScriptAndExtractInt( - browser()->tab_strip_model()->GetActiveWebContents(), - "window.domAutomationController.send(" - "document.querySelector('video').receivedMessageTypes.size);", - &num_received_message_types)); - EXPECT_EQ(3, num_received_message_types); -} - -#if BUILDFLAG(USE_PROPRIETARY_CODECS) -// ClearKey key system is covered in -// content/browser/media/encrypted_media_browsertest.cc. -IN_PROC_BROWSER_TEST_F(EncryptedMediaTestExperimentalCdmInterface, - Playback_Encryption_CENC) { - TestMP4EncryptionPlayback(kExternalClearKeyKeySystem, - "bear-640x360-v_frag-cenc.mp4", media::kEnded); -} - -IN_PROC_BROWSER_TEST_F(EncryptedMediaTestExperimentalCdmInterface, - Playback_Encryption_CBC1) { - TestMP4EncryptionPlayback(kExternalClearKeyKeySystem, - "bear-640x360-v_frag-cbc1.mp4", media::kError); -} - -IN_PROC_BROWSER_TEST_F(EncryptedMediaTestExperimentalCdmInterface, - Playback_Encryption_CENS) { - TestMP4EncryptionPlayback(kExternalClearKeyKeySystem, - "bear-640x360-v_frag-cens.mp4", media::kError); -} - -IN_PROC_BROWSER_TEST_F(EncryptedMediaTestExperimentalCdmInterface, - Playback_Encryption_CBCS) { - TestMP4EncryptionPlayback(kExternalClearKeyKeySystem, - "bear-640x360-v_frag-cbcs.mp4", media::kError); -} -#endif // BUILDFLAG(USE_PROPRIETARY_CODECS) - #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
diff --git a/chrome/browser/media/router/discovery/BUILD.gn b/chrome/browser/media/router/discovery/BUILD.gn index 129a822..83ead68 100644 --- a/chrome/browser/media/router/discovery/BUILD.gn +++ b/chrome/browser/media/router/discovery/BUILD.gn
@@ -64,7 +64,6 @@ "discovery_network_info.cc", "discovery_network_info.h", "discovery_network_list.h", - "discovery_network_list_posix.cc", "discovery_network_list_wifi.h", "discovery_network_list_wifi_linux.cc", "discovery_network_list_wifi_mac.mm", @@ -76,6 +75,9 @@ "discovery_network_monitor_metrics.cc", "discovery_network_monitor_metrics.h", ] + if (is_posix) { + sources += [ "discovery_network_list_posix.cc" ] + } } if (is_mac) {
diff --git a/chrome/browser/media/webrtc/tab_desktop_media_list_unittest.cc b/chrome/browser/media/webrtc/tab_desktop_media_list_unittest.cc index b1cfa3d..e31c492 100644 --- a/chrome/browser/media/webrtc/tab_desktop_media_list_unittest.cc +++ b/chrome/browser/media/webrtc/tab_desktop_media_list_unittest.cc
@@ -270,7 +270,7 @@ TabStripModel* tab_strip_model = browser_->tab_strip_model(); ASSERT_TRUE(tab_strip_model); - tab_strip_model->DetachWebContentsAt(kDefaultSourceCount - 1); + tab_strip_model->DetachWebContentsAt(kDefaultSourceCount - 1).release(); EXPECT_CALL(observer_, OnSourceRemoved(list_.get(), 0)) .WillOnce(
diff --git a/chrome/browser/ntp_snippets/content_suggestions_service_factory.cc b/chrome/browser/ntp_snippets/content_suggestions_service_factory.cc index 2f04e54..4b5dc58e 100644 --- a/chrome/browser/ntp_snippets/content_suggestions_service_factory.cc +++ b/chrome/browser/ntp_snippets/content_suggestions_service_factory.cc
@@ -75,8 +75,6 @@ #include "components/ntp_snippets/breaking_news/breaking_news_gcm_app_handler.h" #include "components/ntp_snippets/breaking_news/subscription_manager.h" #include "components/ntp_snippets/breaking_news/subscription_manager_impl.h" -#include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.h" -#include "components/physical_web/data_source/physical_web_data_source.h" #endif #if BUILDFLAG(ENABLE_OFFLINE_PAGES) @@ -109,7 +107,6 @@ using ntp_snippets::IsBookmarkProviderEnabled; using ntp_snippets::IsDownloadsProviderEnabled; using ntp_snippets::IsForeignSessionsProviderEnabled; -using ntp_snippets::IsPhysicalWebPageProviderEnabled; using ntp_snippets::IsRecentTabProviderEnabled; using ntp_snippets::PersistentScheduler; using ntp_snippets::PrefetchedPagesTracker; @@ -129,9 +126,7 @@ using ntp_snippets::BreakingNewsGCMAppHandler; using ntp_snippets::GetPushUpdatesSubscriptionEndpoint; using ntp_snippets::GetPushUpdatesUnsubscriptionEndpoint; -using ntp_snippets::PhysicalWebPageSuggestionsProvider; using ntp_snippets::SubscriptionManagerImpl; -using physical_web::PhysicalWebDataSource; #endif // OS_ANDROID #if BUILDFLAG(ENABLE_OFFLINE_PAGES) @@ -230,24 +225,6 @@ #if defined(OS_ANDROID) -void RegisterPhysicalWebPageProviderIfEnabled( - ContentSuggestionsService* service, - Profile* profile) { - if (!IsPhysicalWebPageProviderEnabled()) { - return; - } - - PhysicalWebDataSource* physical_web_data_source = - g_browser_process->GetPhysicalWebDataSource(); - auto provider = std::make_unique<PhysicalWebPageSuggestionsProvider>( - service, physical_web_data_source, profile->GetPrefs()); - service->RegisterProvider(std::move(provider)); -} - -#endif // OS_ANDROID - -#if defined(OS_ANDROID) - bool AreGCMPushUpdatesEnabled() { return base::FeatureList::IsEnabled(ntp_snippets::kBreakingNewsPushFeature); } @@ -517,7 +494,6 @@ #if defined(OS_ANDROID) RegisterDownloadsProviderIfEnabled(service, profile, offline_page_model); - RegisterPhysicalWebPageProviderIfEnabled(service, profile); #endif // OS_ANDROID #if BUILDFLAG(ENABLE_OFFLINE_PAGES)
diff --git a/chrome/browser/ntp_snippets/dependent_features.cc b/chrome/browser/ntp_snippets/dependent_features.cc index 130bca8..a0ca616 100644 --- a/chrome/browser/ntp_snippets/dependent_features.cc +++ b/chrome/browser/ntp_snippets/dependent_features.cc
@@ -16,18 +16,6 @@ namespace ntp_snippets { -namespace { - -bool IsPhysicalWebEnabled() { -#if defined(OS_ANDROID) - return base::FeatureList::IsEnabled(chrome::android::kPhysicalWebFeature); -#else - return false; -#endif // OS_ANDROID -} - -} // namespace - // All platforms proxy for whether NTP shortcuts are enabled. bool AreNtpShortcutsEnabled() { #if defined(OS_ANDROID) @@ -66,13 +54,6 @@ offline_pages::kOffliningRecentPagesFeature); } -bool IsPhysicalWebPageProviderEnabled() { - return !AreNtpShortcutsEnabled() && - base::FeatureList::IsEnabled( - ntp_snippets::kPhysicalWebPageSuggestionsFeature) && - IsPhysicalWebEnabled(); -} - bool IsForeignSessionsProviderEnabled() { return !AreNtpShortcutsEnabled() && base::FeatureList::IsEnabled(
diff --git a/chrome/browser/permissions/permission_request_manager_browsertest.cc b/chrome/browser/permissions/permission_request_manager_browsertest.cc index 1f29b96..6fab040 100644 --- a/chrome/browser/permissions/permission_request_manager_browsertest.cc +++ b/chrome/browser/permissions/permission_request_manager_browsertest.cc
@@ -481,14 +481,14 @@ // detachTabsToNewWindow:..]. std::vector<TabStripModelDelegate::NewStripContents> contentses(1); contentses.back().web_contents = strip->GetWebContentsAt(0); - strip->DetachWebContentsAt(0); + strip->DetachWebContentsAt(0).release(); Browser* dragging_browser = strip->delegate()->CreateNewStripWithContents( contentses, gfx::Rect(100, 100, 640, 480), false); // Attach the tab back to the original window. E.g. See steps in // [BrowserWindowController moveTabViews:..]. TabStripModel* drag_strip = dragging_browser->tab_strip_model(); - drag_strip->DetachWebContentsAt(0); + drag_strip->DetachWebContentsAt(0).release(); strip->InsertWebContentsAt(0, contentses.back().web_contents, TabStripModel::ADD_ACTIVE);
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 799e44c..499c442 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc
@@ -184,7 +184,6 @@ #include "components/ntp_snippets/breaking_news/subscription_manager_impl.h" #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h" #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider.h" -#include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.h" #include "components/ntp_tiles/popular_sites_impl.h" #else #include "chrome/browser/gcm/gcm_product_util.h" @@ -303,6 +302,9 @@ "user_experience_metrics.stability.launched_activity_counts"; const char kStabilityCrashedActivityCounts[] = "user_experience_metrics.stability.crashed_activity_counts"; +// Deprecated 4/2018. +const char kDismissedPhysicalWebPageSuggestions[] = + "ntp_suggestions.physical_web.dismissed_ids"; #else // Deprecated 1/2018. const char kShowFirstRunBubbleOption[] = "show-first-run-bubble-option"; @@ -325,6 +327,10 @@ #if defined(OS_CHROMEOS) registry->RegisterBooleanPref(kTouchHudProjectionEnabled, false); #endif + +#if defined(OS_ANDROID) + registry->RegisterListPref(kDismissedPhysicalWebPageSuggestions); +#endif } } // namespace @@ -586,8 +592,6 @@ DownloadSuggestionsProvider::RegisterProfilePrefs(registry); ntp_snippets::BreakingNewsGCMAppHandler::RegisterProfilePrefs(registry); ntp_snippets::ClickBasedCategoryRanker::RegisterProfilePrefs(registry); - ntp_snippets::PhysicalWebPageSuggestionsProvider::RegisterProfilePrefs( - registry); ntp_snippets::RecentTabSuggestionsProvider::RegisterProfilePrefs(registry); ntp_snippets::SubscriptionManagerImpl::RegisterProfilePrefs(registry); OomInterventionDecider::RegisterProfilePrefs(registry); @@ -715,4 +719,9 @@ // Added 12/2017. profile_prefs->ClearPref(kTouchHudProjectionEnabled); #endif + +#if defined(OS_ANDROID) + // Added 4/2018 + profile_prefs->ClearPref(kDismissedPhysicalWebPageSuggestions); +#endif // defined(OS_ANDROID) }
diff --git a/chrome/browser/resource_coordinator/tab_activity_watcher_browsertest.cc b/chrome/browser/resource_coordinator/tab_activity_watcher_browsertest.cc index ebab5fe0..5bf39b24 100644 --- a/chrome/browser/resource_coordinator/tab_activity_watcher_browsertest.cc +++ b/chrome/browser/resource_coordinator/tab_activity_watcher_browsertest.cc
@@ -256,7 +256,8 @@ // "Drag" the new tab out of its browser. content::WebContents* dragged_contents = browser()->tab_strip_model()->GetWebContentsAt(1); - browser()->tab_strip_model()->DetachWebContentsAt(1); + std::unique_ptr<content::WebContents> owned_dragged_contents = + browser()->tab_strip_model()->DetachWebContentsAt(1); dragged_contents->WasHidden(); // The other tab in the browser is now foregrounded. ExpectNewForegroundedEntry(kBrowserStartUrl); @@ -264,8 +265,8 @@ // "Drop" the tab into the other browser. This requires showing and // reactivating the tab, but to the user, it never leaves the foreground, so // we don't log a foregrounded event for it. - browser_2->tab_strip_model()->InsertWebContentsAt(1, dragged_contents, - TabStripModel::ADD_NONE); + browser_2->tab_strip_model()->InsertWebContentsAt( + 1, owned_dragged_contents.release(), TabStripModel::ADD_NONE); dragged_contents->WasShown(); browser_2->tab_strip_model()->ActivateTabAt(1, kIsUserGesture); EXPECT_EQ(0, ukm_entry_checker_->NumNewEntriesRecorded(kFOCEntryName));
diff --git a/chrome/browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc b/chrome/browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc index d404c74..99ecf85 100644 --- a/chrome/browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc +++ b/chrome/browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc
@@ -335,7 +335,8 @@ // Detach the non-active tab. Verify that it can no longer be discarded. EXPECT_FOR_ALL_DISCARD_REASONS(first_lifecycle_unit, CanDiscard, true); - auto* contents = tab_strip_model_->DetachWebContentsAt(0); + std::unique_ptr<content::WebContents> owned_contents = + tab_strip_model_->DetachWebContentsAt(0); EXPECT_FOR_ALL_DISCARD_REASONS(first_lifecycle_unit, CanDiscard, false); // Create a second tab strip. @@ -346,7 +347,7 @@ // Insert the tab into the second tab strip without focusing it. Verify that // it can be discarded. - other_tab_strip_model.AppendWebContents(contents, false); + other_tab_strip_model.AppendWebContents(owned_contents.release(), false); EXPECT_FOR_ALL_DISCARD_REASONS(first_lifecycle_unit, CanDiscard, true); EXPECT_EQ(LifecycleUnit::State::LOADED, first_lifecycle_unit->GetState()); @@ -376,9 +377,10 @@ // Detach and destroy the non-active tab. Verify that the LifecycleUnit is // destroyed. - tab_strip_model_->DetachWebContentsAt(0); + std::unique_ptr<content::WebContents> web_contents = + tab_strip_model_->DetachWebContentsAt(0); EXPECT_CALL(observer, OnLifecycleUnitDestroyed(first_lifecycle_unit)); - delete first_lifecycle_unit->AsTabLifecycleUnitExternal()->GetWebContents(); + web_contents.reset(); testing::Mock::VerifyAndClear(&observer); }
diff --git a/chrome/browser/resources/chromeos/arc_support/background.js b/chrome/browser/resources/chromeos/arc_support/background.js index d2941fa..040ecfd 100644 --- a/chrome/browser/resources/chromeos/arc_support/background.js +++ b/chrome/browser/resources/chromeos/arc_support/background.js
@@ -869,7 +869,10 @@ function showOverlay(overlayClass) { var doc = appWindow.contentWindow.document; var overlayContainer = doc.getElementById('overlay-container'); - overlayContainer.className = 'overlay ' + overlayClass; + overlayContainer.classList.remove('overlay-text'); + overlayContainer.classList.remove('overlay-url'); + overlayContainer.classList.add('overlay-loading'); + overlayContainer.classList.add(overlayClass); overlayContainer.hidden = false; lastFocusedElement = doc.activeElement; doc.getElementById('overlay-close').focus(); @@ -984,6 +987,11 @@ appWindow.contentWindow.cr.ui.overlay.globalInitialization(); overlay.addEventListener('cancelOverlay', hideOverlay); + var overlayWebview = doc.getElementById('overlay-url'); + overlayWebview.addEventListener('contentload', function() { + overlay.classList.remove('overlay-loading'); + }); + focusManager = new appWindow.contentWindow.ArcOptInFocusManager(); focusManager.initialize();
diff --git a/chrome/browser/resources/chromeos/arc_support/main.css b/chrome/browser/resources/chromeos/arc_support/main.css index 5869f35b..dd8bfd3c 100644 --- a/chrome/browser/resources/chromeos/arc_support/main.css +++ b/chrome/browser/resources/chromeos/arc_support/main.css
@@ -163,6 +163,10 @@ display: none; } +.overlay-url .content-area { + height: 332px; +} + .overlay-url webview { display: block; height: 300px; @@ -171,6 +175,10 @@ width: 100%; } +.overlay-url.overlay-loading webview { + display: none; +} + .page { font-family: 'Roboto'; font-size: 13px;
diff --git a/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.css b/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.css index 6ad1491..915c623 100644 --- a/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.css +++ b/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.css
@@ -42,13 +42,17 @@ #arc-tos-overlay-webview { border: 1px solid #d9d9d9; display: block; - height: 270px; + height: 300px; width: 622px; } +#arc-tos-overlay-webview.overlay-loading { + display: none; +} + #arc-tos-overlay-webview-container { box-sizing: border-box; - height: 300px; + height: 332px; margin: auto; padding: 24px 8px 8px 8px; width: 100%;
diff --git a/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js b/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js index 7a0cc44..f72794d 100644 --- a/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js +++ b/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js
@@ -93,6 +93,11 @@ }); }; + var overlayUrl = $('arc-tos-overlay-webview'); + overlayUrl.addEventListener('contentload', function() { + overlayUrl.classList.remove('overlay-loading'); + }); + // Update the screen size after setup layout. if (Oobe.getInstance().currentScreen === this) Oobe.getInstance().updateScreenSize(this); @@ -332,6 +337,7 @@ showUrlOverlay: function(targetUrl) { this.lastFocusedElement = document.activeElement; $('arc-tos-overlay-webview').src = targetUrl; + $('arc-tos-overlay-webview').classList.add('overlay-loading'); $('arc-tos-overlay-url').hidden = false; $('arc-tos-overlay-url-close').focus(); },
diff --git a/chrome/browser/resources/chromeos/mobile_app/manifest.json b/chrome/browser/resources/chromeos/mobile_app/manifest.json index 22caa8a..5a4a822 100644 --- a/chrome/browser/resources/chromeos/mobile_app/manifest.json +++ b/chrome/browser/resources/chromeos/mobile_app/manifest.json
@@ -5,5 +5,6 @@ "description": "Chrome OS Mobile Activation Resources", "default_locale": "en", "incognito": "split", - "permissions": [] + "permissions": [], + "manifest_version": 2 }
diff --git a/chrome/browser/resources/chromeos/multidevice_setup/compiled_resources2.gyp b/chrome/browser/resources/chromeos/multidevice_setup/compiled_resources2.gyp index 501a26f..af3b93cc 100644 --- a/chrome/browser/resources/chromeos/multidevice_setup/compiled_resources2.gyp +++ b/chrome/browser/resources/chromeos/multidevice_setup/compiled_resources2.gyp
@@ -4,33 +4,26 @@ { 'targets': [ { - 'target_name': 'multidevice_setup', - 'dependencies': [ - '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr', - '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior', - 'button_navigation_behavior', - 'start_setup_page', - 'setting_up_page', - 'setup_succeeded_page', - 'setup_failed_page', - ], - 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'], - }, - - { 'target_name': 'button_navigation_behavior', 'dependencies': [], 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'], }, { - 'target_name': 'start_setup_page', - 'dependencies': ['button_navigation_behavior'], + 'target_name': 'multidevice_setup', + 'dependencies': [ + '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr', + '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior', + 'button_navigation_behavior', + 'setup_failed_page', + 'setup_succeeded_page', + 'start_setup_page', + ], 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'], }, { - 'target_name': 'setting_up_page', + 'target_name': 'setup_failed_page', 'dependencies': ['button_navigation_behavior'], 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'], }, @@ -42,7 +35,7 @@ }, { - 'target_name': 'setup_failed_page', + 'target_name': 'start_setup_page', 'dependencies': ['button_navigation_behavior'], 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'], },
diff --git a/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup.html b/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup.html index 40fe75c..c12690dd 100644 --- a/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup.html +++ b/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup.html
@@ -12,7 +12,6 @@ <template> <iron-pages id="pages" attr-for-selected="is" selected="[[visiblePageName_]]" selected-item="{{visiblePage_}}"> - <setting-up-page></setting-up-page> <setup-failed-page></setup-failed-page> <setup-succeeded-page></setup-succeeded-page> <start-setup-page></start-setup-page>
diff --git a/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup.js b/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup.js index aec02478f..f4f40a07 100644 --- a/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup.js +++ b/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup.js
@@ -32,8 +32,8 @@ * DOM Element corresponding to the visible page. * * @private - * @type {!StartSetupPageElement|!SettingUpPageElement| - * !SetupSucceededPageElement|!SetupFailedPageElement} + * @type {!SetupFailedPageElement|!SetupSucceededPageElement| + * !StartSetupPageElement} */ visiblePage_: Object,
diff --git a/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd b/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd index f27d96b..aeeb1307 100644 --- a/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd +++ b/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd
@@ -29,12 +29,6 @@ <structure name="IDR_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_JS" file="multidevice_setup.js" type="chrome_html" /> - <structure name="IDR_MULTIDEVICE_SETUP_SETTING_UP_PAGE_HTML" - file="setting_up_page.html" - type="chrome_html" /> - <structure name="IDR_MULTIDEVICE_SETUP_SETTING_UP_PAGE_JS" - file="setting_up_page.js" - type="chrome_html" /> <structure name="IDR_MULTIDEVICE_SETUP_SETUP_FAILED_PAGE_HTML" file="setup_failed_page.html" type="chrome_html" />
diff --git a/chrome/browser/resources/chromeos/multidevice_setup/setting_up_page.html b/chrome/browser/resources/chromeos/multidevice_setup/setting_up_page.html deleted file mode 100644 index 3503e265..0000000 --- a/chrome/browser/resources/chromeos/multidevice_setup/setting_up_page.html +++ /dev/null
@@ -1,11 +0,0 @@ -<link rel="import" href="chrome://resources/html/polymer.html"> - -<link rel="import" href="chrome://resources/html/cr.html"> -<link rel="import" href="button_navigation_behavior.html"> - -<dom-module id="setting-up-page"> - <template> - Setting Up Placeholder Text - </template> - <script src="setting_up_page.js"></script> -</dom-module>
diff --git a/chrome/browser/resources/chromeos/multidevice_setup/setting_up_page.js b/chrome/browser/resources/chromeos/multidevice_setup/setting_up_page.js deleted file mode 100644 index 51e02b4..0000000 --- a/chrome/browser/resources/chromeos/multidevice_setup/setting_up_page.js +++ /dev/null
@@ -1,22 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/** @polymer */ -Polymer({ - is: 'setting-up-page', - - properties: { - /** - * Overriden from ButtonNavigationBehavior - */ - backwardButtonText: { - type: String, - value: 'Cancel', - }, - }, - - behaviors: [ - ButtonNavigationBehavior, - ], -});
diff --git a/chrome/browser/resources/settings/languages_page/add_languages_dialog.html b/chrome/browser/resources/settings/languages_page/add_languages_dialog.html index e143de5..1e6b863 100644 --- a/chrome/browser/resources/settings/languages_page/add_languages_dialog.html +++ b/chrome/browser/resources/settings/languages_page/add_languages_dialog.html
@@ -42,7 +42,7 @@ <cr-dialog id="dialog" close-text="$i18n{close}"> <div slot="title">$i18n{addLanguagesDialogTitle}</div> <div slot="body" scrollable> - <settings-subpage-search label="[[searchLabel]]" + <settings-subpage-search label="$i18n{searchLanguages}" on-search-changed="onSearchChanged_" autofocus> </settings-subpage-search> <iron-list class="ripple-padding" scroll-target="[[$$('[slot=body]')]]"
diff --git a/chrome/browser/resources/snippets_internals.html b/chrome/browser/resources/snippets_internals.html index b3d3624..318d0512 100644 --- a/chrome/browser/resources/snippets_internals.html +++ b/chrome/browser/resources/snippets_internals.html
@@ -41,12 +41,6 @@ <td class="name">Bookmark Suggestions enabled <td id="flag-bookmark-suggestions" class="value"> <tr> - <td class="name">Physical Web Page Suggestions enabled - <td id="flag-physical-web-page-suggestions" class="value"> - <tr> - <td class="name">Physical Web enabled - <td id="flag-physical-web" class="value"> - <tr> <td class="name">Snippets type <td id="switch-personalized" class="value"> <tr>
diff --git a/chrome/browser/spellchecker/spellcheck_service_browsertest.cc b/chrome/browser/spellchecker/spellcheck_service_browsertest.cc index 6f31078..9cd14b52 100644 --- a/chrome/browser/spellchecker/spellcheck_service_browsertest.cc +++ b/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
@@ -36,6 +36,7 @@ #include "components/user_prefs/user_prefs.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_utils.h" +#include "mojo/public/cpp/bindings/binding.h" using content::BrowserContext; using content::RenderProcessHost;
diff --git a/chrome/browser/sync/test/integration/sessions_helper.cc b/chrome/browser/sync/test/integration/sessions_helper.cc index 7ab47fc..005b47a 100644 --- a/chrome/browser/sync/test/integration/sessions_helper.cc +++ b/chrome/browser/sync/test/integration/sessions_helper.cc
@@ -145,14 +145,15 @@ } void MoveTab(int from_index, int to_index, int tab_index) { - content::WebContents* detached_contents = + std::unique_ptr<content::WebContents> detached_contents = test() ->GetBrowser(from_index) ->tab_strip_model() ->DetachWebContentsAt(tab_index); TabStripModel* target_strip = test()->GetBrowser(to_index)->tab_strip_model(); - target_strip->InsertWebContentsAt(target_strip->count(), detached_contents, + target_strip->InsertWebContentsAt(target_strip->count(), + detached_contents.release(), TabStripModel::ADD_ACTIVE); }
diff --git a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc index 4a63bd1..20818232 100644 --- a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc +++ b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
@@ -215,20 +215,19 @@ CannedSyncableFileSystem::CannedSyncableFileSystem( const GURL& origin, - leveldb::Env* env_override, + bool in_memory_file_system, const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner, const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner) : origin_(origin), type_(storage::kFileSystemTypeSyncable), result_(base::File::FILE_OK), sync_status_(sync_file_system::SYNC_STATUS_OK), - env_override_(env_override), + in_memory_file_system_(in_memory_file_system), io_task_runner_(io_task_runner), file_task_runner_(file_task_runner), is_filesystem_set_up_(false), is_filesystem_opened_(false), - sync_status_observers_(new ObserverList) { -} + sync_status_observers_(new ObserverList) {} CannedSyncableFileSystem::~CannedSyncableFileSystem() {} @@ -248,9 +247,8 @@ std::vector<std::string> additional_allowed_schemes; additional_allowed_schemes.push_back(origin_.scheme()); storage::FileSystemOptions options( - storage::FileSystemOptions::PROFILE_MODE_NORMAL, - additional_allowed_schemes, - env_override_); + storage::FileSystemOptions::PROFILE_MODE_NORMAL, in_memory_file_system_, + additional_allowed_schemes); std::vector<std::unique_ptr<storage::FileSystemBackend>> additional_backends; additional_backends.push_back(SyncFileSystemBackend::CreateForTesting());
diff --git a/chrome/browser/sync_file_system/local/canned_syncable_file_system.h b/chrome/browser/sync_file_system/local/canned_syncable_file_system.h index 1aaf3f59c..03bee0b 100644 --- a/chrome/browser/sync_file_system/local/canned_syncable_file_system.h +++ b/chrome/browser/sync_file_system/local/canned_syncable_file_system.h
@@ -36,10 +36,6 @@ class FileSystemURL; } -namespace leveldb { -class Env; -} - namespace net { class URLRequestContext; } @@ -74,7 +70,7 @@ CannedSyncableFileSystem( const GURL& origin, - leveldb::Env* env_override, + bool in_memory_file_system, const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner, const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner); ~CannedSyncableFileSystem() override; @@ -241,7 +237,7 @@ base::File::Error result_; sync_file_system::SyncStatusCode sync_status_; - leveldb::Env* env_override_; + const bool in_memory_file_system_; scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
diff --git a/chrome/browser/tab_contents/view_source_browsertest.cc b/chrome/browser/tab_contents/view_source_browsertest.cc index a1274d0a..e5f3a58 100644 --- a/chrome/browser/tab_contents/view_source_browsertest.cc +++ b/chrome/browser/tab_contents/view_source_browsertest.cc
@@ -33,6 +33,7 @@ namespace { const char kTestHtml[] = "/viewsource/test.html"; +const char kTestNavigationHtml[] = "/viewsource/navigation.html"; const char kTestMedia[] = "/media/pink_noise_140ms.wav"; } @@ -466,3 +467,49 @@ EXPECT_THAT(title, HasSubstr(original_url.port())); EXPECT_THAT(title, HasSubstr(original_url.path())); } + +// Verify that links clicked from view-source do not send a Referer header. +// See https://crbug.com/834023. +IN_PROC_BROWSER_TEST_F(ViewSourceTest, NavigationOmitsReferrer) { + ASSERT_TRUE(embedded_test_server()->Start()); + + GURL url(content::kViewSourceScheme + std::string(":") + + embedded_test_server()->GetURL(kTestNavigationHtml).spec()); + ui_test_utils::NavigateToURL(browser(), url); + + // Click the first link in the view-source markup. + content::WebContentsAddedObserver nav_observer; + EXPECT_TRUE(content::ExecuteScript( + browser()->tab_strip_model()->GetActiveWebContents(), + "document.getElementsByTagName('A')[0].click();")); + content::WebContents* new_contents = nav_observer.GetWebContents(); + EXPECT_TRUE(WaitForLoadStop(new_contents)); + + // Validate that no referrer was sent. + std::string response_text; + std::string response_text_extraction_script = + "domAutomationController.send(document.body.innerText);"; + EXPECT_TRUE(ExecuteScriptAndExtractString( + new_contents, response_text_extraction_script, &response_text)); + EXPECT_EQ("None", response_text); +} + +// Verify that JavaScript URIs are sanitized to about:blank. +IN_PROC_BROWSER_TEST_F(ViewSourceTest, JavaScriptURISanitized) { + ASSERT_TRUE(embedded_test_server()->Start()); + + GURL url(content::kViewSourceScheme + std::string(":") + + embedded_test_server()->GetURL(kTestNavigationHtml).spec()); + ui_test_utils::NavigateToURL(browser(), url); + + // Get the href of the second link in the view-source markup. + std::string link_href; + std::string link_href_extraction_script = R"( + domAutomationController.send( + document.getElementsByTagName('A')[1].href);)"; + + EXPECT_TRUE(content::ExecuteScriptAndExtractString( + browser()->tab_strip_model()->GetActiveWebContents(), + link_href_extraction_script, &link_href)); + EXPECT_EQ("about:blank", link_href); +}
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 596dc55eb..0746556 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn
@@ -1527,8 +1527,6 @@ "uma_browsing_activity_observer.h", "unload_controller.cc", "unload_controller.h", - "unload_controller_web_contents_delegate.cc", - "unload_controller_web_contents_delegate.h", "webui/app_launcher_login_handler.cc", "webui/app_launcher_login_handler.h", "webui/bookmarks_ui.cc", @@ -2101,6 +2099,7 @@ "//ash/app_list/presenter", "//ash/components/shortcut_viewer:ksv", "//ash/public/cpp", + "//ash/public/cpp/resources:ash_public_unscaled_resources", "//ash/public/cpp/vector_icons", "//ash/strings", "//chrome/browser/chromeos", @@ -2330,6 +2329,8 @@ "cocoa/bookmarks/bookmark_menu_bridge.mm", "cocoa/bookmarks/bookmark_menu_cocoa_controller.h", "cocoa/bookmarks/bookmark_menu_cocoa_controller.mm", + "cocoa/browser_view_bridge.h", + "cocoa/browser_view_bridge.mm", "cocoa/browser_window_command_handler.h", "cocoa/browser_window_command_handler.mm", "cocoa/browser_window_views_mac.h",
diff --git a/chrome/browser/ui/android/infobars/installable_ambient_badge_infobar.cc b/chrome/browser/ui/android/infobars/installable_ambient_badge_infobar.cc index 4031453..da1928f 100644 --- a/chrome/browser/ui/android/infobars/installable_ambient_badge_infobar.cc +++ b/chrome/browser/ui/android/infobars/installable_ambient_badge_infobar.cc
@@ -42,8 +42,7 @@ gfx::ConvertToJavaBitmap(&delegate->GetPrimaryIcon()); return Java_InstallableAmbientBadgeInfoBar_show( - env, delegate->GetIconId(), java_bitmap, java_message_text, java_url, - delegate->is_installed()); + env, delegate->GetIconId(), java_bitmap, java_message_text, java_url); } void InstallableAmbientBadgeInfoBar::ProcessButton(int action) {}
diff --git a/chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc b/chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc index 664f4bc..4cb26f95 100644 --- a/chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc +++ b/chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/app_list/internal_app/internal_app_metadata.h" #include "ash/public/cpp/app_list/internal_app_id_constants.h" -#include "ash/resources/grit/ash_resources.h" +#include "ash/public/cpp/resources/grit/ash_public_unscaled_resources.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/strings/string_util.h" @@ -36,8 +36,7 @@ const std::vector<InternalApp>& GetInternalAppList() { static const base::NoDestructor<std::vector<InternalApp>> internal_app_list( {{kInternalAppIdKeyboardShortcutViewer, - IDS_INTERNAL_APP_KEYBOARD_SHORTCUT_VIEWER, - IDR_KEYBOARD_SHORTCUT_VIEWER_LOGO_192, + IDS_INTERNAL_APP_KEYBOARD_SHORTCUT_VIEWER, IDR_SHORTCUT_VIEWER_LOGO_192, /*recommendable=*/false, /*show_in_launcher=*/false, IDS_LAUNCHER_SEARCHABLE_KEYBOARD_SHORTCUT_VIEWER},
diff --git a/chrome/browser/ui/ash/ash_shell_init.cc b/chrome/browser/ui/ash/ash_shell_init.cc index d5cbfff..d866ad5 100644 --- a/chrome/browser/ui/ash/ash_shell_init.cc +++ b/chrome/browser/ui/ash/ash_shell_init.cc
@@ -6,9 +6,6 @@ #include <utility> -#include "ash/high_contrast/high_contrast_controller.h" -#include "ash/magnifier/magnification_controller.h" -#include "ash/public/cpp/accessibility_types.h" #include "ash/public/cpp/config.h" #include "ash/shell.h" #include "ash/shell_init_params.h" @@ -20,8 +17,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/browser_shutdown.h" -#include "chrome/browser/chromeos/accessibility/accessibility_manager.h" -#include "chrome/browser/chromeos/accessibility/magnification_manager.h" #include "chrome/browser/chromeos/ash_config.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/ui/ash/chrome_shell_content_state.h" @@ -86,14 +81,6 @@ else CreateClassicShell(); - ash::Shell* shell = ash::Shell::Get(); - shell->high_contrast_controller()->SetEnabled( - chromeos::AccessibilityManager::Get()->IsHighContrastEnabled()); - - DCHECK(chromeos::MagnificationManager::Get()); - shell->magnification_controller()->SetEnabled( - chromeos::MagnificationManager::Get()->IsMagnifierEnabled()); - ash::Shell::GetPrimaryRootWindow()->GetHost()->Show(); }
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc index addb39b2..5d45375d 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -1107,8 +1107,9 @@ // Detach a tab at index 1 (app1) from |tab_strip_model1| and insert it as an // active tab at index 1 to |tab_strip_model2|. - content::WebContents* detached_tab = tab_strip_model1->DetachWebContentsAt(1); - tab_strip_model2->InsertWebContentsAt(1, detached_tab, + std::unique_ptr<content::WebContents> detached_tab = + tab_strip_model1->DetachWebContentsAt(1); + tab_strip_model2->InsertWebContentsAt(1, detached_tab.release(), TabStripModel::ADD_ACTIVE); EXPECT_EQ(1, tab_strip_model1->count()); EXPECT_EQ(2, tab_strip_model2->count());
diff --git a/chrome/browser/ui/ash/launcher/settings_window_observer.cc b/chrome/browser/ui/ash/launcher/settings_window_observer.cc index a19a400..1f703aca 100644 --- a/chrome/browser/ui/ash/launcher/settings_window_observer.cc +++ b/chrome/browser/ui/ash/launcher/settings_window_observer.cc
@@ -5,9 +5,9 @@ #include "chrome/browser/ui/ash/launcher/settings_window_observer.h" #include "ash/public/cpp/app_list/internal_app_id_constants.h" +#include "ash/public/cpp/resources/grit/ash_public_unscaled_resources.h" #include "ash/public/cpp/shelf_item.h" #include "ash/public/cpp/window_properties.h" -#include "ash/resources/grit/ash_resources.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/settings_window_manager_chromeos.h"
diff --git a/chrome/browser/ui/ash/test_wallpaper_controller.cc b/chrome/browser/ui/ash/test_wallpaper_controller.cc index c99dfd1..aef6f23 100644 --- a/chrome/browser/ui/ash/test_wallpaper_controller.cc +++ b/chrome/browser/ui/ash/test_wallpaper_controller.cc
@@ -45,13 +45,23 @@ ash::WallpaperLayout layout, const gfx::ImageSkia& image, bool preview_mode) { - set_custom_wallpaper_count_++; + ++set_custom_wallpaper_count_; } -void TestWallpaperController::SetOnlineWallpaper( +void TestWallpaperController::SetOnlineWallpaperIfExists( ash::mojom::WallpaperUserInfoPtr user_info, - const gfx::ImageSkia& image, - const std::string& url, + const GURL& url, + ash::WallpaperLayout layout, + bool preview_mode, + ash::mojom::WallpaperController::SetOnlineWallpaperIfExistsCallback + callback) { + NOTIMPLEMENTED(); +} + +void TestWallpaperController::SetOnlineWallpaperFromData( + ash::mojom::WallpaperUserInfoPtr user_info, + const std::string& image_data, + const GURL& url, ash::WallpaperLayout layout, bool preview_mode) { NOTIMPLEMENTED(); @@ -61,7 +71,7 @@ ash::mojom::WallpaperUserInfoPtr user_info, const std::string& wallpaper_files_id, bool show_wallpaper) { - set_default_wallpaper_count_++; + ++set_default_wallpaper_count_; } void TestWallpaperController::SetCustomizedDefaultWallpaperPaths( @@ -118,7 +128,7 @@ void TestWallpaperController::RemoveUserWallpaper( ash::mojom::WallpaperUserInfoPtr user_info, const std::string& wallpaper_files_id) { - remove_user_wallpaper_count_++; + ++remove_user_wallpaper_count_; } void TestWallpaperController::RemovePolicyWallpaper( @@ -127,6 +137,11 @@ NOTIMPLEMENTED(); } +void TestWallpaperController::GetOfflineWallpaperList( + ash::mojom::WallpaperController::GetOfflineWallpaperListCallback callback) { + NOTIMPLEMENTED(); +} + void TestWallpaperController::SetAnimationDuration( base::TimeDelta animation_duration) { NOTIMPLEMENTED();
diff --git a/chrome/browser/ui/ash/test_wallpaper_controller.h b/chrome/browser/ui/ash/test_wallpaper_controller.h index 1831987..c115a1cb 100644 --- a/chrome/browser/ui/ash/test_wallpaper_controller.h +++ b/chrome/browser/ui/ash/test_wallpaper_controller.h
@@ -49,11 +49,18 @@ ash::WallpaperLayout layout, const gfx::ImageSkia& image, bool preview_mode) override; - void SetOnlineWallpaper(ash::mojom::WallpaperUserInfoPtr user_info, - const gfx::ImageSkia& image, - const std::string& url, - ash::WallpaperLayout layout, - bool preview_mode) override; + void SetOnlineWallpaperIfExists( + ash::mojom::WallpaperUserInfoPtr user_info, + const GURL& url, + ash::WallpaperLayout layout, + bool preview_mode, + ash::mojom::WallpaperController::SetOnlineWallpaperIfExistsCallback + callback) override; + void SetOnlineWallpaperFromData(ash::mojom::WallpaperUserInfoPtr user_info, + const std::string& image_data, + const GURL& url, + ash::WallpaperLayout layout, + bool preview_mode) override; void SetDefaultWallpaper(ash::mojom::WallpaperUserInfoPtr user_info, const std::string& wallpaper_files_id, bool show_wallpaper) override; @@ -82,6 +89,9 @@ const std::string& wallpaper_files_id) override; void RemovePolicyWallpaper(ash::mojom::WallpaperUserInfoPtr user_info, const std::string& wallpaper_files_id) override; + void GetOfflineWallpaperList( + ash::mojom::WallpaperController::GetOfflineWallpaperListCallback callback) + override; void SetAnimationDuration(base::TimeDelta animation_duration) override; void OpenWallpaperPickerIfAllowed() override; void MinimizeInactiveWindows(const std::string& user_id_hash) override;
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client.cc b/chrome/browser/ui/ash/wallpaper_controller_client.cc index d1b8c66..6978134 100644 --- a/chrome/browser/ui/ash/wallpaper_controller_client.cc +++ b/chrome/browser/ui/ash/wallpaper_controller_client.cc
@@ -193,17 +193,33 @@ layout, image, preview_mode); } -void WallpaperControllerClient::SetOnlineWallpaper(const AccountId& account_id, - const gfx::ImageSkia& image, - const std::string& url, - ash::WallpaperLayout layout, - bool preview_mode) { +void WallpaperControllerClient::SetOnlineWallpaperIfExists( + const AccountId& account_id, + const GURL& url, + ash::WallpaperLayout layout, + bool preview_mode, + ash::mojom::WallpaperController::SetOnlineWallpaperIfExistsCallback + callback) { ash::mojom::WallpaperUserInfoPtr user_info = AccountIdToWallpaperUserInfo(account_id); if (!user_info) return; - wallpaper_controller_->SetOnlineWallpaper(std::move(user_info), image, url, - layout, preview_mode); + wallpaper_controller_->SetOnlineWallpaperIfExists( + std::move(user_info), url, layout, preview_mode, std::move(callback)); +} + +void WallpaperControllerClient::SetOnlineWallpaperFromData( + const AccountId& account_id, + const std::string& image_data, + const GURL& url, + ash::WallpaperLayout layout, + bool preview_mode) { + ash::mojom::WallpaperUserInfoPtr user_info = + AccountIdToWallpaperUserInfo(account_id); + if (!user_info) + return; + wallpaper_controller_->SetOnlineWallpaperFromData( + std::move(user_info), image_data, url, layout, preview_mode); } void WallpaperControllerClient::SetDefaultWallpaper(const AccountId& account_id, @@ -350,6 +366,11 @@ GetFilesId(account_id)); } +void WallpaperControllerClient::GetOfflineWallpaperList( + ash::mojom::WallpaperController::GetOfflineWallpaperListCallback callback) { + wallpaper_controller_->GetOfflineWallpaperList(std::move(callback)); +} + void WallpaperControllerClient::SetAnimationDuration( const base::TimeDelta& animation_duration) { wallpaper_controller_->SetAnimationDuration(animation_duration);
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client.h b/chrome/browser/ui/ash/wallpaper_controller_client.h index 3c38deb..611cad7 100644 --- a/chrome/browser/ui/ash/wallpaper_controller_client.h +++ b/chrome/browser/ui/ash/wallpaper_controller_client.h
@@ -37,11 +37,18 @@ ash::WallpaperLayout layout, const gfx::ImageSkia& image, bool preview_mode); - void SetOnlineWallpaper(const AccountId& account_id, - const gfx::ImageSkia& image, - const std::string& url, - ash::WallpaperLayout layout, - bool preview_mode); + void SetOnlineWallpaperIfExists( + const AccountId& account_id, + const GURL& url, + ash::WallpaperLayout layout, + bool preview_mode, + ash::mojom::WallpaperController::SetOnlineWallpaperIfExistsCallback + callback); + void SetOnlineWallpaperFromData(const AccountId& account_id, + const std::string& image_data, + const GURL& url, + ash::WallpaperLayout layout, + bool preview_mode); void SetDefaultWallpaper(const AccountId& account_id, bool show_wallpaper); void SetCustomizedDefaultWallpaperPaths( const base::FilePath& customized_default_small_path, @@ -63,6 +70,9 @@ void ShowSigninWallpaper(); void RemoveUserWallpaper(const AccountId& account_id); void RemovePolicyWallpaper(const AccountId& account_id); + void GetOfflineWallpaperList( + ash::mojom::WallpaperController::GetOfflineWallpaperListCallback + callback); void SetAnimationDuration(const base::TimeDelta& animation_duration); void OpenWallpaperPickerIfAllowed(); void MinimizeInactiveWindows(const std::string& user_id_hash);
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 12667980..2c60a550 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc
@@ -1605,7 +1605,8 @@ if (IsFastTabUnloadEnabled()) { *proceed_to_fire_unload = - fast_unload_controller_->BeforeUnloadFired(web_contents, proceed); + fast_unload_controller_->BeforeUnloadFiredForContents(web_contents, + proceed); } else { *proceed_to_fire_unload = unload_controller_->BeforeUnloadFired(web_contents, proceed);
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index a1ed524..984a1e53 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc
@@ -740,10 +740,10 @@ void ConvertPopupToTabbedBrowser(Browser* browser) { base::RecordAction(UserMetricsAction("ShowAsTab")); TabStripModel* tab_strip = browser->tab_strip_model(); - WebContents* contents = + std::unique_ptr<content::WebContents> contents = tab_strip->DetachWebContentsAt(tab_strip->active_index()); Browser* b = new Browser(Browser::CreateParams(browser->profile(), true)); - b->tab_strip_model()->AppendWebContents(contents, true); + b->tab_strip_model()->AppendWebContents(contents.release(), true); b->window()->Show(); } @@ -1203,7 +1203,8 @@ TabStripModel* source_tabstrip = browser->tab_strip_model(); target_browser->tab_strip_model()->AppendWebContents( - source_tabstrip->DetachWebContentsAt(source_tabstrip->active_index()), + source_tabstrip->DetachWebContentsAt(source_tabstrip->active_index()) + .release(), true); target_browser->window()->Show(); }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index b4f9c09..355e1b9 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -386,7 +386,7 @@ [pulsingButton_ setPulseIsStuckOn:YES]; pulsingBookmarkObserver_.reset( - new BookmarkModelObserverForCocoa(bookmarkModel_, ^() { + new BookmarkModelObserverForCocoa(bookmarkModel_, ^{ // Stop pulsing if anything happened to the node. [self stopPulsingBookmarkNode]; }));
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm index 1d8dc05..7a9c9046 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
@@ -196,7 +196,7 @@ // dialog, the bookmark bubble's cancel: means "don't add this as a // bookmark", not "cancel editing". We must take extra care to not // touch the bookmark in this selector. - bookmarkObserver_.reset(new BookmarkModelObserverForCocoa(model_, ^() { + bookmarkObserver_.reset(new BookmarkModelObserverForCocoa(model_, ^{ [self dismissWithoutEditing:nil]; })); bookmarkObserver_->StartObservingNode(node_);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm index c7db807..8870a5c37 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm
@@ -31,7 +31,7 @@ __block size_t pings = 0U; - BookmarkModelObserverForCocoa::ChangeCallback callback = ^() { + BookmarkModelObserverForCocoa::ChangeCallback callback = ^{ ++pings; };
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm index 0ec930e..0a20e6d 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm
@@ -81,7 +81,7 @@ - (void)runAsModalSheet { // Ping me when things change out from under us. observer_.reset(new BookmarkModelObserverForCocoa( - BookmarkModelFactory::GetForBrowserContext(profile_), ^() { + BookmarkModelFactory::GetForBrowserContext(profile_), ^{ [self cancel:nil]; })); observer_->StartObservingNode(node_);
diff --git a/chrome/browser/ui/cocoa/browser_view_bridge.h b/chrome/browser/ui/cocoa/browser_view_bridge.h new file mode 100644 index 0000000..7db1dbdf --- /dev/null +++ b/chrome/browser/ui/cocoa/browser_view_bridge.h
@@ -0,0 +1,27 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_UI_COCOA_BROWSER_VIEW_BRIDGE_H_ +#define CHROME_BROWSER_UI_COCOA_BROWSER_VIEW_BRIDGE_H_ + +#include <Cocoa/Cocoa.h> + +#include "ui/gfx/native_widget_types.h" + +class BrowserView; + +// These utility functions serve to bridge between native Cocoa code (which +// often can't include BrowserView directly, because of conflicts between Cocoa +// and Views class names) and BrowserView. + +namespace browser_view_bridge { + +BrowserView* BrowserViewForNativeWindow(gfx::NativeWindow window); + +bool BrowserViewHasAcceleratorForEvent(BrowserView* browser_view, + NSEvent* event); + +} // namespace browser_view_bridge + +#endif // CHROME_BROWSER_UI_COCOA_BROWSER_VIEW_BRIDGE_H_
diff --git a/chrome/browser/ui/cocoa/browser_view_bridge.mm b/chrome/browser/ui/cocoa/browser_view_bridge.mm new file mode 100644 index 0000000..ed3663b --- /dev/null +++ b/chrome/browser/ui/cocoa/browser_view_bridge.mm
@@ -0,0 +1,37 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ui/cocoa/browser_view_bridge.h" + +#include "build/buildflag.h" +#include "chrome/browser/ui/views_mode_controller.h" +#include "ui/base/ui_base_features.h" +#include "ui/events/cocoa/cocoa_event_utils.h" +#include "ui/events/event_utils.h" + +#if BUILDFLAG(MAC_VIEWS_BROWSER) +#include "chrome/browser/ui/views/frame/browser_view.h" +#endif + +namespace browser_view_bridge { + +BrowserView* BrowserViewForNativeWindow(gfx::NativeWindow window) { +#if BUILDFLAG(MAC_VIEWS_BROWSER) + if (!views_mode_controller::IsViewsBrowserCocoa()) + return BrowserView::GetBrowserViewForNativeWindow(window); +#endif + return nullptr; +} + +bool BrowserViewHasAcceleratorForEvent(BrowserView* browser_view, + NSEvent* event) { +#if BUILDFLAG(MAC_VIEWS_BROWSER) + ui::Accelerator accelerator(ui::KeyboardCodeFromNative(event), + ui::EventFlagsFromModifiers(event.modifierFlags)); + return browser_view->IsAcceleratorRegistered(accelerator); +#endif + return false; +} + +} // namespace browser_view_bridge
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index f2e106d..3d17573 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -1128,7 +1128,11 @@ // put into a different tab strip, such as during a drop on another window. - (void)detachTabView:(NSView*)view { int index = [tabStripController_ modelIndexForTabView:view]; - browser_->tab_strip_model()->DetachWebContentsAt(index); + + // TODO(erikchen): While it might be nice to fix ownership semantics here, + // realistically the code is going to be deleted in the not-too-distant + // future. + browser_->tab_strip_model()->DetachWebContentsAt(index).release(); } - (NSArray*)tabViews { @@ -1229,7 +1233,11 @@ // deleting the tab contents. This needs to come before creating the new // Browser because it clears the WebContents' delegate, which gets hooked // up during creation of the new window. - model->DetachWebContentsAt(index); + + // TODO(erikchen): While it might be nice to fix ownership semantics here, + // realistically the code is going to be deleted in the not-too-distant + // future. + model->DetachWebContentsAt(index).release(); } // Create a new window with the dragged tabs in its model.
diff --git a/chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.mm b/chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.mm index 2925a67..f7f561c 100644 --- a/chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.mm +++ b/chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.mm
@@ -8,9 +8,11 @@ #include "chrome/browser/global_keyboard_shortcuts_mac.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" +#import "chrome/browser/ui/cocoa/browser_view_bridge.h" #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" #import "chrome/browser/ui/cocoa/browser_window_views_mac.h" #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" +#include "chrome/browser/ui/views_mode_controller.h" namespace { @@ -73,6 +75,16 @@ CommandForBrowserKeyboardShortcut); } +bool IsBrowserKeyboardShortcut(NSEvent* event, NSWindow* window) { +#if BUILDFLAG(MAC_VIEWS_BROWSER) + BrowserView* view = browser_view_bridge::BrowserViewForNativeWindow(window); + if (view) + return browser_view_bridge::BrowserViewHasAcceleratorForEvent(view, event); +#endif + return CommandForExtraKeyboardShortcut( + event, window, CommandForWindowKeyboardShortcut) != -1; +} + } // namespace @implementation ChromeCommandDispatcherDelegate @@ -116,10 +128,8 @@ // special handling here since they happen before normal command dispatch. int cmd = MenuCommandForKeyEvent(event); if (cmd != -1) { - int keyCmd = CommandForExtraKeyboardShortcut( - event, window, CommandForWindowKeyboardShortcut); Browser* browser = chrome::FindBrowserWithWindow(window); - if (keyCmd != -1 && browser) { + if (IsBrowserKeyboardShortcut(event, window) && browser) { chrome::ExecuteCommand(browser, cmd); return YES; }
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h index 470bbe5..b54a3715 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h
@@ -64,7 +64,7 @@ + (CGFloat)getTextContentAreaWidth:(CGFloat)cellContentMaxWidth; -+ (CGFloat)getContentTextHeightForDoubleLine:(BOOL)isDoubleLine; ++ (CGFloat)getContentTextHeight; @end
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm index 2c49600..893665b 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm
@@ -9,7 +9,6 @@ #include <algorithm> #include <cmath> -#include "base/feature_list.h" #include "base/i18n/rtl.h" #include "base/mac/foundation_util.h" #include "base/mac/objc_release_properties.h" @@ -472,9 +471,6 @@ } - (void)drawMatchWithFrame:(NSRect)cellFrame inView:(NSView*)controlView { - bool isVerticalLayout = - base::FeatureList::IsEnabled(omnibox::kUIExperimentVerticalLayout); - OmniboxPopupCellData* cellData = base::mac::ObjCCastStrict<OmniboxPopupCellData>([self objectValue]); OmniboxPopupMatrix* tableView = @@ -488,12 +484,10 @@ int contentsMaxWidth, descriptionMaxWidth; OmniboxPopupModel::ComputeMatchMaxWidths( ceilf(contentsWidth), ceilf(separatorWidth), ceilf(descriptionWidth), - ceilf(remainingWidth), [cellData isAnswer] || isVerticalLayout, + ceilf(remainingWidth), [cellData isAnswer], !AutocompleteMatch::IsSearchType([cellData matchType]), &contentsMaxWidth, &descriptionMaxWidth); - CGFloat halfLineHeight = (kDefaultTextHeight + kDefaultVerticalMargin) / 2; - NSWindow* parentWindow = [[controlView window] parentWindow]; BOOL isDarkTheme = [parentWindow hasDarkTheme]; NSRect imageRect = cellFrame; @@ -501,8 +495,6 @@ imageRect.origin.x += kMaterialImageXOffset + [tableView contentLeftPadding]; imageRect.origin.y += GetVerticalMargin() + kMaterialExtraVerticalImagePadding; - if (isVerticalLayout) - imageRect.origin.y += halfLineHeight; [[cellData image] drawInRect:FlipIfRTL(imageRect, cellFrame) fromRect:NSZeroRect operation:NSCompositeSourceOver @@ -513,10 +505,6 @@ CGFloat left = kMaterialTextStartOffset + [tableView contentLeftPadding]; NSPoint origin = NSMakePoint(left, GetVerticalMargin()); - // For matches lacking description in vertical layout, center vertically. - if (isVerticalLayout && descriptionMaxWidth == 0) - origin.y += halfLineHeight; - origin.x += [self drawMatchPart:[cellData contents] withFrame:cellFrame origin:origin @@ -527,8 +515,7 @@ if (descriptionMaxWidth > 0) { if ([cellData isAnswer]) { origin = NSMakePoint( - left, [OmniboxPopupCell getContentTextHeightForDoubleLine:NO] - - GetVerticalMargin()); + left, [OmniboxPopupCell getContentTextHeight] - GetVerticalMargin()); CGFloat imageSize = [tableView answerLineHeight]; NSRect imageRect = NSMakeRect(NSMinX(cellFrame) + origin.x, NSMinY(cellFrame) + origin.y, @@ -547,17 +534,12 @@ origin.y += 1; } } else { - if (isVerticalLayout) { - origin.x = left; - origin.y += halfLineHeight * 2; - } else { - origin.x += [self drawMatchPart:[tableView separator] - withFrame:cellFrame - origin:origin - withMaxWidth:separatorWidth - forDarkTheme:isDarkTheme - withHeightCap:true]; - } + origin.x += [self drawMatchPart:[tableView separator] + withFrame:cellFrame + origin:origin + withMaxWidth:separatorWidth + forDarkTheme:isDarkTheme + withHeightCap:true]; } [self drawMatchPart:[cellData description] withFrame:cellFrame @@ -667,11 +649,8 @@ return cellContentMaxWidth - kMaterialTextStartOffset; } -+ (CGFloat)getContentTextHeightForDoubleLine:(BOOL)isDoubleLine { - CGFloat height = kDefaultTextHeight + 2 * GetVerticalMargin(); - if (isDoubleLine) - height += kDefaultTextHeight + kDefaultVerticalMargin; - return height; ++ (CGFloat)getContentTextHeight { + return kDefaultTextHeight + 2 * GetVerticalMargin(); } @end
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm index 282602e..fbaabd7b 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm
@@ -4,14 +4,12 @@ #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h" -#include "base/feature_list.h" #include "base/logging.h" #include "base/mac/foundation_util.h" #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h" #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h" #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" #include "components/omnibox/browser/autocomplete_result.h" -#include "components/omnibox/browser/omnibox_field_trial.h" namespace { @@ -103,10 +101,7 @@ - (CGFloat)tableView:(NSTableView*)tableView heightOfRow:(NSInteger)row { BOOL isAnswer = [[array_ objectAtIndex:row] isAnswer]; - BOOL isDoubleLine = !isAnswer && base::FeatureList::IsEnabled( - omnibox::kUIExperimentVerticalLayout); - CGFloat height = - [OmniboxPopupCell getContentTextHeightForDoubleLine:isDoubleLine]; + CGFloat height = [OmniboxPopupCell getContentTextHeight]; if (isAnswer) { OmniboxPopupMatrix* matrix =
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc index 58c436a..e23c23e4 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
@@ -445,8 +445,8 @@ ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE)); ASSERT_TRUE(browser()->window()->IsFullscreen()); - std::unique_ptr<content::WebContents> web_contents( - browser()->tab_strip_model()->DetachWebContentsAt(0)); + std::unique_ptr<content::WebContents> web_contents = + browser()->tab_strip_model()->DetachWebContentsAt(0); ChangeWindowFullscreenState(); EXPECT_FALSE(browser()->window()->IsFullscreen()); } @@ -802,7 +802,7 @@ // The tab should remain in fullscreen mode and neither browser window should // have expanded. It is correct for both FullscreenControllers to agree the // tab is in fullscreen mode. - browser()->tab_strip_model()->DetachWebContentsAt(0); + browser()->tab_strip_model()->DetachWebContentsAt(0).release(); second_browser->tab_strip_model()-> InsertWebContentsAt(0, tab, TabStripModel::ADD_ACTIVE); EXPECT_FALSE(browser()->window()->IsFullscreen()); @@ -817,7 +817,7 @@ // Now, detach and reattach it back to the first browser window. Again, the // tab should remain in fullscreen mode and neither browser window should have // expanded. - second_browser->tab_strip_model()->DetachWebContentsAt(0); + second_browser->tab_strip_model()->DetachWebContentsAt(0).release(); browser()->tab_strip_model()-> InsertWebContentsAt(0, tab, TabStripModel::ADD_ACTIVE); EXPECT_FALSE(browser()->window()->IsFullscreen());
diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc index 02a673e..c1ee3c6 100644 --- a/chrome/browser/ui/extensions/application_launch.cc +++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -452,8 +452,10 @@ TabStripModel* source_tabstrip = source_browser->tab_strip_model(); target_browser->tab_strip_model()->AppendWebContents( - source_tabstrip->DetachWebContentsAt( - source_tabstrip->GetIndexOfWebContents(contents)), + source_tabstrip + ->DetachWebContentsAt( + source_tabstrip->GetIndexOfWebContents(contents)) + .release(), true); target_browser->window()->Show();
diff --git a/chrome/browser/ui/fast_unload_controller.cc b/chrome/browser/ui/fast_unload_controller.cc index 58495eb..faf88129 100644 --- a/chrome/browser/ui/fast_unload_controller.cc +++ b/chrome/browser/ui/fast_unload_controller.cc
@@ -16,7 +16,6 @@ #include "chrome/browser/ui/tab_contents/core_tab_helper.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" -#include "chrome/browser/ui/unload_controller_web_contents_delegate.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" @@ -36,14 +35,13 @@ : browser_(browser), tab_needing_before_unload_ack_(NULL), is_attempting_to_close_browser_(false), - detached_delegate_( - std::make_unique<UnloadControllerWebContentsDelegate>()), weak_factory_(this) { browser_->tab_strip_model()->AddObserver(this); } FastUnloadController::~FastUnloadController() { browser_->tab_strip_model()->RemoveObserver(this); + web_contents_waiting_for_deletion_.clear(); } bool FastUnloadController::CanCloseContents(content::WebContents* contents) { @@ -104,8 +102,9 @@ return false; } -bool FastUnloadController::BeforeUnloadFired(content::WebContents* contents, - bool proceed) { +bool FastUnloadController::BeforeUnloadFiredForContents( + content::WebContents* contents, + bool proceed) { if (!proceed) DevToolsWindow::OnPageCloseCanceled(contents); @@ -271,6 +270,19 @@ } //////////////////////////////////////////////////////////////////////////////// +// FastUnloadController, content::WebContentsDelegate implementation: + +bool FastUnloadController::ShouldSuppressDialogs(content::WebContents* source) { + return true; +} + +void FastUnloadController::CloseContents(content::WebContents* source) { + auto it = web_contents_waiting_for_deletion_.find(source); + DCHECK(it != web_contents_waiting_for_deletion_.end()); + web_contents_waiting_for_deletion_.erase(it); +} + +//////////////////////////////////////////////////////////////////////////////// // FastUnloadController, content::NotificationObserver implementation: void FastUnloadController::Observe( @@ -354,8 +366,9 @@ if (index != TabStripModel::kNoTab && contents->NeedToFireBeforeUnload()) { tabs_needing_unload_ack_.insert(contents); - browser_->tab_strip_model()->DetachWebContentsAt(index); - contents->SetDelegate(detached_delegate_.get()); + web_contents_waiting_for_deletion_[contents] = + browser_->tab_strip_model()->DetachWebContentsAt(index); + contents->SetDelegate(this); CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(contents); core_tab_helper->OnUnloadDetachedStarted(); return true; @@ -377,7 +390,7 @@ tabs_needing_before_unload_.insert(tab_needing_before_unload_ack_); CancelTabNeedingBeforeUnloadAck(); } else { - // Wait for |BeforeUnloadFired| before proceeding. + // Wait for |BeforeUnloadFiredForContents| before proceeding. return; } }
diff --git a/chrome/browser/ui/fast_unload_controller.h b/chrome/browser/ui/fast_unload_controller.h index 939c2660..a037e06f 100644 --- a/chrome/browser/ui/fast_unload_controller.h +++ b/chrome/browser/ui/fast_unload_controller.h
@@ -7,6 +7,7 @@ #include <memory> #include <set> +#include <unordered_map> #include "base/callback.h" #include "base/macros.h" @@ -15,10 +16,10 @@ #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "content/public/browser/web_contents_delegate.h" class Browser; class TabStripModel; -class UnloadControllerWebContentsDelegate; namespace content { class NotificationSource; @@ -54,7 +55,8 @@ // the window is finally closed. // class FastUnloadController : public content::NotificationObserver, - public TabStripModelObserver { + public TabStripModelObserver, + public content::WebContentsDelegate { public: explicit FastUnloadController(Browser* browser); ~FastUnloadController() override; @@ -79,7 +81,8 @@ // |browser_| is being closed, Unload handlers for any particular WebContents // will not be run until every WebContents being closed has a chance to run // its BeforeUnloadHandler. - bool BeforeUnloadFired(content::WebContents* contents, bool proceed); + bool BeforeUnloadFiredForContents(content::WebContents* contents, + bool proceed); bool is_attempting_to_close_browser() const { return is_attempting_to_close_browser_; @@ -116,6 +119,10 @@ void CancelWindowClose(); private: + // Overridden from content::WebContentsDelegate + bool ShouldSuppressDialogs(content::WebContents* source) override; + void CloseContents(content::WebContents* source) override; + // Overridden from content::NotificationObserver: void Observe(int type, const content::NotificationSource& source, @@ -196,8 +203,11 @@ // are currently confirming that the browser is closable. base::Callback<void(bool)> on_close_confirmed_; - // Manage tabs with beforeunload/unload handlers that close detached. - std::unique_ptr<UnloadControllerWebContentsDelegate> detached_delegate_; + // This class must wait for a call to WebContentsDelegate::CloseContents + // before the WebContents can be deleted. + std::unordered_map<content::WebContents*, + std::unique_ptr<content::WebContents>> + web_contents_waiting_for_deletion_; base::WeakPtrFactory<FastUnloadController> weak_factory_;
diff --git a/chrome/browser/ui/omnibox/omnibox_theme.cc b/chrome/browser/ui/omnibox/omnibox_theme.cc index c2092c9..3f3d1f3 100644 --- a/chrome/browser/ui/omnibox/omnibox_theme.cc +++ b/chrome/browser/ui/omnibox/omnibox_theme.cc
@@ -227,8 +227,7 @@ switch (part) { case OmniboxPart::LOCATION_BAR_BACKGROUND: - return dark ? SkColorSetRGB(0x28, 0x2C, 0x2F) - : SkColorSetRGB(0xED, 0xEF, 0xF2); + return dark ? SkColorSetRGB(0x28, 0x2C, 0x2F) : gfx::kGoogleGrey100; case OmniboxPart::LOCATION_BAR_SECURITY_CHIP: return GetSecurityChipColor(tint, state); case OmniboxPart::LOCATION_BAR_SELECTED_KEYWORD:
diff --git a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc index f5667776..2d81f65c 100644 --- a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc +++ b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
@@ -49,9 +49,10 @@ CreateBrowserWithTestWindowForParams(¶ms)); // Move the tab which is destroying the crash info bar to the new browser. - tab_strip->DetachWebContentsAt(0); + std::unique_ptr<content::WebContents> owned_web_contents = + tab_strip->DetachWebContentsAt(0); tab_strip = opened_browser->tab_strip_model(); - tab_strip->AppendWebContents(web_contents, true); + tab_strip->AppendWebContents(owned_web_contents.release(), true); // Close the original browser. first_browser->window()->Close();
diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc index d9f07e7..1d0c8d2 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.cc +++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -150,7 +150,11 @@ // already been closed. We just want to undo our bookkeeping. int index = tab_strip_model_->GetIndexOfWebContents(web_contents()); DCHECK_NE(TabStripModel::kNoTab, index); - tab_strip_model_->DetachWebContentsAt(index); + + // TODO(erikchen): Clean up the internal ownership of TabStripModel once we + // move to a world where there's always explicit ownership of WebContents. + // https://crbug.com/832879. + tab_strip_model_->DetachWebContentsAt(index).release(); } /////////////////////////////////////////////////////////////////////////////// @@ -273,7 +277,8 @@ return base::WrapUnique(old_contents); } -WebContents* TabStripModel::DetachWebContentsAt(int index) { +std::unique_ptr<content::WebContents> TabStripModel::DetachWebContentsAt( + int index) { CHECK(!in_notify_); if (contents_data_.empty()) return nullptr; @@ -324,7 +329,7 @@ observer.TabSelectionChanged(this, old_model); } } - return removed_contents; + return base::WrapUnique(removed_contents); } void TabStripModel::ActivateTabAt(int index, bool user_gesture) {
diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h index 66ec0831..7df2082 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h
@@ -191,7 +191,7 @@ // WebContents is not destroyed, just removed from display. The caller // is responsible for doing something with it (e.g. stuffing it into another // strip). Returns the detached WebContents. - content::WebContents* DetachWebContentsAt(int index); + std::unique_ptr<content::WebContents> DetachWebContentsAt(int index); // Makes the tab at the specified index the active tab. |user_gesture| is true // if the user actually clicked on the tab or navigated to it using a keyboard
diff --git a/chrome/browser/ui/tabs/tab_strip_model_stats_recorder_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_stats_recorder_unittest.cc index 836430a..6b5ec1c 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_stats_recorder_unittest.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_stats_recorder_unittest.cc
@@ -128,7 +128,7 @@ static_cast<int>(TabStripModelStatsRecorder::TabState::INACTIVE), 2); // Move the first tab in strip 1 to strip 2 - tabstrip1.DetachWebContentsAt(0); + tabstrip1.DetachWebContentsAt(0).release(); tabstrip2.InsertWebContentsAt(2, contents1, TabStripModel::ADD_ACTIVE); tester.ExpectUniqueSample(
diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc index bf864ea..a7faee7 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
@@ -516,9 +516,11 @@ // Test DetachWebContentsAt { // Detach ... - WebContents* detached = tabstrip.DetachWebContentsAt(2); + std::unique_ptr<content::WebContents> detached_with_ownership = + tabstrip.DetachWebContentsAt(2); + WebContents* detached = detached_with_ownership.get(); // ... and append again because we want this for later. - tabstrip.AppendWebContents(detached, true); + tabstrip.AppendWebContents(detached_with_ownership.release(), true); EXPECT_EQ(8, observer.GetStateCount()); State s1(detached, 2, MockTabStripModelObserver::DETACH); EXPECT_TRUE(observer.StateEquals(0, s1)); @@ -998,11 +1000,11 @@ InsertWebContentses(&tabstrip, contents1, contents2, contents3); EXPECT_EQ(0, tabstrip.active_index()); - tabstrip.DetachWebContentsAt(1); + tabstrip.DetachWebContentsAt(1).release(); EXPECT_EQ(0, tabstrip.active_index()); for (int i = tabstrip.count() - 1; i >= 1; --i) - tabstrip.DetachWebContentsAt(i); + tabstrip.DetachWebContentsAt(i).release(); // Now test that when a tab doesn't have an opener, selection shifts to the // right when the tab is closed. @@ -1012,15 +1014,15 @@ tabstrip.ForgetAllOpeners(); tabstrip.ActivateTabAt(1, true); EXPECT_EQ(1, tabstrip.active_index()); - tabstrip.DetachWebContentsAt(1); + tabstrip.DetachWebContentsAt(1).release(); EXPECT_EQ(1, tabstrip.active_index()); - tabstrip.DetachWebContentsAt(1); + tabstrip.DetachWebContentsAt(1).release(); EXPECT_EQ(1, tabstrip.active_index()); - tabstrip.DetachWebContentsAt(1); + tabstrip.DetachWebContentsAt(1).release(); EXPECT_EQ(0, tabstrip.active_index()); for (int i = tabstrip.count() - 1; i >= 1; --i) - tabstrip.DetachWebContentsAt(i); + tabstrip.DetachWebContentsAt(i).release(); // Now test that when a tab does have an opener, it selects the next tab // opened by the same opener scanning LTR when it is closed. @@ -2460,11 +2462,12 @@ EXPECT_TRUE(strip_src.IsTabBlocked(1)); // Detach the tab. - WebContents* moved_contents = strip_src.DetachWebContentsAt(1); - EXPECT_EQ(contents2, moved_contents); + std::unique_ptr<WebContents> moved_contents = + strip_src.DetachWebContentsAt(1); + EXPECT_EQ(contents2, moved_contents.get()); // Attach the tab to the destination tab strip. - strip_dst.AppendWebContents(moved_contents, true); + strip_dst.AppendWebContents(moved_contents.release(), true); EXPECT_TRUE(strip_dst.IsTabBlocked(0)); strip_dst.CloseAllTabs();
diff --git a/chrome/browser/ui/tabs/window_activity_watcher_unittest.cc b/chrome/browser/ui/tabs/window_activity_watcher_unittest.cc index 82a51e8..eb9b36d 100644 --- a/chrome/browser/ui/tabs/window_activity_watcher_unittest.cc +++ b/chrome/browser/ui/tabs/window_activity_watcher_unittest.cc
@@ -249,7 +249,7 @@ } // Drag the tab out of its window. - content::WebContents* dragged_tab = + std::unique_ptr<content::WebContents> dragged_tab = starting_browser->tab_strip_model()->DetachWebContentsAt(1); starting_browser_metrics[TabManager_WindowMetrics::kTabCountName].value() = 1; { @@ -271,7 +271,7 @@ FakeBrowserWindow::CreateBrowserWithFakeWindowForParams(¶ms); created_browser->window()->Activate(); created_browser->tab_strip_model()->InsertWebContentsAt( - 0, dragged_tab, TabStripModel::ADD_ACTIVE); + 0, dragged_tab.release(), TabStripModel::ADD_ACTIVE); UkmMetricMap created_browser_metrics({ {TabManager_WindowMetrics::kWindowIdName, created_browser->session_id().id()},
diff --git a/chrome/browser/ui/unload_controller.h b/chrome/browser/ui/unload_controller.h index 0c437c6..dd57d5e0 100644 --- a/chrome/browser/ui/unload_controller.h +++ b/chrome/browser/ui/unload_controller.h
@@ -17,7 +17,6 @@ class Browser; class TabStripModel; -class UnloadControllerWebContentsDelegate; namespace content { class NotificationSource;
diff --git a/chrome/browser/ui/unload_controller_web_contents_delegate.cc b/chrome/browser/ui/unload_controller_web_contents_delegate.cc deleted file mode 100644 index a80f51c..0000000 --- a/chrome/browser/ui/unload_controller_web_contents_delegate.cc +++ /dev/null
@@ -1,20 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/ui/unload_controller_web_contents_delegate.h" - -#include "content/public/browser/web_contents.h" - -UnloadControllerWebContentsDelegate::UnloadControllerWebContentsDelegate() {} -UnloadControllerWebContentsDelegate::~UnloadControllerWebContentsDelegate() {} - -bool UnloadControllerWebContentsDelegate::ShouldSuppressDialogs( - content::WebContents* source) { - return true; -} - -void UnloadControllerWebContentsDelegate::CloseContents( - content::WebContents* source) { - delete source; -}
diff --git a/chrome/browser/ui/unload_controller_web_contents_delegate.h b/chrome/browser/ui/unload_controller_web_contents_delegate.h deleted file mode 100644 index 684c77f1..0000000 --- a/chrome/browser/ui/unload_controller_web_contents_delegate.h +++ /dev/null
@@ -1,28 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_UI_UNLOAD_CONTROLLER_WEB_CONTENTS_DELEGATE_H_ -#define CHROME_BROWSER_UI_UNLOAD_CONTROLLER_WEB_CONTENTS_DELEGATE_H_ - -#include "content/public/browser/web_contents_delegate.h" - -// UnloadControllerWebContentsDelegate will delete web contents when they are -// closed. It's used by UnloadController when beforeunload event is skipped so -// that the existing dialogs will be closed as well. It's used by -// FastUnloadController regardless. -class UnloadControllerWebContentsDelegate - : public content::WebContentsDelegate { - public: - UnloadControllerWebContentsDelegate(); - ~UnloadControllerWebContentsDelegate() override; - - // WebContentsDelegate implementation. - bool ShouldSuppressDialogs(content::WebContents* source) override; - void CloseContents(content::WebContents* source) override; - - private: - DISALLOW_COPY_AND_ASSIGN(UnloadControllerWebContentsDelegate); -}; - -#endif // CHROME_BROWSER_UI_UNLOAD_CONTROLLER_WEB_CONTENTS_DELEGATE_H_
diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc index 24e20a4a..3b09fbd 100644 --- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc +++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
@@ -168,10 +168,12 @@ // Move the tab to a second browser window; but first create another tab. // That prevents the first browser window from closing when its tab is moved. chrome::NewTab(browser()); - browser()->tab_strip_model()->DetachWebContentsAt( - browser()->tab_strip_model()->GetIndexOfWebContents(web_contents)); + std::unique_ptr<content::WebContents> owned_web_contents = + browser()->tab_strip_model()->DetachWebContentsAt( + browser()->tab_strip_model()->GetIndexOfWebContents(web_contents)); Browser* browser2 = CreateBrowser(browser()->profile()); - browser2->tab_strip_model()->AppendWebContents(web_contents, true); + browser2->tab_strip_model()->AppendWebContents(owned_web_contents.release(), + true); EXPECT_TRUE(dialog->GetWidget()->IsVisible()); // Close the first browser.
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc index c1a9144..2018a417 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
@@ -38,6 +38,8 @@ #include "chrome/browser/ui/views/frame/taskbar_decorator_win.h" #endif +using MD = ui::MaterialDesignController; + BrowserNonClientFrameView::BrowserNonClientFrameView(BrowserFrame* frame, BrowserView* browser_view) : frame_(frame), @@ -61,7 +63,7 @@ // static int BrowserNonClientFrameView::GetAvatarIconPadding() { - return ui::MaterialDesignController::IsTouchOptimizedUiEnabled() ? 8 : 4; + return MD::IsTouchOptimizedUiEnabled() ? 8 : 4; } void BrowserNonClientFrameView::OnBrowserViewInitViewsComplete() { @@ -258,20 +260,21 @@ tp->GetColor(ThemeProperties::COLOR_TOOLBAR)); } - // Top stroke. - gfx::ScopedCanvas scoped_canvas(canvas); - gfx::Rect tabstrip_bounds = - GetMirroredRect(GetBoundsForTabStrip(browser_view()->tabstrip())); - canvas->ClipRect(tabstrip_bounds, SkClipOp::kDifference); - gfx::Rect separator_rect(x, y, w, 0); - separator_rect.set_y(tabstrip_bounds.bottom()); - BrowserView::Paint1pxHorizontalLine(canvas, GetToolbarTopSeparatorColor(), - separator_rect, true); - - // Toolbar/content separator. - BrowserView::Paint1pxHorizontalLine( - canvas, tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR), - toolbar_bounds, true); + if (TabStrip::ShouldDrawStrokes()) { + // Top stroke. + gfx::ScopedCanvas scoped_canvas(canvas); + gfx::Rect tabstrip_bounds = + GetMirroredRect(GetBoundsForTabStrip(browser_view()->tabstrip())); + canvas->ClipRect(tabstrip_bounds, SkClipOp::kDifference); + gfx::Rect separator_rect(x, y, w, 0); + separator_rect.set_y(tabstrip_bounds.bottom()); + BrowserView::Paint1pxHorizontalLine(canvas, GetToolbarTopSeparatorColor(), + separator_rect, true); + // Toolbar/content separator. + BrowserView::Paint1pxHorizontalLine( + canvas, tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR), + toolbar_bounds, true); + } } void BrowserNonClientFrameView::ViewHierarchyChanged( @@ -424,7 +427,7 @@ // frame. It's instead shown in the new tab button. However, we still show an // avatar icon for the teleported browser windows between multi-user sessions // (Chrome OS only). Note that you can't teleport an incognito window. - if (is_incognito && ui::MaterialDesignController::IsTouchOptimizedUiEnabled()) + if (is_incognito && MD::IsTouchOptimizedUiEnabled()) return false; #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index f92ec57..b775c5e 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1804,13 +1804,13 @@ // Destroy any remaining WebContents early on. Doing so may result in // calling back to one of the Views/LayoutManagers or supporting classes of // BrowserView. By destroying here we ensure all said classes are valid. - std::vector<content::WebContents*> contents; + std::vector<std::unique_ptr<content::WebContents>> contents; while (browser()->tab_strip_model()->count()) contents.push_back(browser()->tab_strip_model()->DetachWebContentsAt(0)); // Note: The BrowserViewTest tests rely on the contents being destroyed in the // order that they were present in the tab strip. - for (auto* content : contents) - delete content; + for (auto& content : contents) + content.reset(); } void BrowserView::OnWidgetActivationChanged(views::Widget* widget,
diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index 53deaa93..5bb6b84 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -357,7 +357,10 @@ } bool InfoBarView::ShouldDrawSeparator() const { - return parent()->GetIndexOf(this) != 0; + // There will be no parent when this infobar is not in a container, e.g. if + // it's in a background tab. It's still possible to reach here in that case, + // e.g. if ElevationIconSetter triggers a Layout(). + return parent() && parent()->GetIndexOf(this) != 0; } int InfoBarView::GetSeparatorHeightDip() const {
diff --git a/chrome/browser/ui/views/infobars/infobar_view_unittest.cc b/chrome/browser/ui/views/infobars/infobar_view_unittest.cc index 0c6ca7c..444f1fe 100644 --- a/chrome/browser/ui/views/infobars/infobar_view_unittest.cc +++ b/chrome/browser/ui/views/infobars/infobar_view_unittest.cc
@@ -13,11 +13,13 @@ class TestInfoBarDelegate : public infobars::InfoBarDelegate { public: - static bool Create(InfoBarService* infobar_service) { - return !!infobar_service->AddInfoBar( - std::make_unique<InfoBarView>(std::make_unique<TestInfoBarDelegate>())); + static InfoBarView* Create(InfoBarService* infobar_service) { + return static_cast<InfoBarView*>( + infobar_service->AddInfoBar(std::make_unique<InfoBarView>( + std::make_unique<TestInfoBarDelegate>()))); } + // infobars::InfoBarDelegate: InfoBarIdentifier GetIdentifier() const override { return TEST_INFOBAR; } }; @@ -43,15 +45,11 @@ }; TEST_F(InfoBarViewTest, ShouldDrawSeparator) { - // Add multiple infobars. - for (int i = 0; i < 3; ++i) - EXPECT_TRUE(TestInfoBarDelegate::Create(infobar_service())); - - // The top infobar should not draw a separator; the others should. - auto infobar_at = [this](size_t index) { - return static_cast<InfoBarView*>(infobar_service()->infobar_at(index)); - }; - EXPECT_FALSE(infobar_at(0)->ShouldDrawSeparator()); - EXPECT_TRUE(infobar_at(1)->ShouldDrawSeparator()); - EXPECT_TRUE(infobar_at(2)->ShouldDrawSeparator()); + // Add multiple infobars. The top infobar should not draw a separator; the + // others should. + for (int i = 0; i < 3; ++i) { + InfoBarView* infobar = TestInfoBarDelegate::Create(infobar_service()); + ASSERT_TRUE(infobar); + EXPECT_EQ(i > 0, infobar->ShouldDrawSeparator()); + } }
diff --git a/chrome/browser/ui/views/message_center/popups_only_ui_delegate.cc b/chrome/browser/ui/views/message_center/popups_only_ui_delegate.cc index de7da93ce..923aef7 100644 --- a/chrome/browser/ui/views/message_center/popups_only_ui_delegate.cc +++ b/chrome/browser/ui/views/message_center/popups_only_ui_delegate.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/message_center/popups_only_ui_delegate.h" #include "ui/display/screen.h" +#include "ui/message_center/message_center.h" #include "ui/message_center/ui_controller.h" #include "ui/message_center/views/desktop_popup_alignment_delegate.h" #include "ui/message_center/views/message_popup_collection.h" @@ -18,6 +19,7 @@ alignment_delegate_.reset(new message_center::DesktopPopupAlignmentDelegate); popup_collection_.reset(new message_center::MessagePopupCollection( message_center(), ui_controller_.get(), alignment_delegate_.get())); + message_center()->SetHasMessageCenterView(false); } PopupsOnlyUiDelegate::~PopupsOnlyUiDelegate() {
diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc index 3e5b0ee..4746352f 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
@@ -66,11 +66,6 @@ // the additional padding here to zero). static const int kAnswerIconToTextPadding = 2; -// Whether to use the two-line layout. -bool IsTwoLineLayout() { - return base::FeatureList::IsEnabled(omnibox::kUIExperimentVerticalLayout); -} - // Creates a views::Background for the current result style. std::unique_ptr<views::Background> CreateBackgroundWithColor(SkColor bg_color) { return ui::MaterialDesignController::IsNewerMaterialUi() @@ -183,7 +178,6 @@ void LayoutAnswer(); void LayoutEntity(); void LayoutSplit(); - void LayoutTwoLine(); bool is_answer_; bool is_search_type_; @@ -222,8 +216,6 @@ text_height_ + GetVerticalInsets(text_height_, is_answer_).height(); if (is_answer_) height += GetAnswerHeight(); - else if (IsTwoLineLayout()) - height += text_height_; return gfx::Size(0, height); } @@ -244,7 +236,7 @@ void OmniboxSuggestionView::OnMatchUpdate(const AutocompleteMatch& match) { is_answer_ = !!match.answer; is_search_type_ = AutocompleteMatch::IsSearchType(match.type); - if (is_answer_ || IsTwoLineLayout()) { + if (is_answer_) { separator_view_->SetSize(gfx::Size()); } if (is_answer_ && @@ -265,8 +257,6 @@ } else { LayoutAnswer(); } - } else if (IsTwoLineLayout()) { - LayoutTwoLine(); } else { LayoutSplit(); } @@ -277,9 +267,8 @@ int x = start_x + LocationBarView::GetBorderThicknessDip(); int y = GetVerticalInsets(text_height_, is_answer_).top(); icon_view_->SetSize(icon_view_->CalculatePreferredSize()); - int center_icon_within = IsTwoLineLayout() ? height() : text_height_; icon_view_->SetPosition( - gfx::Point(x, y + (center_icon_within - icon_view_->height()) / 2)); + gfx::Point(x, y + (text_height_ - icon_view_->height()) / 2)); x += icon_view_->width() + HorizontalPadding(); content_view_->SetBounds(x, y, width() - x, text_height_); y += text_height_; @@ -339,29 +328,6 @@ } } -void OmniboxSuggestionView::LayoutTwoLine() { - int x = GetIconAlignmentOffset() + HorizontalPadding() + - LocationBarView::GetBorderThicknessDip(); - int y = GetVerticalInsets(text_height_, is_answer_).top(); - icon_view_->SetSize(icon_view_->CalculatePreferredSize()); - icon_view_->SetPosition(gfx::Point(x, (height() - icon_view_->height()) / 2)); - x += icon_view_->width() + HorizontalPadding(); - if (!!description_view_->GetContentsBounds().width()) { - // A description is present. - content_view_->SetBounds(x, y, width() - x, text_height_); - y += text_height_; - int description_width = width() - x; - description_view_->SetBounds( - x, y, description_width, - description_view_->GetHeightForWidth(description_width) + - kVerticalPadding); - } else { - // For no description, shift down halfway to draw contents in middle. - y += text_height_ / 2; - content_view_->SetBounds(x, y, width() - x, text_height_); - } -} - //////////////////////////////////////////////////////////////////////////////// // OmniboxResultView, public:
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index 919215d..b9e5b17 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -69,6 +69,7 @@ #endif using base::UserMetricsAction; +using MD = ui::MaterialDesignController; namespace { @@ -94,14 +95,17 @@ // Drawing and utility functions // Returns the width of the tab endcap in DIP. More precisely, this is the -// width of the curve making up either the outer or inner edge of the stroke; -// since these two curves are horizontally offset by 1 px (regardless of scale), -// the total width of the endcap from tab outer edge to the inside end of the -// stroke inner edge is (GetUnscaledEndcapWidth() * scale) + 1. +// width of the curve making up either the outer or inner edge of the stroke. +// +// For non-material-refresh mode, these two curves are horizontally offset by +// 1 px (regardless of scale), the total width of the endcap from tab outer +// edge to the inside end of the stroke inner edge is +// (GetUnscaledEndcapWidth() * scale) + 1. // // The value returned here must be at least Tab::kMinimumEndcapWidth. float GetTabEndcapWidth() { - return GetLayoutInsets(TAB).left() - 0.5f; + return GetLayoutInsets(TAB).left() - + (MD::GetMode() == MD::MATERIAL_REFRESH ? 0.0f : 0.5f); } void DrawHighlight(gfx::Canvas* canvas, @@ -138,30 +142,73 @@ // this makes it easier to avoid overdraw in the top center near minimum // width, and to implement cases where |horizontal_inset| != 0. gfx::Path right_path; - right_path.moveTo(right - 1 - scaled_horizontal_inset, bottom); - right_path.rCubicTo(-0.75 * scale, 0, -1.625 * scale, -0.5 * scale, - -2 * scale, -1.5 * scale); - right_path.lineTo( - right - 1 - scaled_horizontal_inset - (endcap_width - 2) * scale, - 2.5 * scale); - right_path.rCubicTo(-0.375 * scale, -1 * scale, -1.25 * scale, -1.5 * scale, - -2 * scale, -1.5 * scale); - right_path.lineTo(0, scale); - right_path.lineTo(0, bottom); - right_path.close(); - gfx::Path left_path; - const float scaled_endcap_width = 1 + endcap_width * scale; - left_path.moveTo(scaled_endcap_width + scaled_horizontal_inset, scale); - left_path.rCubicTo(-0.75 * scale, 0, -1.625 * scale, 0.5 * scale, -2 * scale, - 1.5 * scale); - left_path.lineTo(1 + scaled_horizontal_inset + 2 * scale, - bottom - 1.5 * scale); - left_path.rCubicTo(-0.375 * scale, scale, -1.25 * scale, 1.5 * scale, - -2 * scale, 1.5 * scale); - left_path.lineTo(right, bottom); - left_path.lineTo(right, scale); - left_path.close(); + if (MD::GetMode() == MD::MATERIAL_REFRESH) { + const float radius = (endcap_width / 2) * scale; + + const float stroke_thickness = TabStrip::ShouldDrawStrokes() ? 1 : 0; + + // Bottom right. + right_path.moveTo(right, bottom); + + right_path.arcTo(radius, radius, 0, SkPath::kSmall_ArcSize, + SkPath::kCW_Direction, right - radius, bottom - radius); + + // Right vertical. + right_path.lineTo(right - radius, radius + stroke_thickness); + + // Top right. + right_path.arcTo(radius, radius, 0, SkPath::kSmall_ArcSize, + SkPath::kCCW_Direction, right - radius * 2, + stroke_thickness); + + // Top edge. + right_path.lineTo(0, stroke_thickness); + right_path.lineTo(0, bottom); + right_path.close(); + + // Top left. + left_path.moveTo(radius * 2, stroke_thickness); + + left_path.arcTo(radius, radius, 0, SkPath::kSmall_ArcSize, + SkPath::kCCW_Direction, radius, radius + stroke_thickness); + + // Left vertical. + left_path.lineTo(radius, bottom - radius); + + // Bottom left. + left_path.arcTo(radius, radius, 0, SkPath::kSmall_ArcSize, + SkPath::kCW_Direction, 0, bottom); + + // Bottom edge. + left_path.lineTo(right, bottom); + left_path.lineTo(right, stroke_thickness); + left_path.close(); + } else { + right_path.moveTo(right - 1 - scaled_horizontal_inset, bottom); + right_path.rCubicTo(-0.75 * scale, 0, -1.625 * scale, -0.5 * scale, + -2 * scale, -1.5 * scale); + right_path.lineTo( + right - 1 - scaled_horizontal_inset - (endcap_width - 2) * scale, + 2.5 * scale); + right_path.rCubicTo(-0.375 * scale, -1 * scale, -1.25 * scale, -1.5 * scale, + -2 * scale, -1.5 * scale); + right_path.lineTo(0, scale); + right_path.lineTo(0, bottom); + right_path.close(); + + const float scaled_endcap_width = 1 + endcap_width * scale; + left_path.moveTo(scaled_endcap_width + scaled_horizontal_inset, scale); + left_path.rCubicTo(-0.75 * scale, 0, -1.625 * scale, 0.5 * scale, + -2 * scale, 1.5 * scale); + left_path.lineTo(1 + scaled_horizontal_inset + 2 * scale, + bottom - 1.5 * scale); + left_path.rCubicTo(-0.375 * scale, scale, -1.25 * scale, 1.5 * scale, + -2 * scale, 1.5 * scale); + left_path.lineTo(right, bottom); + left_path.lineTo(right, scale); + left_path.close(); + } gfx::Path complete_path; Op(left_path, right_path, SkPathOp::kIntersect_SkPathOp, &complete_path); @@ -179,34 +226,63 @@ bool extend_to_top, float endcap_width, const gfx::Size& size) { - const float top = scale - 1; + const float stroke_thickness = TabStrip::ShouldDrawStrokes() ? 1 : 0; + const float top = scale - stroke_thickness; const float right = size.width() * scale; const float bottom = size.height() * scale; gfx::Path path; + path.moveTo(0, bottom); path.rLineTo(0, -1); - path.rCubicTo(0.75 * scale, 0, 1.625 * scale, -0.5 * scale, 2 * scale, - -1.5 * scale); - path.lineTo((endcap_width - 2) * scale, top + 1.5 * scale); - if (extend_to_top) { - // Create the vertical extension by extending the side diagonals until - // they reach the top of the bounds. - const float dy = 2.5 * scale - 1; - const float dx = Tab::GetInverseDiagonalSlope() * dy; - path.rLineTo(dx, -dy); - path.lineTo(right - (endcap_width - 2) * scale - dx, 0); - path.rLineTo(dx, dy); + + if (MD::GetMode() == MD::MATERIAL_REFRESH) { + const float radius = (endcap_width / 2) * scale; + const float bottom_radius = radius - stroke_thickness; + const float top_radius = radius + stroke_thickness; + + // bottom left + path.arcTo(bottom_radius, bottom_radius, 0, SkPath::kSmall_ArcSize, + SkPath::kCCW_Direction, bottom_radius, bottom - radius); + // left vertical + path.lineTo(bottom_radius, top_radius); + // top left + path.arcTo(top_radius, top_radius, 0, SkPath::kSmall_ArcSize, + SkPath::kCW_Direction, radius * 2, 0); + // top line + path.lineTo(right - radius * 2, 0); + // top right + path.arcTo(top_radius, top_radius, 0, SkPath::kSmall_ArcSize, + SkPath::kCW_Direction, right - bottom_radius, radius); + // right vertical + path.lineTo(right - bottom_radius, bottom - radius); + // bottom right + path.arcTo(bottom_radius, bottom_radius, 0, SkPath::kSmall_ArcSize, + SkPath::kCCW_Direction, right, bottom - stroke_thickness); } else { - path.rCubicTo(0.375 * scale, -scale, 1.25 * scale, -1.5 * scale, 2 * scale, + path.rCubicTo(0.75 * scale, 0, 1.625 * scale, -0.5 * scale, 2 * scale, -1.5 * scale); - path.lineTo(right - endcap_width * scale, top); - path.rCubicTo(0.75 * scale, 0, 1.625 * scale, 0.5 * scale, 2 * scale, + path.lineTo((endcap_width - 2) * scale, top + 1.5 * scale); + if (extend_to_top) { + // Create the vertical extension by extending the side diagonals until + // they reach the top of the bounds. + const float dy = 2.5 * scale - 1; + const float dx = Tab::GetInverseDiagonalSlope() * dy; + path.rLineTo(dx, -dy); + path.lineTo(right - (endcap_width - 2) * scale - dx, 0); + path.rLineTo(dx, dy); + } else { + path.rCubicTo(0.375 * scale, -scale, 1.25 * scale, -1.5 * scale, + 2 * scale, -1.5 * scale); + path.lineTo(right - endcap_width * scale, top); + path.rCubicTo(0.75 * scale, 0, 1.625 * scale, 0.5 * scale, 2 * scale, + 1.5 * scale); + } + path.lineTo(right - 2 * scale, bottom - 1 - 1.5 * scale); + path.rCubicTo(0.375 * scale, scale, 1.25 * scale, 1.5 * scale, 2 * scale, 1.5 * scale); } - path.lineTo(right - 2 * scale, bottom - 1 - 1.5 * scale); - path.rCubicTo(0.375 * scale, scale, 1.25 * scale, 1.5 * scale, 2 * scale, - 1.5 * scale); + path.rLineTo(0, 1); path.close(); @@ -281,8 +357,7 @@ } SkColor Tab::GetAlertIndicatorColor(TabAlertState state) const { - const bool is_touch_optimized = - ui::MaterialDesignController::IsTouchOptimizedUiEnabled(); + const bool is_touch_optimized = MD::IsTouchOptimizedUiEnabled(); // If theme provider is not yet available, return the default button // color. const ui::ThemeProvider* theme_provider = GetThemeProvider(); @@ -678,8 +753,7 @@ close_button_->SetVisible(showing_close_button_); if (showing_alert_indicator_) { - const bool is_touch_optimized = - ui::MaterialDesignController::IsTouchOptimizedUiEnabled(); + const bool is_touch_optimized = MD::IsTouchOptimizedUiEnabled(); const gfx::Size image_size(alert_indicator_button_->GetPreferredSize()); const int alert_to_close_spacing = is_touch_optimized ? after_title_padding : 0; @@ -991,15 +1065,17 @@ if (fill_id || paint_hover_effect) { gfx::Path fill_path = GetInteriorPath(canvas->image_scale(), size(), endcap_width); - gfx::Path stroke_path = GetBorderPath(canvas->image_scale(), false, false, - endcap_width, size()); PaintTabBackgroundFill(canvas, fill_path, active, paint_hover_effect, active_color, inactive_color, fill_id, y_offset); - gfx::ScopedCanvas scoped_canvas(clip ? canvas : nullptr); - if (clip) - canvas->sk_canvas()->clipPath(*clip, SkClipOp::kDifference, true); - PaintTabBackgroundStroke(canvas, fill_path, stroke_path, active, - stroke_color); + if (TabStrip::ShouldDrawStrokes()) { + gfx::Path stroke_path = GetBorderPath(canvas->image_scale(), false, false, + endcap_width, size()); + gfx::ScopedCanvas scoped_canvas(clip ? canvas : nullptr); + if (clip) + canvas->sk_canvas()->clipPath(*clip, SkClipOp::kDifference, true); + PaintTabBackgroundStroke(canvas, fill_path, stroke_path, active, + stroke_color); + } return; } @@ -1022,7 +1098,7 @@ fill_id, y_offset); cache.fill_record = recorder.finishRecordingAsPicture(); } - { + if (TabStrip::ShouldDrawStrokes()) { gfx::Canvas cache_canvas( recorder.beginRecording(size().width(), size().height()), canvas->image_scale()); @@ -1036,10 +1112,12 @@ } canvas->sk_canvas()->drawPicture(cache.fill_record); - gfx::ScopedCanvas scoped_canvas(clip ? canvas : nullptr); - if (clip) - canvas->sk_canvas()->clipPath(*clip, SkClipOp::kDifference, true); - canvas->sk_canvas()->drawPicture(cache.stroke_record); + if (TabStrip::ShouldDrawStrokes()) { + gfx::ScopedCanvas scoped_canvas(clip ? canvas : nullptr); + if (clip) + canvas->sk_canvas()->clipPath(*clip, SkClipOp::kDifference, true); + canvas->sk_canvas()->drawPicture(cache.stroke_record); + } } void Tab::PaintTabBackgroundFill(gfx::Canvas* canvas, @@ -1110,8 +1188,7 @@ int available_width = std::max(0, width() - min_size.width()); - const bool is_touch_optimized = - ui::MaterialDesignController::IsTouchOptimizedUiEnabled(); + const bool is_touch_optimized = MD::IsTouchOptimizedUiEnabled(); const int favicon_width = gfx::kFaviconSize; const int alert_icon_width = alert_indicator_button_->GetPreferredSize().width(); @@ -1233,10 +1310,10 @@ button_color_ = new_button_color; title_->SetEnabledColor(title_color); alert_indicator_button_->OnParentTabButtonColorChanged(); - if (!ui::MaterialDesignController::IsTouchOptimizedUiEnabled()) + if (!MD::IsTouchOptimizedUiEnabled()) close_button_->SetTabColor(button_color_); } - if (ui::MaterialDesignController::IsTouchOptimizedUiEnabled()) + if (MD::IsTouchOptimizedUiEnabled()) close_button_->ActiveStateChanged(this); }
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc index 5dfbeb0..c514ee58 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -980,7 +980,10 @@ // Hide the tab so that the user doesn't see it animate closed. drag_data_[i].attached_tab->SetVisible(false); drag_data_[i].attached_tab->set_detached(); - attached_model->DetachWebContentsAt(index); + + // TODO(erikchen): Fix ownership semantics for this class once all + // TabStripModel APIs have been migrated to use proper ownership semantics. + attached_model->DetachWebContentsAt(index).release(); // Detaching may end up deleting the tab, drop references to it. drag_data_[i].attached_tab = NULL; @@ -1454,12 +1457,14 @@ if (attached_tabstrip_ != source_tabstrip_) { // The Tab was inserted into another TabStrip. We need to put it back // into the original one. - GetModel(attached_tabstrip_)->DetachWebContentsAt(index); + std::unique_ptr<content::WebContents> detached_web_contents = + GetModel(attached_tabstrip_)->DetachWebContentsAt(index); // TODO(beng): (Cleanup) seems like we should use Attach() for this // somehow. - GetModel(source_tabstrip_)->InsertWebContentsAt( - data->source_model_index, data->contents, - (data->pinned ? TabStripModel::ADD_PINNED : 0)); + GetModel(source_tabstrip_) + ->InsertWebContentsAt(data->source_model_index, + detached_web_contents.release(), + (data->pinned ? TabStripModel::ADD_PINNED : 0)); } else { // The Tab was moved within the TabStrip where the drag was initiated. // Move it back to the starting location.
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 011dffa0..b7344b3 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -80,6 +80,7 @@ using base::UserMetricsAction; using ui::DropTargetEvent; +using MD = ui::MaterialDesignController; namespace { @@ -306,6 +307,11 @@ RemoveAllChildViews(true); } +// static +bool TabStrip::ShouldDrawStrokes() { + return MD::GetMode() != MD::MATERIAL_REFRESH; +} + void TabStrip::AddObserver(TabStripObserver* observer) { observers_.AddObserver(observer); } @@ -1172,14 +1178,16 @@ paint_info.paint_recording_scale_x(), paint_info.paint_recording_scale_y(), nullptr); - gfx::Canvas* canvas = recorder.canvas(); - if (active_tab && active_tab->visible()) { - canvas->sk_canvas()->clipRect( - gfx::RectToSkRect(active_tab->GetMirroredBounds()), - SkClipOp::kDifference); + if (ShouldDrawStrokes()) { + gfx::Canvas* canvas = recorder.canvas(); + if (active_tab && active_tab->visible()) { + canvas->sk_canvas()->clipRect( + gfx::RectToSkRect(active_tab->GetMirroredBounds()), + SkClipOp::kDifference); + } + BrowserView::Paint1pxHorizontalLine(canvas, GetToolbarTopSeparatorColor(), + GetLocalBounds(), true); } - BrowserView::Paint1pxHorizontalLine(canvas, GetToolbarTopSeparatorColor(), - GetLocalBounds(), true); } const char* TabStrip::GetClassName() const { @@ -2327,8 +2335,7 @@ } void TabStrip::SetResetToShrinkOnExit(bool value) { - if (!adjust_layout_ || - ui::MaterialDesignController::IsTouchOptimizedUiEnabled()) { + if (!adjust_layout_ || MD::IsTouchOptimizedUiEnabled()) { return; }
diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h index 75e8ead..09405a6 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.h +++ b/chrome/browser/ui/views/tabs/tab_strip.h
@@ -65,6 +65,9 @@ explicit TabStrip(std::unique_ptr<TabStripController> controller); ~TabStrip() override; + // Returns whether or not strokes should be drawn around and under the tabs. + static bool ShouldDrawStrokes(); + // Add and remove observers to changes within this TabStrip. void AddObserver(TabStripObserver* observer); void RemoveObserver(TabStripObserver* observer);
diff --git a/chrome/browser/ui/webui/chromeos/first_run/DEPS b/chrome/browser/ui/webui/chromeos/first_run/DEPS deleted file mode 100644 index 5d44c60..0000000 --- a/chrome/browser/ui/webui/chromeos/first_run/DEPS +++ /dev/null
@@ -1,7 +0,0 @@ -specific_include_rules = { - "first_run_ui\.cc": [ - # TODO(mash): Remove. http://crbug.com/770866 - "+ash/shell.h", - "+ash/shelf/shelf.h", - ], -}
diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc index c666cf8..46fa96ea6 100644 --- a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc +++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc
@@ -6,8 +6,7 @@ #include <memory> -#include "ash/shelf/shelf.h" -#include "ash/shell.h" +#include "ash/public/cpp/shelf_prefs.h" #include "base/command_line.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" @@ -21,6 +20,8 @@ #include "content/public/browser/web_ui_data_source.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/web_ui_util.h" +#include "ui/display/display.h" +#include "ui/display/screen.h" namespace { @@ -29,7 +30,8 @@ const char kShelfAlignmentLeft[] = "left"; const char kShelfAlignmentRight[] = "right"; -void SetLocalizedStrings(base::DictionaryValue* localized_strings) { +void SetLocalizedStrings(Profile* profile, + base::DictionaryValue* localized_strings) { localized_strings->SetString( "appListHeader", l10n_util::GetStringUTF16(IDS_FIRST_RUN_APP_LIST_STEP_HEADER)); @@ -62,9 +64,11 @@ localized_strings->SetString( "accessibleTitle", l10n_util::GetStringUTF16(IDS_FIRST_RUN_STEP_ACCESSIBLE_TITLE)); - ash::Shelf* shelf = ash::Shelf::ForWindow(ash::Shell::GetPrimaryRootWindow()); + ash::ShelfAlignment alignment = ash::GetShelfAlignmentPref( + profile->GetPrefs(), + display::Screen::GetScreen()->GetPrimaryDisplay().id()); std::string shelf_alignment; - switch (shelf->alignment()) { + switch (alignment) { case ash::SHELF_ALIGNMENT_BOTTOM: case ash::SHELF_ALIGNMENT_BOTTOM_LOCKED: shelf_alignment = kShelfAlignmentBottom; @@ -79,7 +83,7 @@ localized_strings->SetString("shelfAlignment", shelf_alignment); } -content::WebUIDataSource* CreateDataSource() { +content::WebUIDataSource* CreateDataSource(Profile* profile) { content::WebUIDataSource* source = content::WebUIDataSource::Create(chrome::kChromeUIFirstRunHost); source->SetJsonPath("strings.js"); @@ -88,7 +92,7 @@ base::DictionaryValue localized_strings; const std::string& app_locale = g_browser_process->GetApplicationLocale(); webui::SetLoadTimeDataDefaults(app_locale, &localized_strings); - SetLocalizedStrings(&localized_strings); + SetLocalizedStrings(profile, &localized_strings); source->AddLocalizedStrings(localized_strings); return source; } @@ -103,7 +107,8 @@ auto handler = std::make_unique<FirstRunHandler>(); actor_ = handler.get(); web_ui->AddMessageHandler(std::move(handler)); - content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), CreateDataSource()); + Profile* profile = Profile::FromWebUI(web_ui); + content::WebUIDataSource::Add(profile, CreateDataSource(profile)); } } // namespace chromeos
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc index c9a1d3bb..3847889 100644 --- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -1220,6 +1220,7 @@ LocalizedString localized_strings[] = { {"languagesPageTitle", IDS_SETTINGS_LANGUAGES_PAGE_TITLE}, {"languagesListTitle", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_TITLE}, + {"searchLanguages", IDS_SETTINGS_LANGUAGE_SEARCH}, {"languagesExpandA11yLabel", IDS_SETTINGS_LANGUAGES_EXPAND_ACCESSIBILITY_LABEL}, {"orderLanguagesInstructions",
diff --git a/chrome/browser/ui/webui/snippets_internals_message_handler.cc b/chrome/browser/ui/webui/snippets_internals_message_handler.cc index a65c50f..5ae5439c 100644 --- a/chrome/browser/ui/webui/snippets_internals_message_handler.cc +++ b/chrome/browser/ui/webui/snippets_internals_message_handler.cc
@@ -54,7 +54,6 @@ using ntp_snippets::CategoryStatus; using ntp_snippets::ContentSuggestion; using ntp_snippets::IsBookmarkProviderEnabled; -using ntp_snippets::IsPhysicalWebPageProviderEnabled; using ntp_snippets::IsRecentTabProviderEnabled; using ntp_snippets::KnownCategories; using ntp_snippets::RemoteSuggestion; @@ -438,12 +437,6 @@ SendBoolean("flag-bookmark-suggestions", IsBookmarkProviderEnabled()); - SendBoolean("flag-physical-web-page-suggestions", - IsPhysicalWebPageProviderEnabled()); - - SendBoolean("flag-physical-web", base::FeatureList::IsEnabled( - chrome::android::kPhysicalWebFeature)); - SendClassification(); SendRankerDebugData(); SendLastRemoteSuggestionsBackgroundFetchTime();
diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc index ff81d2c9..c6c393f 100644 --- a/chrome/browser/unload_browsertest.cc +++ b/chrome/browser/unload_browsertest.cc
@@ -126,16 +126,15 @@ int aborts_; }; -class UnloadTestBase : public InProcessBrowserTest { +class UnloadTest : public InProcessBrowserTest { public: void SetUpCommandLine(base::CommandLine* command_line) override { const testing::TestInfo* const test_info = testing::UnitTest::GetInstance()->current_test_info(); - if (strstr(test_info->name(), "BrowserCloseTabWhenOtherTabHasListener") != - nullptr) { + if (strcmp(test_info->name(), + "BrowserCloseTabWhenOtherTabHasListener") == 0) { command_line->AppendSwitch(switches::kDisablePopupBlocking); - } else if (strstr(test_info->name(), "BrowserTerminateBeforeUnload") != - nullptr) { + } else if (strcmp(test_info->name(), "BrowserTerminateBeforeUnload") == 0) { #if defined(OS_POSIX) DisableSIGTERMHandling(); #endif @@ -206,24 +205,12 @@ } }; -class UnloadTest : public UnloadTestBase, - public testing::WithParamInterface<bool> { - public: - void SetUpCommandLine(base::CommandLine* command_line) override { - UnloadTestBase::SetUpCommandLine(command_line); - if (GetParam()) - command_line->AppendSwitch(switches::kEnableFastUnload); - } -}; - -INSTANTIATE_TEST_CASE_P(, UnloadTest, testing::Bool()); - // Navigate to a page with an infinite unload handler. // Then two async crosssite requests to ensure // we don't get confused and think we're closing the tab. // // This test is flaky on the valgrind UI bots. http://crbug.com/39057 -IN_PROC_BROWSER_TEST_P(UnloadTest, CrossSiteInfiniteUnloadAsync) { +IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteUnloadAsync) { // Tests makes no sense in single-process mode since the renderer is hung. if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kSingleProcess)) @@ -237,7 +224,7 @@ // Navigate to a page with an infinite unload handler. // Then two sync crosssite requests to ensure // we correctly nav to each one. -IN_PROC_BROWSER_TEST_P(UnloadTest, CrossSiteInfiniteUnloadSync) { +IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteUnloadSync) { // Tests makes no sense in single-process mode since the renderer is hung. if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kSingleProcess)) @@ -253,7 +240,7 @@ // we don't get confused and think we're closing the tab. // This test is flaky on the valgrind UI bots. http://crbug.com/39057 and // http://crbug.com/86469 -IN_PROC_BROWSER_TEST_P(UnloadTest, CrossSiteInfiniteBeforeUnloadAsync) { +IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteBeforeUnloadAsync) { // Tests makes no sense in single-process mode since the renderer is hung. if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kSingleProcess)) @@ -268,7 +255,7 @@ // Then two two sync crosssite requests to ensure // we correctly nav to each one. // Flaky on Win, Linux, and Mac; http://crbug.com/462671. -IN_PROC_BROWSER_TEST_P(UnloadTest, DISABLED_CrossSiteInfiniteBeforeUnloadSync) { +IN_PROC_BROWSER_TEST_F(UnloadTest, DISABLED_CrossSiteInfiniteBeforeUnloadSync) { // Tests makes no sense in single-process mode since the renderer is hung. if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kSingleProcess)) @@ -280,19 +267,19 @@ } // Tests closing the browser on a page with no unload listeners registered. -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserCloseNoUnloadListeners) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseNoUnloadListeners) { LoadUrlAndQuitBrowser(NOLISTENERS_HTML, "nolisteners"); } // Tests closing the browser on a page with an unload listener registered. // Test marked as flaky in http://crbug.com/51698 -IN_PROC_BROWSER_TEST_P(UnloadTest, DISABLED_BrowserCloseUnload) { +IN_PROC_BROWSER_TEST_F(UnloadTest, DISABLED_BrowserCloseUnload) { LoadUrlAndQuitBrowser(UNLOAD_HTML, "unload"); } // Tests closing the browser with a beforeunload handler and clicking // OK in the beforeunload confirm dialog. -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserCloseBeforeUnloadOK) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseBeforeUnloadOK) { NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload"); PrepareForDialog(browser()); @@ -307,7 +294,7 @@ // Tests closing the browser with a beforeunload handler and clicking // CANCEL in the beforeunload confirm dialog. // If this test flakes, reopen http://crbug.com/123110 -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserCloseBeforeUnloadCancel) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) { NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload"); PrepareForDialog(browser()); chrome::CloseWindow(browser()); @@ -334,7 +321,7 @@ // Tests closing the browser by BrowserList::CloseAllBrowsersWithProfile, // on a page with no unload listeners registered. -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserListCloseNoUnloadListeners) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListCloseNoUnloadListeners) { NavigateToDataURL(NOLISTENERS_HTML, "nolisteners"); content::WindowedNotificationObserver window_observer( @@ -353,7 +340,7 @@ // Tests closing the browser by BrowserList::CloseAllBrowsersWithProfile, with a // beforeunload handler and clicking Leave in the beforeunload confirm dialog. -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserListCloseBeforeUnloadOK) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListCloseBeforeUnloadOK) { NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload"); PrepareForDialog(browser()); @@ -374,7 +361,7 @@ // Tests closing the browser by BrowserList::CloseAllBrowsersWithProfile, with a // beforeunload handler and clicking Stay in the beforeunload confirm dialog. -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserListCloseBeforeUnloadCancel) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListCloseBeforeUnloadCancel) { NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload"); PrepareForDialog(browser()); @@ -410,7 +397,7 @@ // Tests double calls to BrowserList::CloseAllBrowsersWithProfile, with a // beforeunload handler and clicking Leave in the beforeunload confirm dialog. -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserListDoubleCloseBeforeUnloadOK) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListDoubleCloseBeforeUnloadOK) { NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload"); PrepareForDialog(browser()); @@ -436,7 +423,7 @@ // Tests double calls to BrowserList::CloseAllBrowsersWithProfile, with a // beforeunload handler and clicking Stay in the beforeunload confirm dialog. -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserListDoubleCloseBeforeUnloadCancel) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListDoubleCloseBeforeUnloadCancel) { NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload"); PrepareForDialog(browser()); @@ -478,7 +465,7 @@ // Tests closing the browser by BrowserList::CloseAllBrowsersWithProfile, with // a null success callback, a beforeunload handler and clicking Leave in the // beforeunload confirm dialog. The test succeed if no crash happens. -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserListCloseBeforeUnloadNullCallbackOk) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListCloseBeforeUnloadNullCallbackOk) { NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload"); PrepareForDialog(browser()); @@ -496,7 +483,7 @@ // Tests closing the browser by BrowserList::CloseAllBrowsersWithProfile, with // a null failure callback, a beforeunload handler and clicking Stay in the // beforeunload confirm dialog. The test succeed if no crash happens. -IN_PROC_BROWSER_TEST_P(UnloadTest, +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListCloseBeforeUnloadNullCallbackCancel) { NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload"); PrepareForDialog(browser()); @@ -529,7 +516,7 @@ // Tests terminating the browser with a beforeunload handler. // Currently only ChromeOS shuts down gracefully. #if defined(OS_CHROMEOS) -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserTerminateBeforeUnload) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserTerminateBeforeUnload) { NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload"); EXPECT_EQ(kill(base::GetCurrentProcessHandle(), SIGTERM), 0); } @@ -538,7 +525,7 @@ // Tests closing the browser and clicking OK in the beforeunload confirm dialog // if an inner frame has the focus. // If this flakes, use http://crbug.com/32615 and http://crbug.com/45675 -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserCloseWithInnerFocusedFrame) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseWithInnerFocusedFrame) { NavigateToDataURL(INNER_FRAME_WITH_FOCUS_HTML, "innerframewithfocus"); PrepareForDialog(browser()); @@ -552,14 +539,14 @@ // Tests closing the browser with a beforeunload handler that takes forever // by running an infinite loop. -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserCloseInfiniteBeforeUnload) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseInfiniteBeforeUnload) { LoadUrlAndQuitBrowser(INFINITE_BEFORE_UNLOAD_HTML, "infinitebeforeunload"); } // Tests closing the browser on a page with an unload listener registered where // the unload handler has an infinite loop. -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserCloseInfiniteUnload) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseInfiniteUnload) { // Tests makes no sense in single-process mode since the renderer is hung. if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kSingleProcess)) @@ -570,7 +557,7 @@ // Tests closing the browser with a beforeunload handler that hangs. // If this flakes, use http://crbug.com/78803 and http://crbug.com/86469 -IN_PROC_BROWSER_TEST_P(UnloadTest, DISABLED_BrowserCloseInfiniteBeforeUnload) { +IN_PROC_BROWSER_TEST_F(UnloadTest, DISABLED_BrowserCloseInfiniteBeforeUnload) { // Tests makes no sense in single-process mode since the renderer is hung. if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kSingleProcess)) @@ -582,7 +569,7 @@ // Tests closing the browser on a page with an unload listener registered where // the unload handler has an infinite loop followed by an alert. // If this flakes, use http://crbug.com/86469 -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserCloseInfiniteUnloadAlert) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseInfiniteUnloadAlert) { // Tests makes no sense in single-process mode since the renderer is hung. if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kSingleProcess)) @@ -594,7 +581,7 @@ // Tests closing the browser with a beforeunload handler that hangs then // pops up an alert. // If this flakes, use http://crbug.com/78803 and http://crbug.com/86469. -IN_PROC_BROWSER_TEST_P(UnloadTest, +IN_PROC_BROWSER_TEST_F(UnloadTest, DISABLED_BrowserCloseInfiniteBeforeUnloadAlert) { // Tests makes no sense in single-process mode since the renderer is hung. if (base::CommandLine::ForCurrentProcess()->HasSwitch( @@ -607,13 +594,13 @@ // Tests closing the browser on a page with an unload listener registered where // the unload handler has an 2 second long loop followed by an alert. -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserCloseTwoSecondUnloadAlert) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseTwoSecondUnloadAlert) { LoadUrlAndQuitBrowser(TWO_SECOND_UNLOAD_ALERT_HTML, "twosecondunloadalert"); } // Tests closing the browser with a beforeunload handler that takes // two seconds to run then pops up an alert. -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserCloseTwoSecondBeforeUnloadAlert) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnloadAlert) { LoadUrlAndQuitBrowser(TWO_SECOND_BEFORE_UNLOAD_ALERT_HTML, "twosecondbeforeunloadalert"); } @@ -623,7 +610,7 @@ // handler can be closed. // If this flakes, see http://crbug.com/45162, http://crbug.com/45281 and // http://crbug.com/86769. -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserCloseTabWhenOtherTabHasListener) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseTabWhenOtherTabHasListener) { NavigateToDataURL(CLOSE_TAB_WHEN_OTHER_TAB_HAS_LISTENER, "only_one_unload"); // Simulate a click to force user_gesture to true; if we don't, the resulting @@ -650,7 +637,7 @@ CheckTitle("only_one_unload"); } -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserListForceCloseNoUnloadListeners) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListForceCloseNoUnloadListeners) { NavigateToDataURL(NOLISTENERS_HTML, "nolisteners"); content::WindowedNotificationObserver window_observer( @@ -667,7 +654,7 @@ EXPECT_EQ(0, unload_results.get_aborts()); } -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserListForceCloseWithBeforeUnload) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListForceCloseWithBeforeUnload) { NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload"); content::WindowedNotificationObserver window_observer( @@ -684,7 +671,7 @@ EXPECT_EQ(0, unload_results.get_aborts()); } -IN_PROC_BROWSER_TEST_P(UnloadTest, BrowserListForceCloseAfterNormalClose) { +IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserListForceCloseAfterNormalClose) { NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload"); content::WindowedNotificationObserver window_observer( @@ -706,10 +693,10 @@ EXPECT_EQ(0, unload_results.get_aborts()); } -class FastUnloadTest : public UnloadTestBase { +class FastUnloadTest : public UnloadTest { public: void SetUpCommandLine(base::CommandLine* command_line) override { - UnloadTestBase::SetUpCommandLine(command_line); + UnloadTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnableFastUnload); }
diff --git a/chrome/browser/vr/BUILD.gn b/chrome/browser/vr/BUILD.gn index a6fa657..5ee1c1a 100644 --- a/chrome/browser/vr/BUILD.gn +++ b/chrome/browser/vr/BUILD.gn
@@ -174,6 +174,8 @@ "renderers/gradient_quad_renderer.h", "renderers/textured_quad_renderer.cc", "renderers/textured_quad_renderer.h", + "renderers/transparent_quad_renderer.cc", + "renderers/transparent_quad_renderer.h", "renderers/web_vr_renderer.cc", "renderers/web_vr_renderer.h", "sample_queue.cc",
diff --git a/chrome/browser/vr/elements/content_element.cc b/chrome/browser/vr/elements/content_element.cc index 505a349..b938ba9 100644 --- a/chrome/browser/vr/elements/content_element.cc +++ b/chrome/browser/vr/elements/content_element.cc
@@ -52,7 +52,7 @@ int texture_id = texture_id_; bool blend = true; if (uses_quad_layer_) { - texture_id = overlay_texture_id_; + texture_id = 0; overlay_texture_id = 0; blend = false; } @@ -156,6 +156,10 @@ overlay_texture_non_empty_ = !empty; } +bool ContentElement::GetOverlayTextureEmpty() { + return !overlay_texture_non_empty_; +} + void ContentElement::SetProjectionMatrix(const gfx::Transform& matrix) { projection_matrix_ = matrix; }
diff --git a/chrome/browser/vr/elements/content_element.h b/chrome/browser/vr/elements/content_element.h index 284112fe..93e8277 100644 --- a/chrome/browser/vr/elements/content_element.h +++ b/chrome/browser/vr/elements/content_element.h
@@ -50,6 +50,7 @@ void SetOverlayTextureId(unsigned int texture_id); void SetOverlayTextureLocation(UiElementRenderer::TextureLocation location); void SetOverlayTextureEmpty(bool empty); + bool GetOverlayTextureEmpty(); void SetProjectionMatrix(const gfx::Transform& matrix); void SetTextInputDelegate(TextInputDelegate* text_input_delegate); void SetDelegate(ContentInputDelegate* delegate);
diff --git a/chrome/browser/vr/elements/environment/background.cc b/chrome/browser/vr/elements/environment/background.cc index 98feaa28..efa3d280 100644 --- a/chrome/browser/vr/elements/environment/background.cc +++ b/chrome/browser/vr/elements/environment/background.cc
@@ -309,6 +309,7 @@ float normal_factor, float incognito_factor, float fullscreen_factor) { + glDisable(GL_BLEND); glUseProgram(program_handle_); // Pass in model view project matrix.
diff --git a/chrome/browser/vr/elements/ui_element.cc b/chrome/browser/vr/elements/ui_element.cc index a4fc5cf..3627a873 100644 --- a/chrome/browser/vr/elements/ui_element.cc +++ b/chrome/browser/vr/elements/ui_element.cc
@@ -307,6 +307,14 @@ computed_opacity() > 0.0f; } +bool UiElement::IsVisibleAndOpaque() const { + DCHECK(update_phase_ >= kUpdatedComputedOpacity || + FrameLifecycle::phase() >= kUpdatedComputedOpacity); + // TODO(crbug.com/832216): we shouldn't need to check opacity() here. + return update_phase_ != kDirty && opacity() == 1.0f && + computed_opacity() == 1.0f; +} + bool UiElement::IsOrWillBeLocallyVisible() const { return opacity() > 0.0f || GetTargetOpacity() > 0.0f; }
diff --git a/chrome/browser/vr/elements/ui_element.h b/chrome/browser/vr/elements/ui_element.h index bd8cfa42..d90f2ed 100644 --- a/chrome/browser/vr/elements/ui_element.h +++ b/chrome/browser/vr/elements/ui_element.h
@@ -179,6 +179,9 @@ // If true, the object has a non-zero opacity. bool IsVisible() const; + // If true, the object is both visible and opaque. + bool IsVisibleAndOpaque() const; + // For convenience, sets opacity to |opacity_when_visible_|. virtual void SetVisible(bool visible); virtual void SetVisibleImmediately(bool visible);
diff --git a/chrome/browser/vr/renderers/transparent_quad_renderer.cc b/chrome/browser/vr/renderers/transparent_quad_renderer.cc new file mode 100644 index 0000000..a56c9c7 --- /dev/null +++ b/chrome/browser/vr/renderers/transparent_quad_renderer.cc
@@ -0,0 +1,40 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/vr/renderers/transparent_quad_renderer.h" + +#include "chrome/browser/vr/vr_gl_util.h" +#include "ui/gfx/transform.h" + +namespace vr { + +namespace { + +// clang-format off +static constexpr char const* kFragmentShader = SHADER( + precision highp float; + uniform sampler2D u_Texture; + uniform sampler2D u_OverlayTexture; + uniform vec4 u_CopyRect; + varying vec2 v_TexCoordinate; + varying vec2 v_CornerPosition; + uniform mediump float u_Opacity; + uniform mediump float u_OverlayOpacity; + void main() { + if (step(1.0, length(v_CornerPosition)) > 0.0) + discard; + gl_FragColor = vec4(0, 0, 0, 0); + } +); +// clang-format on + +} // namespace + +TransparentQuadRenderer::TransparentQuadRenderer() + : TexturedQuadRenderer(TexturedQuadRenderer::VertexShader(), + kFragmentShader) {} + +TransparentQuadRenderer::~TransparentQuadRenderer() = default; + +} // namespace vr
diff --git a/chrome/browser/vr/renderers/transparent_quad_renderer.h b/chrome/browser/vr/renderers/transparent_quad_renderer.h new file mode 100644 index 0000000..a4b7b3d --- /dev/null +++ b/chrome/browser/vr/renderers/transparent_quad_renderer.h
@@ -0,0 +1,23 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_VR_RENDERERS_TRANSPARENT_QUAD_RENDERER_H_ +#define CHROME_BROWSER_VR_RENDERERS_TRANSPARENT_QUAD_RENDERER_H_ + +#include "base/macros.h" +#include "chrome/browser/vr/renderers/textured_quad_renderer.h" + +namespace vr { + +class TransparentQuadRenderer : public TexturedQuadRenderer { + public: + TransparentQuadRenderer(); + ~TransparentQuadRenderer() override; + + DISALLOW_COPY_AND_ASSIGN(TransparentQuadRenderer); +}; + +} // namespace vr + +#endif // CHROME_BROWSER_VR_RENDERERS_TRANSPARENT_QUAD_RENDERER_H_
diff --git a/chrome/browser/vr/renderers/web_vr_renderer.cc b/chrome/browser/vr/renderers/web_vr_renderer.cc index 2cf6c83..4b5c1fd6 100644 --- a/chrome/browser/vr/renderers/web_vr_renderer.cc +++ b/chrome/browser/vr/renderers/web_vr_renderer.cc
@@ -16,12 +16,18 @@ uniform mat4 u_UvTransform; attribute vec4 a_Position; varying vec2 v_TexCoordinate; + uniform float u_XBorder; + uniform float u_YBorder; void main() { - // The quad vertex coordinate range is [-0.5, 0.5]. Transform to [0, 1] for - // the input UV vector, and then apply the supplied affine transform matrix - // to get the final UV. - vec4 uv_in = vec4(a_Position[0] + 0.5, a_Position[1] + 0.5, 0.0, 1.0); + // The quad vertex coordinate range is [-0.5, 0.5]. Transform to [0, 1], + // scale to cause the borders to wrap the texture, then apply the supplied + // affine transform matrix to get the final UV. + float xposition = a_Position[0] + 0.5; + xposition = xposition * (2.0 * u_XBorder + 1.0) - u_XBorder; + float yposition = a_Position[1] + 0.5; + yposition = yposition * (2.0 * u_YBorder + 1.0) - u_YBorder; + vec4 uv_in = vec4(xposition, yposition, 0.0, 1.0); vec4 uv_out = u_UvTransform * uv_in; v_TexCoordinate = vec2(uv_out.x, uv_out.y); gl_Position = vec4(a_Position.xyz * 2.0, 1.0); @@ -45,10 +51,15 @@ : BaseQuadRenderer(kWebVrVertexShader, kWebVrFragmentShader) { texture_handle_ = glGetUniformLocation(program_handle_, "u_Texture"); uv_transform_ = glGetUniformLocation(program_handle_, "u_UvTransform"); + x_border_handle_ = glGetUniformLocation(program_handle_, "u_XBorder"); + y_border_handle_ = glGetUniformLocation(program_handle_, "u_YBorder"); } // Draw the stereo WebVR frame -void WebVrRenderer::Draw(int texture_handle, const float (&uv_transform)[16]) { +void WebVrRenderer::Draw(int texture_handle, + const float (&uv_transform)[16], + float xborder, + float yborder) { glUseProgram(program_handle_); // Bind vertex attributes @@ -66,6 +77,9 @@ SetTexParameters(GL_TEXTURE_EXTERNAL_OES); glUniform1i(texture_handle_, 0); + glUniform1f(x_border_handle_, xborder); + glUniform1f(y_border_handle_, yborder); + glUniformMatrix4fv(uv_transform_, 1, GL_FALSE, &uv_transform[0]); // Blit texture to buffer
diff --git a/chrome/browser/vr/renderers/web_vr_renderer.h b/chrome/browser/vr/renderers/web_vr_renderer.h index f4275b9..f3a7b8e 100644 --- a/chrome/browser/vr/renderers/web_vr_renderer.h +++ b/chrome/browser/vr/renderers/web_vr_renderer.h
@@ -16,11 +16,16 @@ WebVrRenderer(); ~WebVrRenderer() override; - void Draw(int texture_handle, const float (&uv_transform)[16]); + void Draw(int texture_handle, + const float (&uv_transform)[16], + float xborder, + float yborder); private: GLuint texture_handle_; GLuint uv_transform_; + GLuint x_border_handle_; + GLuint y_border_handle_; DISALLOW_COPY_AND_ASSIGN(WebVrRenderer); };
diff --git a/chrome/browser/vr/test/ui_pixel_test.cc b/chrome/browser/vr/test/ui_pixel_test.cc index 691e3157..ad128b1 100644 --- a/chrome/browser/vr/test/ui_pixel_test.cc +++ b/chrome/browser/vr/test/ui_pixel_test.cc
@@ -87,7 +87,6 @@ render_info.left_eye_model.proj_matrix = proj_matrix; render_info.left_eye_model.view_proj_matrix = proj_matrix * view_matrix; render_info.right_eye_model = render_info.left_eye_model; - render_info.surface_texture_size = frame_buffer_size_; render_info.left_eye_model.viewport = {0, 0, frame_buffer_size_.width(), frame_buffer_size_.height()}; render_info.right_eye_model.viewport = {0, 0, 0, 0};
diff --git a/chrome/browser/vr/testapp/vr_test_context.cc b/chrome/browser/vr/testapp/vr_test_context.cc index 27881352..2a05622 100644 --- a/chrome/browser/vr/testapp/vr_test_context.cc +++ b/chrome/browser/vr/testapp/vr_test_context.cc
@@ -683,7 +683,6 @@ RenderInfo VrTestContext::GetRenderInfo() const { RenderInfo render_info; render_info.head_pose = head_pose_; - render_info.surface_texture_size = window_size_; render_info.left_eye_model.viewport = gfx::Rect(window_size_); render_info.left_eye_model.view_matrix = head_pose_; render_info.left_eye_model.proj_matrix = ProjectionMatrix();
diff --git a/chrome/browser/vr/ui.cc b/chrome/browser/vr/ui.cc index 8acd26a1..7aa101d 100644 --- a/chrome/browser/vr/ui.cc +++ b/chrome/browser/vr/ui.cc
@@ -11,6 +11,7 @@ #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/vr/content_input_delegate.h" #include "chrome/browser/vr/cpu_surface_provider.h" +#include "chrome/browser/vr/elements/content_element.h" #include "chrome/browser/vr/elements/prompt.h" #include "chrome/browser/vr/elements/text_input.h" #include "chrome/browser/vr/ganesh_surface_provider.h" @@ -533,4 +534,28 @@ } } +ContentElement* Ui::GetContentElement() { + if (!content_element_) { + content_element_ = + static_cast<ContentElement*>(scene()->GetUiElementByName(kContentQuad)); + } + return content_element_; +} + +bool Ui::IsContentVisibleAndOpaque() { + return GetContentElement()->IsVisibleAndOpaque(); +} + +bool Ui::IsContentOverlayTextureEmpty() { + return GetContentElement()->GetOverlayTextureEmpty(); +} + +void Ui::SetContentUsesQuadLayer(bool uses_quad_layer) { + return GetContentElement()->SetUsesQuadLayer(uses_quad_layer); +} + +gfx::Transform Ui::GetContentWorldSpaceTransform() { + return GetContentElement()->world_space_transform(); +} + } // namespace vr
diff --git a/chrome/browser/vr/ui.h b/chrome/browser/vr/ui.h index 4f406096..77e47b68 100644 --- a/chrome/browser/vr/ui.h +++ b/chrome/browser/vr/ui.h
@@ -21,6 +21,7 @@ class AudioDelegate; class BrowserUiInterface; +class ContentElement; class ContentInputDelegate; class ContentInputForwarder; class KeyboardDelegate; @@ -168,9 +169,15 @@ void AcceptDoffPromptForTesting(); void PerformUiActionForTesting(UiTestInput test_input); + bool IsContentVisibleAndOpaque(); + bool IsContentOverlayTextureEmpty(); + void SetContentUsesQuadLayer(bool uses_quad_buffers); + gfx::Transform GetContentWorldSpaceTransform(); + private: void InitializeModel(const UiInitialState& ui_initial_state); UiBrowserInterface* browser_; + ContentElement* GetContentElement(); // This state may be further abstracted into a SkiaUi object. std::unique_ptr<UiScene> scene_; @@ -181,6 +188,10 @@ std::unique_ptr<UiRenderer> ui_renderer_; std::unique_ptr<SkiaSurfaceProvider> provider_; + // Cache the content element so we don't have to get it multiple times per + // frame. + ContentElement* content_element_ = nullptr; + AudioDelegate* audio_delegate_ = nullptr; base::WeakPtrFactory<Ui> weak_ptr_factory_;
diff --git a/chrome/browser/vr/ui_element_renderer.cc b/chrome/browser/vr/ui_element_renderer.cc index b24df6a..4f9dd6c 100644 --- a/chrome/browser/vr/ui_element_renderer.cc +++ b/chrome/browser/vr/ui_element_renderer.cc
@@ -15,6 +15,7 @@ #include "chrome/browser/vr/renderers/external_textured_quad_renderer.h" #include "chrome/browser/vr/renderers/gradient_quad_renderer.h" #include "chrome/browser/vr/renderers/textured_quad_renderer.h" +#include "chrome/browser/vr/renderers/transparent_quad_renderer.h" #include "chrome/browser/vr/renderers/web_vr_renderer.h" #include "chrome/browser/vr/vr_gl_util.h" #include "ui/gfx/geometry/point3_f.h" @@ -38,6 +39,7 @@ void UiElementRenderer::Init() { external_textured_quad_renderer_ = std::make_unique<ExternalTexturedQuadRenderer>(); + transparent_quad_renderer_ = std::make_unique<TransparentQuadRenderer>(); textured_quad_renderer_ = std::make_unique<TexturedQuadRenderer>(); gradient_quad_renderer_ = std::make_unique<GradientQuadRenderer>(); webvr_renderer_ = std::make_unique<WebVrRenderer>(); @@ -70,6 +72,11 @@ TexturedQuadRenderer* renderer = texture_location == kTextureLocationExternal ? external_textured_quad_renderer_.get() : textured_quad_renderer_.get(); + if (!texture_data_handle && !overlay_texture_data_handle) { + // If we're blending, why are we even drawing a transparent quad? + DCHECK(!blend); + renderer = transparent_quad_renderer_.get(); + } FlushIfNecessary(renderer); renderer->AddQuad(texture_data_handle, overlay_texture_data_handle, model_view_proj_matrix, copy_rect, opacity, element_size, @@ -128,9 +135,11 @@ } void UiElementRenderer::DrawWebVr(int texture_data_handle, - const float (&uv_transform)[16]) { + const float (&uv_transform)[16], + float xborder, + float yborder) { FlushIfNecessary(webvr_renderer_.get()); - webvr_renderer_->Draw(texture_data_handle, uv_transform); + webvr_renderer_->Draw(texture_data_handle, uv_transform, xborder, yborder); } void UiElementRenderer::DrawShadow(const gfx::Transform& model_view_proj_matrix,
diff --git a/chrome/browser/vr/ui_element_renderer.h b/chrome/browser/vr/ui_element_renderer.h index 0387669..e6334008 100644 --- a/chrome/browser/vr/ui_element_renderer.h +++ b/chrome/browser/vr/ui_element_renderer.h
@@ -38,6 +38,7 @@ class ExternalTexturedQuadRenderer; class GradientQuadRenderer; class TexturedQuadRenderer; +class TransparentQuadRenderer; class WebVrRenderer; // An instance of this class is passed to UiElements by the UiRenderer in order @@ -96,7 +97,9 @@ const gfx::Transform& model_view_proj_matrix); VIRTUAL_FOR_MOCKS void DrawWebVr(int texture_data_handle, - const float (&uv_transform)[16]); + const float (&uv_transform)[16], + float xborder, + float yborder); VIRTUAL_FOR_MOCKS void DrawShadow( const gfx::Transform& model_view_proj_matrix, @@ -138,6 +141,7 @@ std::unique_ptr<ExternalTexturedQuadRenderer> external_textured_quad_renderer_; + std::unique_ptr<TransparentQuadRenderer> transparent_quad_renderer_; std::unique_ptr<TexturedQuadRenderer> textured_quad_renderer_; std::unique_ptr<GradientQuadRenderer> gradient_quad_renderer_; std::unique_ptr<WebVrRenderer> webvr_renderer_;
diff --git a/chrome/browser/vr/ui_input_manager_unittest.cc b/chrome/browser/vr/ui_input_manager_unittest.cc index cd7a9740..091aa6e 100644 --- a/chrome/browser/vr/ui_input_manager_unittest.cc +++ b/chrome/browser/vr/ui_input_manager_unittest.cc
@@ -142,7 +142,6 @@ 1.0f, static_cast<float>(kWindowSize.width()) / kWindowSize.height()); render_info.head_pose = head_pose_; - render_info.surface_texture_size = kWindowSize; render_info.left_eye_model.viewport = gfx::Rect(kWindowSize); render_info.left_eye_model.view_matrix = head_pose_; render_info.left_eye_model.proj_matrix = projection_matrix;
diff --git a/chrome/browser/vr/ui_renderer.h b/chrome/browser/vr/ui_renderer.h index b1d53b37..e914eaa 100644 --- a/chrome/browser/vr/ui_renderer.h +++ b/chrome/browser/vr/ui_renderer.h
@@ -21,7 +21,6 @@ // matrix. struct RenderInfo { gfx::Transform head_pose; - gfx::Size surface_texture_size; CameraModel left_eye_model; CameraModel right_eye_model; };
diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni index 6d41299..9c2c9cbd 100644 --- a/chrome/chrome_paks.gni +++ b/chrome/chrome_paks.gni
@@ -151,12 +151,14 @@ } if (is_chromeos) { sources += [ + "$root_gen_dir/ash/public/cpp/resources/ash_public_unscaled_resources.pak", "$root_gen_dir/chrome/multidevice_setup_resources.pak", "$root_gen_dir/chromeos/chromeos_resources.pak", "$root_gen_dir/components/chrome_apps/chrome_apps_resources.pak", "$root_gen_dir/ui/file_manager/file_manager_resources.pak", ] deps += [ + "//ash/public/cpp/resources:ash_public_unscaled_resources", "//chrome/browser/resources/chromeos:multidevice_setup_resources", "//chromeos/resources", "//components/chrome_apps:resources",
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn index 176913b..c5b284ea 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn
@@ -62,7 +62,7 @@ "channel_info_win.cc", ] - if (!is_android && !is_chromeos && !is_mac) { + if (is_posix && !is_android && !is_chromeos && !is_mac) { sources += [ "channel_info_posix.cc" ] } public_deps = [ @@ -415,10 +415,14 @@ "service_process_util.h", "service_process_util_linux.cc", "service_process_util_mac.mm", - "service_process_util_posix.cc", - "service_process_util_posix.h", "service_process_util_win.cc", ] + if (is_posix) { + sources += [ + "service_process_util_posix.cc", + "service_process_util_posix.h", + ] + } } if (enable_print_preview && is_win) { sources += [ "chrome_utility_printing_messages.h" ]
diff --git a/chrome/common/extensions/api/webstore_private.json b/chrome/common/extensions/api/webstore_private.json index dd475ee..a5fb29cc 100644 --- a/chrome/common/extensions/api/webstore_private.json +++ b/chrome/common/extensions/api/webstore_private.json
@@ -330,7 +330,7 @@ "type": "string", "description": "The extension id of the extension to be checked." }, - { + { "name": "callback", "type": "function", "optional": false, @@ -339,6 +339,19 @@ ] } ] + }, + { + "name": "getReferrerChain", + "description": "Returns a base-64 encoded referrer chain leading to the webstore page. Should only be used for extension anti-abuse purposes.", + "parameters": [ + { + "name": "callback", + "type": "function", + "parameters": [ + { "name": "referrerChain", "type": "string" } + ] + } + ] } ] }
diff --git a/chrome/common/extensions/docs/examples/tutorials/get_started_complete/popup.js b/chrome/common/extensions/docs/examples/tutorials/get_started_complete/popup.js index 24ad20a..ea9b26f 100644 --- a/chrome/common/extensions/docs/examples/tutorials/get_started_complete/popup.js +++ b/chrome/common/extensions/docs/examples/tutorials/get_started_complete/popup.js
@@ -13,7 +13,9 @@ changeColor.onclick = function(element) { let color = element.target.value; + chrome.tabs.query({active: true, currentWindow: true}, function(tabs) { chrome.tabs.executeScript( tabs[0].id, {code: 'document.body.style.backgroundColor = "' + color + '";'}); + }); };
diff --git a/chrome/common/extensions/docs/templates/articles/devguide.html b/chrome/common/extensions/docs/templates/articles/devguide.html index 26c75df..b8669364 100644 --- a/chrome/common/extensions/docs/templates/articles/devguide.html +++ b/chrome/common/extensions/docs/templates/articles/devguide.html
@@ -1,139 +1,249 @@ -<h1>Developer's Guide</h1> +<h1>Develop Extensions</h1> <p> -These pages assume you've completed -the <a href="getstarted">Getting Started</a> tutorial -and <a href="overview">Overview</a>. + After reading the <a href="getstarted">Getting Started</a> tutorial + and <a href="overview">Overview</a>, + use this guide as an outline to extension components and abilities. + Developers are encouraged to explore + and expand extension functionality. </p> + <table class="simple"> <tr> - <td colspan="2"><h4>Changing the Google Chrome chrome</h4></td> - </tr> - <tr> - <td colspan="2"> </td> + <th colspan="2"> + <strong>Customize extension user interface</strong> + </th> </tr> <tr> <td> <a href="browserAction">Browser Actions</a> </td> - <td> Add icons to the toolbar <em>(extensions only)</em> </td> + <td> Add an icon, tooltip, badge, and popup to the toolbar.</td> </tr> <tr> - <td> <a href="desktop_notifications">Desktop Notifications</a> </td> - <td> Notify users of important events </td> + <td> <a href="commands">Commands</a> </td> + <td> Add keyboard shortcuts that trigger actions.</td> + </tr> + <tr> + <td> <a href="contextMenus">Context Menus</a> </td> + <td> Add items to Google Chrome's context menu.</td> </tr> <tr> <td> <a href="omnibox">Omnibox</a> </td> - <td> Add a keyword to the address bar </td> - </tr> - <tr> - <td> <a href="options">Options Pages</a> </td> - <td> Let users customize your extension </td> + <td> Add keyword functionality to the address bar.</td> </tr> <tr> <td> <a href="override">Override Pages</a> </td> - <td> Implement your own version of standard browser pages - such as the New Tab page</td> + <td> Create a version of the New Tab, Bookmark, or History page.</td> </tr> <tr> <td> <a href="pageAction">Page Actions</a> </td> - <td> Add temporary icons inside the address bar <em>(extensions only)</em> </td> + <td> Dynamically display icons in the toolbar.</td> </tr> +</table> +<table class="simple"> <tr> - <td> <a href="themes">Themes</a> </td> - <td> Change the overall appearance of the browser </td> - </tr> - - <tr> - <td colspan="2"><h4>Interacting with Google Chrome in other ways</h4></td> - </tr> - <tr> - <td colspan="2"> </td> - </tr> - <tr> - <td> <a href="bookmarks">Bookmarks</a> </td> - <td> Create, organize, and otherwise manipulate the user's bookmarks </td> - </tr> - <tr> - <td> <a href="cookies">Cookies</a> </td> - <td> Explore and modify the browser's cookie system </td> - </tr> - <tr> - <td> <a href="devtools">Developer Tools</a> </td> - <td> Add features to Chrome Developer Tools </td> - </tr> - <tr> - <td> <a href="events">Events</a> </td> - <td> Detect when something interesting happens </td> - </tr> - <tr> - <td> <a href="history">History</a> </td> - <td> Interact with the browser's record of visited pages </td> - </tr> - <tr> - <td> <a href="tabs">Tabs</a> </td> - <td> Create, modify, and rearrange tabs in the browser </td> - </tr> - <tr> - <td> <a href="windows">Windows</a> </td> - <td> Create, modify, and rearrange windows in the browser </td> - </tr> - - <tr> - <td colspan="2"><h4>Implementing the innards of your extension</h4></td> - </tr> - <tr> - <td colspan="2"> </td> + <th colspan="2"> + <strong>Build extension utilities</strong> + </th> </tr> <tr> <td> <a href="a11y">Accessibility (a11y)</a> </td> - <td> Make your extension accessible to people with disabilities </td> + <td> Make an extension accessible to people with disabilities. </td> </tr> <tr> - <td> <a href="event_pages">Event Pages</a> </td> - <td> Put all the common code for your extension in a single place </td> - </tr> - <tr> - <td> <a href="content_scripts">Content Scripts</a> </td> - <td> Run JavaScript code in the context of web pages </td> - </tr> - <tr> - <td> <a href="xhr">Cross-Origin XHR</a> </td> - <td> Use XMLHttpRequest to send and receive data from remote servers </td> + <td> <a href="background_pages">Background Scripts</a></td> + <td> Detect and react when something interesting happens.</td> </tr> <tr> <td> <a href="i18n">Internationalization</a> </td> - <td> Deal with language and locale </td> + <td> Work with language and locale. </td> + </tr> + <tr> + <td> <a href="identity">Identity</a> </td> + <td> Get OAuth2 access tokens. </td> + </tr> + <tr> + <td> <a href="management">Management</a> </td> + <td> Manage extensions that are installed and running. </td> </tr> <tr> <td> <a href="messaging">Message Passing</a> </td> <td> Communicate from a content script to its parent extension, - or vice versa</td> + or vice versa.</td> </tr> <tr> - <td> <a href="permissions">Optional Permissions</a> </td> - <td> Modify your extension's permissions </td> + <td> <a href="options">Options Pages</a> </td> + <td> Let users customize an extension.</td> </tr> + <tr> + <td> <a href="permissions">Permissions</a> </td> + <td> Modify an extension's permissions. </td> + </tr> + <tr> + <td> <a href="storage">Storage</a> </td> + <td> Store and retrieve data. </td> + </tr> +</table> +<table class="simple"> <tr> - <td colspan="2"><h4>Finishing and distributing your extension</h4></td> + <th colspan="2"> + <strong>Modify and observe the Chrome Browser</strong> + </th> </tr> <tr> - <td colspan="2"> </td> + <td> <a href="bookmarks">Bookmarks</a> </td> + <td> Create, organize, and manipulate bookmark behavior.</td> + </tr> + <tr> + <td> <a href="browsingData">Browsing Data</a></td> + <td> Remove browsing data from a user's local profile. </td> + </tr> + <tr> + <td> <a href="downloads">Downloads</a> </td> + <td> Programmatically initiate, monitor, manipulate, + and search for downloads. </td> + </tr> + <tr> + <td> <a href="fontSettings">Font Settings</a> </td> + <td>Manage Chrome's font settings.</td> + </tr> + <tr> + <td> <a href="history">History</a> </td> + <td> Interact with the browser's record of visited pages.</td> + </tr> + <tr> + <td> <a href="privacy">Privacy</a> </td> + <td> Control Chrome privacy features. </td> + </tr> + <tr> + <td> <a href="proxy">Proxy</a> </td> + <td> Manage Chrome's proxy settings. </td> + </tr> + <tr> + <td> <a href="sessions">Sessions</a> </td> + <td> Query and restore tabs and windows from a browsing session. </td> + </tr> + <tr> + <td> <a href="tabs">Tabs</a> </td> + <td> Create, modify, and rearrange tabs in the browser. </td> + </tr> + <tr> + <td> <a href="topSites">Top Sites</a> </td> + <td> Access users most visited URLs. </td> + </tr> + <tr> + <td> <a href="themes">Themes</a> </td> + <td> Change the overall appearance of the browser.</td> + </tr> + <tr> + <td> <a href="windows">Windows</a> </td> + <td> Create, modify, and rearrange windows in the browser. </td> + </tr> +</table> + +<table class="simple"> + <tr> + <th colspan="2"> + <strong>Modify and observe the web</strong> + </th> + </tr> + <tr> + <td> <a href="activeTab">Active Tab</a> </td> + <td> Securely access websites by removing most needs + for <code><all_urls></code> host permission. </td> + </tr> + <tr> + <td> <a href="contentSettings">Content Settings</a> </td> + <td> Customize websites features such as cookies, JavaScript, + and plugins. </td> + </tr> + <tr> + <td> <a href="content_scripts">Content Scripts</a> </td> + <td> Run JavaScript code in the context of web pages. </td> + </tr> + <tr> + <td> <a href="cookies">Cookies</a> </td> + <td> Explore and modify the browser's cookie system. </td> + </tr> + <tr> + <td> <a href="xhr">Cross-Origin XHR</a> </td> + <td> Use XMLHttpRequest to send and receive data from remote servers. </td> + </tr> + <tr> + <td> <a href="declarativeContent">Declarative Content</a> </td> + <td> Perform actions on the content of a page + without requiring permission.</td> + </tr> + <tr> + <td> <a href="desktopCapture">Desktop Capture</a> </td> + <td> Capture content of screen, individual windows or tabs. </td> + </tr> + <tr> + <td> <a href="pageCapture">Page Capture</a> </td> + <td> Save a tab's source information as MHTML. </td> + </tr> + <tr> + <td> <a href="tabCapture">Tab Capture</a> </td> + <td> Interact with tab media streams. </td> + </tr> + <tr> + <td> <a href="webNavigation">Web Navigation</a></td> + <td> Status updates of navigation requests in-flight.</td> + </tr> + <tr> + <td> <a href="webRequest">Web Request</a> </td> + <td> Observe and analyze traffic. + Intercept block, or modify requests in-flight. </td> + </tr> +</table> + +<table class="simple"> + <tr> + <th colspan="2"> + <strong>Package, deploy and update</strong> + </th> </tr> <tr> <td> <a href="autoupdate">Autoupdating</a> </td> - <td> Update extensions automatically </td> + <td> Update extensions automatically. </td> </tr> <tr> <td> <a href="hosting">Hosting</a> </td> - <td> Host extensions on Google servers or your own </td> + <td> Host extensions on Google or a designated server. </td> </tr> <tr> - <td> <a href="external_extensions">Other Deployment Options</a> </td> - <td> Distribute extensions on your network or with other software </td> + <td> <a href="external_extensions">Other Deployment Options</a> + </td> + <td> Distribute extensions on a designated network or with other software. + </td> </tr> <tr> <td> <a href="packaging">Packaging</a> </td> - <td> Create a <code>.crx</code> file so you can distribute your extension </td> + <td> Create a <code>.crx</code> + file to distribute an extension outside of the + <a href="https://chrome.google.com/webstore/category/extensions"> + Chrome Webstore</a>. </td> </tr> + <tr> + <td> <a href="webstore">Webstore</a> </td> + <td> Initiate inline installations from an designated site. </td> + </tr> +</table> + +<table class="simple"> + <tr> + <th colspan="2"> + <strong>Expand Chrome DevTools</strong> + </th> + </tr> + <td> <a href="debugger">Debugger</a> </td> + <td> Instrument network interaction, debug JavaScript, + mutate the DOM and CSS. </td> + </tr> + <tr> + <td> <a href="devtools">Devtools</a> </td> + <td> Add features to Chrome Developer Tools. </td> + </tr> + <tr> </table>
diff --git a/chrome/common/extensions/docs/templates/articles/getstarted.html b/chrome/common/extensions/docs/templates/articles/getstarted.html index d71b0fe..3e1f4b9 100644 --- a/chrome/common/extensions/docs/templates/articles/getstarted.html +++ b/chrome/common/extensions/docs/templates/articles/getstarted.html
@@ -105,10 +105,10 @@ "name": "Getting Started Example", "version": "1.0", "description": "Build an Extension!", - <b>"background": { - "scripts": ["background.js"], - "persistent": false - },</b> + <b>"background": {</b> + <b>"scripts": ["background.js"],</b> + <b>"persistent": false</b> + <b>},</b> "manifest_version": 2 } </pre> @@ -212,9 +212,9 @@ "scripts": ["background.js"], "persistent": false }, - <b>"page_action": { - "default_popup": "popup.html", - },</b> + <b>"page_action": {</b> + <b>"default_popup": "popup.html",</b> + <b>},</b> "manifest_version": 2 } </pre> @@ -241,12 +241,12 @@ }, "page_action": { "default_popup": "popup.html", - <b>"default_icon": { - "16": "images/get_started16.png", - "32": "images/get_started32.png", - "48": "images/get_started48.png", - "128": "images/get_started128.png" - }</b> + <b>"default_icon": {</b> + <b>"16": "images/get_started16.png",</b> + <b>"32": "images/get_started32.png",</b> + <b>"48": "images/get_started48.png",</b> + <b>"128": "images/get_started128.png"</b> + <b>}</b> }, "manifest_version": 2 } @@ -277,12 +277,12 @@ "128": "images/get_started128.png" } }, - <b>"icons": { - "16": "images/get_started16.png", - "32": "images/get_started32.png", - "48": "images/get_started48.png", - "128": "images/get_started128.png" - },</b> + <b>"icons": {</b> + <b>"16": "images/get_started16.png",</b> + <b>"32": "images/get_started32.png",</b> + <b>"48": "images/get_started48.png",</b> + <b>"128": "images/get_started128.png"</b> + <b>},</b> "manifest_version": 2 } </pre> @@ -305,15 +305,15 @@ chrome.storage.sync.set({color: '#3aa757'}, function() { console.log('The color is green.'); }); - <b>chrome.declarativeContent.onPageChanged.removeRules(undefined, function() { - chrome.declarativeContent.onPageChanged.addRules([{ - conditions: [new chrome.declarativeContent.PageStateMatcher({ - pageUrl: {hostEquals: 'developer.chrome.com'}, - }) - ], - actions: [new chrome.declarativeContent.ShowPageAction()] - }]); - });</b> + <b>chrome.declarativeContent.onPageChanged.removeRules(undefined, function() {</b> + <b>chrome.declarativeContent.onPageChanged.addRules([{</b> + <b>conditions: [new chrome.declarativeContent.PageStateMatcher({</b> + <b>pageUrl: {hostEquals: 'developer.chrome.com'},</b> + <b>})</b> + <b>],</b> + <b>actions: [new chrome.declarativeContent.ShowPageAction()]</b> + <b>}]);</b> + <b>});</b> }); </pre> <p> @@ -386,12 +386,14 @@ <pre data-filename="popup.js"> let changeColor = document.getElementById('changeColor'); ... - <b>changeColor.onclick = function(element) { - let color = element.target.value; - chrome.tabs.executeScript( - tabs[0].id, - {code: 'document.body.style.backgroundColor = "' + color + '";'}); - };</b> + <b>changeColor.onclick = function(element) {</b> + <b>let color = element.target.value;</b> + <b>chrome.tabs.query({active: true, currentWindow: true}, function(tabs) {</b> + <b>chrome.tabs.executeScript(</b> + <b>tabs[0].id,</b> + <b>{code: 'document.body.style.backgroundColor = "' + color + '";'});</b> + <b>}); + <b>};</b> </pre> <p> The updated code adds an onclick event the button,
diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/BUILD.gn index f35eeb6..a4c8092 100644 --- a/chrome/common/safe_browsing/BUILD.gn +++ b/chrome/common/safe_browsing/BUILD.gn
@@ -26,7 +26,6 @@ "binary_feature_extractor.cc", "binary_feature_extractor.h", "binary_feature_extractor_mac.cc", - "binary_feature_extractor_posix.cc", "binary_feature_extractor_win.cc", "download_protection_util.cc", "download_protection_util.h", @@ -42,6 +41,9 @@ "zip_analyzer.cc", "zip_analyzer.h", ] + if (is_posix) { + sources += [ "binary_feature_extractor_posix.cc" ] + } } public_deps = [
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc index c6972d7..1c75653 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc
@@ -204,8 +204,8 @@ return true; } -// Adds work items to |list| to register a COM server with the OS, which is used -// to handle the toast notification activation. +// Adds work items to |list| to register a COM server with the OS after deleting +// the old ones, which is used to handle the toast notification activation. void AddNativeNotificationWorkItems(const InstallerState& installer_state, const base::FilePath& target_path, const base::Version& new_version, @@ -239,21 +239,9 @@ target_path.AppendASCII(new_version.GetString()) .Append(kNotificationHelperExe); - // Command-line featuring the quoted path to the exe. - base::string16 command(1, L'"'); - command.append(notification_helper.value()).append(1, L'"'); - - toast_activator_reg_path.append(L"\\LocalServer32"); - - list->AddCreateRegKeyWorkItem(root, toast_activator_reg_path, - WorkItem::kWow64Default); - - list->AddSetRegValueWorkItem(root, toast_activator_reg_path, - WorkItem::kWow64Default, L"", command, true); - - list->AddSetRegValueWorkItem(root, toast_activator_reg_path, - WorkItem::kWow64Default, L"ServerExecutable", - notification_helper.value(), true); + AddNativeNotificationInstallWorkItems(installer_state.root_key(), + notification_helper, + toast_activator_reg_path, list); } // This is called when an MSI installation is run. It may be that a user is @@ -916,6 +904,29 @@ install_list); } +void AddNativeNotificationInstallWorkItems( + HKEY root, + const base::FilePath& notification_helper, + const base::string16& toast_activator_reg_path, + WorkItemList* list) { + base::string16 toast_activator_server_path = + toast_activator_reg_path + L"\\LocalServer32"; + + // Command-line featuring the quoted path to the exe. + base::string16 command(1, L'"'); + command.append(notification_helper.value()).append(1, L'"'); + + list->AddCreateRegKeyWorkItem(root, toast_activator_server_path, + WorkItem::kWow64Default); + + list->AddSetRegValueWorkItem(root, toast_activator_server_path, + WorkItem::kWow64Default, L"", command, true); + + list->AddSetRegValueWorkItem(root, toast_activator_server_path, + WorkItem::kWow64Default, L"ServerExecutable", + notification_helper.value(), true); +} + void AddSetMsiMarkerWorkItem(const InstallerState& installer_state, BrowserDistribution* dist, bool set,
diff --git a/chrome/installer/setup/install_worker.h b/chrome/installer/setup/install_worker.h index e145aa1..1b817df 100644 --- a/chrome/installer/setup/install_worker.h +++ b/chrome/installer/setup/install_worker.h
@@ -85,6 +85,14 @@ const base::Version& new_version, WorkItemList* install_list); +// Adds work items to |list| to register a COM server with the OS, which is used +// to handle the toast notification activation. +void AddNativeNotificationInstallWorkItems( + HKEY root, + const base::FilePath& notification_helper, + const base::string16& toast_activator_reg_path, + WorkItemList* list); + void AddSetMsiMarkerWorkItem(const InstallerState& installer_state, BrowserDistribution* dist, bool set,
diff --git a/chrome/services/media_gallery_util/media_metadata_parser.cc b/chrome/services/media_gallery_util/media_metadata_parser.cc index 1d0583d..edeace4 100644 --- a/chrome/services/media_gallery_util/media_metadata_parser.cc +++ b/chrome/services/media_gallery_util/media_metadata_parser.cc
@@ -16,75 +16,59 @@ #include "media/media_buildflags.h" #include "net/base/mime_sniffer.h" -namespace MediaGalleries = extensions::api::media_galleries; - namespace { -#if BUILDFLAG(ENABLE_FFMPEG) -void SetStringScopedPtr(const std::string& value, - std::unique_ptr<std::string>* destination) { - DCHECK(destination); - if (!value.empty()) - destination->reset(new std::string(value)); -} - -void SetIntScopedPtr(int value, std::unique_ptr<int>* destination) { - DCHECK(destination); - if (value >= 0) - destination->reset(new int(value)); -} -#endif - // This runs on |media_thread_|, as the underlying FFmpeg operation is // blocking, and the utility thread must not be blocked, so the media file // bytes can be sent from the browser process to the utility process. -void ParseAudioVideoMetadata( +chrome::mojom::MediaMetadataPtr ParseAudioVideoMetadata( media::DataSource* source, bool get_attached_images, - MediaMetadataParser::MediaMetadata* metadata, + const std::string& mime_type, std::vector<metadata::AttachedImage>* attached_images) { DCHECK(source); - DCHECK(metadata); + + chrome::mojom::MediaMetadataPtr metadata = + chrome::mojom::MediaMetadata::New(); + metadata->mime_type = mime_type; #if BUILDFLAG(ENABLE_FFMPEG) media::AudioVideoMetadataExtractor extractor; if (!extractor.Extract(source, get_attached_images)) - return; + return metadata; if (extractor.has_duration() && extractor.duration() >= 0) - metadata->duration.reset(new double(extractor.duration())); + metadata->duration = extractor.duration(); if (extractor.height() >= 0 && extractor.width() >= 0) { - metadata->height.reset(new int(extractor.height())); - metadata->width.reset(new int(extractor.width())); + metadata->height = extractor.height(); + metadata->width = extractor.width(); } - SetStringScopedPtr(extractor.artist(), &metadata->artist); - SetStringScopedPtr(extractor.album(), &metadata->album); - SetStringScopedPtr(extractor.artist(), &metadata->artist); - SetStringScopedPtr(extractor.comment(), &metadata->comment); - SetStringScopedPtr(extractor.copyright(), &metadata->copyright); - SetIntScopedPtr(extractor.disc(), &metadata->disc); - SetStringScopedPtr(extractor.genre(), &metadata->genre); - SetStringScopedPtr(extractor.language(), &metadata->language); - SetIntScopedPtr(extractor.rotation(), &metadata->rotation); - SetStringScopedPtr(extractor.title(), &metadata->title); - SetIntScopedPtr(extractor.track(), &metadata->track); + metadata->artist = extractor.artist(); + metadata->album = extractor.album(); + metadata->comment = extractor.comment(); + metadata->copyright = extractor.copyright(); + metadata->disc = extractor.disc(); + metadata->genre = extractor.genre(); + metadata->language = extractor.language(); + metadata->rotation = extractor.rotation(); + metadata->title = extractor.title(); + metadata->track = extractor.track(); for (media::AudioVideoMetadataExtractor::StreamInfoVector::const_iterator it = extractor.stream_infos().begin(); it != extractor.stream_infos().end(); ++it) { - MediaGalleries::StreamInfo stream_info; - stream_info.type = it->type; - + chrome::mojom::MediaStreamInfoPtr stream_info = + chrome::mojom::MediaStreamInfo::New( + it->type, std::make_unique<base::DictionaryValue>()); for (std::map<std::string, std::string>::const_iterator tag_it = it->tags.begin(); tag_it != it->tags.end(); ++tag_it) { - stream_info.tags.additional_properties.SetString(tag_it->first, - tag_it->second); + stream_info->additional_properties->SetKey(tag_it->first, + base::Value(tag_it->second)); } - metadata->raw_tags.push_back(std::move(stream_info)); } @@ -99,17 +83,18 @@ } } #endif + return metadata; } void FinishParseAudioVideoMetadata( MediaMetadataParser::MetadataCallback callback, - MediaMetadataParser::MediaMetadata* metadata, - std::vector<metadata::AttachedImage>* attached_images) { + std::vector<metadata::AttachedImage>* attached_images, + chrome::mojom::MediaMetadataPtr metadata) { DCHECK(!callback.is_null()); DCHECK(metadata); DCHECK(attached_images); - callback.Run(*metadata, *attached_images); + callback.Run(std::move(metadata), *attached_images); } bool IsSupportedMetadataMimetype(const std::string& mime_type) { @@ -134,21 +119,20 @@ void MediaMetadataParser::Start(const MetadataCallback& callback) { if (!IsSupportedMetadataMimetype(mime_type_)) { - callback.Run(MediaMetadata(), std::vector<metadata::AttachedImage>()); + callback.Run(chrome::mojom::MediaMetadata::New(), + std::vector<metadata::AttachedImage>()); return; } - MediaMetadata* metadata = new MediaMetadata(); - metadata->mime_type = mime_type_; auto* images = new std::vector<metadata::AttachedImage>(); media_thread_.reset(new base::Thread("media_thread")); CHECK(media_thread_->Start()); - media_thread_->task_runner()->PostTaskAndReply( - FROM_HERE, + base::PostTaskAndReplyWithResult( + media_thread_->task_runner().get(), FROM_HERE, base::BindOnce(&ParseAudioVideoMetadata, source_.get(), - get_attached_images_, metadata, images), + get_attached_images_, mime_type_, images), base::BindOnce(&FinishParseAudioVideoMetadata, callback, - base::Owned(metadata), base::Owned(images))); + base::Owned(images))); }
diff --git a/chrome/services/media_gallery_util/media_metadata_parser.h b/chrome/services/media_gallery_util/media_metadata_parser.h index 32e7aa7..8a1bff24 100644 --- a/chrome/services/media_gallery_util/media_metadata_parser.h +++ b/chrome/services/media_gallery_util/media_metadata_parser.h
@@ -11,8 +11,8 @@ #include "base/callback.h" #include "base/macros.h" -#include "chrome/common/extensions/api/media_galleries.h" #include "chrome/common/media_galleries/metadata_types.h" +#include "chrome/services/media_gallery_util/public/mojom/media_parser.mojom.h" namespace base { class Thread; @@ -28,9 +28,8 @@ // so we sandbox potentially dangerous operations on user-provided data. class MediaMetadataParser { public: - typedef extensions::api::media_galleries::MediaMetadata MediaMetadata; typedef base::Callback<void( - const MediaMetadata& metadata, + chrome::mojom::MediaMetadataPtr metadata, const std::vector<metadata::AttachedImage>& attached_images)> MetadataCallback;
diff --git a/chrome/services/media_gallery_util/media_parser.cc b/chrome/services/media_gallery_util/media_parser.cc index 5b14c8f..b3ca1e2 100644 --- a/chrome/services/media_gallery_util/media_parser.cc +++ b/chrome/services/media_gallery_util/media_parser.cc
@@ -21,9 +21,9 @@ void ParseMediaMetadataDone( MediaParser::ParseMediaMetadataCallback callback, MediaMetadataParser* /* parser */, - const extensions::api::media_galleries::MediaMetadata& metadata, + chrome::mojom::MediaMetadataPtr metadata, const std::vector<metadata::AttachedImage>& attached_images) { - std::move(callback).Run(true, metadata.ToValue(), attached_images); + std::move(callback).Run(true, std::move(metadata), attached_images); } } // namespace @@ -65,4 +65,4 @@ ffmpeg_cpu_flags = av_get_cpu_flags(); #endif std::move(callback).Run(libyuv::InitCpuFlags(), ffmpeg_cpu_flags); -} \ No newline at end of file +}
diff --git a/chrome/services/media_gallery_util/public/cpp/DEPS b/chrome/services/media_gallery_util/public/cpp/DEPS index e6680cda..b8c00a8 100644 --- a/chrome/services/media_gallery_util/public/cpp/DEPS +++ b/chrome/services/media_gallery_util/public/cpp/DEPS
@@ -1,5 +1,4 @@ include_rules = [ - "+extensions/browser", "+third_party/libyuv", "+third_party/ffmpeg", ] \ No newline at end of file
diff --git a/chrome/services/media_gallery_util/public/cpp/safe_media_metadata_parser.cc b/chrome/services/media_gallery_util/public/cpp/safe_media_metadata_parser.cc index 60192e93..45c88b5 100644 --- a/chrome/services/media_gallery_util/public/cpp/safe_media_metadata_parser.cc +++ b/chrome/services/media_gallery_util/public/cpp/safe_media_metadata_parser.cc
@@ -45,18 +45,18 @@ } void SafeMediaMetadataParser::OnConnectionError() { - auto metadata_dictionary = std::make_unique<base::DictionaryValue>(); + chrome::mojom::MediaMetadataPtr metadata = + chrome::mojom::MediaMetadata::New(); auto attached_images = std::make_unique<std::vector<metadata::AttachedImage>>(); - std::move(callback_).Run(/*parse_success=*/false, - std::move(metadata_dictionary), + std::move(callback_).Run(/*parse_success=*/false, std::move(metadata), std::move(attached_images)); } void SafeMediaMetadataParser::ParseMediaMetadataDone( bool parse_success, - std::unique_ptr<base::DictionaryValue> metadata_dictionary, + chrome::mojom::MediaMetadataPtr metadata, const std::vector<metadata::AttachedImage>& attached_images) { ResetMediaParser(); media_data_source_.reset(); @@ -64,7 +64,7 @@ auto attached_images_copy = std::make_unique<std::vector<metadata::AttachedImage>>(attached_images); - std::move(callback_).Run(parse_success, std::move(metadata_dictionary), + std::move(callback_).Run(parse_success, std::move(metadata), std::move(attached_images_copy)); }
diff --git a/chrome/services/media_gallery_util/public/cpp/safe_media_metadata_parser.h b/chrome/services/media_gallery_util/public/cpp/safe_media_metadata_parser.h index fff3227..c5b90666c 100644 --- a/chrome/services/media_gallery_util/public/cpp/safe_media_metadata_parser.h +++ b/chrome/services/media_gallery_util/public/cpp/safe_media_metadata_parser.h
@@ -30,7 +30,7 @@ public: typedef base::OnceCallback<void( bool parse_success, - std::unique_ptr<base::DictionaryValue> metadata_dictionary, + chrome::mojom::MediaMetadataPtr metadata, std::unique_ptr<std::vector<metadata::AttachedImage>> attached_images)> DoneCallback; @@ -68,7 +68,7 @@ // Callback from utility process when it finishes parsing metadata. void ParseMediaMetadataDone( bool parse_success, - std::unique_ptr<base::DictionaryValue> metadata_dictionary, + chrome::mojom::MediaMetadataPtr metadata, const std::vector<metadata::AttachedImage>& attached_images); // Invoked when the media data has been read, which will be sent back to
diff --git a/chrome/services/media_gallery_util/public/mojom/media_parser.mojom b/chrome/services/media_gallery_util/public/mojom/media_parser.mojom index c449a1bc..3dbbde5 100644 --- a/chrome/services/media_gallery_util/public/mojom/media_parser.mojom +++ b/chrome/services/media_gallery_util/public/mojom/media_parser.mojom
@@ -18,7 +18,7 @@ bool get_attached_images, MediaDataSource media_data_source) => (bool parse_success, - mojo.common.mojom.DictionaryValue metadata, + MediaMetadata metadata, array<AttachedImage> attached_images); // Validates the passed media file with sanity checks, and file decoding @@ -52,6 +52,45 @@ Read(int64 position, int64 length) => (array<uint8> data); }; +struct MediaStreamInfo { + // Describes format of container or codec of stream, i.e. "mp3", "h264". + string type; + + // A string->string dictionary of tags for the media stream. + mojo.common.mojom.DictionaryValue additional_properties; +}; + +// All data are parsed from user-defined media data. The consumer of this API should filter special +// characters if needed. The encoding of strings may be UTF-8 that ffmpeg library assumes strings to +// be UTF-8 but does not validate the encoding. +// TODO(xingliu): Sanitize strings and AttachedImage in utility and browser processes. +struct MediaMetadata { + string mime_type; + + // Defined for video. In pixels. + int32 height = -1; + int32 width = -1; + + // Defined for audio and video. In seconds. + double duration = -1; + + // Defined for video. In degrees. + int32 rotation; + // Defined for audio and video. + string album; + + string artist; + string comment; + string copyright; + int32 disc = -1; + string genre; + string language; + string title; + int32 track = -1; + + array<MediaStreamInfo> raw_tags; +}; + struct AttachedImage { // If ParseMediaMetadata returns attached images, each of the images is // returned in an AttachedImage object.
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 83d16a8..aae5c0ec 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -1670,6 +1670,7 @@ "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc", "../browser/extensions/api/screenlock_private/screenlock_private_apitest.cc", "../browser/extensions/api/vpn_provider/vpn_provider_apitest.cc", + "../browser/extensions/chromeos_component_extensions_browsertest.cc", "../browser/mash_service_registry_browsertest.cc", "../browser/notifications/chrome_ash_message_center_client_browsertest.cc", "../browser/resources/chromeos/zip_archiver/test/zip_archiver_jstest.cc", @@ -2928,7 +2929,6 @@ "../browser/notifications/message_center_notifications_unittest.cc", "../browser/platform_util_unittest.cc", "../browser/policy/policy_path_parser_unittest.cc", - "../browser/process_singleton_posix_unittest.cc", "../browser/profile_resetter/profile_resetter_unittest.cc", "../browser/profile_resetter/triggered_profile_resetter_win_unittest.cc", "../browser/renderer_context_menu/render_view_context_menu_unittest.cc", @@ -3067,6 +3067,10 @@ "../utility/importer/firefox_importer_unittest_utils_mac.cc", "../utility/importer/safari_importer_unittest.mm", ] + if (is_posix || is_fuchsia) { + sources += [ "../browser/process_singleton_posix_unittest.cc" ] + } + deps += [ "//chrome/browser/resource_coordinator:tab_metrics_event_proto", "//components/favicon/core/test:test_support", @@ -3230,6 +3234,7 @@ ] deps += [ "//ash:test_support_with_content", + "//ash/public/cpp/resources:ash_public_unscaled_resources", "//ash/resources", "//ash/strings", ]
diff --git a/chrome/test/data/extensions/api_test/wallpaper_manager/test.js b/chrome/test/data/extensions/api_test/wallpaper_manager/test.js index 8e6dce6..28b2acc 100644 --- a/chrome/test/data/extensions/api_test/wallpaper_manager/test.js +++ b/chrome/test/data/extensions/api_test/wallpaper_manager/test.js
@@ -106,13 +106,13 @@ chrome.wallpaperPrivate.setWallpaperIfExists( 'http://dummyurl/test1.jpg', 'CENTER_CROPPED', false /*previewMode=*/, - fail('Failed to set wallpaper test1.jpg from file system.')); + fail('The wallpaper doesn\'t exist in local file system.')); // Attempt to preview wallpaper from a non-existent file should // also fail. chrome.wallpaperPrivate.setWallpaperIfExists( 'http://dummyurl/test1.jpg', 'CENTER_CROPPED', true /*previewMode=*/, - fail('Failed to set wallpaper test1.jpg from file system.')); + fail('The wallpaper doesn\'t exist in local file system.')); })); }, function getAndSetThumbnail() { @@ -140,19 +140,8 @@ function getOfflineWallpaperList() { chrome.wallpaperPrivate.getOfflineWallpaperList(pass(function(list) { // We have previously saved test.jpg in wallpaper directory. + chrome.test.assertEq(1, list.length); chrome.test.assertEq('test.jpg', list[0]); - // Saves the same wallpaper to wallpaper directory but name it as - // test1.jpg. - chrome.wallpaperPrivate.setWallpaper( - wallpaperJpeg, 'CENTER_CROPPED', 'http://dummyurl/test1.jpg', - false /*previewMode=*/, pass(function() { - chrome.wallpaperPrivate.getOfflineWallpaperList( - pass(function(list) { - list = list.sort(); - chrome.test.assertEq('test.jpg', list[0]); - chrome.test.assertEq('test1.jpg', list[1]); - })); - })); })); } ]);
diff --git a/chrome/test/data/extensions/api_test/webstore_private/empty_referrer_chain.html b/chrome/test/data/extensions/api_test/webstore_private/empty_referrer_chain.html new file mode 100644 index 0000000..0851f48e --- /dev/null +++ b/chrome/test/data/extensions/api_test/webstore_private/empty_referrer_chain.html
@@ -0,0 +1 @@ +<script src="empty_referrer_chain.js"></script>
diff --git a/chrome/test/data/extensions/api_test/webstore_private/empty_referrer_chain.js b/chrome/test/data/extensions/api_test/webstore_private/empty_referrer_chain.js new file mode 100644 index 0000000..c99778b --- /dev/null +++ b/chrome/test/data/extensions/api_test/webstore_private/empty_referrer_chain.js
@@ -0,0 +1,14 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +var tests = [ + function getReferrerChain() { + chrome.webstorePrivate.getReferrerChain((result) => { + chrome.test.assertEq("", result); + chrome.test.succeed(); + }); + }, +]; + +chrome.test.runTests(tests);
diff --git a/chrome/test/data/extensions/api_test/webstore_private/referrer_chain.html b/chrome/test/data/extensions/api_test/webstore_private/referrer_chain.html new file mode 100644 index 0000000..87f0ecb7 --- /dev/null +++ b/chrome/test/data/extensions/api_test/webstore_private/referrer_chain.html
@@ -0,0 +1 @@ +<script src="referrer_chain.js"></script>
diff --git a/chrome/test/data/extensions/api_test/webstore_private/referrer_chain.js b/chrome/test/data/extensions/api_test/webstore_private/referrer_chain.js new file mode 100644 index 0000000..62f02982 --- /dev/null +++ b/chrome/test/data/extensions/api_test/webstore_private/referrer_chain.js
@@ -0,0 +1,26 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +var tests = [ + function getReferrerChain() { + chrome.webstorePrivate.getReferrerChain((result) => { + // |result| contains the base64-encoded referrer data. Since the data + // contains the (randomly generated) server port, we cannot simply + // compare it to an expected base64-encoded string. + var referrerString = atob(result); + chrome.test.assertTrue( + referrerString.includes('example.com'), + 'Referrer data should contain example.com'); + chrome.test.assertTrue( + referrerString.includes('redirect1.com'), + 'Referrer data should contain redirect1.com'); + chrome.test.assertTrue( + referrerString.includes('redirect2.com'), + 'Referrer data should contain redirect2.com'); + chrome.test.succeed(); + }); + }, +]; + +chrome.test.runTests(tests);
diff --git a/chrome/test/data/viewsource/navigation.html b/chrome/test/data/viewsource/navigation.html new file mode 100644 index 0000000..67b9ab0 --- /dev/null +++ b/chrome/test/data/viewsource/navigation.html
@@ -0,0 +1,9 @@ +<html> +<head> + <title>Links test</title> +</head> +<body> +<a href="/echoheader?Referer">Navigate</a> +<a href="javascript:alert('fail');">JavaScript</a> +</body> +</html>
diff --git a/chromecast/media/cma/backend/buffering_mixer_source.cc b/chromecast/media/cma/backend/buffering_mixer_source.cc index 8340480d..a247f82 100644 --- a/chromecast/media/cma/backend/buffering_mixer_source.cc +++ b/chromecast/media/cma/backend/buffering_mixer_source.cc
@@ -215,15 +215,18 @@ LOG(INFO) << "End of stream for " << device_id_ << " (" << this << ")"; locked->state_ = State::kGotEos; } else { - locked->queued_frames_ += - data->data_size() / (num_channels_ * sizeof(float)); + const int frames = data->data_size() / (num_channels_ * sizeof(float)); + locked->queued_frames_ += frames; locked->queue_.push_back(std::move(data)); } - RenderingDelay delay = locked->mixer_rendering_delay_; - delay.delay_microseconds += SamplesToMicroseconds( - locked->queued_frames_ + locked->extra_delay_frames_, - input_samples_per_second_); + RenderingDelay delay; + if (locked->started_) { + delay = locked->mixer_rendering_delay_; + delay.delay_microseconds += SamplesToMicroseconds( + locked->queued_frames_ + locked->extra_delay_frames_, + input_samples_per_second_); + } return delay; }
diff --git a/chromecast/media/cma/backend/multizone_backend_unittest.cc b/chromecast/media/cma/backend/multizone_backend_unittest.cc index c7bba93..c3186dc 100644 --- a/chromecast/media/cma/backend/multizone_backend_unittest.cc +++ b/chromecast/media/cma/backend/multizone_backend_unittest.cc
@@ -101,6 +101,7 @@ const bool effects_only_; base::OnceClosure eos_cb_; const int64_t push_limit_us_; + const int playback_rate_change_count_; const int64_t playback_rate_change_interval_us_; float original_playback_rate_; float playback_rate_; @@ -121,7 +122,9 @@ } // namespace -using TestParams = std::tuple<int /* sample rate */, float /* playback rate */>; +using TestParams = std::tuple<int /* sample rate */, + float /* playback rate */, + bool /* change_playback_rate */>; class MultizoneBackendTest : public testing::TestWithParam<TestParams> { public: @@ -170,6 +173,7 @@ effects_only_(effects_only), eos_cb_(std::move(eos_cb)), push_limit_us_(effects_only_ ? 0 : kPushTimeUs), + playback_rate_change_count_(playback_rate_change_count), playback_rate_change_interval_us_(push_limit_us_ / (playback_rate_change_count + 1)), original_playback_rate_(1.0f), @@ -223,8 +227,9 @@ if (feeding_completed_) return; - if (!effects_only_ && pushed_us_ > pushed_us_when_rate_changed_ + - playback_rate_change_interval_us_) { + if (playback_rate_change_count_ > 1 && !effects_only_ && + pushed_us_ > + pushed_us_when_rate_changed_ + playback_rate_change_interval_us_) { pushed_us_when_rate_changed_ = pushed_us_; if (playback_rate_ != original_playback_rate_) { playback_rate_ = original_playback_rate_; @@ -369,8 +374,10 @@ const TestParams& params = GetParam(); int sample_rate = testing::get<0>(params); float playback_rate = testing::get<1>(params); + bool change_playback_rate = testing::get<2>(params); + int playback_rate_change_count = (change_playback_rate ? 1 : 0); - Initialize(sample_rate, 1 /* playback_rate_change_count */); + Initialize(sample_rate, playback_rate_change_count); AddEffectsStreams(); Start(playback_rate); } @@ -393,13 +400,14 @@ 32000, 44100, 48000), - ::testing::Values(0.5f, 0.99f, 1.0f, 1.01f, 2.0f))); + ::testing::Values(0.5f, 0.99f, 1.0f, 1.01f, 2.0f), + ::testing::Values(true))); -INSTANTIATE_TEST_CASE_P( - Optional, - MultizoneBackendTest, - testing::Combine(::testing::Values(64000, 88200, 96000), - ::testing::Values(0.5f, 0.99f, 1.0f, 1.01f, 2.0f))); +INSTANTIATE_TEST_CASE_P(Optional, + MultizoneBackendTest, + testing::Combine(::testing::Values(64000, 88200, 96000), + ::testing::Values(1.0f), + ::testing::Values(false))); } // namespace media } // namespace chromecast
diff --git a/chromeos/network/onc/onc_validator.cc b/chromeos/network/onc/onc_validator.cc index 2d63c1c..02993a99 100644 --- a/chromeos/network/onc/onc_validator.cc +++ b/chromeos/network/onc/onc_validator.cc
@@ -33,6 +33,17 @@ return std::vector<T>(array, array + N); } +void AddKeyToList(const char* key, base::Value::ListStorage& list) { + base::Value key_value(key); + if (!base::ContainsValue(list, key_value)) + list.push_back(std::move(key_value)); +} + +std::string GetStringFromDict(const base::Value& dict, const char* key) { + const base::Value* value = dict.FindKeyOfType(key, base::Value::Type::STRING); + return value ? value->GetString() : std::string(); +} + } // namespace Validator::Validator(bool error_on_unknown_field, @@ -302,9 +313,7 @@ if (FieldExistsAndHasNoValidValue(*result, kClientCertType, valid_cert_types)) return false; - std::string cert_type; - result->GetStringWithoutPathExpansion(kClientCertType, &cert_type); - + std::string cert_type = GetStringFromDict(*result, kClientCertType); bool all_required_exist = true; if (cert_type == kPattern) @@ -570,11 +579,10 @@ all_required_exist &= RequireField(*result, kName) && RequireField(*result, kType); - std::string ip_address_config_type, name_servers_config_type; - result->GetStringWithoutPathExpansion(kIPAddressConfigType, - &ip_address_config_type); - result->GetStringWithoutPathExpansion(kNameServersConfigType, - &name_servers_config_type); + std::string ip_address_config_type = + GetStringFromDict(*result, kIPAddressConfigType); + std::string name_servers_config_type = + GetStringFromDict(*result, kNameServersConfigType); if (ip_address_config_type == kIPConfigTypeStatic || name_servers_config_type == kIPConfigTypeStatic) { // TODO(pneubeck): Add ValidateStaticIPConfig and confirm that the @@ -582,8 +590,7 @@ all_required_exist &= RequireField(*result, kStaticIPConfig); } - std::string type; - result->GetStringWithoutPathExpansion(kType, &type); + std::string type = GetStringFromDict(*result, kType); // Prohibit anything but WiFi and Ethernet for device-level policy (which // corresponds to shared networks). See also http://crosbug.com/28741. @@ -630,8 +637,7 @@ } bool all_required_exist = true; - std::string auth; - result->GetStringWithoutPathExpansion(kAuthentication, &auth); + std::string auth = GetStringFromDict(*result, kAuthentication); if (auth == k8021X) all_required_exist &= RequireField(*result, kEAP); @@ -647,8 +653,7 @@ *result, ::onc::ipconfig::kType, valid_types)) return false; - std::string type; - result->GetStringWithoutPathExpansion(::onc::ipconfig::kType, &type); + std::string type = GetStringFromDict(*result, ::onc::ipconfig::kType); int lower_bound = 1; // In case of missing type, choose higher upper_bound. int upper_bound = (type == kIPv4) ? 32 : 128; @@ -686,8 +691,7 @@ if (!result->HasKey(kHexSSID)) all_required_exist &= RequireField(*result, kSSID); - std::string security; - result->GetStringWithoutPathExpansion(kSecurity, &security); + std::string security = GetStringFromDict(*result, kSecurity); if (security == kWEP_8021X || security == kWPA_EAP) all_required_exist &= RequireField(*result, kEAP); else if (security == kWEP_PSK || security == kWPA_PSK) @@ -706,8 +710,7 @@ return false; bool all_required_exist = RequireField(*result, ::onc::vpn::kType); - std::string type; - result->GetStringWithoutPathExpansion(::onc::vpn::kType, &type); + std::string type = GetStringFromDict(*result, ::onc::vpn::kType); if (type == kOpenVPN) { all_required_exist &= RequireField(*result, kOpenVPN); } else if (type == kIPsec) { @@ -750,8 +753,7 @@ bool all_required_exist = RequireField(*result, kAuthenticationType) && RequireField(*result, kIKEVersion); - std::string auth; - result->GetStringWithoutPathExpansion(kAuthenticationType, &auth); + std::string auth = GetStringFromDict(*result, kAuthenticationType); bool has_server_ca_cert = result->HasKey(kServerCARefs) || result->HasKey(kServerCARef); if (auth == kCert) { @@ -807,24 +809,35 @@ return false; } + // ONC policy prevents the UI from setting properties that are not explicitly + // listed as 'recommended' (i.e. the default is 'enforced'). Historically + // the configuration UI ignored this restriction. In order to support legacy + // ONC configurations, add recommended entries for user authentication + // properties where appropriate. if ((onc_source_ == ::onc::ONC_SOURCE_DEVICE_POLICY || - onc_source_ == ::onc::ONC_SOURCE_USER_POLICY) && - !result->FindKeyOfType(::onc::openvpn::kUserAuthenticationType, - base::Value::Type::STRING)) { - // If kUserAuthenticationType is unspecified for a policy controlled - // network, allow Password and OTP to be specified by the user by adding - // them to the recommended list. + onc_source_ == ::onc::ONC_SOURCE_USER_POLICY)) { base::Value* recommended = result->FindKeyOfType(::onc::kRecommended, base::Value::Type::LIST); if (!recommended) recommended = result->SetKey(::onc::kRecommended, base::ListValue()); - base::Value::ListStorage& result_list = recommended->GetList(); - base::Value password_value(::onc::openvpn::kPassword); - if (!base::ContainsValue(result_list, password_value)) - result_list.push_back(std::move(password_value)); - base::Value otp_value(::onc::openvpn::kOTP); - if (!base::ContainsValue(result_list, otp_value)) - result_list.push_back(std::move(otp_value)); + + // If kUserAuthenticationType is unspecified, allow Password and OTP. + base::Value::ListStorage& recommended_list = recommended->GetList(); + if (!result->FindKeyOfType(::onc::openvpn::kUserAuthenticationType, + base::Value::Type::STRING)) { + AddKeyToList(::onc::openvpn::kPassword, recommended_list); + AddKeyToList(::onc::openvpn::kOTP, recommended_list); + } + + // If client cert type is not provided, empty, or 'None', allow client cert + // properties. + std::string client_cert_type = + GetStringFromDict(*result, ::onc::client_cert::kClientCertType); + if (client_cert_type.empty() || + client_cert_type == ::onc::client_cert::kClientCertTypeNone) { + AddKeyToList(::onc::client_cert::kClientCertType, recommended_list); + AddKeyToList(::onc::client_cert::kClientCertPKCS11Id, recommended_list); + } } if (result->HasKey(kServerCARefs) && result->HasKey(kServerCARef)) { @@ -942,8 +955,7 @@ return false; bool all_required_exist = RequireField(*result, ::onc::proxy::kType); - std::string type; - result->GetStringWithoutPathExpansion(::onc::proxy::kType, &type); + std::string type = GetStringFromDict(*result, ::onc::proxy::kType); if (type == kManual) all_required_exist &= RequireField(*result, kManual); else if (type == kPAC) @@ -1004,8 +1016,7 @@ return false; } - std::string type; - result->GetStringWithoutPathExpansion(kType, &type); + std::string type = GetStringFromDict(*result, kType); if (!CheckGuidIsUniqueAndAddToSet(*result, kGUID, &certificate_guids_)) return false; @@ -1052,9 +1063,8 @@ return false; } - std::string carrier; - if (!result->GetStringWithoutPathExpansion(kCarrier, &carrier) || - carrier.empty()) { + std::string carrier = GetStringFromDict(*result, kCarrier); + if (carrier.empty()) { // Carrier must be a non-empty string. error_or_warning_found_ = true; return false;
diff --git a/chromeos/test/data/network/policy/policy_vpn_no_auth.onc b/chromeos/test/data/network/policy/policy_vpn_no_auth.onc index b4b38a1..b377080 100644 --- a/chromeos/test/data/network/policy/policy_vpn_no_auth.onc +++ b/chromeos/test/data/network/policy/policy_vpn_no_auth.onc
@@ -8,6 +8,7 @@ "AutoConnect":false, "Host":"vpn.my.domain.com", "OpenVPN":{ + "ClientCertType":"None", "Port":443, "Proto":"udp", "Recommended": ["Username", "Password", "SaveCredentials"],
diff --git a/chromeos/test/data/network/policy/policy_vpn_ui.json b/chromeos/test/data/network/policy/policy_vpn_ui.json index 59877e0..4f286ad 100644 --- a/chromeos/test/data/network/policy/policy_vpn_ui.json +++ b/chromeos/test/data/network/policy/policy_vpn_ui.json
@@ -6,6 +6,8 @@ "AutoConnect":false, "Host":"vpn.my.domain.com", "OpenVPN":{ + "ClientCertPKCS11Id":"1:2345", + "ClientCertType":"PKCS11Id", "OTP":"user OTP", "Password":"user password", "SaveCredentials":true,
diff --git a/chromeos/test/data/network/policy/shill_policy_on_managed_vpn_plus_ui.json b/chromeos/test/data/network/policy/shill_policy_on_managed_vpn_plus_ui.json index e8df514..36bb94e 100644 --- a/chromeos/test/data/network/policy/shill_policy_on_managed_vpn_plus_ui.json +++ b/chromeos/test/data/network/policy/shill_policy_on_managed_vpn_plus_ui.json
@@ -8,6 +8,8 @@ "Host": "vpn.my.domain.com", "OpenVPN.OTP": "user OTP", "OpenVPN.Password": "user password", + "OpenVPN.Pkcs11.ID": "2345", + "OpenVPN.Pkcs11.PIN": "111111", "OpenVPN.Port": "443", "OpenVPN.Proto": "udp", "OpenVPN.RemoteCertKU": "", @@ -18,7 +20,7 @@ "SaveCredentials": true, "State": "idle", "Type": "vpn", - "UIData": "{\"onc_source\":\"user_policy\",\"user_settings\":{\"GUID\":\"{a3860e83-f03d-4cb1-bafa-b22c9e746950}\",\"Name\":\"my vpn\",\"Type\":\"VPN\",\"VPN\":{\"AutoConnect\":false,\"Host\":\"vpn.my.domain.com\",\"OpenVPN\":{\"OTP\":\"user OTP\",\"Password\":\"FAKE_CREDENTIAL_VPaJDV9x\",\"SaveCredentials\":true,\"UserAuthenticationType\":\"PasswordAndOTP\",\"Username\":\"user name\"},\"Type\":\"OpenVPN\"}}}", + "UIData": "{\"onc_source\":\"user_policy\",\"user_settings\":{\"GUID\":\"{a3860e83-f03d-4cb1-bafa-b22c9e746950}\",\"Name\":\"my vpn\",\"Type\":\"VPN\",\"VPN\":{\"AutoConnect\":false,\"Host\":\"vpn.my.domain.com\",\"OpenVPN\":{\"ClientCertPKCS11Id\":\"1:2345\",\"ClientCertType\":\"PKCS11Id\",\"OTP\":\"user OTP\",\"Password\":\"FAKE_CREDENTIAL_VPaJDV9x\",\"SaveCredentials\":true,\"UserAuthenticationType\":\"PasswordAndOTP\",\"Username\":\"user name\"},\"Type\":\"OpenVPN\"}}}", "Visible": true, "WiFi.HexSSID": "7B61333836306538332D663033642D346362312D626166612D6232326339653734363935307D" }
diff --git a/components/autofill/ios/browser/autofill_agent.mm b/components/autofill/ios/browser/autofill_agent.mm index 9d1de17f..fbfa850 100644 --- a/components/autofill/ios/browser/autofill_agent.mm +++ b/components/autofill/ios/browser/autofill_agent.mm
@@ -619,7 +619,7 @@ return; // Return early if the page is not processed yet. - if (pageProcessed_) + if (!pageProcessed_) return; // Return early if |params| is not complete.
diff --git a/components/download/internal/common/BUILD.gn b/components/download/internal/common/BUILD.gn index bb3a929..d498f58 100644 --- a/components/download/internal/common/BUILD.gn +++ b/components/download/internal/common/BUILD.gn
@@ -35,12 +35,14 @@ "download_utils.cc", "download_worker.cc", "download_worker.h", + "in_progress_download_manager.cc", "parallel_download_job.cc", "parallel_download_job.h", "parallel_download_utils.cc", "parallel_download_utils.h", "rate_estimator.cc", "resource_downloader.cc", + "resource_downloader.h", "save_package_download_job.cc", "save_package_download_job.h", "stream_handle_input_stream.cc",
diff --git a/components/download/internal/common/DEPS b/components/download/internal/common/DEPS index 65c7005..a5df1ad 100644 --- a/components/download/internal/common/DEPS +++ b/components/download/internal/common/DEPS
@@ -6,10 +6,12 @@ "+components/ukm/test_ukm_recorder.h", "+crypto", "+mojo/public/c/system", + "+mojo/public/cpp/bindings", "+net/base/filename_util.h", "+net/base/load_flags.h", "+net/base/io_buffer.h", "+net/base/net_errors.h", + "+net/cert/cert_status_flags.h", "+net/http/http_content_disposition.h", "+net/http/http_request_headers.h", "+net/http/http_response_headers.h", @@ -18,4 +20,5 @@ "+net/traffic_annotation/network_traffic_annotation.h", "+services/metrics/public/cpp", "+services/network/public/cpp", + "+services/network/public/mojom", ]
diff --git a/components/download/internal/common/download_worker.cc b/components/download/internal/common/download_worker.cc index 24efd15d..577e62e2 100644 --- a/components/download/internal/common/download_worker.cc +++ b/components/download/internal/common/download_worker.cc
@@ -5,13 +5,13 @@ #include "components/download/internal/common/download_worker.h" #include "base/message_loop/message_loop.h" +#include "components/download/internal/common/resource_downloader.h" #include "components/download/public/common/download_create_info.h" #include "components/download/public/common/download_interrupt_reasons.h" #include "components/download/public/common/download_task_runner.h" #include "components/download/public/common/download_url_loader_factory_getter.h" #include "components/download/public/common/download_utils.h" #include "components/download/public/common/input_stream.h" -#include "components/download/public/common/resource_downloader.h" #include "components/download/public/common/url_download_handler_factory.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/shared_url_loader_factory.h"
diff --git a/components/download/internal/common/in_progress_download_manager.cc b/components/download/internal/common/in_progress_download_manager.cc new file mode 100644 index 0000000..bde18424 --- /dev/null +++ b/components/download/internal/common/in_progress_download_manager.cc
@@ -0,0 +1,173 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/download/public/common/in_progress_download_manager.h" + +#include "base/optional.h" +#include "base/threading/thread_task_runner_handle.h" +#include "components/download/internal/common/resource_downloader.h" +#include "components/download/public/common/download_task_runner.h" +#include "components/download/public/common/download_url_loader_factory_getter.h" +#include "components/download/public/common/download_url_parameters.h" +#include "components/download/public/common/download_utils.h" +#include "components/download/public/common/input_stream.h" +#include "services/network/public/cpp/resource_request.h" +#include "services/network/public/cpp/resource_response.h" + +namespace download { + +namespace { + +void OnUrlDownloadHandlerCreated( + UrlDownloadHandler::UniqueUrlDownloadHandlerPtr downloader, + base::WeakPtr<InProgressDownloadManager> download_manager, + const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner) { + main_task_runner->PostTask( + FROM_HERE, + base::BindOnce(&UrlDownloadHandler::Delegate::OnUrlDownloadHandlerCreated, + download_manager, std::move(downloader))); +} + +void BeginResourceDownload( + std::unique_ptr<DownloadUrlParameters> params, + std::unique_ptr<network::ResourceRequest> request, + scoped_refptr<DownloadURLLoaderFactoryGetter> url_loader_factory_getter, + uint32_t download_id, + base::WeakPtr<InProgressDownloadManager> download_manager, + const GURL& site_url, + const GURL& tab_url, + const GURL& tab_referrer_url, + const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner) { + DCHECK(GetIOTaskRunner()->BelongsToCurrentThread()); + UrlDownloadHandler::UniqueUrlDownloadHandlerPtr downloader( + ResourceDownloader::BeginDownload( + download_manager, std::move(params), std::move(request), + std::move(url_loader_factory_getter), site_url, tab_url, + tab_referrer_url, download_id, false, main_task_runner) + .release(), + base::OnTaskRunnerDeleter(base::ThreadTaskRunnerHandle::Get())); + + OnUrlDownloadHandlerCreated(std::move(downloader), download_manager, + main_task_runner); +} + +void CreateDownloadHandlerForNavigation( + base::WeakPtr<InProgressDownloadManager> download_manager, + std::unique_ptr<network::ResourceRequest> resource_request, + int render_process_id, + int render_frame_id, + const GURL& site_url, + const GURL& tab_url, + const GURL& tab_referrer_url, + std::vector<GURL> url_chain, + const base::Optional<std::string>& suggested_filename, + scoped_refptr<network::ResourceResponse> response, + net::CertStatus cert_status, + network::mojom::URLLoaderClientEndpointsPtr url_loader_client_endpoints, + scoped_refptr<DownloadURLLoaderFactoryGetter> url_loader_factory_getter, + const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner) { + DCHECK(GetIOTaskRunner()->BelongsToCurrentThread()); + download::UrlDownloadHandler::UniqueUrlDownloadHandlerPtr downloader( + download::ResourceDownloader::InterceptNavigationResponse( + download_manager, std::move(resource_request), render_process_id, + render_frame_id, site_url, tab_url, tab_referrer_url, + std::move(url_chain), suggested_filename, std::move(response), + std::move(cert_status), std::move(url_loader_client_endpoints), + std::move(url_loader_factory_getter), main_task_runner) + .release(), + base::OnTaskRunnerDeleter(base::ThreadTaskRunnerHandle::Get())); + + OnUrlDownloadHandlerCreated(std::move(downloader), download_manager, + main_task_runner); +} + +} // namespace + +InProgressDownloadManager::InProgressDownloadManager( + UrlDownloadHandler::Delegate* delegate) + : delegate_(delegate), weak_factory_(this) {} + +InProgressDownloadManager::~InProgressDownloadManager() = default; + +void InProgressDownloadManager::OnUrlDownloadStarted( + std::unique_ptr<DownloadCreateInfo> download_create_info, + std::unique_ptr<InputStream> input_stream, + scoped_refptr<DownloadURLLoaderFactoryGetter> url_loader_factory_getter, + const DownloadUrlParameters::OnStartedCallback& callback) { + if (delegate_) { + delegate_->OnUrlDownloadStarted( + std::move(download_create_info), std::move(input_stream), + std::move(url_loader_factory_getter), callback); + } +} + +void InProgressDownloadManager::OnUrlDownloadStopped( + UrlDownloadHandler* downloader) { + for (auto ptr = url_download_handlers_.begin(); + ptr != url_download_handlers_.end(); ++ptr) { + if (ptr->get() == downloader) { + url_download_handlers_.erase(ptr); + return; + } + } +} + +void InProgressDownloadManager::OnUrlDownloadHandlerCreated( + UrlDownloadHandler::UniqueUrlDownloadHandlerPtr downloader) { + if (downloader) + url_download_handlers_.push_back(std::move(downloader)); +} + +void InProgressDownloadManager::StartDownload( + std::unique_ptr<DownloadUrlParameters> params, + scoped_refptr<DownloadURLLoaderFactoryGetter> url_loader_factory_getter, + uint32_t download_id, + const GURL& site_url, + const GURL& tab_url, + const GURL& tab_referrer_url) { + std::unique_ptr<network::ResourceRequest> request = + CreateResourceRequest(params.get()); + GetIOTaskRunner()->PostTask( + FROM_HERE, + base::BindOnce(&BeginResourceDownload, std::move(params), + std::move(request), std::move(url_loader_factory_getter), + download_id, weak_factory_.GetWeakPtr(), site_url, tab_url, + tab_referrer_url, base::ThreadTaskRunnerHandle::Get())); +} + +void InProgressDownloadManager::InterceptDownloadFromNavigation( + std::unique_ptr<network::ResourceRequest> resource_request, + int render_process_id, + int render_frame_id, + const GURL& site_url, + const GURL& tab_url, + const GURL& tab_referrer_url, + std::vector<GURL> url_chain, + const base::Optional<std::string>& suggested_filename, + scoped_refptr<network::ResourceResponse> response, + net::CertStatus cert_status, + network::mojom::URLLoaderClientEndpointsPtr url_loader_client_endpoints, + scoped_refptr<DownloadURLLoaderFactoryGetter> url_loader_factory_getter) { + GetIOTaskRunner()->PostTask( + FROM_HERE, + base::BindOnce(&CreateDownloadHandlerForNavigation, + weak_factory_.GetWeakPtr(), std::move(resource_request), + render_process_id, render_frame_id, site_url, tab_url, + tab_referrer_url, std::move(url_chain), suggested_filename, + std::move(response), std::move(cert_status), + std::move(url_loader_client_endpoints), + std::move(url_loader_factory_getter), + base::ThreadTaskRunnerHandle::Get())); +} + +void InProgressDownloadManager::ShutDown() { + url_download_handlers_.clear(); +} + +void InProgressDownloadManager::ResumeInterruptedDownload( + std::unique_ptr<DownloadUrlParameters> params, + uint32_t id, + const GURL& site_url) {} + +} // namespace download
diff --git a/components/download/internal/common/resource_downloader.cc b/components/download/internal/common/resource_downloader.cc index 04760d4..6d687263 100644 --- a/components/download/internal/common/resource_downloader.cc +++ b/components/download/internal/common/resource_downloader.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/download/public/common/resource_downloader.h" +#include "components/download/internal/common/resource_downloader.h" #include <memory>
diff --git a/components/download/public/common/resource_downloader.h b/components/download/internal/common/resource_downloader.h similarity index 96% rename from components/download/public/common/resource_downloader.h rename to components/download/internal/common/resource_downloader.h index 7934fe3..171748d 100644 --- a/components/download/public/common/resource_downloader.h +++ b/components/download/internal/common/resource_downloader.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_DOWNLOAD_PUBLIC_COMMON_RESOURCE_DOWNLOADER_H_ -#define COMPONENTS_DOWNLOAD_PUBLIC_COMMON_RESOURCE_DOWNLOADER_H_ +#ifndef COMPONENTS_DOWNLOAD_INTERNAL_COMMON_RESOURCE_DOWNLOADER_H_ +#define COMPONENTS_DOWNLOAD_INTERNAL_COMMON_RESOURCE_DOWNLOADER_H_ #include "components/download/public/common/download_export.h" #include "components/download/public/common/download_response_handler.h" @@ -144,4 +144,4 @@ } // namespace download -#endif // COMPONENTS_DOWNLOAD_PUBLIC_COMMON_RESOURCE_DOWNLOADER_H_ +#endif // COMPONENTS_DOWNLOAD_INTERNAL_COMMON_RESOURCE_DOWNLOADER_H_
diff --git a/components/download/internal/common/url_download_handler_factory.cc b/components/download/internal/common/url_download_handler_factory.cc index c85c9af1..625f6da 100644 --- a/components/download/internal/common/url_download_handler_factory.cc +++ b/components/download/internal/common/url_download_handler_factory.cc
@@ -6,10 +6,10 @@ #include "base/no_destructor.h" #include "base/synchronization/lock.h" +#include "components/download/internal/common/resource_downloader.h" #include "components/download/public/common/download_item.h" #include "components/download/public/common/download_url_loader_factory_getter.h" #include "components/download/public/common/download_utils.h" -#include "components/download/public/common/resource_downloader.h" #include "services/network/public/cpp/shared_url_loader_factory.h" namespace download {
diff --git a/components/download/public/common/BUILD.gn b/components/download/public/common/BUILD.gn index f11815d..7127336 100644 --- a/components/download/public/common/BUILD.gn +++ b/components/download/public/common/BUILD.gn
@@ -48,11 +48,11 @@ "download_url_parameters.cc", "download_url_parameters.h", "download_utils.h", + "in_progress_download_manager.h", "input_stream.cc", "input_stream.h", "parallel_download_configs.h", "rate_estimator.h", - "resource_downloader.h", "resume_mode.h", "stream_handle_input_stream.h", "url_download_handler_factory.h",
diff --git a/components/download/public/common/in_progress_download_manager.h b/components/download/public/common/in_progress_download_manager.h new file mode 100644 index 0000000..dff70ab3 --- /dev/null +++ b/components/download/public/common/in_progress_download_manager.h
@@ -0,0 +1,96 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_DOWNLOAD_PUBLIC_COMMON_IN_PROGRESS_DOWNLOAD_MANAGER_H_ +#define COMPONENTS_DOWNLOAD_PUBLIC_COMMON_IN_PROGRESS_DOWNLOAD_MANAGER_H_ + +#include <memory> +#include <vector> + +#include "base/memory/scoped_refptr.h" +#include "base/memory/weak_ptr.h" +#include "base/optional.h" +#include "components/download/public/common/download_export.h" +#include "components/download/public/common/download_item_impl_delegate.h" +#include "components/download/public/common/url_download_handler.h" +#include "url/gurl.h" + +namespace network { +struct ResourceResponse; +} + +namespace download { + +class DownloadURLLoaderFactoryGetter; +class DownloadUrlParameters; + +// Manager for handling all active downloads. +class COMPONENTS_DOWNLOAD_EXPORT InProgressDownloadManager + : public UrlDownloadHandler::Delegate, + public DownloadItemImplDelegate { + public: + InProgressDownloadManager(UrlDownloadHandler::Delegate* delegate); + ~InProgressDownloadManager() override; + + // Called to start a download. + void StartDownload( + std::unique_ptr<DownloadUrlParameters> params, + scoped_refptr<DownloadURLLoaderFactoryGetter> url_loader_factory_getter, + uint32_t download_id, + const GURL& site_url, + const GURL& tab_url, + const GURL& tab_referrer_url); + + // Intercepts a download from navigation. + void InterceptDownloadFromNavigation( + std::unique_ptr<network::ResourceRequest> resource_request, + int render_process_id, + int render_frame_id, + const GURL& site_url, + const GURL& tab_url, + const GURL& tab_referrer_url, + std::vector<GURL> url_chain, + const base::Optional<std::string>& suggested_filename, + scoped_refptr<network::ResourceResponse> response, + net::CertStatus cert_status, + network::mojom::URLLoaderClientEndpointsPtr url_loader_client_endpoints, + scoped_refptr<DownloadURLLoaderFactoryGetter> url_loader_factory_getter); + + // Shutting down the manager and stop all downloads. + void ShutDown(); + + private: + // UrlDownloadHandler::Delegate implementations. + void OnUrlDownloadStarted( + std::unique_ptr<DownloadCreateInfo> download_create_info, + std::unique_ptr<InputStream> input_stream, + scoped_refptr<DownloadURLLoaderFactoryGetter> shared_url_loader_factory, + const DownloadUrlParameters::OnStartedCallback& callback) override; + void OnUrlDownloadStopped(UrlDownloadHandler* downloader) override; + void OnUrlDownloadHandlerCreated( + UrlDownloadHandler::UniqueUrlDownloadHandlerPtr downloader) override; + + // Overridden from DownloadItemImplDelegate. + void ResumeInterruptedDownload(std::unique_ptr<DownloadUrlParameters> params, + uint32_t id, + const GURL& site_url) override; + + // Active download handlers. + std::vector<UrlDownloadHandler::UniqueUrlDownloadHandlerPtr> + url_download_handlers_; + + // Delegate to call when download starts. Only OnUrlDownloadStarted() is being + // passed through for now as we need content layer to provide default download + // dir. + // TODO(qinmin): remove this once this class drives all active download. + UrlDownloadHandler::Delegate* delegate_; + + base::WeakPtrFactory<InProgressDownloadManager> weak_factory_; + + DISALLOW_COPY_AND_ASSIGN(InProgressDownloadManager); +}; + +} // namespace download + +#endif // COMPONENTS_DOWNLOAD_PUBLIC_COMMON_IN_PROGRESS_DOWNLOAD_MANAGER_H_
diff --git a/components/download/public/common/url_download_handler.h b/components/download/public/common/url_download_handler.h index 347d695b..ce059d923 100644 --- a/components/download/public/common/url_download_handler.h +++ b/components/download/public/common/url_download_handler.h
@@ -26,8 +26,7 @@ virtual void OnUrlDownloadStarted( std::unique_ptr<DownloadCreateInfo> download_create_info, std::unique_ptr<InputStream> input_stream, - scoped_refptr<download::DownloadURLLoaderFactoryGetter> - url_loader_factory_getter, + scoped_refptr<DownloadURLLoaderFactoryGetter> url_loader_factory_getter, const DownloadUrlParameters::OnStartedCallback& callback) = 0; // Called after the connection is cancelled or finished.
diff --git a/components/exo/shell_surface_base.cc b/components/exo/shell_surface_base.cc index ed07b48..4795a9a6 100644 --- a/components/exo/shell_surface_base.cc +++ b/components/exo/shell_surface_base.cc
@@ -701,6 +701,8 @@ geometry_ = pending_geometry_; // Apply new minimum/maximium size. + bool size_constraint_changed = minimum_size_ != pending_minimum_size_ || + maximum_size_ != pending_maximum_size_; minimum_size_ = pending_minimum_size_; maximum_size_ = pending_maximum_size_; @@ -747,7 +749,8 @@ SubmitCompositorFrame(); - widget_->OnSizeConstraintsChanged(); + if (size_constraint_changed) + widget_->OnSizeConstraintsChanged(); } bool ShellSurfaceBase::IsInputEnabled(Surface*) const {
diff --git a/components/ntp_snippets/BUILD.gn b/components/ntp_snippets/BUILD.gn index c6507be..cca306c1 100644 --- a/components/ntp_snippets/BUILD.gn +++ b/components/ntp_snippets/BUILD.gn
@@ -71,8 +71,6 @@ "ntp_snippets_constants.h", "offline_pages/recent_tab_suggestions_provider.cc", "offline_pages/recent_tab_suggestions_provider.h", - "physical_web_pages/physical_web_page_suggestions_provider.cc", - "physical_web_pages/physical_web_page_suggestions_provider.h", "pref_names.cc", "pref_names.h", "pref_util.cc", @@ -160,7 +158,6 @@ "//components/offline_pages/core", "//components/offline_pages/core/downloads:offline_pages_ui_adapter", "//components/offline_pages/core/recent_tabs", - "//components/physical_web/data_source", "//components/reading_list/core", "//components/sessions", "//components/strings", @@ -220,7 +217,6 @@ "contextual/contextual_suggestions_ukm_entry_unittest.cc", "logger_unittest.cc", "offline_pages/recent_tab_suggestions_provider_unittest.cc", - "physical_web_pages/physical_web_page_suggestions_provider_unittest.cc", "reading_list/reading_list_suggestions_provider_unittest.cc", "remote/cached_image_fetcher_unittest.cc", "remote/json_request_unittest.cc", @@ -263,7 +259,6 @@ "//components/offline_pages/core/background:test_support", "//components/offline_pages/core/downloads:offline_pages_ui_adapter", "//components/offline_pages/core/recent_tabs", - "//components/physical_web/data_source:test_support", "//components/prefs:test_support", "//components/reading_list/core", "//components/sessions",
diff --git a/components/ntp_snippets/category.h b/components/ntp_snippets/category.h index c40ed5d..506d51f 100644 --- a/components/ntp_snippets/category.h +++ b/components/ntp_snippets/category.h
@@ -29,7 +29,7 @@ BOOKMARKS, // Physical Web page available in the vicinity. - PHYSICAL_WEB_PAGES, + PHYSICAL_WEB_PAGES_DEPRECATED, // Pages recently browsed to on other devices. FOREIGN_TABS,
diff --git a/components/ntp_snippets/category_rankers/click_based_category_ranker_unittest.cc b/components/ntp_snippets/category_rankers/click_based_category_ranker_unittest.cc index 8bd537e..c8e8843 100644 --- a/components/ntp_snippets/category_rankers/click_based_category_ranker_unittest.cc +++ b/components/ntp_snippets/category_rankers/click_based_category_ranker_unittest.cc
@@ -608,9 +608,6 @@ ResetRanker(base::DefaultClock::GetInstance()); // Make sure we have the default order. EXPECT_TRUE(CompareCategories( - Category::FromKnownCategory(KnownCategories::PHYSICAL_WEB_PAGES), - Category::FromKnownCategory(KnownCategories::DOWNLOADS))); - EXPECT_TRUE(CompareCategories( Category::FromKnownCategory(KnownCategories::DOWNLOADS), Category::FromKnownCategory(KnownCategories::RECENT_TABS))); EXPECT_TRUE(CompareCategories( @@ -625,20 +622,20 @@ } TEST_F(ClickBasedCategoryRankerTest, ShouldEndPromotionOnSectionDismissal) { - const Category physical_web = - Category::FromKnownCategory(KnownCategories::PHYSICAL_WEB_PAGES); + const Category downloads = + Category::FromKnownCategory(KnownCategories::DOWNLOADS); const Category articles = Category::FromKnownCategory(KnownCategories::ARTICLES); - ASSERT_TRUE(CompareCategories(physical_web, articles)); + ASSERT_TRUE(CompareCategories(downloads, articles)); SetPromotedCategoryVariationParam(articles.id()); ResetRanker(base::DefaultClock::GetInstance()); - ASSERT_TRUE(CompareCategories(articles, physical_web)); + ASSERT_TRUE(CompareCategories(articles, downloads)); ranker()->OnCategoryDismissed(articles); - EXPECT_FALSE(CompareCategories(articles, physical_web)); - EXPECT_TRUE(CompareCategories(physical_web, articles)); + EXPECT_FALSE(CompareCategories(articles, downloads)); + EXPECT_TRUE(CompareCategories(downloads, articles)); } TEST_F(ClickBasedCategoryRankerTest,
diff --git a/components/ntp_snippets/category_rankers/constant_category_ranker.cc b/components/ntp_snippets/category_rankers/constant_category_ranker.cc index c7ab47d..40c7e1e4b 100644 --- a/components/ntp_snippets/category_rankers/constant_category_ranker.cc +++ b/components/ntp_snippets/category_rankers/constant_category_ranker.cc
@@ -122,7 +122,6 @@ // KnownCategories::CONTEXTUAL because it is not handled by // ContentSuggestionsService. case CategoryOrderChoice::GENERAL: - categories.push_back(KnownCategories::PHYSICAL_WEB_PAGES); categories.push_back(KnownCategories::READING_LIST); categories.push_back(KnownCategories::DOWNLOADS); categories.push_back(KnownCategories::RECENT_TABS); @@ -136,7 +135,6 @@ categories.push_back(KnownCategories::DOWNLOADS); categories.push_back(KnownCategories::BOOKMARKS); - categories.push_back(KnownCategories::PHYSICAL_WEB_PAGES); categories.push_back(KnownCategories::RECENT_TABS); categories.push_back(KnownCategories::FOREIGN_TABS); break;
diff --git a/components/ntp_snippets/content_suggestions_metrics.cc b/components/ntp_snippets/content_suggestions_metrics.cc index 5c6746c..6c0fe3d5 100644 --- a/components/ntp_snippets/content_suggestions_metrics.cc +++ b/components/ntp_snippets/content_suggestions_metrics.cc
@@ -84,7 +84,7 @@ RECENT_TABS, DOWNLOADS, BOOKMARKS, - PHYSICAL_WEB_PAGES, + PHYSICAL_WEB_PAGES_DEPRECATED, FOREIGN_TABS, ARTICLES, READING_LIST, @@ -110,8 +110,6 @@ return HistogramCategories::DOWNLOADS; case KnownCategories::BOOKMARKS: return HistogramCategories::BOOKMARKS; - case KnownCategories::PHYSICAL_WEB_PAGES: - return HistogramCategories::PHYSICAL_WEB_PAGES; case KnownCategories::FOREIGN_TABS: return HistogramCategories::FOREIGN_TABS; case KnownCategories::ARTICLES: @@ -120,6 +118,7 @@ return HistogramCategories::READING_LIST; case KnownCategories::CONTEXTUAL: return HistogramCategories::CONTEXTUAL; + case KnownCategories::PHYSICAL_WEB_PAGES_DEPRECATED: case KnownCategories::LOCAL_CATEGORIES_COUNT: case KnownCategories::REMOTE_CATEGORIES_OFFSET: NOTREACHED(); @@ -140,8 +139,6 @@ return "Downloads"; case HistogramCategories::BOOKMARKS: return "Bookmarks"; - case HistogramCategories::PHYSICAL_WEB_PAGES: - return "PhysicalWeb"; case HistogramCategories::FOREIGN_TABS: return "ForeignTabs"; case HistogramCategories::ARTICLES: @@ -152,6 +149,7 @@ return "ReadingList"; case HistogramCategories::CONTEXTUAL: return "Contextual"; + case HistogramCategories::PHYSICAL_WEB_PAGES_DEPRECATED: case HistogramCategories::COUNT: NOTREACHED(); break;
diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc index af71fdc..2fd237d2 100644 --- a/components/ntp_snippets/features.cc +++ b/components/ntp_snippets/features.cc
@@ -31,7 +31,6 @@ &kIncreasedVisibility, &kKeepPrefetchedContentSuggestions, &kNotificationsFeature, - &kPhysicalWebPageSuggestionsFeature, &kPublisherFaviconsFromNewServerFeature, &kRecentOfflineTabSuggestionsFeature, &kRemoteSuggestionsBackendFeature, @@ -52,9 +51,6 @@ const base::Feature kIncreasedVisibility{"NTPSnippetsIncreasedVisibility", base::FEATURE_ENABLED_BY_DEFAULT}; -const base::Feature kPhysicalWebPageSuggestionsFeature{ - "NTPPhysicalWebPageSuggestions", base::FEATURE_DISABLED_BY_DEFAULT}; - const base::Feature kForeignSessionsSuggestionsFeature{ "NTPForeignSessionsSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
diff --git a/components/ntp_snippets/features.h b/components/ntp_snippets/features.h index 5c689e29..b2dda46 100644 --- a/components/ntp_snippets/features.h +++ b/components/ntp_snippets/features.h
@@ -34,7 +34,6 @@ extern const base::Feature kBookmarkSuggestionsFeature; extern const base::Feature kRecentOfflineTabSuggestionsFeature; -extern const base::Feature kPhysicalWebPageSuggestionsFeature; extern const base::Feature kForeignSessionsSuggestionsFeature; //////////////////////////////////////////////////////////////////////////////// @@ -43,7 +42,6 @@ // Feature to allow show/hide article suggestions by clicking the header. extern const base::Feature kArticleSuggestionsExpandableHeader; -// TODO(jkrcal): Rename to kRemoteSuggestionsFeature. extern const base::Feature kArticleSuggestionsFeature; // Feature to allow UI as specified here: https://crbug.com/660837.
diff --git a/components/ntp_snippets/physical_web_pages/DEPS b/components/ntp_snippets/physical_web_pages/DEPS deleted file mode 100644 index ea8c01fd..0000000 --- a/components/ntp_snippets/physical_web_pages/DEPS +++ /dev/null
@@ -1,4 +0,0 @@ -include_rules = [ - "+components/grit", - "+components/physical_web/data_source", -]
diff --git a/components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.cc b/components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.cc deleted file mode 100644 index 357a8c7..0000000 --- a/components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.cc +++ /dev/null
@@ -1,373 +0,0 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.h" - -#include <algorithm> -#include <memory> -#include <set> -#include <string> -#include <utility> - -#include "base/bind.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/string_piece.h" -#include "base/strings/string_util.h" -#include "base/strings/utf_string_conversions.h" -#include "base/threading/thread_task_runner_handle.h" -#include "components/grit/components_scaled_resources.h" -#include "components/ntp_snippets/pref_names.h" -#include "components/ntp_snippets/pref_util.h" -#include "components/physical_web/data_source/physical_web_data_source.h" -#include "components/prefs/pref_registry_simple.h" -#include "components/prefs/pref_service.h" -#include "components/strings/grit/components_strings.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" -#include "ui/gfx/image/image.h" -#include "url/gurl.h" - -namespace ntp_snippets { - -namespace { - -const size_t kMaxSuggestionsCount = 10; - -std::string GetPageId(const physical_web::Metadata& page_metadata) { - return page_metadata.resolved_url.spec(); -} - -bool CompareByDistance(const physical_web::Metadata& left, - const physical_web::Metadata& right) { - // When there is no estimate, the value is <= 0, so we implicitly treat it as - // infinity. - bool is_left_estimated = left.distance_estimate > 0; - bool is_right_estimated = right.distance_estimate > 0; - - if (is_left_estimated != is_right_estimated) - return is_left_estimated; - return left.distance_estimate < right.distance_estimate; -} - -void FilterOutByGroupId(physical_web::MetadataList& page_metadata_list) { - // |std::unique| only removes duplicates that immediately follow each other. - // Thus, first, we have to sort by group_id and distance and only then remove - // duplicates. - std::sort(page_metadata_list.begin(), page_metadata_list.end(), - [](const physical_web::Metadata& left, - const physical_web::Metadata& right) { - if (left.group_id != right.group_id) { - return left.group_id < right.group_id; - } - - // We want closest pages first, so in case of same group_id we - // sort by distance. - return CompareByDistance(left, right); - }); - - // Each empty group_id must be treated as unique, so we do not apply - // std::unique to them at all. - auto nonempty_group_id_begin = - std::find_if(page_metadata_list.begin(), page_metadata_list.end(), - [](const physical_web::Metadata& page) { - return !page.group_id.empty(); - }); - - auto new_end = std::unique(nonempty_group_id_begin, page_metadata_list.end(), - [](const physical_web::Metadata& left, - const physical_web::Metadata& right) { - return left.group_id == right.group_id; - }); - - page_metadata_list.erase(new_end, page_metadata_list.end()); -} - -} // namespace - -PhysicalWebPageSuggestionsProvider::PhysicalWebPageSuggestionsProvider( - ContentSuggestionsProvider::Observer* observer, - physical_web::PhysicalWebDataSource* physical_web_data_source, - PrefService* pref_service) - : ContentSuggestionsProvider(observer), - category_status_(CategoryStatus::AVAILABLE), - provided_category_( - Category::FromKnownCategory(KnownCategories::PHYSICAL_WEB_PAGES)), - physical_web_data_source_(physical_web_data_source), - pref_service_(pref_service) { - observer->OnCategoryStatusChanged(this, provided_category_, category_status_); - physical_web_data_source_->RegisterListener( - this, physical_web::BACKGROUND_INTERMITTENT); - // TODO(vitaliii): Rewrite initial fetch once crbug.com/667754 is resolved. - FetchPhysicalWebPages(); -} - -PhysicalWebPageSuggestionsProvider::~PhysicalWebPageSuggestionsProvider() { - physical_web_data_source_->UnregisterListener(this); -} - -CategoryStatus PhysicalWebPageSuggestionsProvider::GetCategoryStatus( - Category category) { - return category_status_; -} - -CategoryInfo PhysicalWebPageSuggestionsProvider::GetCategoryInfo( - Category category) { - return CategoryInfo(l10n_util::GetStringUTF16( - IDS_NTP_PHYSICAL_WEB_PAGE_SUGGESTIONS_SECTION_HEADER), - ContentSuggestionsCardLayout::FULL_CARD, - ContentSuggestionsAdditionalAction::NONE, - /*show_if_empty=*/false, - l10n_util::GetStringUTF16( - IDS_NTP_PHYSICAL_WEB_PAGE_SUGGESTIONS_SECTION_EMPTY)); -} - -void PhysicalWebPageSuggestionsProvider::DismissSuggestion( - const ContentSuggestion::ID& suggestion_id) { - DCHECK_EQ(provided_category_, suggestion_id.category()); - std::set<std::string> dismissed_ids = ReadDismissedIDsFromPrefs(); - dismissed_ids.insert(suggestion_id.id_within_category()); - StoreDismissedIDsToPrefs(dismissed_ids); -} - -void PhysicalWebPageSuggestionsProvider::FetchSuggestionImage( - const ContentSuggestion::ID& suggestion_id, - ImageFetchedCallback callback) { - ui::ResourceBundle& resource_bundle = ui::ResourceBundle::GetSharedInstance(); - base::StringPiece raw_data = resource_bundle.GetRawDataResourceForScale( - IDR_PHYSICAL_WEB_LOGO_WITH_PADDING, resource_bundle.GetMaxScaleFactor()); - base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, - base::BindOnce( - std::move(callback), - gfx::Image::CreateFrom1xPNGBytes( - reinterpret_cast<const unsigned char*>(raw_data.data()), - raw_data.size()))); -} - -void PhysicalWebPageSuggestionsProvider::FetchSuggestionImageData( - const ContentSuggestion::ID& suggestion_id, - ImageDataFetchedCallback callback) { - // Not implemented for this provider. - base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::BindOnce(std::move(callback), std::string())); -} -void PhysicalWebPageSuggestionsProvider::Fetch( - const Category& category, - const std::set<std::string>& known_suggestion_ids, - FetchDoneCallback callback) { - DCHECK_EQ(category, provided_category_); - std::vector<ContentSuggestion> suggestions = - GetMostRecentPhysicalWebPagesWithFilter(kMaxSuggestionsCount, - known_suggestion_ids); - AppendToShownScannedUrls(suggestions); - base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::BindOnce(std::move(callback), Status::Success(), - std::move(suggestions))); -} - -void PhysicalWebPageSuggestionsProvider::ClearHistory( - base::Time begin, - base::Time end, - const base::Callback<bool(const GURL& url)>& filter) { - ClearDismissedSuggestionsForDebugging(provided_category_); -} - -void PhysicalWebPageSuggestionsProvider::ClearCachedSuggestions() { - // Ignored -} - -void PhysicalWebPageSuggestionsProvider::GetDismissedSuggestionsForDebugging( - Category category, - DismissedSuggestionsCallback callback) { - DCHECK_EQ(provided_category_, category); - std::unique_ptr<physical_web::MetadataList> page_metadata_list = - physical_web_data_source_->GetMetadataList(); - const std::set<std::string> dismissed_ids = ReadDismissedIDsFromPrefs(); - std::vector<ContentSuggestion> suggestions; - for (const auto& page_metadata : *page_metadata_list) { - if (dismissed_ids.count(GetPageId(page_metadata))) { - suggestions.push_back(ConvertPhysicalWebPage(page_metadata)); - } - } - - std::move(callback).Run(std::move(suggestions)); -} - -void PhysicalWebPageSuggestionsProvider::ClearDismissedSuggestionsForDebugging( - Category category) { - DCHECK_EQ(provided_category_, category); - StoreDismissedIDsToPrefs(std::set<std::string>()); - FetchPhysicalWebPages(); -} - -// static -void PhysicalWebPageSuggestionsProvider::RegisterProfilePrefs( - PrefRegistrySimple* registry) { - registry->RegisterListPref(prefs::kDismissedPhysicalWebPageSuggestions); -} - -//////////////////////////////////////////////////////////////////////////////// -// Private methods - -void PhysicalWebPageSuggestionsProvider::NotifyStatusChanged( - CategoryStatus new_status) { - if (category_status_ == new_status) { - return; - } - category_status_ = new_status; - observer()->OnCategoryStatusChanged(this, provided_category_, new_status); -} - -void PhysicalWebPageSuggestionsProvider::FetchPhysicalWebPages() { - DCHECK_EQ(CategoryStatus::AVAILABLE, category_status_); - std::vector<ContentSuggestion> suggestions = - GetMostRecentPhysicalWebPagesWithFilter( - kMaxSuggestionsCount, - /*excluded_ids=*/std::set<std::string>()); - shown_resolved_urls_by_scanned_url_.clear(); - AppendToShownScannedUrls(suggestions); - observer()->OnNewSuggestions(this, provided_category_, - std::move(suggestions)); -} - -std::vector<ContentSuggestion> -PhysicalWebPageSuggestionsProvider::GetMostRecentPhysicalWebPagesWithFilter( - int max_count, - const std::set<std::string>& excluded_ids) { - std::unique_ptr<physical_web::MetadataList> page_metadata_list = - physical_web_data_source_->GetMetadataList(); - - // These is to filter out dismissed suggestions and at the same time prune the - // dismissed IDs list removing nonavailable pages (this is needed since some - // OnLost() calls may have been missed). - const std::set<std::string> old_dismissed_ids = ReadDismissedIDsFromPrefs(); - std::set<std::string> new_dismissed_ids; - physical_web::MetadataList filtered_metadata_list; - for (const auto& page_metadata : *page_metadata_list) { - const std::string page_id = GetPageId(page_metadata); - if (!excluded_ids.count(page_id) && !old_dismissed_ids.count(page_id)) { - filtered_metadata_list.push_back(page_metadata); - } - - if (old_dismissed_ids.count(page_id)) { - new_dismissed_ids.insert(page_id); - } - } - - if (old_dismissed_ids.size() != new_dismissed_ids.size()) { - StoreDismissedIDsToPrefs(new_dismissed_ids); - } - - FilterOutByGroupId(filtered_metadata_list); - - std::sort(filtered_metadata_list.begin(), filtered_metadata_list.end(), - CompareByDistance); - - std::vector<ContentSuggestion> suggestions; - for (const auto& page_metadata : filtered_metadata_list) { - if (static_cast<int>(suggestions.size()) == max_count) { - break; - } - suggestions.push_back(ConvertPhysicalWebPage(page_metadata)); - } - - return suggestions; -} - -ContentSuggestion PhysicalWebPageSuggestionsProvider::ConvertPhysicalWebPage( - const physical_web::Metadata& page) const { - ContentSuggestion suggestion(provided_category_, GetPageId(page), - page.resolved_url); - DCHECK(base::IsStringUTF8(page.title)); - suggestion.set_title(base::UTF8ToUTF16(page.title)); - suggestion.set_publisher_name(base::UTF8ToUTF16(page.resolved_url.host())); - DCHECK(base::IsStringUTF8(page.description)); - suggestion.set_snippet_text(base::UTF8ToUTF16(page.description)); - return suggestion; -} - -// PhysicalWebListener implementation. -void PhysicalWebPageSuggestionsProvider::OnFound(const GURL& url) { - FetchPhysicalWebPages(); -} - -void PhysicalWebPageSuggestionsProvider::OnLost(const GURL& url) { - auto it = shown_resolved_urls_by_scanned_url_.find(url); - if (it == shown_resolved_urls_by_scanned_url_.end()) { - // The notification is propagated further in case the suggestion is shown on - // old NTPs (created before last |shown_resolved_urls_by_scanned_url_| - // update). - - // TODO(vitaliii): Use |resolved_url| here when it is available. Currently - // there is no way to find out |resolved_url|, which corresponds to this - // |scanned_url| (the metadata has been already removed from the Physical - // Web list). We use |scanned_url| (it may be the same as |resolved_url|, - // otherwise nothing happens), however, we should use the latter once it is - // provided (e.g. as an argument). - InvalidateSuggestion(url.spec()); - return; - } - - // This is not a reference, because the multimap pair will be removed below. - const GURL lost_resolved_url = it->second; - shown_resolved_urls_by_scanned_url_.erase(it); - if (std::find_if(shown_resolved_urls_by_scanned_url_.begin(), - shown_resolved_urls_by_scanned_url_.end(), - [lost_resolved_url](const std::pair<GURL, GURL>& pair) { - return lost_resolved_url == pair.second; - }) == shown_resolved_urls_by_scanned_url_.end()) { - // There are no more beacons for this URL. - InvalidateSuggestion(lost_resolved_url.spec()); - } -} - -void PhysicalWebPageSuggestionsProvider::OnDistanceChanged( - const GURL& url, - double distance_estimate) { - FetchPhysicalWebPages(); -} - -void PhysicalWebPageSuggestionsProvider::InvalidateSuggestion( - const std::string& page_id) { - observer()->OnSuggestionInvalidated( - this, ContentSuggestion::ID(provided_category_, page_id)); - - // Remove |page_id| from dismissed suggestions, if present. - std::set<std::string> dismissed_ids = ReadDismissedIDsFromPrefs(); - auto it = dismissed_ids.find(page_id); - if (it != dismissed_ids.end()) { - dismissed_ids.erase(it); - StoreDismissedIDsToPrefs(dismissed_ids); - } -} - -void PhysicalWebPageSuggestionsProvider::AppendToShownScannedUrls( - const std::vector<ContentSuggestion>& suggestions) { - std::unique_ptr<physical_web::MetadataList> page_metadata_list = - physical_web_data_source_->GetMetadataList(); - for (const auto& page_metadata : *page_metadata_list) { - if (std::find_if(suggestions.begin(), suggestions.end(), - [page_metadata](const ContentSuggestion& suggestion) { - return suggestion.url() == page_metadata.resolved_url; - }) != suggestions.end()) { - shown_resolved_urls_by_scanned_url_.insert(std::make_pair( - page_metadata.scanned_url, page_metadata.resolved_url)); - } - } -} - -std::set<std::string> -PhysicalWebPageSuggestionsProvider::ReadDismissedIDsFromPrefs() const { - return prefs::ReadDismissedIDsFromPrefs( - *pref_service_, prefs::kDismissedPhysicalWebPageSuggestions); -} - -void PhysicalWebPageSuggestionsProvider::StoreDismissedIDsToPrefs( - const std::set<std::string>& dismissed_ids) { - prefs::StoreDismissedIDsToPrefs(pref_service_, - prefs::kDismissedPhysicalWebPageSuggestions, - dismissed_ids); -} - -} // namespace ntp_snippets
diff --git a/components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.h b/components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.h deleted file mode 100644 index c4c1130..0000000 --- a/components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.h +++ /dev/null
@@ -1,116 +0,0 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef COMPONENTS_NTP_SNIPPETS_PHYSICAL_WEB_PAGES_PHYSICAL_WEB_PAGE_SUGGESTIONS_PROVIDER_H_ -#define COMPONENTS_NTP_SNIPPETS_PHYSICAL_WEB_PAGES_PHYSICAL_WEB_PAGE_SUGGESTIONS_PROVIDER_H_ - -#include <map> -#include <set> -#include <vector> - -#include "base/callback_forward.h" -#include "components/ntp_snippets/category.h" -#include "components/ntp_snippets/category_status.h" -#include "components/ntp_snippets/content_suggestion.h" -#include "components/ntp_snippets/content_suggestions_provider.h" -#include "components/physical_web/data_source/physical_web_listener.h" - -class GURL; -class PrefRegistrySimple; -class PrefService; - -namespace physical_web { -class PhysicalWebDataSource; -struct Metadata; -} // namespace physical_web - -namespace ntp_snippets { - -// Provides content suggestions from the Physical Web Service. -class PhysicalWebPageSuggestionsProvider - : public ContentSuggestionsProvider, - public physical_web::PhysicalWebListener { - public: - PhysicalWebPageSuggestionsProvider( - ContentSuggestionsProvider::Observer* observer, - physical_web::PhysicalWebDataSource* physical_web_data_source, - PrefService* pref_service); - ~PhysicalWebPageSuggestionsProvider() override; - - // ContentSuggestionsProvider implementation. - CategoryStatus GetCategoryStatus(Category category) override; - CategoryInfo GetCategoryInfo(Category category) override; - void DismissSuggestion(const ContentSuggestion::ID& suggestion_id) override; - void FetchSuggestionImage(const ContentSuggestion::ID& suggestion_id, - ImageFetchedCallback callback) override; - void FetchSuggestionImageData(const ContentSuggestion::ID& suggestion_id, - ImageDataFetchedCallback callback) override; - void Fetch(const Category& category, - const std::set<std::string>& known_suggestion_ids, - FetchDoneCallback callback) override; - void ClearHistory( - base::Time begin, - base::Time end, - const base::Callback<bool(const GURL& url)>& filter) override; - void ClearCachedSuggestions() override; - void GetDismissedSuggestionsForDebugging( - Category category, - DismissedSuggestionsCallback callback) override; - void ClearDismissedSuggestionsForDebugging(Category category) override; - - static void RegisterProfilePrefs(PrefRegistrySimple* registry); - - private: - friend class PhysicalWebPageSuggestionsProviderTest; - - // Updates the |category_status_| and notifies the |observer_|, if necessary. - void NotifyStatusChanged(CategoryStatus new_status); - - // Manually requests all physical web pages and updates the suggestions. - void FetchPhysicalWebPages(); - - // Returns at most |max_count| ContentSuggestions with IDs not in - // |excluded_ids| and sorted by distance (the closest first). Dismissed - // suggestions are excluded automatically (no need to add them to - // |excluded_ids|) and pruned. The raw pages are obtained from Physical Web - // data source. - std::vector<ContentSuggestion> GetMostRecentPhysicalWebPagesWithFilter( - int max_count, - const std::set<std::string>& excluded_ids); - - // Converts an Physical Web page to a ContentSuggestion. - ContentSuggestion ConvertPhysicalWebPage( - const physical_web::Metadata& page) const; - - // PhysicalWebListener implementation. - void OnFound(const GURL& url) override; - void OnLost(const GURL& url) override; - void OnDistanceChanged(const GURL& url, double distance_estimate) override; - - // Fires the |OnSuggestionInvalidated| event for the suggestion corresponding - // to the given |page_id| and deletes it from the dismissed IDs list, if - // necessary. - void InvalidateSuggestion(const std::string& page_id); - - void AppendToShownScannedUrls( - const std::vector<ContentSuggestion>& suggestions); - - // Reads dismissed IDs from Prefs. - std::set<std::string> ReadDismissedIDsFromPrefs() const; - - // Writes |dismissed_ids| into Prefs. - void StoreDismissedIDsToPrefs(const std::set<std::string>& dismissed_ids); - - std::multimap<GURL, GURL> shown_resolved_urls_by_scanned_url_; - CategoryStatus category_status_; - const Category provided_category_; - physical_web::PhysicalWebDataSource* physical_web_data_source_; - PrefService* pref_service_; - - DISALLOW_COPY_AND_ASSIGN(PhysicalWebPageSuggestionsProvider); -}; - -} // namespace ntp_snippets - -#endif // COMPONENTS_NTP_SNIPPETS_PHYSICAL_WEB_PAGES_PHYSICAL_WEB_PAGE_SUGGESTIONS_PROVIDER_H_
diff --git a/components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider_unittest.cc b/components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider_unittest.cc deleted file mode 100644 index 0a2f069f..0000000 --- a/components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider_unittest.cc +++ /dev/null
@@ -1,466 +0,0 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.h" - -#include <memory> -#include <string> -#include <vector> - -#include "base/bind.h" -#include "base/message_loop/message_loop.h" -#include "base/run_loop.h" -#include "base/strings/string_number_conversions.h" -#include "components/ntp_snippets/category.h" -#include "components/ntp_snippets/content_suggestions_provider.h" -#include "components/ntp_snippets/mock_content_suggestions_provider_observer.h" -#include "components/ntp_snippets/offline_pages/offline_pages_test_utils.h" -#include "components/ntp_snippets/status.h" -#include "components/physical_web/data_source/fake_physical_web_data_source.h" -#include "components/prefs/testing_pref_service.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "url/gurl.h" - -using ntp_snippets::test::CaptureDismissedSuggestions; -using physical_web::CreateDummyPhysicalWebPages; -using physical_web::FakePhysicalWebDataSource; -using testing::_; -using testing::AnyNumber; -using testing::AtMost; -using testing::ElementsAre; -using testing::ElementsAreArray; -using testing::Mock; -using testing::StrictMock; -using testing::UnorderedElementsAre; - -namespace ntp_snippets { - -namespace { - -MATCHER_P(HasUrl, url, "") { - *result_listener << "expected URL: " << url - << ", but has URL: " << arg.url().spec(); - return url == arg.url().spec(); -} - -void CompareFetchMoreResult( - const base::Closure& done_closure, - Status expected_status, - const std::vector<std::string>& expected_suggestion_urls, - Status actual_status, - std::vector<ContentSuggestion> actual_suggestions) { - EXPECT_EQ(expected_status.code, actual_status.code); - std::vector<std::string> actual_suggestion_urls; - for (const ContentSuggestion& suggestion : actual_suggestions) { - actual_suggestion_urls.push_back(suggestion.url().spec()); - } - EXPECT_THAT(actual_suggestion_urls, - ElementsAreArray(expected_suggestion_urls)); - done_closure.Run(); -} - -} // namespace - -class PhysicalWebPageSuggestionsProviderTest : public testing::Test { - public: - PhysicalWebPageSuggestionsProviderTest() - : pref_service_(std::make_unique<TestingPrefServiceSimple>()) { - PhysicalWebPageSuggestionsProvider::RegisterProfilePrefs( - pref_service_->registry()); - } - - void IgnoreOnCategoryStatusChangedToAvailable() { - EXPECT_CALL(observer_, OnCategoryStatusChanged(_, provided_category(), - CategoryStatus::AVAILABLE)) - .Times(AnyNumber()); - EXPECT_CALL(observer_, - OnCategoryStatusChanged(_, provided_category(), - CategoryStatus::AVAILABLE_LOADING)) - .Times(AnyNumber()); - } - - void IgnoreOnSuggestionInvalidated() { - EXPECT_CALL(observer_, OnSuggestionInvalidated(_, _)).Times(AnyNumber()); - } - - void IgnoreOnNewSuggestions() { - EXPECT_CALL(observer_, OnNewSuggestions(_, provided_category(), _)) - .Times(AnyNumber()); - } - - PhysicalWebPageSuggestionsProvider* CreateProvider() { - DCHECK(!provider_); - provider_ = std::make_unique<PhysicalWebPageSuggestionsProvider>( - &observer_, &physical_web_data_source_, pref_service_.get()); - return provider_.get(); - } - - void DestroyProvider() { provider_.reset(); } - - Category provided_category() { - return Category::FromKnownCategory(KnownCategories::PHYSICAL_WEB_PAGES); - } - - ContentSuggestion::ID GetDummySuggestionId(int id) { - return ContentSuggestion::ID( - provided_category(), - "https://resolved_url.com/" + base::IntToString(id)); - } - - void FireUrlFound(const std::string& url) { - physical_web_data_source_.NotifyOnFound(GURL(url)); - } - - void FireUrlLost(const std::string& url) { - physical_web_data_source_.NotifyOnLost(GURL(url)); - } - - void FireUrlDistanceChanged(const GURL& url, double new_distance) { - physical_web_data_source_.NotifyOnDistanceChanged(url, new_distance); - } - - ContentSuggestionsProvider* provider() { - DCHECK(provider_); - return provider_.get(); - } - - FakePhysicalWebDataSource* physical_web_data_source() { - return &physical_web_data_source_; - } - MockContentSuggestionsProviderObserver* observer() { return &observer_; } - TestingPrefServiceSimple* pref_service() { return pref_service_.get(); } - - private: - FakePhysicalWebDataSource physical_web_data_source_; - StrictMock<MockContentSuggestionsProviderObserver> observer_; - std::unique_ptr<TestingPrefServiceSimple> pref_service_; - // Added in order to test provider's |Fetch| method. - base::MessageLoop message_loop_; - // Last so that the dependencies are deleted after the provider. - std::unique_ptr<PhysicalWebPageSuggestionsProvider> provider_; - - DISALLOW_COPY_AND_ASSIGN(PhysicalWebPageSuggestionsProviderTest); -}; - -TEST_F(PhysicalWebPageSuggestionsProviderTest, - ShouldSubmitSuggestionsOnStartup) { - physical_web_data_source()->SetMetadataList( - CreateDummyPhysicalWebPages({1, 2, 3})); - EXPECT_CALL(*observer(), OnCategoryStatusChanged(_, provided_category(), - CategoryStatus::AVAILABLE)); - EXPECT_CALL(*observer(), - OnNewSuggestions( - _, provided_category(), - UnorderedElementsAre(HasUrl("https://resolved_url.com/1"), - HasUrl("https://resolved_url.com/2"), - HasUrl("https://resolved_url.com/3")))); - CreateProvider(); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, ShouldSortByDistance) { - IgnoreOnCategoryStatusChangedToAvailable(); - IgnoreOnSuggestionInvalidated(); - // |CreateDummyPhysicalWebPages| builds pages with distances 1, 2 and 3 - // respectively. - physical_web_data_source()->SetMetadataList( - CreateDummyPhysicalWebPages({3, 2, 1})); - EXPECT_CALL( - *observer(), - OnNewSuggestions(_, provided_category(), - ElementsAre(HasUrl("https://resolved_url.com/3"), - HasUrl("https://resolved_url.com/2"), - HasUrl("https://resolved_url.com/1")))); - CreateProvider(); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, - ShouldConsiderPagesWithoutDistanceEstimateFurthest) { - IgnoreOnCategoryStatusChangedToAvailable(); - IgnoreOnSuggestionInvalidated(); - // |CreateDummyPhysicalWebPages| builds pages with distances 1, 2 and 3 - // respectively. - std::unique_ptr<physical_web::MetadataList> pages = - CreateDummyPhysicalWebPages({3, 2, 1}); - // Set the second page distance estimate to unknown. - (*pages)[1].distance_estimate = -1.0; - physical_web_data_source()->SetMetadataList(std::move(pages)); - EXPECT_CALL( - *observer(), - OnNewSuggestions(_, provided_category(), - ElementsAre(HasUrl("https://resolved_url.com/3"), - HasUrl("https://resolved_url.com/1"), - HasUrl("https://resolved_url.com/2")))); - CreateProvider(); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, - ShouldNotShowSuggestionsWithSameGroupId) { - IgnoreOnCategoryStatusChangedToAvailable(); - IgnoreOnSuggestionInvalidated(); - // |CreateDummyPhysicalWebPages| builds pages with distances 1, 2 - // respectively. - std::unique_ptr<physical_web::MetadataList> pages = - CreateDummyPhysicalWebPages({2, 1}); - for (auto& page : *pages) { - page.group_id = "some_group_id"; - } - - physical_web_data_source()->SetMetadataList(std::move(pages)); - // The closest page should be reported. - EXPECT_CALL( - *observer(), - OnNewSuggestions(_, provided_category(), - ElementsAre(HasUrl("https://resolved_url.com/2")))); - CreateProvider(); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, - ShouldShowSuggestionsWithEmptyGroupId) { - IgnoreOnCategoryStatusChangedToAvailable(); - IgnoreOnSuggestionInvalidated(); - std::unique_ptr<physical_web::MetadataList> pages = - CreateDummyPhysicalWebPages({1, 2}); - for (auto& page : *pages) { - page.group_id = ""; - } - - physical_web_data_source()->SetMetadataList(std::move(pages)); - EXPECT_CALL(*observer(), - OnNewSuggestions( - _, provided_category(), - UnorderedElementsAre(HasUrl("https://resolved_url.com/1"), - HasUrl("https://resolved_url.com/2")))); - CreateProvider(); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, - FetchMoreShouldFilterAndReturnSortedSuggestions) { - IgnoreOnCategoryStatusChangedToAvailable(); - IgnoreOnSuggestionInvalidated(); - std::vector<int> ids; - const int kNumSuggestionsInSection = 10; - const int kNumSuggestionsInSource = 3 * kNumSuggestionsInSection; - for (int i = 1; i <= kNumSuggestionsInSource; ++i) { - ids.push_back(i); - } - // |CreateDummyPhysicalWebPages| builds pages with distances 1, 2, 3, ... , - // so we know the order of suggestions in the provider. - physical_web_data_source()->SetMetadataList(CreateDummyPhysicalWebPages(ids)); - EXPECT_CALL(*observer(), OnNewSuggestions(_, provided_category(), _)); - CreateProvider(); - - const std::string dummy_resolved_url = "https://resolved_url.com/"; - std::set<std::string> known_ids; - for (int i = 1; i <= kNumSuggestionsInSection; ++i) { - known_ids.insert(dummy_resolved_url + base::IntToString(i)); - } - known_ids.insert(dummy_resolved_url + base::IntToString(12)); - known_ids.insert(dummy_resolved_url + base::IntToString(17)); - std::vector<std::string> expected_suggestion_urls; - for (int i = 1; i <= kNumSuggestionsInSource; ++i) { - if (expected_suggestion_urls.size() == kNumSuggestionsInSection) { - break; - } - std::string url = dummy_resolved_url + base::IntToString(i); - if (!known_ids.count(url)) { - expected_suggestion_urls.push_back(url); - } - } - - // Added to wait for |Fetch| callback to be called. - base::RunLoop run_loop; - provider()->Fetch(provided_category(), known_ids, - base::Bind(CompareFetchMoreResult, run_loop.QuitClosure(), - Status::Success(), expected_suggestion_urls)); - // Wait for the callback to be called. - run_loop.Run(); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, ShouldDismiss) { - IgnoreOnCategoryStatusChangedToAvailable(); - IgnoreOnSuggestionInvalidated(); - physical_web_data_source()->SetMetadataList(CreateDummyPhysicalWebPages({1})); - EXPECT_CALL(*observer(), OnNewSuggestions(_, provided_category(), _)) - .Times(AtMost(1)); - CreateProvider(); - - provider()->DismissSuggestion(GetDummySuggestionId(1)); - - std::vector<ContentSuggestion> dismissed_suggestions; - provider()->GetDismissedSuggestionsForDebugging( - provided_category(), - base::Bind(&CaptureDismissedSuggestions, &dismissed_suggestions)); - EXPECT_THAT(dismissed_suggestions, - ElementsAre(HasUrl("https://resolved_url.com/1"))); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, - ShouldNotShowDismissedSuggestions) { - IgnoreOnCategoryStatusChangedToAvailable(); - IgnoreOnSuggestionInvalidated(); - physical_web_data_source()->SetMetadataList(CreateDummyPhysicalWebPages({1})); - EXPECT_CALL(*observer(), OnNewSuggestions(_, provided_category(), _)) - .Times(AtMost(1)); - CreateProvider(); - Mock::VerifyAndClearExpectations(observer()); - - provider()->DismissSuggestion(GetDummySuggestionId(1)); - - physical_web_data_source()->SetMetadataList( - CreateDummyPhysicalWebPages({1, 2})); - EXPECT_CALL( - *observer(), - OnNewSuggestions(_, provided_category(), - ElementsAre(HasUrl("https://resolved_url.com/2")))); - FireUrlFound("https://resolved_url.com/2"); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, - ShouldPruneDismissedSuggestionsWhenFetching) { - IgnoreOnCategoryStatusChangedToAvailable(); - IgnoreOnSuggestionInvalidated(); - IgnoreOnNewSuggestions(); - physical_web_data_source()->SetMetadataList( - CreateDummyPhysicalWebPages({1, 2})); - CreateProvider(); - - provider()->DismissSuggestion(GetDummySuggestionId(1)); - provider()->DismissSuggestion(GetDummySuggestionId(2)); - - physical_web_data_source()->SetMetadataList( - CreateDummyPhysicalWebPages({2, 3})); - FireUrlFound("https://resolved_url.com/3"); - - // The first page needs to be silently added back to the source, because - // |GetDismissedSuggestionsForDebugging| uses the data source to return - // suggestions and dismissed suggestions, which are not present there, cannot - // be returned. - physical_web_data_source()->SetMetadataList( - CreateDummyPhysicalWebPages({1, 2, 3})); - std::vector<ContentSuggestion> dismissed_suggestions; - provider()->GetDismissedSuggestionsForDebugging( - provided_category(), - base::Bind(&CaptureDismissedSuggestions, &dismissed_suggestions)); - EXPECT_THAT(dismissed_suggestions, - ElementsAre(HasUrl("https://resolved_url.com/2"))); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, - ShouldPruneDismissedSuggestionsWhenUrlLost) { - IgnoreOnCategoryStatusChangedToAvailable(); - IgnoreOnSuggestionInvalidated(); - IgnoreOnNewSuggestions(); - physical_web_data_source()->SetMetadataList( - CreateDummyPhysicalWebPages({1, 2})); - CreateProvider(); - - provider()->DismissSuggestion(GetDummySuggestionId(1)); - provider()->DismissSuggestion(GetDummySuggestionId(2)); - - physical_web_data_source()->SetMetadataList(CreateDummyPhysicalWebPages({2})); - FireUrlLost("https://resolved_url.com/1"); - - physical_web_data_source()->SetMetadataList( - CreateDummyPhysicalWebPages({1, 2})); - std::vector<ContentSuggestion> dismissed_suggestions; - provider()->GetDismissedSuggestionsForDebugging( - provided_category(), - base::Bind(&CaptureDismissedSuggestions, &dismissed_suggestions)); - EXPECT_THAT(dismissed_suggestions, - ElementsAre(HasUrl("https://resolved_url.com/2"))); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, - ShouldStoreDismissedSuggestions) { - IgnoreOnCategoryStatusChangedToAvailable(); - IgnoreOnSuggestionInvalidated(); - IgnoreOnNewSuggestions(); - physical_web_data_source()->SetMetadataList( - CreateDummyPhysicalWebPages({1, 2})); - CreateProvider(); - provider()->DismissSuggestion(GetDummySuggestionId(1)); - DestroyProvider(); - - CreateProvider(); - std::vector<ContentSuggestion> dismissed_suggestions; - provider()->GetDismissedSuggestionsForDebugging( - provided_category(), - base::Bind(&CaptureDismissedSuggestions, &dismissed_suggestions)); - EXPECT_THAT(dismissed_suggestions, - ElementsAre(HasUrl("https://resolved_url.com/1"))); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, - ShouldInvalidateSuggestionWhenItsOnlyBeaconIsLost) { - IgnoreOnCategoryStatusChangedToAvailable(); - physical_web_data_source()->SetMetadataList( - CreateDummyPhysicalWebPages({1, 2})); - - EXPECT_CALL(*observer(), OnNewSuggestions(_, provided_category(), _)); - CreateProvider(); - - EXPECT_CALL(*observer(), OnSuggestionInvalidated(_, GetDummySuggestionId(1))); - FireUrlLost("https://scanned_url.com/1"); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, - ShouldNotInvalidateSuggestionWhenBeaconWithDifferentScannedURLRemains) { - IgnoreOnCategoryStatusChangedToAvailable(); - // Make 2 beacons point to the same URL, while having different |scanned_url|. - std::unique_ptr<physical_web::MetadataList> pages = - CreateDummyPhysicalWebPages({1, 2}); - (*pages)[1].resolved_url = (*pages)[0].resolved_url; - physical_web_data_source()->SetMetadataList(std::move(pages)); - - EXPECT_CALL(*observer(), OnNewSuggestions(_, provided_category(), _)); - CreateProvider(); - - // The first beacons is lost, but the second one still points to the same - // |resolved_url|, so the suggestion must not be invalidated. - EXPECT_CALL(*observer(), OnSuggestionInvalidated(_, _)).Times(0); - FireUrlLost("https://scanned_url.com/1"); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, - ShouldNotInvalidateSuggestionWhenBeaconWithSameScannedURLRemains) { - IgnoreOnCategoryStatusChangedToAvailable(); - // Make 2 beacons point to the same URL, while having the same |scanned_url|. - std::unique_ptr<physical_web::MetadataList> pages = - CreateDummyPhysicalWebPages({1, 2}); - (*pages)[1].scanned_url = (*pages)[0].scanned_url; - (*pages)[1].resolved_url = (*pages)[0].resolved_url; - physical_web_data_source()->SetMetadataList(std::move(pages)); - - EXPECT_CALL(*observer(), OnNewSuggestions(_, provided_category(), _)); - CreateProvider(); - - // The first beacons is lost, but the second one still points to the same - // |resolved_url|, so the suggestion must not be invalidated. - EXPECT_CALL(*observer(), OnSuggestionInvalidated(_, _)).Times(0); - FireUrlLost("https://scanned_url.com/1"); -} - -TEST_F(PhysicalWebPageSuggestionsProviderTest, - ShouldInvalidateSuggestionWhenAllBeaconsLost) { - IgnoreOnCategoryStatusChangedToAvailable(); - // Make 3 beacons point to the same URL. Two of them have the same - // |scanned_url|. - std::unique_ptr<physical_web::MetadataList> pages = - CreateDummyPhysicalWebPages({1, 2, 3}); - (*pages)[1].scanned_url = (*pages)[0].scanned_url; - (*pages)[1].resolved_url = (*pages)[0].resolved_url; - (*pages)[2].resolved_url = (*pages)[0].resolved_url; - physical_web_data_source()->SetMetadataList(std::move(pages)); - - EXPECT_CALL(*observer(), OnNewSuggestions(_, provided_category(), _)); - CreateProvider(); - - FireUrlLost("https://scanned_url.com/1"); - FireUrlLost("https://scanned_url.com/1"); - EXPECT_CALL(*observer(), OnSuggestionInvalidated(_, GetDummySuggestionId(1))); - FireUrlLost("https://scanned_url.com/3"); -} - -} // namespace ntp_snippets
diff --git a/components/ntp_snippets/pref_names.cc b/components/ntp_snippets/pref_names.cc index 781e0f2c..3ae3397 100644 --- a/components/ntp_snippets/pref_names.cc +++ b/components/ntp_snippets/pref_names.cc
@@ -57,8 +57,6 @@ "ntp_suggestions.foreign_sessions.dismissed_ids"; const char kDismissedOfflinePageDownloadSuggestions[] = "ntp_suggestions.downloads.offline_pages.dismissed_ids"; -const char kDismissedPhysicalWebPageSuggestions[] = - "ntp_suggestions.physical_web.dismissed_ids"; const char kDismissedRecentOfflineTabSuggestions[] = "ntp_suggestions.offline_pages.recent_tabs.dismissed_ids";
diff --git a/components/ntp_snippets/pref_names.h b/components/ntp_snippets/pref_names.h index e00b7778..ac4f3765 100644 --- a/components/ntp_snippets/pref_names.h +++ b/components/ntp_snippets/pref_names.h
@@ -69,7 +69,6 @@ extern const char kDismissedAssetDownloadSuggestions[]; extern const char kDismissedForeignSessionsSuggestions[]; extern const char kDismissedOfflinePageDownloadSuggestions[]; -extern const char kDismissedPhysicalWebPageSuggestions[]; extern const char kDismissedRecentOfflineTabSuggestions[]; extern const char kDismissedCategories[];
diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc index 3ee0d76..418c27f 100644 --- a/components/omnibox/browser/omnibox_field_trial.cc +++ b/components/omnibox/browser/omnibox_field_trial.cc
@@ -120,10 +120,6 @@ "OmniboxUIExperimentSwapTitleAndUrl", base::FEATURE_DISABLED_BY_DEFAULT}; // Feature used for the vertical margin UI experiment. -const base::Feature kUIExperimentVerticalLayout{ - "OmniboxUIExperimentVerticalLayout", base::FEATURE_DISABLED_BY_DEFAULT}; - -// Feature used for the vertical margin UI experiment. const base::Feature kUIExperimentVerticalMargin{ "OmniboxUIExperimentVerticalMargin", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -647,12 +643,8 @@ OmniboxFieldTrial::EmphasizeTitlesCondition OmniboxFieldTrial::GetEmphasizeTitlesConditionForInput( const AutocompleteInput& input) { - // Check the features that always swaps title and URL (assuming the title is - // non-empty). - if (base::FeatureList::IsEnabled(omnibox::kUIExperimentSwapTitleAndUrl) || - base::FeatureList::IsEnabled(omnibox::kUIExperimentVerticalLayout)) { + if (base::FeatureList::IsEnabled(omnibox::kUIExperimentSwapTitleAndUrl)) return EMPHASIZE_WHEN_NONEMPTY; - } // Touch-optimized UI and MD Refresh also always swap title and URL. if (ui::MaterialDesignController::is_mode_initialized() &&
diff --git a/components/omnibox/browser/omnibox_field_trial.h b/components/omnibox/browser/omnibox_field_trial.h index afc0766..37b0a9a7 100644 --- a/components/omnibox/browser/omnibox_field_trial.h +++ b/components/omnibox/browser/omnibox_field_trial.h
@@ -41,7 +41,6 @@ extern const base::Feature kUIExperimentNarrowDropdown; extern const base::Feature kUIExperimentShowSuggestionFavicons; extern const base::Feature kUIExperimentSwapTitleAndUrl; -extern const base::Feature kUIExperimentVerticalLayout; extern const base::Feature kUIExperimentVerticalMargin; extern const base::Feature kSpeculativeServiceWorkerStartOnQueryInput; extern const base::Feature kBreakWordsAtUnderscores;
diff --git a/components/password_manager/core/browser/form_parsing/fuzzer/BUILD.gn b/components/password_manager/core/browser/form_parsing/fuzzer/BUILD.gn index c763341..cba3911 100644 --- a/components/password_manager/core/browser/form_parsing/fuzzer/BUILD.gn +++ b/components/password_manager/core/browser/form_parsing/fuzzer/BUILD.gn
@@ -3,19 +3,16 @@ # found in the LICENSE file. import("//testing/libfuzzer/fuzzer_test.gni") +import("//third_party/protobuf/proto_library.gni") static_library("fuzzer_support") { sources = [ "data_accessor.cc", "data_accessor.h", - "form_data_producer.cc", - "form_data_producer.h", ] deps = [ "//base", - "//components/autofill/core/common", - "//url", ] } @@ -34,6 +31,8 @@ fuzzer_test("password_manager_form_parser_fuzzer") { sources = [ + "form_data_producer.cc", + "form_data_producer.h", "form_parser_fuzzer.cc", ] @@ -43,7 +42,34 @@ "//base:i18n", "//components/autofill/core/common", "//components/password_manager/core/browser/form_parsing", + "//url", ] dict = "form_parser_fuzzer.dict" } + +fuzzer_test("password_manager_form_parser_proto_fuzzer") { + sources = [ + "form_data_proto_producer.cc", + "form_data_proto_producer.h", + "form_parser_proto_fuzzer.cc", + ] + + deps = [ + ":form_data_essentials_proto", + "//base", + "//base:i18n", + "//components/autofill/core/common", + "//components/password_manager/core/browser/form_parsing", + "//third_party/libprotobuf-mutator", + "//url", + ] + + dict = "form_parser_fuzzer.dict" +} + +proto_library("form_data_essentials_proto") { + sources = [ + "form_data_essentials.proto", + ] +}
diff --git a/components/password_manager/core/browser/form_parsing/fuzzer/form_data_essentials.proto b/components/password_manager/core/browser/form_parsing/fuzzer/form_data_essentials.proto new file mode 100644 index 0000000..73e87f4 --- /dev/null +++ b/components/password_manager/core/browser/form_parsing/fuzzer/form_data_essentials.proto
@@ -0,0 +1,32 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +syntax = "proto3"; +package form_data_fuzzer; + +// The FormField message describes those data members of +// autofill::FormFieldData, which are interesting for the FormData parsing code +// being fuzzed. +message FormField { + bool is_focusable = 1; + string form_control_type = 2; + string autocomplete_attribute = 3; + string label = 4; + string name = 5; + string id = 6; + string value = 7; +} + +// The Form message describes those data members of autofill::FormData, which +// are interesting for the FormData parsing code being fuzzed. +message Form { + bool is_mode_filling = 1; + bool is_form_tag = 2; + bool is_formless_checkout = 3; + string name = 4; + string action = 5; + string origin = 6; + string main_frame_origin = 7; + repeated FormField fields = 8; +}
diff --git a/components/password_manager/core/browser/form_parsing/fuzzer/form_data_proto_producer.cc b/components/password_manager/core/browser/form_parsing/fuzzer/form_data_proto_producer.cc new file mode 100644 index 0000000..4b375a8 --- /dev/null +++ b/components/password_manager/core/browser/form_parsing/fuzzer/form_data_proto_producer.cc
@@ -0,0 +1,46 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/password_manager/core/browser/form_parsing/fuzzer/form_data_proto_producer.h" + +#include "base/strings/utf_string_conversions.h" +#include "components/autofill/core/common/form_field_data.h" +#include "components/password_manager/core/browser/form_parsing/fuzzer/form_data_essentials.pb.h" +#include "url/gurl.h" +#include "url/origin.h" + +using autofill::FormData; +using autofill::FormFieldData; +using base::UTF8ToUTF16; + +namespace password_manager { + +FormData GenerateWithProto(const ::form_data_fuzzer::Form& form_proto) { + FormData result; + + result.is_form_tag = form_proto.is_form_tag(); + result.is_formless_checkout = form_proto.is_formless_checkout(); + result.name = UTF8ToUTF16(form_proto.name()); + result.action = GURL(form_proto.action()); + result.origin = GURL(form_proto.origin()); + result.main_frame_origin = + url::Origin::Create(GURL(form_proto.main_frame_origin())); + + result.fields.resize(form_proto.fields_size()); + for (int i = 0; i < form_proto.fields_size(); ++i) { + const ::form_data_fuzzer::FormField& form_data_proto = form_proto.fields(i); + result.fields[i].is_focusable = form_data_proto.is_focusable(); + result.fields[i].form_control_type = form_data_proto.form_control_type(); + result.fields[i].autocomplete_attribute = + form_data_proto.autocomplete_attribute(); + result.fields[i].label = UTF8ToUTF16(form_data_proto.label()); + result.fields[i].name = UTF8ToUTF16(form_data_proto.name()); + result.fields[i].id = UTF8ToUTF16(form_data_proto.id()); + result.fields[i].value = UTF8ToUTF16(form_data_proto.value()); + } + + return result; +} + +} // namespace password_manager
diff --git a/components/password_manager/core/browser/form_parsing/fuzzer/form_data_proto_producer.h b/components/password_manager/core/browser/form_parsing/fuzzer/form_data_proto_producer.h new file mode 100644 index 0000000..2542323 --- /dev/null +++ b/components/password_manager/core/browser/form_parsing/fuzzer/form_data_proto_producer.h
@@ -0,0 +1,23 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_FORM_PARSING_FUZZER_FORM_DATA_PROTO_PRODUCER_H_ +#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_FORM_PARSING_FUZZER_FORM_DATA_PROTO_PRODUCER_H_ + +#include "components/autofill/core/common/form_data.h" + +namespace form_data_fuzzer { +class Form; +} + +namespace password_manager { + +// Generates a |FormData| object based on values represented by a parsed +// protobuf |form_proto|. +autofill::FormData GenerateWithProto( + const ::form_data_fuzzer::Form& form_proto); + +} // namespace password_manager + +#endif // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_FORM_PARSING_FUZZER_FORM_DATA_PROTO_PRODUCER_H_
diff --git a/components/password_manager/core/browser/form_parsing/fuzzer/form_parser_proto_fuzzer.cc b/components/password_manager/core/browser/form_parsing/fuzzer/form_parser_proto_fuzzer.cc new file mode 100644 index 0000000..d4728e3 --- /dev/null +++ b/components/password_manager/core/browser/form_parsing/fuzzer/form_parser_proto_fuzzer.cc
@@ -0,0 +1,42 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include <stddef.h> +#include <stdint.h> + +#include <memory> + +#include "base/at_exit.h" +#include "base/i18n/icu_util.h" +#include "components/autofill/core/common/password_form.h" +#include "components/password_manager/core/browser/form_parsing/fuzzer/form_data_essentials.pb.h" +#include "components/password_manager/core/browser/form_parsing/fuzzer/form_data_proto_producer.h" +#include "components/password_manager/core/browser/form_parsing/ios_form_parser.h" +#include "testing/libfuzzer/proto/lpm_interface.h" + +namespace password_manager { + +// ICU is used inside GURL parser, which is used by GenerateWithDataAccessor. +struct IcuEnvironment { + IcuEnvironment() { CHECK(base::i18n::InitializeICU()); } + // used by ICU integration. + base::AtExitManager at_exit_manager; +}; + +IcuEnvironment* env = new IcuEnvironment(); + +DEFINE_BINARY_PROTO_FUZZER(const ::form_data_fuzzer::Form& form_proto) { + FormParsingMode mode = form_proto.is_mode_filling() ? FormParsingMode::FILLING + : FormParsingMode::SAVING; + autofill::FormData form_data = GenerateWithProto(form_proto); + std::unique_ptr<autofill::PasswordForm> result = + ParseFormData(form_data, mode); + if (result) { + // Create a copy of the result -- running the copy-constructor might + // discover some invalid data in |result|. + autofill::PasswordForm copy(*result); + } +} + +} // namespace password_manager
diff --git a/components/rlz/rlz_tracker.cc b/components/rlz/rlz_tracker.cc index 43139f1..37a5d36 100644 --- a/components/rlz/rlz_tracker.cc +++ b/components/rlz/rlz_tracker.cc
@@ -33,11 +33,12 @@ // Maximum and minimum delay for financial ping we would allow to be set through // master preferences. Somewhat arbitrary, may need to be adjusted in future. #if defined(OS_CHROMEOS) +const base::TimeDelta kMinInitDelay = base::TimeDelta::FromSeconds(60); const base::TimeDelta kMaxInitDelay = base::TimeDelta::FromHours(24); #else +const base::TimeDelta kMinInitDelay = base::TimeDelta::FromSeconds(20); const base::TimeDelta kMaxInitDelay = base::TimeDelta::FromSeconds(200); #endif -const base::TimeDelta kMinInitDelay = base::TimeDelta::FromSeconds(20); void RecordProductEvents(bool first_run, bool is_google_default_search,
diff --git a/components/subresource_filter/content/common/ad_delay_throttle.cc b/components/subresource_filter/content/common/ad_delay_throttle.cc index cd94d35..4e30877 100644 --- a/components/subresource_filter/content/common/ad_delay_throttle.cc +++ b/components/subresource_filter/content/common/ad_delay_throttle.cc
@@ -15,6 +15,8 @@ #include "base/metrics/histogram_macros.h" #include "base/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/default_tick_clock.h" +#include "base/time/tick_clock.h" #include "components/subresource_filter/core/common/common_features.h" #include "url/gurl.h" #include "url/url_constants.h" @@ -60,7 +62,15 @@ NonIsolatedCondition(base::TimeDelta delay, AdDelayThrottle::MetadataProvider* provider) : DeferCondition(delay, provider) {} - ~NonIsolatedCondition() override = default; + ~NonIsolatedCondition() override { + if (provider()->IsAdRequest()) { + UMA_HISTOGRAM_ENUMERATION( + "SubresourceFilter.AdDelay.IsolatedInfo", + was_condition_ever_satisfied() + ? AdDelayThrottle::IsolatedInfo::kNonIsolatedAd + : AdDelayThrottle::IsolatedInfo::kIsolatedAd); + } + } private: // DeferCondition: @@ -120,8 +130,14 @@ return base::WrapUnique(new AdDelayThrottle(std::move(provider), this)); } -// TODO(csharrison): Log metrics for actual delay time. AdDelayThrottle::~AdDelayThrottle() { + if (!expected_delay_.is_zero()) { + UMA_HISTOGRAM_TIMES("SubresourceFilter.AdDelay.Delay", actual_delay_); + UMA_HISTOGRAM_TIMES("SubresourceFilter.AdDelay.Delay.Expected", + expected_delay_); + UMA_HISTOGRAM_TIMES("SubresourceFilter.AdDelay.Delay.Queuing", + actual_delay_ - expected_delay_); + } } void AdDelayThrottle::DetachFromCurrentSequence() { @@ -162,17 +178,19 @@ for (DeferCondition* condition : matched_conditions) { delay += condition->OnReadyToDefer(); } - // TODO(csharrison): Consider logging to the console here that Chrome // delayed this request. + expected_delay_ += delay; base::SequencedTaskRunnerHandle::Get()->PostDelayedTask( FROM_HERE, - base::BindOnce(&AdDelayThrottle::Resume, weak_factory_.GetWeakPtr()), + base::BindOnce(&AdDelayThrottle::Resume, weak_factory_.GetWeakPtr(), + tick_clock_->NowTicks()), delay); return true; } -void AdDelayThrottle::Resume() { +void AdDelayThrottle::Resume(base::TimeTicks defer_start) { + actual_delay_ += tick_clock_->NowTicks() - defer_start; delegate_->Resume(); } @@ -180,6 +198,7 @@ const AdDelayThrottle::Factory* factory) : content::URLLoaderThrottle(), provider_(std::move(provider)), + tick_clock_(base::DefaultTickClock::GetInstance()), delay_enabled_(factory->delay_enabled()), weak_factory_(this) { defer_conditions_.emplace_back(std::make_unique<InsecureCondition>(
diff --git a/components/subresource_filter/content/common/ad_delay_throttle.h b/components/subresource_filter/content/common/ad_delay_throttle.h index 99bba5c9..3e6a6e99 100644 --- a/components/subresource_filter/content/common/ad_delay_throttle.h +++ b/components/subresource_filter/content/common/ad_delay_throttle.h
@@ -15,6 +15,10 @@ class GURL; +namespace base { +class TickClock; +} // namespace base + namespace subresource_filter { class DeferCondition; @@ -75,6 +79,19 @@ kMaxValue = kInsecureNonAd }; + // This enum backs a histogram. Make sure to only append elements, and update + // enums.xml with new values. + enum class IsolatedInfo { + // Ad that was loaded isolated from the top-level page (e.g. from a + // cross-domain iframe). + kIsolatedAd = 0, + + // Ad loaded from a non-isolated context. + kNonIsolatedAd = 1, + + // Add new elements above kLast. + kMaxValue = kNonIsolatedAd + }; // The AdDelayThrottle has multiple possible conditions which can cause // delays. These conditions will subclass DeferCondition and override // IsConditionSatisfied. @@ -112,6 +129,10 @@ ~AdDelayThrottle() override; + void set_tick_clock_for_testing(const base::TickClock* tick_clock) { + tick_clock_ = tick_clock; + } + private: // content::URLLoaderThrottle: void DetachFromCurrentSequence() override; @@ -123,7 +144,7 @@ // Returns whether the request to |url| should be deferred. bool MaybeDefer(const GURL& url); - void Resume(); + void Resume(base::TimeTicks defer_start); AdDelayThrottle(std::unique_ptr<MetadataProvider> provider, const Factory* factory); @@ -134,6 +155,13 @@ // Must be destroyed before |provider_|. std::vector<std::unique_ptr<DeferCondition>> defer_conditions_; + // Must never be nullptr. + const base::TickClock* tick_clock_; + + // Will be zero if no delay occurs. + base::TimeDelta expected_delay_; + base::TimeDelta actual_delay_; + // Whether to actually delay the request. If set to false, will operate in a // dry-run style mode that only logs metrics. const bool delay_enabled_ = false;
diff --git a/components/subresource_filter/content/common/ad_delay_throttle_unittest.cc b/components/subresource_filter/content/common/ad_delay_throttle_unittest.cc index 16e4a7ce..bf3c09e 100644 --- a/components/subresource_filter/content/common/ad_delay_throttle_unittest.cc +++ b/components/subresource_filter/content/common/ad_delay_throttle_unittest.cc
@@ -16,6 +16,7 @@ #include "base/test/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/scoped_task_environment.h" +#include "base/test/simple_test_tick_clock.h" #include "base/threading/thread_task_runner_handle.h" #include "components/subresource_filter/core/common/common_features.h" #include "content/public/common/weak_wrapper_shared_url_loader_factory.h" @@ -335,6 +336,104 @@ EXPECT_TRUE(client_->has_received_completion()); } +TEST_F(AdDelayThrottleTest, DelayMetrics) { + AdDelayThrottle::Factory factory; + const GURL secure_url("https://example.test/ad.js"); + const GURL insecure_url("http://example.test/ad.js"); + loader_factory_.AddResponse(secure_url.spec(), "foo"); + loader_factory_.AddResponse(insecure_url.spec(), "foo"); + + const base::TimeDelta kQueuingDelay = base::TimeDelta::FromMilliseconds(25); + + const char kDelayHistogram[] = "SubresourceFilter.AdDelay.Delay"; + const char kQueuingDelayHistogram[] = + "SubresourceFilter.AdDelay.Delay.Queuing"; + const char kExpectedDelayHistogram[] = + "SubresourceFilter.AdDelay.Delay.Expected"; + { + // Secure isolated ad -> no delay. + base::HistogramTester histograms; + { + auto throttle = + factory.MaybeCreate(std::make_unique<MockMetadataProvider>()); + throttle->set_tick_clock_for_testing( + scoped_environment_.GetMockTickClock()); + client_ = std::make_unique<network::TestURLLoaderClient>(); + auto loader = CreateLoaderAndStart(secure_url, std::move(throttle)); + scoped_environment_.FastForwardUntilNoTasksRemain(); + } + histograms.ExpectTotalCount(kDelayHistogram, 0); + histograms.ExpectTotalCount(kQueuingDelayHistogram, 0); + histograms.ExpectTotalCount(kExpectedDelayHistogram, 0); + } + { + // Insecure isolated non-ad -> no delay. + base::HistogramTester histograms; + { + auto non_ad_metadata = std::make_unique<MockMetadataProvider>(); + non_ad_metadata->set_is_ad_request(false); + auto throttle = factory.MaybeCreate(std::move(non_ad_metadata)); + throttle->set_tick_clock_for_testing( + scoped_environment_.GetMockTickClock()); + client_ = std::make_unique<network::TestURLLoaderClient>(); + auto loader = CreateLoaderAndStart(insecure_url, std::move(throttle)); + scoped_environment_.FastForwardUntilNoTasksRemain(); + } + histograms.ExpectTotalCount(kDelayHistogram, 0); + histograms.ExpectTotalCount(kQueuingDelayHistogram, 0); + histograms.ExpectTotalCount(kExpectedDelayHistogram, 0); + } + + // Use a test clock instead of the scoped task environment's clock because the + // environment executes tasks as soon as it is able, and we want to simulate + // jank by advancing time more than the expected delay. + base::SimpleTestTickClock tick_clock; + { + // Insecure isolated ad -> delay. + base::HistogramTester histograms; + base::TimeDelta expected_delay = GetExpectedDelay(kInsecureDelayParam); + { + auto throttle = + factory.MaybeCreate(std::make_unique<MockMetadataProvider>()); + throttle->set_tick_clock_for_testing(&tick_clock); + client_ = std::make_unique<network::TestURLLoaderClient>(); + auto loader = CreateLoaderAndStart(insecure_url, std::move(throttle)); + + tick_clock.Advance(expected_delay + kQueuingDelay); + scoped_environment_.FastForwardBy(expected_delay + kQueuingDelay); + } + histograms.ExpectUniqueSample( + kDelayHistogram, (expected_delay + kQueuingDelay).InMilliseconds(), 1); + histograms.ExpectUniqueSample(kQueuingDelayHistogram, + kQueuingDelay.InMilliseconds(), 1); + histograms.ExpectUniqueSample(kExpectedDelayHistogram, + expected_delay.InMilliseconds(), 1); + } + { + // Insecure non-isolated ad -> delay. + base::HistogramTester histograms; + base::TimeDelta expected_delay = GetExpectedDelay(kInsecureDelayParam) + + GetExpectedDelay(kNonIsolatedDelayParam); + { + auto non_isolated_metadata = std::make_unique<MockMetadataProvider>(); + non_isolated_metadata->set_is_non_isolated(true); + auto throttle = factory.MaybeCreate(std::move(non_isolated_metadata)); + throttle->set_tick_clock_for_testing(&tick_clock); + client_ = std::make_unique<network::TestURLLoaderClient>(); + auto loader = CreateLoaderAndStart(insecure_url, std::move(throttle)); + + tick_clock.Advance(expected_delay + kQueuingDelay); + scoped_environment_.FastForwardBy(expected_delay + kQueuingDelay); + } + histograms.ExpectUniqueSample( + kDelayHistogram, (expected_delay + kQueuingDelay).InMilliseconds(), 1); + histograms.ExpectUniqueSample(kQueuingDelayHistogram, + kQueuingDelay.InMilliseconds(), 1); + histograms.ExpectUniqueSample(kExpectedDelayHistogram, + expected_delay.InMilliseconds(), 1); + } +} + // Make sure metrics are logged when the feature is enabled and disabled. TEST_P(AdDelayThrottleEnabledParamTest, SecureMetrics) { AdDelayThrottle::Factory factory; @@ -400,6 +499,66 @@ } } +TEST_P(AdDelayThrottleEnabledParamTest, IsolatedMetrics) { + AdDelayThrottle::Factory factory; + const GURL url("https://example.test/ad.js"); + loader_factory_.AddResponse(url.spec(), "foo"); + + const char kIsolatedHistogram[] = "SubresourceFilter.AdDelay.IsolatedInfo"; + { + base::HistogramTester histograms; + { + auto throttle = + factory.MaybeCreate(std::make_unique<MockMetadataProvider>()); + client_ = std::make_unique<network::TestURLLoaderClient>(); + auto loader = CreateLoaderAndStart(url, std::move(throttle)); + scoped_environment_.FastForwardUntilNoTasksRemain(); + } + histograms.ExpectUniqueSample( + kIsolatedHistogram, + static_cast<int>(AdDelayThrottle::IsolatedInfo::kIsolatedAd), 1); + } + { + base::HistogramTester histograms; + { + auto metadata = std::make_unique<MockMetadataProvider>(); + metadata->set_is_non_isolated(true); + auto throttle = factory.MaybeCreate(std::move(metadata)); + client_ = std::make_unique<network::TestURLLoaderClient>(); + auto loader = CreateLoaderAndStart(url, std::move(throttle)); + scoped_environment_.FastForwardUntilNoTasksRemain(); + } + histograms.ExpectUniqueSample( + kIsolatedHistogram, + static_cast<int>(AdDelayThrottle::IsolatedInfo::kNonIsolatedAd), 1); + } + { + base::HistogramTester histograms; + { + auto non_ad_metadata = std::make_unique<MockMetadataProvider>(); + non_ad_metadata->set_is_ad_request(false); + client_ = std::make_unique<network::TestURLLoaderClient>(); + auto throttle = factory.MaybeCreate(std::move(non_ad_metadata)); + auto loader = CreateLoaderAndStart(url, std::move(throttle)); + scoped_environment_.FastForwardUntilNoTasksRemain(); + } + histograms.ExpectTotalCount(kIsolatedHistogram, 0); + } + { + base::HistogramTester histograms; + { + auto non_ad_metadata = std::make_unique<MockMetadataProvider>(); + non_ad_metadata->set_is_ad_request(false); + non_ad_metadata->set_is_non_isolated(true); + auto throttle = factory.MaybeCreate(std::move(non_ad_metadata)); + client_ = std::make_unique<network::TestURLLoaderClient>(); + auto loader = CreateLoaderAndStart(url, std::move(throttle)); + scoped_environment_.FastForwardUntilNoTasksRemain(); + } + histograms.ExpectTotalCount(kIsolatedHistogram, 0); + } +} + INSTANTIATE_TEST_CASE_P(, AdDelayThrottleEnabledParamTest, ::testing::Values(true, false));
diff --git a/components/viz/client/BUILD.gn b/components/viz/client/BUILD.gn index f1ff32e..9897c00 100644 --- a/components/viz/client/BUILD.gn +++ b/components/viz/client/BUILD.gn
@@ -8,8 +8,6 @@ sources = [ "client_layer_tree_frame_sink.cc", "client_layer_tree_frame_sink.h", - "client_shared_bitmap_manager.cc", - "client_shared_bitmap_manager.h", "frame_eviction_manager.cc", "frame_eviction_manager.h", "frame_evictor.cc",
diff --git a/components/viz/client/client_shared_bitmap_manager.cc b/components/viz/client/client_shared_bitmap_manager.cc deleted file mode 100644 index 4438d89..0000000 --- a/components/viz/client/client_shared_bitmap_manager.cc +++ /dev/null
@@ -1,138 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "components/viz/client/client_shared_bitmap_manager.h" - -#include <stddef.h> - -#include <utility> - -#include "base/debug/alias.h" -#include "base/trace_event/trace_event.h" -#include "build/build_config.h" -#include "components/viz/common/resources/bitmap_allocation.h" -#include "components/viz/common/resources/resource_format_utils.h" -#include "mojo/public/cpp/system/platform_handle.h" -#include "ui/gfx/geometry/size.h" - -namespace viz { - -namespace { - -class ClientSharedBitmap : public SharedBitmap { - public: - ClientSharedBitmap( - scoped_refptr<mojom::ThreadSafeSharedBitmapAllocationNotifierPtr> - shared_bitmap_allocation_notifier, - base::SharedMemory* shared_memory, - const SharedBitmapId& id, - uint32_t sequence_number) - : SharedBitmap(static_cast<uint8_t*>(shared_memory->memory()), - id, - sequence_number), - shared_bitmap_allocation_notifier_( - std::move(shared_bitmap_allocation_notifier)), - tracing_id_(shared_memory->mapped_id()) {} - - ClientSharedBitmap( - scoped_refptr<mojom::ThreadSafeSharedBitmapAllocationNotifierPtr> - shared_bitmap_allocation_notifier, - std::unique_ptr<base::SharedMemory> shared_memory_holder, - const SharedBitmapId& id, - uint32_t sequence_number) - : ClientSharedBitmap(std::move(shared_bitmap_allocation_notifier), - shared_memory_holder.get(), - id, - sequence_number) { - shared_memory_holder_ = std::move(shared_memory_holder); - } - - ~ClientSharedBitmap() override { - (*shared_bitmap_allocation_notifier_)->DidDeleteSharedBitmap(id()); - } - - // SharedBitmap implementation. - base::UnguessableToken GetCrossProcessGUID() const override { - return tracing_id_; - } - - private: - scoped_refptr<mojom::ThreadSafeSharedBitmapAllocationNotifierPtr> - shared_bitmap_allocation_notifier_; - std::unique_ptr<base::SharedMemory> shared_memory_holder_; - base::UnguessableToken tracing_id_; -}; - -} // namespace - -ClientSharedBitmapManager::ClientSharedBitmapManager( - scoped_refptr<mojom::ThreadSafeSharedBitmapAllocationNotifierPtr> - shared_bitmap_allocation_notifier) - : shared_bitmap_allocation_notifier_( - std::move(shared_bitmap_allocation_notifier)) {} - -ClientSharedBitmapManager::~ClientSharedBitmapManager() = default; - -std::unique_ptr<SharedBitmap> ClientSharedBitmapManager::AllocateSharedBitmap( - const gfx::Size& size, - ResourceFormat format) { - DCHECK(IsBitmapFormatSupported(format)); - TRACE_EVENT2("renderer", "ClientSharedBitmapManager::AllocateSharedBitmap", - "width", size.width(), "height", size.height()); - SharedBitmapId id = SharedBitmap::GenerateId(); - std::unique_ptr<base::SharedMemory> memory = - bitmap_allocation::AllocateMappedBitmap(size, format); - uint32_t sequence_number = NotifyAllocatedSharedBitmap(memory.get(), id); - return std::make_unique<ClientSharedBitmap>( - shared_bitmap_allocation_notifier_, std::move(memory), id, - sequence_number); -} - -std::unique_ptr<SharedBitmap> ClientSharedBitmapManager::GetSharedBitmapFromId( - const gfx::Size&, - ResourceFormat, - const SharedBitmapId&) { - NOTREACHED(); - return nullptr; -} - -bool ClientSharedBitmapManager::ChildAllocatedSharedBitmap( - mojo::ScopedSharedBufferHandle buffer, - const SharedBitmapId& id) { - // Display compositor only. - NOTREACHED(); - return false; -} - -void ClientSharedBitmapManager::ChildDeletedSharedBitmap( - const SharedBitmapId& id) { - // Display compositor only. - NOTREACHED(); -} - -std::unique_ptr<SharedBitmap> -ClientSharedBitmapManager::GetBitmapForSharedMemory(base::SharedMemory* mem) { - SharedBitmapId id = SharedBitmap::GenerateId(); - uint32_t sequence_number = NotifyAllocatedSharedBitmap(mem, id); - return std::make_unique<ClientSharedBitmap>( - shared_bitmap_allocation_notifier_, mem, id, sequence_number); -} - -// Notifies the browser process that a shared bitmap with the given ID was -// allocated. Caller keeps ownership of |memory|. -uint32_t ClientSharedBitmapManager::NotifyAllocatedSharedBitmap( - base::SharedMemory* memory, - const SharedBitmapId& id) { - mojo::ScopedSharedBufferHandle buffer_handle = - bitmap_allocation::DuplicateAndCloseMappedBitmap(memory, gfx::Size(), - RGBA_8888); - { - base::AutoLock lock(lock_); - (*shared_bitmap_allocation_notifier_) - ->DidAllocateSharedBitmap(std::move(buffer_handle), id); - return ++last_sequence_number_; - } -} - -} // namespace viz
diff --git a/components/viz/client/client_shared_bitmap_manager.h b/components/viz/client/client_shared_bitmap_manager.h deleted file mode 100644 index 0c5d731a..0000000 --- a/components/viz/client/client_shared_bitmap_manager.h +++ /dev/null
@@ -1,66 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef COMPONENTS_VIZ_CLIENT_CLIENT_SHARED_BITMAP_MANAGER_H_ -#define COMPONENTS_VIZ_CLIENT_CLIENT_SHARED_BITMAP_MANAGER_H_ - -#include <stdint.h> - -#include <memory> - -#include "base/macros.h" -#include "base/memory/ref_counted.h" -#include "base/memory/shared_memory.h" -#include "base/synchronization/lock.h" -#include "components/viz/client/viz_client_export.h" -#include "components/viz/common/resources/shared_bitmap_manager.h" -#include "mojo/public/cpp/bindings/thread_safe_interface_ptr.h" -#include "services/viz/public/interfaces/compositing/shared_bitmap_allocation_notifier.mojom.h" - -namespace viz { - -// A SharedBitmapManager implementation for use outside of the display -// compositor's process. This implementation supports SharedBitmaps that -// can be transported over process boundaries to the display compositor. -class VIZ_CLIENT_EXPORT ClientSharedBitmapManager : public SharedBitmapManager { - public: - explicit ClientSharedBitmapManager( - scoped_refptr<mojom::ThreadSafeSharedBitmapAllocationNotifierPtr> - shared_bitmap_allocation_notifier); - ~ClientSharedBitmapManager() override; - - // SharedBitmapManager implementation. - std::unique_ptr<SharedBitmap> AllocateSharedBitmap( - const gfx::Size&, - ResourceFormat format) override; - std::unique_ptr<SharedBitmap> GetSharedBitmapFromId( - const gfx::Size&, - ResourceFormat, - const SharedBitmapId&) override; - bool ChildAllocatedSharedBitmap(mojo::ScopedSharedBufferHandle buffer, - const SharedBitmapId& id) override; - void ChildDeletedSharedBitmap(const SharedBitmapId& id) override; - - std::unique_ptr<SharedBitmap> GetBitmapForSharedMemory( - base::SharedMemory* mem); - - private: - uint32_t NotifyAllocatedSharedBitmap(base::SharedMemory* memory, - const SharedBitmapId& id); - - scoped_refptr<mojom::ThreadSafeSharedBitmapAllocationNotifierPtr> - shared_bitmap_allocation_notifier_; - - base::Lock lock_; - - // Each SharedBitmap allocated by this class is assigned a unique sequence - // number that is incremental. - uint32_t last_sequence_number_ = 0; - - DISALLOW_COPY_AND_ASSIGN(ClientSharedBitmapManager); -}; - -} // namespace viz - -#endif // COMPONENTS_VIZ_CLIENT_CLIENT_SHARED_BITMAP_MANAGER_H_
diff --git a/components/viz/common/resources/shared_bitmap_manager.h b/components/viz/common/resources/shared_bitmap_manager.h index 1975daa..0aefd35 100644 --- a/components/viz/common/resources/shared_bitmap_manager.h +++ b/components/viz/common/resources/shared_bitmap_manager.h
@@ -19,19 +19,6 @@ SharedBitmapManager() {} virtual ~SharedBitmapManager() {} - // Allocate a shared bitmap that can be given to the display compositor. - virtual std::unique_ptr<SharedBitmap> AllocateSharedBitmap( - const gfx::Size&, - ResourceFormat) = 0; - - // The following methods are only used by the display compositor, but are on - // the base interface in order to allow tests (or prod) to implement the - // display and client implementations with the same type, in lieu of having - // the ServerSharedBitmapManager and ClientSharedBitmapManager be separate - // interfaces instead of this single one. - // TODO(crbug.com/730660): Intent is to remove the ClientSharedBitmapManager - // over time, and make SharedBitmapManager a display-compositor-only concept. - // Used in the display compositor to find the bitmap associated with an id. virtual std::unique_ptr<SharedBitmap> GetSharedBitmapFromId( const gfx::Size&,
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn index 6aa3878..4c5f5749 100644 --- a/components/viz/service/BUILD.gn +++ b/components/viz/service/BUILD.gn
@@ -101,8 +101,6 @@ "display_embedder/in_process_gpu_memory_buffer_manager.h", "display_embedder/server_shared_bitmap_manager.cc", "display_embedder/server_shared_bitmap_manager.h", - "display_embedder/shared_bitmap_allocation_notifier_impl.cc", - "display_embedder/shared_bitmap_allocation_notifier_impl.h", "display_embedder/software_output_surface.cc", "display_embedder/software_output_surface.h", "display_embedder/viz_process_context_provider.cc",
diff --git a/components/viz/service/display_embedder/gpu_display_provider.cc b/components/viz/service/display_embedder/gpu_display_provider.cc index 0c01ec8..748509ef 100644 --- a/components/viz/service/display_embedder/gpu_display_provider.cc +++ b/components/viz/service/display_embedder/gpu_display_provider.cc
@@ -182,8 +182,9 @@ #if defined(OS_WIN) if (!output_device_backing_) output_device_backing_ = std::make_unique<OutputDeviceBacking>(); - return std::make_unique<SoftwareOutputDeviceWin>(output_device_backing_.get(), - widget); + return std::make_unique<SoftwareOutputDeviceWin>( + output_device_backing_.get(), widget, + /*force_disable_hwnd_composited=*/true); #elif defined(OS_MACOSX) // TODO(crbug.com/730660): What do we do to get something we can draw to? Can // we use an IO surface? Can we use CA layers and overlays like we do for gpu
diff --git a/components/viz/service/display_embedder/server_shared_bitmap_manager.cc b/components/viz/service/display_embedder/server_shared_bitmap_manager.cc index a9745b9..9d84f91 100644 --- a/components/viz/service/display_embedder/server_shared_bitmap_manager.cc +++ b/components/viz/service/display_embedder/server_shared_bitmap_manager.cc
@@ -23,10 +23,7 @@ class BitmapData : public base::RefCountedThreadSafe<BitmapData> { public: explicit BitmapData(size_t buffer_size) : buffer_size(buffer_size) {} - // For shm allocated and shared from a client out-of-process. std::unique_ptr<base::SharedMemory> memory; - // For memory allocated by the ServerSharedBitmapManager for in-process. - std::unique_ptr<uint8_t[]> pixels; size_t buffer_size; private: @@ -39,31 +36,23 @@ class ServerSharedBitmap : public SharedBitmap { public: - ServerSharedBitmap(uint8_t* pixels, - scoped_refptr<BitmapData> bitmap_data, - const SharedBitmapId& id, - ServerSharedBitmapManager* manager) - : SharedBitmap(pixels, id, 0 /* sequence_number */), - bitmap_data_(bitmap_data), - manager_(manager) {} + ServerSharedBitmap(scoped_refptr<BitmapData> bitmap_data, + const SharedBitmapId& id) + : SharedBitmap(static_cast<uint8_t*>(bitmap_data->memory->memory()), + id, + 0 /* sequence_number */), + bitmap_data_(std::move(bitmap_data)) {} ~ServerSharedBitmap() override { - if (manager_) - manager_->FreeSharedMemoryFromMap(id()); } // SharedBitmap implementation. base::UnguessableToken GetCrossProcessGUID() const override { - if (!bitmap_data_->memory) { - // Locally allocated for in-process use. - return {}; - } return bitmap_data_->memory->mapped_id(); } private: scoped_refptr<BitmapData> bitmap_data_; - ServerSharedBitmapManager* manager_; }; } // namespace @@ -81,26 +70,6 @@ return g_shared_memory_manager.Pointer(); } -std::unique_ptr<SharedBitmap> ServerSharedBitmapManager::AllocateSharedBitmap( - const gfx::Size& size, - ResourceFormat format) { - DCHECK(IsBitmapFormatSupported(format)); - base::AutoLock lock(lock_); - size_t bitmap_size; - if (!ResourceSizes::MaybeSizeInBytes(size, format, &bitmap_size)) - return nullptr; - - scoped_refptr<BitmapData> data(new BitmapData(bitmap_size)); - // Bitmaps allocated in server don't need to be shared to other processes, so - // allocate them with new instead. - data->pixels = std::unique_ptr<uint8_t[]>(new uint8_t[bitmap_size]); - - SharedBitmapId id = SharedBitmap::GenerateId(); - handle_map_[id] = data; - return std::make_unique<ServerSharedBitmap>(data->pixels.get(), data, id, - this); -} - std::unique_ptr<SharedBitmap> ServerSharedBitmapManager::GetSharedBitmapFromId( const gfx::Size& size, ResourceFormat format, @@ -117,16 +86,11 @@ bitmap_size > data->buffer_size) return nullptr; - if (data->pixels) { - return std::make_unique<ServerSharedBitmap>(data->pixels.get(), data, id, - nullptr); - } if (!data->memory->memory()) { return nullptr; } - return std::make_unique<ServerSharedBitmap>( - static_cast<uint8_t*>(data->memory->memory()), data, id, nullptr); + return std::make_unique<ServerSharedBitmap>(data, id); } bool ServerSharedBitmapManager::ChildAllocatedSharedBitmap(
diff --git a/components/viz/service/display_embedder/server_shared_bitmap_manager.h b/components/viz/service/display_embedder/server_shared_bitmap_manager.h index af9be43..5781073 100644 --- a/components/viz/service/display_embedder/server_shared_bitmap_manager.h +++ b/components/viz/service/display_embedder/server_shared_bitmap_manager.h
@@ -36,9 +36,6 @@ static ServerSharedBitmapManager* current(); // SharedBitmapManager implementation. - std::unique_ptr<SharedBitmap> AllocateSharedBitmap( - const gfx::Size& size, - ResourceFormat format) override; std::unique_ptr<SharedBitmap> GetSharedBitmapFromId( const gfx::Size& size, ResourceFormat format,
diff --git a/components/viz/service/display_embedder/server_shared_bitmap_manager_unittest.cc b/components/viz/service/display_embedder/server_shared_bitmap_manager_unittest.cc index cce61d2..b592373 100644 --- a/components/viz/service/display_embedder/server_shared_bitmap_manager_unittest.cc +++ b/components/viz/service/display_embedder/server_shared_bitmap_manager_unittest.cc
@@ -5,7 +5,6 @@ #include "components/viz/service/display_embedder/server_shared_bitmap_manager.h" #include "components/viz/common/resources/resource_sizes.h" -#include "components/viz/service/display_embedder/shared_bitmap_allocation_notifier_impl.h" #include "mojo/public/cpp/system/platform_handle.h" #include "testing/gtest/include/gtest/gtest.h" @@ -36,12 +35,11 @@ memset(bitmap->memory(), 0xff, size_in_bytes); SharedBitmapId id = SharedBitmap::GenerateId(); - SharedBitmapAllocationNotifierImpl notifier(manager()); base::SharedMemoryHandle handle = bitmap->handle().Duplicate(); mojo::ScopedSharedBufferHandle buffer_handle = mojo::WrapSharedMemoryHandle( handle, size_in_bytes, mojo::UnwrappedSharedMemoryHandleProtection::kReadWrite); - notifier.ChildAllocatedSharedBitmap(std::move(buffer_handle), id); + manager()->ChildAllocatedSharedBitmap(std::move(buffer_handle), id); std::unique_ptr<SharedBitmap> large_bitmap; large_bitmap = @@ -81,7 +79,7 @@ EXPECT_EQ(memcmp(shared_bitmap->pixels(), bitmap->memory(), size_in_bytes), 0); - notifier.DidDeleteSharedBitmap(id); + manager()->ChildDeletedSharedBitmap(id); memset(bitmap->memory(), 0, size_in_bytes); @@ -91,42 +89,6 @@ shared_bitmap.reset(); } -TEST_F(ServerSharedBitmapManagerTest, ServiceDestroyed) { - gfx::Size bitmap_size(1, 1); - size_t size_in_bytes; - EXPECT_TRUE( - ResourceSizes::MaybeSizeInBytes(bitmap_size, RGBA_8888, &size_in_bytes)); - std::unique_ptr<base::SharedMemory> bitmap(new base::SharedMemory()); - bitmap->CreateAndMapAnonymous(size_in_bytes); - memset(bitmap->memory(), 0xff, size_in_bytes); - SharedBitmapId id = SharedBitmap::GenerateId(); - - // This outlives the SharedBitmapAllocationNotifier. - std::unique_ptr<SharedBitmap> shared_bitmap; - - { - SharedBitmapAllocationNotifierImpl notifier(manager()); - base::SharedMemoryHandle handle = bitmap->handle().Duplicate(); - mojo::ScopedSharedBufferHandle buffer_handle = mojo::WrapSharedMemoryHandle( - handle, size_in_bytes, - mojo::UnwrappedSharedMemoryHandleProtection::kReadWrite); - notifier.ChildAllocatedSharedBitmap(std::move(buffer_handle), id); - - shared_bitmap = - manager()->GetSharedBitmapFromId(bitmap_size, RGBA_8888, id); - ASSERT_TRUE(shared_bitmap.get() != nullptr); - - EXPECT_EQ(1u, manager()->AllocatedBitmapCount()); - } - EXPECT_EQ(0u, manager()->AllocatedBitmapCount()); - - std::unique_ptr<SharedBitmap> shared_bitmap2; - shared_bitmap2 = manager()->GetSharedBitmapFromId(bitmap_size, RGBA_8888, id); - EXPECT_FALSE(!!shared_bitmap2); - EXPECT_EQ(memcmp(shared_bitmap->pixels(), bitmap->memory(), size_in_bytes), - 0); -} - TEST_F(ServerSharedBitmapManagerTest, AddDuplicate) { gfx::Size bitmap_size(1, 1); size_t size_in_bytes; @@ -137,13 +99,11 @@ memset(bitmap->memory(), 0xff, size_in_bytes); SharedBitmapId id = SharedBitmap::GenerateId(); - SharedBitmapAllocationNotifierImpl notifier(manager()); - base::SharedMemoryHandle handle = bitmap->handle().Duplicate(); mojo::ScopedSharedBufferHandle buffer_handle = mojo::WrapSharedMemoryHandle( handle, size_in_bytes, mojo::UnwrappedSharedMemoryHandleProtection::kReadWrite); - notifier.ChildAllocatedSharedBitmap(std::move(buffer_handle), id); + manager()->ChildAllocatedSharedBitmap(std::move(buffer_handle), id); std::unique_ptr<base::SharedMemory> bitmap2(new base::SharedMemory()); bitmap2->CreateAndMapAnonymous(size_in_bytes); @@ -153,14 +113,14 @@ buffer_handle = mojo::WrapSharedMemoryHandle( handle2, size_in_bytes, mojo::UnwrappedSharedMemoryHandleProtection::kReadWrite); - notifier.ChildAllocatedSharedBitmap(std::move(buffer_handle), id); + manager()->ChildAllocatedSharedBitmap(std::move(buffer_handle), id); std::unique_ptr<SharedBitmap> shared_bitmap; shared_bitmap = manager()->GetSharedBitmapFromId(bitmap_size, RGBA_8888, id); ASSERT_TRUE(shared_bitmap.get() != nullptr); EXPECT_EQ(memcmp(shared_bitmap->pixels(), bitmap->memory(), size_in_bytes), 0); - notifier.DidDeleteSharedBitmap(id); + manager()->ChildDeletedSharedBitmap(id); } TEST_F(ServerSharedBitmapManagerTest, SharedMemoryHandle) { @@ -174,21 +134,19 @@ base::UnguessableToken shared_memory_guid = bitmap->handle().GetGUID(); EXPECT_FALSE(shared_memory_guid.is_empty()); - SharedBitmapAllocationNotifierImpl notifier(manager()); - SharedBitmapId id = SharedBitmap::GenerateId(); base::SharedMemoryHandle handle = bitmap->handle().Duplicate(); mojo::ScopedSharedBufferHandle buffer_handle = mojo::WrapSharedMemoryHandle( handle, size_in_bytes, mojo::UnwrappedSharedMemoryHandleProtection::kReadWrite); - notifier.ChildAllocatedSharedBitmap(std::move(buffer_handle), id); + manager()->ChildAllocatedSharedBitmap(std::move(buffer_handle), id); std::unique_ptr<SharedBitmap> shared_bitmap; shared_bitmap = manager()->GetSharedBitmapFromId(gfx::Size(1, 1), RGBA_8888, id); EXPECT_EQ(shared_bitmap->GetCrossProcessGUID(), shared_memory_guid); - notifier.DidDeleteSharedBitmap(id); + manager()->ChildDeletedSharedBitmap(id); } } // namespace
diff --git a/components/viz/service/display_embedder/shared_bitmap_allocation_notifier_impl.cc b/components/viz/service/display_embedder/shared_bitmap_allocation_notifier_impl.cc deleted file mode 100644 index fa5468d3..0000000 --- a/components/viz/service/display_embedder/shared_bitmap_allocation_notifier_impl.cc +++ /dev/null
@@ -1,79 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "components/viz/service/display_embedder/shared_bitmap_allocation_notifier_impl.h" - -#include "components/viz/service/display_embedder/server_shared_bitmap_manager.h" -#include "mojo/public/cpp/system/platform_handle.h" - -namespace viz { - -SharedBitmapAllocationNotifierImpl::SharedBitmapAllocationNotifierImpl( - ServerSharedBitmapManager* manager) - : manager_(manager), binding_(this) { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); -} - -SharedBitmapAllocationNotifierImpl::~SharedBitmapAllocationNotifierImpl() { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - ChildDied(); -} - -void SharedBitmapAllocationNotifierImpl::Bind( - mojom::SharedBitmapAllocationNotifierRequest request) { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - if (binding_.is_bound()) { - DLOG(ERROR) << "Only one SharedBitmapAllocationNotifierRequest is " - << "expected from the renderer."; - return; - } - binding_.Bind(std::move(request)); -} - -void SharedBitmapAllocationNotifierImpl::DidAllocateSharedBitmap( - mojo::ScopedSharedBufferHandle buffer, - const SharedBitmapId& id) { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - this->ChildAllocatedSharedBitmap(std::move(buffer), id); - last_sequence_number_++; - for (SharedBitmapAllocationObserver& observer : observers_) - observer.OnSharedBitmapAllocatedByChild(last_sequence_number_); -} - -void SharedBitmapAllocationNotifierImpl::DidDeleteSharedBitmap( - const SharedBitmapId& id) { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - manager_->ChildDeletedSharedBitmap(id); - owned_bitmaps_.erase(id); -} - -void SharedBitmapAllocationNotifierImpl::ChildAllocatedSharedBitmap( - mojo::ScopedSharedBufferHandle buffer, - const SharedBitmapId& id) { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - if (manager_->ChildAllocatedSharedBitmap(std::move(buffer), id)) - owned_bitmaps_.insert(id); -} - -void SharedBitmapAllocationNotifierImpl::ChildDied() { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - for (const auto& id : owned_bitmaps_) - manager_->ChildDeletedSharedBitmap(id); - owned_bitmaps_.clear(); - binding_.Close(); -} - -void SharedBitmapAllocationNotifierImpl::AddObserver( - SharedBitmapAllocationObserver* observer) { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - observers_.AddObserver(observer); -} - -void SharedBitmapAllocationNotifierImpl::RemoveObserver( - SharedBitmapAllocationObserver* observer) { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - observers_.RemoveObserver(observer); -} - -} // namespace viz
diff --git a/components/viz/service/display_embedder/shared_bitmap_allocation_notifier_impl.h b/components/viz/service/display_embedder/shared_bitmap_allocation_notifier_impl.h deleted file mode 100644 index 0b4e32dd..0000000 --- a/components/viz/service/display_embedder/shared_bitmap_allocation_notifier_impl.h +++ /dev/null
@@ -1,63 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SHARED_BITMAP_ALLOCATION_NOTIFIER_IMPL_H_ -#define COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SHARED_BITMAP_ALLOCATION_NOTIFIER_IMPL_H_ - -#include <unordered_set> - -#include "base/observer_list.h" -#include "base/threading/thread_checker.h" -#include "components/viz/common/quads/shared_bitmap.h" -#include "components/viz/service/viz_service_export.h" -#include "mojo/public/cpp/bindings/binding.h" -#include "services/viz/public/interfaces/compositing/shared_bitmap_allocation_notifier.mojom.h" - -namespace viz { -class ServerSharedBitmapManager; - -class SharedBitmapAllocationObserver { - public: - virtual void OnSharedBitmapAllocatedByChild(uint32_t sequence_number) = 0; -}; - -class VIZ_SERVICE_EXPORT SharedBitmapAllocationNotifierImpl - : public mojom::SharedBitmapAllocationNotifier { - public: - explicit SharedBitmapAllocationNotifierImpl( - ServerSharedBitmapManager* manager); - - ~SharedBitmapAllocationNotifierImpl() override; - - void AddObserver(SharedBitmapAllocationObserver* observer); - void RemoveObserver(SharedBitmapAllocationObserver* observer); - - void Bind(mojom::SharedBitmapAllocationNotifierRequest request); - - // mojom::SharedBitmapAllocationNotifier overrides: - void DidAllocateSharedBitmap(mojo::ScopedSharedBufferHandle buffer, - const SharedBitmapId& id) override; - void DidDeleteSharedBitmap(const SharedBitmapId& id) override; - - void ChildAllocatedSharedBitmap(mojo::ScopedSharedBufferHandle buffer, - const SharedBitmapId& id); - - void ChildDied(); - - uint32_t last_sequence_number() const { return last_sequence_number_; } - - private: - THREAD_CHECKER(thread_checker_); - ServerSharedBitmapManager* const manager_; - mojo::Binding<mojom::SharedBitmapAllocationNotifier> binding_; - std::unordered_set<SharedBitmapId, SharedBitmapIdHash> owned_bitmaps_; - base::ObserverList<SharedBitmapAllocationObserver> observers_; - uint32_t last_sequence_number_ = 0; - - DISALLOW_COPY_AND_ASSIGN(SharedBitmapAllocationNotifierImpl); -}; - -} // namespace viz - -#endif // COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SHARED_BITMAP_ALLOCATION_NOTIFIER_IMPL_H_
diff --git a/components/viz/service/display_embedder/software_output_device_win.cc b/components/viz/service/display_embedder/software_output_device_win.cc index 61213e77..349d08f 100644 --- a/components/viz/service/display_embedder/software_output_device_win.cc +++ b/components/viz/service/display_embedder/software_output_device_win.cc
@@ -83,13 +83,16 @@ return max_size; } -SoftwareOutputDeviceWin::SoftwareOutputDeviceWin(OutputDeviceBacking* backing, - gfx::AcceleratedWidget widget) +SoftwareOutputDeviceWin::SoftwareOutputDeviceWin( + OutputDeviceBacking* backing, + gfx::AcceleratedWidget widget, + bool force_disable_hwnd_composited) : hwnd_(widget), is_hwnd_composited_(false), backing_(backing), in_paint_(false) { - is_hwnd_composited_ = !!::GetProp(hwnd_, ui::kWindowTranslucent); + is_hwnd_composited_ = !force_disable_hwnd_composited && + !!::GetProp(hwnd_, ui::kWindowTranslucent); // Layered windows must be completely updated every time, so they can't // share contents with other windows. if (is_hwnd_composited_)
diff --git a/components/viz/service/display_embedder/software_output_device_win.h b/components/viz/service/display_embedder/software_output_device_win.h index ad2a049f..3378efed 100644 --- a/components/viz/service/display_embedder/software_output_device_win.h +++ b/components/viz/service/display_embedder/software_output_device_win.h
@@ -48,8 +48,13 @@ class VIZ_SERVICE_EXPORT SoftwareOutputDeviceWin : public SoftwareOutputDevice { public: + // TODO(crbug.com/826633): Investigating if the layered window drawing + // path is necessary then remove |force_disable_hwnd_composited|. This is only + // used with --enable-features=VizDisplayCompositor where + // UpdateLayeredWindow() call is blocked by GPU sandbox. SoftwareOutputDeviceWin(OutputDeviceBacking* backing, - gfx::AcceleratedWidget widget); + gfx::AcceleratedWidget widget, + bool force_disable_hwnd_composited = false); ~SoftwareOutputDeviceWin() override; void Resize(const gfx::Size& viewport_pixel_size,
diff --git a/components/viz/service/gl/gpu_service_impl.cc b/components/viz/service/gl/gpu_service_impl.cc index 060a293..f05f50d 100644 --- a/components/viz/service/gl/gpu_service_impl.cc +++ b/components/viz/service/gl/gpu_service_impl.cc
@@ -114,9 +114,7 @@ std::unique_ptr<gpu::GpuWatchdogThread> watchdog_thread, scoped_refptr<base::SingleThreadTaskRunner> io_runner, const gpu::GpuFeatureInfo& gpu_feature_info, - const gpu::GpuPreferences& gpu_preferences, - const gpu::GPUInfo& gpu_info_for_hardware_gpu, - const gpu::GpuFeatureInfo& gpu_feature_info_for_hardware_gpu) + const gpu::GpuPreferences& gpu_preferences) : main_runner_(base::ThreadTaskRunnerHandle::Get()), io_runner_(std::move(io_runner)), watchdog_thread_(std::move(watchdog_thread)), @@ -125,8 +123,6 @@ gpu_preferences_(gpu_preferences), gpu_info_(gpu_info), gpu_feature_info_(gpu_feature_info), - gpu_info_for_hardware_gpu_(gpu_info_for_hardware_gpu), - gpu_feature_info_for_hardware_gpu_(gpu_feature_info_for_hardware_gpu), bindings_(std::make_unique<mojo::BindingSet<mojom::GpuService>>()), weak_ptr_factory_(this) { DCHECK(!io_runner_->BelongsToCurrentThread()); @@ -194,9 +190,7 @@ gpu::SyncPointManager* sync_point_manager, base::WaitableEvent* shutdown_event) { DCHECK(main_runner_->BelongsToCurrentThread()); - gpu_host->DidInitialize(gpu_info_, gpu_feature_info_, - gpu_info_for_hardware_gpu_, - gpu_feature_info_for_hardware_gpu_); + gpu_host->DidInitialize(gpu_info_, gpu_feature_info_); gpu_host_ = mojom::ThreadSafeGpuHostPtr::Create(gpu_host.PassInterface(), io_runner_); if (!in_host_process()) {
diff --git a/components/viz/service/gl/gpu_service_impl.h b/components/viz/service/gl/gpu_service_impl.h index 8abf60c..a29e320f 100644 --- a/components/viz/service/gl/gpu_service_impl.h +++ b/components/viz/service/gl/gpu_service_impl.h
@@ -62,9 +62,7 @@ std::unique_ptr<gpu::GpuWatchdogThread> watchdog, scoped_refptr<base::SingleThreadTaskRunner> io_runner, const gpu::GpuFeatureInfo& gpu_feature_info, - const gpu::GpuPreferences& gpu_preferences, - const gpu::GPUInfo& gpu_info_for_hardware_gpu, - const gpu::GpuFeatureInfo& gpu_feature_info_for_hardware_gpu); + const gpu::GpuPreferences& gpu_preferences); ~GpuServiceImpl() override; @@ -228,11 +226,6 @@ // Information about general chrome feature support for the GPU. gpu::GpuFeatureInfo gpu_feature_info_; - // What we would have gotten if we haven't fallen back to SwiftShader or - // pure software (in the viz case). - gpu::GPUInfo gpu_info_for_hardware_gpu_; - gpu::GpuFeatureInfo gpu_feature_info_for_hardware_gpu_; - scoped_refptr<mojom::ThreadSafeGpuHostPtr> gpu_host_; std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_; std::unique_ptr<media::MediaGpuChannelManager> media_gpu_channel_manager_;
diff --git a/components/viz/service/gl/gpu_service_impl_unittest.cc b/components/viz/service/gl/gpu_service_impl_unittest.cc index db04e5f2..c36a072f 100644 --- a/components/viz/service/gl/gpu_service_impl_unittest.cc +++ b/components/viz/service/gl/gpu_service_impl_unittest.cc
@@ -51,8 +51,7 @@ ASSERT_TRUE(io_thread_.Start()); gpu_service_ = std::make_unique<GpuServiceImpl>( gpu::GPUInfo(), nullptr /* watchdog_thread */, io_thread_.task_runner(), - gpu::GpuFeatureInfo(), gpu::GpuPreferences(), gpu::GPUInfo(), - gpu::GpuFeatureInfo()); + gpu::GpuFeatureInfo(), gpu::GpuPreferences()); } void TearDown() override {
diff --git a/components/viz/service/main/viz_main_impl.cc b/components/viz/service/main/viz_main_impl.cc index df94129..7738314c 100644 --- a/components/viz/service/main/viz_main_impl.cc +++ b/components/viz/service/main/viz_main_impl.cc
@@ -143,9 +143,7 @@ gpu_service_ = std::make_unique<GpuServiceImpl>( gpu_init_->gpu_info(), gpu_init_->TakeWatchdogThread(), io_task_runner(), - gpu_init_->gpu_feature_info(), gpu_init_->gpu_preferences(), - gpu_init_->gpu_info_for_hardware_gpu(), - gpu_init_->gpu_feature_info_for_hardware_gpu()); + gpu_init_->gpu_feature_info(), gpu_init_->gpu_preferences()); } VizMainImpl::~VizMainImpl() {
diff --git a/components/viz/test/test_shared_bitmap_manager.cc b/components/viz/test/test_shared_bitmap_manager.cc index e3b0933..1cf67ea 100644 --- a/components/viz/test/test_shared_bitmap_manager.cc +++ b/components/viz/test/test_shared_bitmap_manager.cc
@@ -16,26 +16,6 @@ static uint32_t g_next_sequence_number = 1; -class OwnedSharedBitmap : public SharedBitmap { - public: - OwnedSharedBitmap(std::unique_ptr<base::SharedMemory> shared_memory, - const SharedBitmapId& id) - : SharedBitmap(static_cast<uint8_t*>(shared_memory->memory()), - id, - g_next_sequence_number++), - shared_memory_(std::move(shared_memory)) {} - - ~OwnedSharedBitmap() override = default; - - // SharedBitmap: - base::UnguessableToken GetCrossProcessGUID() const override { - return shared_memory_->mapped_id(); - } - - private: - std::unique_ptr<base::SharedMemory> shared_memory_; -}; - class UnownedSharedBitmap : public SharedBitmap { public: UnownedSharedBitmap(uint8_t* pixels, @@ -59,20 +39,6 @@ TestSharedBitmapManager::~TestSharedBitmapManager() = default; -std::unique_ptr<SharedBitmap> TestSharedBitmapManager::AllocateSharedBitmap( - const gfx::Size& size, - ResourceFormat resource_format) { - DCHECK(IsBitmapFormatSupported(resource_format)); - base::AutoLock lock(lock_); - std::unique_ptr<base::SharedMemory> memory(new base::SharedMemory); - DCHECK_EQ(0, BitsPerPixel(resource_format) % 8); - size_t memory_size = size.GetArea() * BitsPerPixel(resource_format) / 8; - memory->CreateAndMapAnonymous(memory_size); - SharedBitmapId id = SharedBitmap::GenerateId(); - bitmap_map_[id] = memory.get(); - return std::make_unique<OwnedSharedBitmap>(std::move(memory), id); -} - std::unique_ptr<SharedBitmap> TestSharedBitmapManager::GetSharedBitmapFromId( const gfx::Size&, ResourceFormat,
diff --git a/components/viz/test/test_shared_bitmap_manager.h b/components/viz/test/test_shared_bitmap_manager.h index 95775e9d..ce2f435 100644 --- a/components/viz/test/test_shared_bitmap_manager.h +++ b/components/viz/test/test_shared_bitmap_manager.h
@@ -23,9 +23,6 @@ ~TestSharedBitmapManager() override; // SharedBitmapManager implementation. - std::unique_ptr<SharedBitmap> AllocateSharedBitmap( - const gfx::Size& size, - ResourceFormat format) override; std::unique_ptr<SharedBitmap> GetSharedBitmapFromId( const gfx::Size&, ResourceFormat,
diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc index 4aad657..4ef5e1f 100644 --- a/content/browser/browser_child_process_host_impl.cc +++ b/content/browser/browser_child_process_host_impl.cc
@@ -427,7 +427,7 @@ // what the bad message was. base::debug::DumpWithoutCrashing(); - child_process_->GetProcess().Terminate(RESULT_CODE_KILLED_BAD_MESSAGE, false); + child_process_->Terminate(RESULT_CODE_KILLED_BAD_MESSAGE); } void BrowserChildProcessHostImpl::OnChannelInitialized(IPC::Channel* channel) { @@ -648,8 +648,7 @@ base::debug::ScopedCrashKeyString scoped_error_key( bad_message::GetMojoErrorCrashKey(), error); base::debug::DumpWithoutCrashing(); - process->child_process_->GetProcess().Terminate( - RESULT_CODE_KILLED_BAD_MESSAGE, false); + process->child_process_->Terminate(RESULT_CODE_KILLED_BAD_MESSAGE); } #if defined(OS_WIN)
diff --git a/content/browser/browsing_data/browsing_data_filter_builder_impl.cc b/content/browser/browsing_data/browsing_data_filter_builder_impl.cc index 174800f..74ba9ff 100644 --- a/content/browser/browsing_data/browsing_data_filter_builder_impl.cc +++ b/content/browser/browsing_data/browsing_data_filter_builder_impl.cc
@@ -56,27 +56,6 @@ (mode == BrowsingDataFilterBuilder::WHITELIST)); } -// True if no domains can see the given cookie and we're a blacklist, or any -// domains can see the cookie and we're a whitelist. -// The whitelist or blacklist is represented as |domains_and_ips| and |mode|. -bool MatchesCookieForRegisterableDomainsAndIPs( - const std::set<std::string>& domains_and_ips, - BrowsingDataFilterBuilder::Mode mode, - const net::CanonicalCookie& cookie) { - if (domains_and_ips.empty()) - return mode == BrowsingDataFilterBuilder::BLACKLIST; - std::string cookie_domain = cookie.Domain(); - if (cookie.IsDomainCookie()) - cookie_domain = cookie_domain.substr(1); - std::string parsed_cookie_domain = - GetDomainAndRegistry(cookie_domain, INCLUDE_PRIVATE_REGISTRIES); - // This means we're an IP address or an internal hostname. - if (parsed_cookie_domain.empty()) - parsed_cookie_domain = cookie_domain; - return (mode == BrowsingDataFilterBuilder::WHITELIST) == - (domains_and_ips.find(parsed_cookie_domain) != domains_and_ips.end()); -} - // True if none of the supplied domains matches this Channel ID's server ID // and we're a blacklist, or one of them does and we're a whitelist. // The whitelist or blacklist is represented as |domains_and_ips| and |mode|. @@ -173,13 +152,24 @@ return filter; } -base::RepeatingCallback<bool(const net::CanonicalCookie& cookie)> -BrowsingDataFilterBuilderImpl::BuildCookieFilter() const { - DCHECK(origins_.empty()) << - "Origin-based deletion is not suitable for cookies. Please use " - "different scoping, such as RegistrableDomainFilterBuilder."; - return base::BindRepeating(&MatchesCookieForRegisterableDomainsAndIPs, - domains_, mode_); +net::CookieStore::CookieDeletionInfo +BrowsingDataFilterBuilderImpl::BuildCookieDeletionInfo() const { + DCHECK(origins_.empty()) + << "Origin-based deletion is not suitable for cookies. Please use " + "different scoping, such as RegistrableDomainFilterBuilder."; + net::CookieStore::CookieDeletionInfo delete_info; + + switch (mode_) { + case WHITELIST: + delete_info.domains_and_ips_to_delete.insert(domains_.begin(), + domains_.end()); + break; + case BLACKLIST: + delete_info.domains_and_ips_to_ignore.insert(domains_.begin(), + domains_.end()); + break; + } + return delete_info; } base::RepeatingCallback<bool(const std::string& channel_id_server_id)>
diff --git a/content/browser/browsing_data/browsing_data_filter_builder_impl.h b/content/browser/browsing_data/browsing_data_filter_builder_impl.h index ed3fe8fc..0eb04b8a 100644 --- a/content/browser/browsing_data/browsing_data_filter_builder_impl.h +++ b/content/browser/browsing_data/browsing_data_filter_builder_impl.h
@@ -26,8 +26,7 @@ BuildGeneralFilter() const override; network::mojom::ClearCacheUrlFilterPtr BuildClearCacheUrlFilter() const override; - base::RepeatingCallback<bool(const net::CanonicalCookie& pattern)> - BuildCookieFilter() const override; + net::CookieStore::CookieDeletionInfo BuildCookieDeletionInfo() const override; base::RepeatingCallback<bool(const std::string& server_id)> BuildChannelIDFilter() const override; base::RepeatingCallback<bool(const std::string& site)>
diff --git a/content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc b/content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc index 81fc09d..7e9cfb0 100644 --- a/content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc +++ b/content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc
@@ -15,6 +15,8 @@ #include "url/gurl.h" #include "url/origin.h" +using CookieDeletionInfo = net::CookieStore::CookieDeletionInfo; + namespace content { namespace { @@ -47,9 +49,7 @@ << test_case.url; } -void RunTestCase( - TestCase test_case, - const base::Callback<bool(const net::CanonicalCookie&)>& filter) { +void RunTestCase(TestCase test_case, CookieDeletionInfo delete_info) { // Test with regular cookie, http only, domain, and secure. std::string cookie_line = "A=2"; GURL test_url(test_case.url); @@ -59,28 +59,28 @@ EXPECT_TRUE(cookie) << cookie_line << " from " << test_case.url << " is not a valid cookie"; if (cookie) - EXPECT_EQ(test_case.should_match, filter.Run(*cookie)) + EXPECT_EQ(test_case.should_match, delete_info.Matches(*cookie)) << cookie->DebugString(); cookie_line = std::string("A=2;domain=") + test_url.host(); cookie = net::CanonicalCookie::Create( test_url, cookie_line, base::Time::Now(), net::CookieOptions()); if (cookie) - EXPECT_EQ(test_case.should_match, filter.Run(*cookie)) + EXPECT_EQ(test_case.should_match, delete_info.Matches(*cookie)) << cookie->DebugString(); cookie_line = std::string("A=2; HttpOnly;") + test_url.host(); cookie = net::CanonicalCookie::Create( test_url, cookie_line, base::Time::Now(), net::CookieOptions()); if (cookie) - EXPECT_EQ(test_case.should_match, filter.Run(*cookie)) + EXPECT_EQ(test_case.should_match, delete_info.Matches(*cookie)) << cookie->DebugString(); cookie_line = std::string("A=2; HttpOnly; Secure;") + test_url.host(); cookie = net::CanonicalCookie::Create( test_url, cookie_line, base::Time::Now(), net::CookieOptions()); if (cookie) - EXPECT_EQ(test_case.should_match, filter.Run(*cookie)) + EXPECT_EQ(test_case.should_match, delete_info.Matches(*cookie)) << cookie->DebugString(); } @@ -210,8 +210,6 @@ builder.AddRegisterableDomain(std::string(kIPAddress)); builder.AddRegisterableDomain(std::string(kUnknownRegistryDomain)); builder.AddRegisterableDomain(std::string(kInternalHostname)); - base::Callback<bool(const net::CanonicalCookie&)> filter = - builder.BuildCookieFilter(); TestCase test_cases[] = { // Any cookie with the same registerable domain as the origins is matched. @@ -250,7 +248,7 @@ }; for (TestCase test_case : test_cases) - RunTestCase(test_case, filter); + RunTestCase(test_case, builder.BuildCookieDeletionInfo()); } TEST(BrowsingDataFilterBuilderImplTest, @@ -262,8 +260,6 @@ builder.AddRegisterableDomain(std::string(kIPAddress)); builder.AddRegisterableDomain(std::string(kUnknownRegistryDomain)); builder.AddRegisterableDomain(std::string(kInternalHostname)); - base::Callback<bool(const net::CanonicalCookie&)> filter = - builder.BuildCookieFilter(); TestCase test_cases[] = { // Any cookie that doesn't have the same registerable domain is matched. @@ -302,7 +298,7 @@ }; for (TestCase test_case : test_cases) - RunTestCase(test_case, filter); + RunTestCase(test_case, builder.BuildCookieDeletionInfo()); } TEST(BrowsingDataFilterBuilderImplTest,
diff --git a/content/browser/browsing_data/browsing_data_remover_impl.cc b/content/browser/browsing_data/browsing_data_remover_impl.cc index bb4e8bd4..5ded314 100644 --- a/content/browser/browsing_data/browsing_data_remover_impl.cc +++ b/content/browser/browsing_data/browsing_data_remover_impl.cc
@@ -435,12 +435,12 @@ } // If cookies are supposed to be conditionally deleted from the storage - // partition, create a cookie matcher function. - StoragePartition::CookieMatcherFunction cookie_matcher; + // partition, create the deletion info object. + net::CookieStore::CookieDeletionInfo cookie_delete_info; if (!filter_builder.IsEmptyBlacklist() && (storage_partition_remove_mask & StoragePartition::REMOVE_DATA_MASK_COOKIES)) { - cookie_matcher = filter_builder.BuildCookieFilter(); + cookie_delete_info = filter_builder.BuildCookieDeletionInfo(); } BrowsingDataRemoverDelegate::EmbedderOriginTypeMatcher embedder_matcher; @@ -451,7 +451,7 @@ storage_partition_remove_mask, quota_storage_remove_mask, base::BindRepeating(&DoesOriginMatchMaskAndURLs, origin_type_mask_, filter, std::move(embedder_matcher)), - std::move(cookie_matcher), delete_begin_, delete_end_, + std::move(cookie_delete_info), delete_begin_, delete_end_, CreatePendingTaskCompletionClosure()); }
diff --git a/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc b/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc index cf4705ac..729276a 100644 --- a/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc +++ b/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc
@@ -112,9 +112,7 @@ base::Time remove_begin; base::Time remove_end; StoragePartition::OriginMatcherFunction origin_matcher; - StoragePartition::CookieMatcherFunction cookie_matcher; - - StoragePartitionRemovalData() {} + net::CookieStore::CookieDeletionInfo cookie_delete_info; }; net::CanonicalCookie CreateCookieWithHost(const GURL& source) { @@ -162,7 +160,7 @@ void ClearData(uint32_t remove_mask, uint32_t quota_storage_remove_mask, const OriginMatcherFunction& origin_matcher, - const CookieMatcherFunction& cookie_matcher, + net::CookieStore::CookieDeletionInfo cookie_delete_info, const base::Time begin, const base::Time end, base::OnceClosure callback) override { @@ -173,7 +171,8 @@ storage_partition_removal_data_.remove_begin = begin; storage_partition_removal_data_.remove_end = end; storage_partition_removal_data_.origin_matcher = origin_matcher; - storage_partition_removal_data_.cookie_matcher = cookie_matcher; + storage_partition_removal_data_.cookie_delete_info = + std::move(cookie_delete_info); BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, @@ -182,7 +181,7 @@ base::Unretained(this), std::move(callback))); } - StoragePartitionRemovalData GetStoragePartitionRemovalData() { + const StoragePartitionRemovalData& GetStoragePartitionRemovalData() const { return storage_partition_removal_data_; } @@ -548,7 +547,7 @@ int GetOriginTypeMask() { return remover_->GetLastUsedOriginTypeMask(); } - StoragePartitionRemovalData GetStoragePartitionRemovalData() { + const StoragePartitionRemovalData& GetStoragePartitionRemovalData() const { return storage_partition_removal_data_; } @@ -645,12 +644,16 @@ // Even though it's a different origin, it's the same domain. EXPECT_FALSE(removal_data.origin_matcher.Run(kOrigin4, mock_policy())); - EXPECT_FALSE(removal_data.cookie_matcher.Run(CreateCookieWithHost(kOrigin1))); - EXPECT_TRUE(removal_data.cookie_matcher.Run(CreateCookieWithHost(kOrigin2))); - EXPECT_FALSE(removal_data.cookie_matcher.Run(CreateCookieWithHost(kOrigin3))); + EXPECT_FALSE( + removal_data.cookie_delete_info.Matches(CreateCookieWithHost(kOrigin1))); + EXPECT_TRUE( + removal_data.cookie_delete_info.Matches(CreateCookieWithHost(kOrigin2))); + EXPECT_FALSE( + removal_data.cookie_delete_info.Matches(CreateCookieWithHost(kOrigin3))); // This is false, because this is the same domain as 3, just with a different // scheme. - EXPECT_FALSE(removal_data.cookie_matcher.Run(CreateCookieWithHost(kOrigin4))); + EXPECT_FALSE( + removal_data.cookie_delete_info.Matches(CreateCookieWithHost(kOrigin4))); } // Test that removing cookies clears HTTP auth data.
diff --git a/content/browser/devtools/protocol/system_info_handler.cc b/content/browser/devtools/protocol/system_info_handler.cc index ca7da4d..3a90a35d 100644 --- a/content/browser/devtools/protocol/system_info_handler.cc +++ b/content/browser/devtools/protocol/system_info_handler.cc
@@ -184,8 +184,7 @@ // TODO(zmo): CHECK everywhere once https://crbug.com/796386 is fixed. gpu::GpuFeatureInfo gpu_feature_info = gpu::ComputeGpuFeatureInfoWithHardwareAccelerationDisabled(); - GpuDataManagerImpl::GetInstance()->UpdateGpuFeatureInfo( - gpu_feature_info, gpu::GpuFeatureInfo()); + GpuDataManagerImpl::GetInstance()->UpdateGpuFeatureInfo(gpu_feature_info); UnregisterAndSendResponse(); #else CHECK(false) << "Gathering system GPU info took more than 5 seconds.";
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc index 057be44..88e9a45 100644 --- a/content/browser/download/download_manager_impl.cc +++ b/content/browser/download/download_manager_impl.cc
@@ -37,7 +37,7 @@ #include "components/download/public/common/download_url_loader_factory_getter.h" #include "components/download/public/common/download_url_parameters.h" #include "components/download/public/common/download_utils.h" -#include "components/download/public/common/resource_downloader.h" +#include "components/download/public/common/in_progress_download_manager.h" #include "components/download/public/common/url_download_handler_factory.h" #include "content/browser/byte_stream.h" #include "content/browser/child_process_security_policy_impl.h" @@ -207,37 +207,6 @@ download_manager, std::move(downloader))); } -void BeginResourceDownload( - std::unique_ptr<download::DownloadUrlParameters> params, - std::unique_ptr<network::ResourceRequest> request, - scoped_refptr<download::DownloadURLLoaderFactoryGetter> - url_loader_factory_getter, - uint32_t download_id, - base::WeakPtr<DownloadManagerImpl> download_manager, - const GURL& site_url, - const GURL& tab_url, - const GURL& tab_referrer_url, - const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { - DCHECK_CURRENTLY_ON(BrowserThread::IO); - - // TODO(qinmin): Check the storage permission before creating the URLLoader. - // This is already done for context menu download, but it is missing for - // download service and download resumption. - download::UrlDownloadHandler::UniqueUrlDownloadHandlerPtr downloader( - download::ResourceDownloader::BeginDownload( - download_manager, std::move(params), std::move(request), - url_loader_factory_getter, site_url, tab_url, tab_referrer_url, - download_id, false, task_runner) - .release(), - base::OnTaskRunnerDeleter(base::ThreadTaskRunnerHandle::Get())); - - task_runner->PostTask( - FROM_HERE, - base::BindOnce( - &download::UrlDownloadHandler::Delegate::OnUrlDownloadHandlerCreated, - download_manager, std::move(downloader))); -} - class DownloadItemFactoryImpl : public download::DownloadItemFactory { public: DownloadItemFactoryImpl() {} @@ -411,6 +380,7 @@ in_progress_cache_initialized_(false), browser_context_(browser_context), delegate_(nullptr), + in_progress_manager_(new download::InProgressDownloadManager(this)), weak_factory_(this) { DCHECK(browser_context); download::SetIOTaskRunner( @@ -553,6 +523,8 @@ // We'll have nothing more to report to the observers after this point. observers_.Clear(); + in_progress_manager_->ShutDown(); + if (delegate_) delegate_->Shutdown(); delegate_ = nullptr; @@ -1262,53 +1234,13 @@ } StoragePartitionImpl* storage_partition = GetStoragePartition(browser_context_, render_process_id, render_frame_id); - BrowserThread::PostTask( - BrowserThread::IO, FROM_HERE, - base::BindOnce(&DownloadManagerImpl::CreateDownloadHandlerForNavigation, - weak_factory_.GetWeakPtr(), std::move(resource_request), - render_process_id, render_frame_id, site_url, tab_url, - tab_referrer_url, std::move(url_chain), suggested_filename, - std::move(response), std::move(cert_status), - std::move(url_loader_client_endpoints), - CreateDownloadURLLoaderFactoryGetter( - storage_partition, render_frame_host, - suggested_filename.has_value()), - base::MessageLoop::current()->task_runner())); -} - -// static -void DownloadManagerImpl::CreateDownloadHandlerForNavigation( - base::WeakPtr<DownloadManagerImpl> download_manager, - std::unique_ptr<network::ResourceRequest> resource_request, - int render_process_id, - int render_frame_id, - const GURL& site_url, - const GURL& tab_url, - const GURL& tab_referrer_url, - std::vector<GURL> url_chain, - const base::Optional<std::string>& suggested_filename, - scoped_refptr<network::ResourceResponse> response, - net::CertStatus cert_status, - network::mojom::URLLoaderClientEndpointsPtr url_loader_client_endpoints, - scoped_refptr<download::DownloadURLLoaderFactoryGetter> - url_loader_factory_getter, - const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { - DCHECK_CURRENTLY_ON(BrowserThread::IO); - - download::UrlDownloadHandler::UniqueUrlDownloadHandlerPtr resource_downloader( - download::ResourceDownloader::InterceptNavigationResponse( - download_manager, std::move(resource_request), render_process_id, - render_frame_id, site_url, tab_url, tab_referrer_url, - std::move(url_chain), suggested_filename, std::move(response), - std::move(cert_status), std::move(url_loader_client_endpoints), - std::move(url_loader_factory_getter), task_runner) - .release(), - base::OnTaskRunnerDeleter(base::ThreadTaskRunnerHandle::Get())); - - BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, - base::BindOnce(&DownloadManagerImpl::OnUrlDownloadHandlerCreated, - download_manager, std::move(resource_downloader))); + in_progress_manager_->InterceptDownloadFromNavigation( + std::move(resource_request), render_process_id, render_frame_id, site_url, + tab_url, tab_referrer_url, std::move(url_chain), suggested_filename, + std::move(response), std::move(cert_status), + std::move(url_loader_client_endpoints), + CreateDownloadURLLoaderFactoryGetter(storage_partition, render_frame_host, + suggested_filename.has_value())); } void DownloadManagerImpl::BeginDownloadInternal( @@ -1328,8 +1260,6 @@ } if (base::FeatureList::IsEnabled(network::features::kNetworkService)) { - std::unique_ptr<network::ResourceRequest> request = - download::CreateResourceRequest(params.get()); GURL site_url, tab_url, tab_referrer_url; auto* rfh = RenderFrameHost::FromID(params->render_process_host_id(), params->render_frame_host_routing_id()); @@ -1352,13 +1282,10 @@ url_loader_factory_getter = CreateDownloadURLLoaderFactoryGetter( storage_partition, rfh, !params->suggested_name().empty()); } - BrowserThread::PostTask( - BrowserThread::IO, FROM_HERE, - base::BindOnce(&BeginResourceDownload, std::move(params), - std::move(request), std::move(url_loader_factory_getter), - id, weak_factory_.GetWeakPtr(), site_url, tab_url, - tab_referrer_url, - base::MessageLoop::current()->task_runner())); + + in_progress_manager_->StartDownload( + std::move(params), std::move(url_loader_factory_getter), id, site_url, + tab_url, tab_referrer_url); } else { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE,
diff --git a/content/browser/download/download_manager_impl.h b/content/browser/download/download_manager_impl.h index a13ab73..a35035e 100644 --- a/content/browser/download/download_manager_impl.h +++ b/content/browser/download/download_manager_impl.h
@@ -37,6 +37,7 @@ class DownloadItemFactory; class DownloadItemImpl; class DownloadRequestHandleInterface; +class InProgressDownloadManager; } namespace content { @@ -221,7 +222,6 @@ void OnFileExistenceChecked(uint32_t download_id, bool result); // Overridden from DownloadItemImplDelegate - // (Note that |GetBrowserContext| are present in both interfaces.) void DetermineDownloadTarget(download::DownloadItemImpl* item, const DownloadTargetCallback& callback) override; bool ShouldCompleteDownload(download::DownloadItemImpl* item, @@ -263,26 +263,6 @@ network::mojom::URLLoaderClientEndpointsPtr url_loader_client_endpoints, bool is_download_allowed); - // Called when a navigation turns to be a download. Create a new - // DownloadHandler. It will be used to continue the loading instead of the - // regular document loader. Must be called on the IO thread. - static void CreateDownloadHandlerForNavigation( - base::WeakPtr<DownloadManagerImpl> download_manager, - std::unique_ptr<network::ResourceRequest> resource_request, - int render_process_id, - int render_frame_id, - const GURL& site_url, - const GURL& tab_url, - const GURL& tab_referrer_url, - std::vector<GURL> url_chain, - const base::Optional<std::string>& suggested_filename, - scoped_refptr<network::ResourceResponse> response, - net::CertStatus cert_status, - network::mojom::URLLoaderClientEndpointsPtr url_loader_client_endpoints, - scoped_refptr<download::DownloadURLLoaderFactoryGetter> - url_loader_factory_getter, - const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); - // Factory for creation of downloads items. std::unique_ptr<download::DownloadItemFactory> item_factory_; @@ -327,9 +307,12 @@ // Allows an embedder to control behavior. Guaranteed to outlive this object. DownloadManagerDelegate* delegate_; + // TODO(qinmin): remove this once network service is enabled by default. std::vector<download::UrlDownloadHandler::UniqueUrlDownloadHandlerPtr> url_download_handlers_; + std::unique_ptr<download::InProgressDownloadManager> in_progress_manager_; + base::WeakPtrFactory<DownloadManagerImpl> weak_factory_; DISALLOW_COPY_AND_ASSIGN(DownloadManagerImpl);
diff --git a/content/browser/fileapi/browser_file_system_helper.cc b/content/browser/fileapi/browser_file_system_helper.cc index 9e56a72..c07e2e5 100644 --- a/content/browser/fileapi/browser_file_system_helper.cc +++ b/content/browser/fileapi/browser_file_system_helper.cc
@@ -5,6 +5,7 @@ #include "content/browser/fileapi/browser_file_system_helper.h" #include <stddef.h> +#include <memory> #include <string> #include <utility> #include <vector> @@ -62,12 +63,8 @@ switches::kAllowFileAccessFromFiles)) { additional_allowed_schemes.push_back(url::kFileScheme); } - std::unique_ptr<leveldb::Env> env_override; - if (is_incognito) - env_override = leveldb_chrome::NewMemEnv("filesystem"); - // TODO(crbug.com/823854) Fix leaking override MemEnv. - return FileSystemOptions(profile_mode, additional_allowed_schemes, - env_override.release()); + return FileSystemOptions(profile_mode, is_incognito, + additional_allowed_schemes); } } // namespace
diff --git a/content/browser/fileapi/browser_file_system_helper_unittest.cc b/content/browser/fileapi/browser_file_system_helper_unittest.cc index c1c84c3..1b0cff4 100644 --- a/content/browser/fileapi/browser_file_system_helper_unittest.cc +++ b/content/browser/fileapi/browser_file_system_helper_unittest.cc
@@ -62,7 +62,7 @@ new base::NullTaskRunner); storage::FileSystemOptions file_system_options( storage::FileSystemOptions::PROFILE_MODE_NORMAL, - std::vector<std::string>(), nullptr); + false /* force_in_memory */, std::vector<std::string>()); scoped_refptr<storage::FileSystemContext> test_file_system_context( new storage::FileSystemContext( io_task_runner.get(), file_task_runner.get(),
diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc index 5946d9f5..741a816 100644 --- a/content/browser/gpu/compositor_util.cc +++ b/content/browser/gpu/compositor_util.cc
@@ -26,9 +26,6 @@ #include "content/public/common/content_features.h" #include "content/public/common/content_switches.h" #include "gpu/command_buffer/common/gpu_memory_buffer_support.h" -#include "gpu/config/gpu_blacklist.h" -#include "gpu/config/gpu_driver_bug_list.h" -#include "gpu/config/gpu_driver_bug_workaround_type.h" #include "gpu/config/gpu_feature_type.h" #include "gpu/config/gpu_finch_features.h" #include "gpu/config/gpu_switches.h" @@ -45,8 +42,6 @@ const int kMinMSAASampleCount = 0; -enum class GpuFeatureInfoType { kCurrent, kForHardwareGpu }; - struct GpuFeatureData { std::string name; gpu::GpuFeatureStatus status; @@ -61,96 +56,80 @@ return command_line->HasSwitch(switches::kForceGpuRasterization); } -gpu::GpuFeatureStatus SafeGetFeatureStatus( - const gpu::GpuFeatureInfo& gpu_feature_info, - gpu::GpuFeatureType feature) { - if (!gpu_feature_info.IsInitialized()) { +gpu::GpuFeatureStatus SafeGetFeatureStatus(GpuDataManagerImpl* manager, + gpu::GpuFeatureType feature) { + if (!manager->IsGpuFeatureInfoAvailable()) { // The GPU process probably crashed during startup, but we can't // assert this as the test bots are slow, and recording the crash // is racy. Be robust and just say that all features are disabled. return gpu::kGpuFeatureStatusDisabled; } - DCHECK(feature >= 0 && feature < gpu::NUMBER_OF_GPU_FEATURE_TYPES); - return gpu_feature_info.status_values[feature]; + return manager->GetFeatureStatus(feature); } -gpu::GpuFeatureStatus GetGpuCompositingStatus( - const gpu::GpuFeatureInfo& gpu_feature_info, - GpuFeatureInfoType type) { +gpu::GpuFeatureStatus GetGpuCompositingStatus() { gpu::GpuFeatureStatus status = SafeGetFeatureStatus( - gpu_feature_info, gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING); + GpuDataManagerImpl::GetInstance(), gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING); #if defined(USE_AURA) || defined(OS_MACOSX) - if (type == GpuFeatureInfoType::kCurrent && - status == gpu::kGpuFeatureStatusEnabled && + if (status == gpu::kGpuFeatureStatusEnabled && ImageTransportFactory::GetInstance()->IsGpuCompositingDisabled()) { - // We only adjust the status for kCurrent, because compositing status - // affects other feature status, and we want to preserve the kHardwareGpu - // feature status and don't want them to be modified by the current - // compositing status. status = gpu::kGpuFeatureStatusDisabled; } #endif return status; } -const GpuFeatureData GetGpuFeatureData( - const gpu::GpuFeatureInfo& gpu_feature_info, - GpuFeatureInfoType type, - size_t index, - bool* eof) { +const GpuFeatureData GetGpuFeatureData(size_t index, bool* eof) { const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); + GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance(); const GpuFeatureData kGpuFeatureData[] = { {"2d_canvas", - SafeGetFeatureStatus(gpu_feature_info, + SafeGetFeatureStatus(manager, gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS), command_line.HasSwitch(switches::kDisableAccelerated2dCanvas), - "Accelerated 2D canvas is unavailable: either disabled via blacklist or" - " the command line.", + "Accelerated 2D canvas is unavailable: either disabled via blacklist or " + "the command line.", true, true}, - {"gpu_compositing", GetGpuCompositingStatus(gpu_feature_info, type), + {"gpu_compositing", GetGpuCompositingStatus(), command_line.HasSwitch(switches::kDisableGpuCompositing), "Gpu compositing has been disabled, either via blacklist, about:flags " "or the command line. The browser will fall back to software " "compositing and hardware acceleration will be unavailable.", true, true}, {"webgl", - SafeGetFeatureStatus(gpu_feature_info, - gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL), + SafeGetFeatureStatus(manager, gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL), command_line.HasSwitch(switches::kDisableWebGL), "WebGL has been disabled via blacklist or the command line.", false, true}, - {"flash_3d", - SafeGetFeatureStatus(gpu_feature_info, gpu::GPU_FEATURE_TYPE_FLASH3D), + {"flash_3d", SafeGetFeatureStatus(manager, gpu::GPU_FEATURE_TYPE_FLASH3D), command_line.HasSwitch(switches::kDisableFlash3d), "Using 3d in flash has been disabled, either via blacklist, about:flags " "or the command line.", true, true}, {"flash_stage3d", - SafeGetFeatureStatus(gpu_feature_info, - gpu::GPU_FEATURE_TYPE_FLASH_STAGE3D), + SafeGetFeatureStatus(manager, gpu::GPU_FEATURE_TYPE_FLASH_STAGE3D), command_line.HasSwitch(switches::kDisableFlashStage3d), "Using Stage3d in Flash has been disabled, either via blacklist, " "about:flags or the command line.", true, true}, {"flash_stage3d_baseline", - SafeGetFeatureStatus(gpu_feature_info, + SafeGetFeatureStatus(manager, gpu::GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE), command_line.HasSwitch(switches::kDisableFlashStage3d), "Using Stage3d Baseline profile in Flash has been disabled, either via " "blacklist, about:flags or the command line.", true, true}, {"video_decode", - SafeGetFeatureStatus(gpu_feature_info, + SafeGetFeatureStatus(manager, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), "Accelerated video decode has been disabled, either via blacklist, " "about:flags or the command line.", true, true}, {"rasterization", - SafeGetFeatureStatus(gpu_feature_info, - gpu::GPU_FEATURE_TYPE_GPU_RASTERIZATION), + SafeGetFeatureStatus(manager, gpu::GPU_FEATURE_TYPE_GPU_RASTERIZATION), (command_line.HasSwitch(switches::kDisableGpuRasterization) && !IsForceGpuRasterizationEnabled()), "Accelerated rasterization has been disabled, either via blacklist, " @@ -170,8 +149,7 @@ "line.", false, false}, {"webgl2", - SafeGetFeatureStatus(gpu_feature_info, - gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL2), + SafeGetFeatureStatus(manager, gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL2), (command_line.HasSwitch(switches::kDisableWebGL) || command_line.HasSwitch(switches::kDisableWebGL2)), "WebGL2 has been disabled via blacklist or the command line.", false, @@ -190,142 +168,6 @@ return kGpuFeatureData[index]; } -std::unique_ptr<base::DictionaryValue> GetFeatureStatusImpl( - GpuFeatureInfoType type) { - GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance(); - std::string gpu_access_blocked_reason; - bool gpu_access_blocked = - !manager->GpuAccessAllowed(&gpu_access_blocked_reason); - const gpu::GpuFeatureInfo gpu_feature_info = - type == GpuFeatureInfoType::kCurrent - ? manager->GetGpuFeatureInfo() - : manager->GetGpuFeatureInfoForHardwareGpu(); - - auto feature_status_dict = std::make_unique<base::DictionaryValue>(); - - bool eof = false; - for (size_t i = 0; !eof; ++i) { - const GpuFeatureData gpu_feature_data = - GetGpuFeatureData(gpu_feature_info, type, i, &eof); - std::string status; - if (gpu_feature_data.disabled || gpu_access_blocked || - gpu_feature_data.status == gpu::kGpuFeatureStatusDisabled) { - status = "disabled"; - if (gpu_feature_data.fallback_to_software) - status += "_software"; - else - status += "_off"; - } else if (gpu_feature_data.status == gpu::kGpuFeatureStatusBlacklisted) { - status = "unavailable_off"; - } else if (gpu_feature_data.status == gpu::kGpuFeatureStatusSoftware) { - status = "unavailable_software"; - } else { - status = "enabled"; - if ((gpu_feature_data.name == "webgl" || - gpu_feature_data.name == "webgl2") && - (GetGpuCompositingStatus(gpu_feature_info, type) != - gpu::kGpuFeatureStatusEnabled)) - status += "_readback"; - if (gpu_feature_data.name == "rasterization") { - if (IsForceGpuRasterizationEnabled()) - status += "_force"; - } - if (gpu_feature_data.name == "multiple_raster_threads") { - const base::CommandLine& command_line = - *base::CommandLine::ForCurrentProcess(); - if (command_line.HasSwitch(switches::kNumRasterThreads)) - status += "_force"; - status += "_on"; - } - if (gpu_feature_data.name == "checker_imaging") { - const base::CommandLine& command_line = - *base::CommandLine::ForCurrentProcess(); - if (command_line.HasSwitch(cc::switches::kEnableCheckerImaging)) - status += "_force"; - status += "_on"; - } - if (gpu_feature_data.name == "surface_synchronization") { - if (features::IsSurfaceSynchronizationEnabled()) - status += "_on"; - } - if (gpu_feature_data.name == "viz_display_compositor") { - if (base::FeatureList::IsEnabled(features::kVizDisplayCompositor)) - status += "_on"; - } - } - feature_status_dict->SetString(gpu_feature_data.name, status); - } - return feature_status_dict; -} - -std::unique_ptr<base::ListValue> GetProblemsImpl(GpuFeatureInfoType type) { - GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance(); - std::string gpu_access_blocked_reason; - bool gpu_access_blocked = - !manager->GpuAccessAllowed(&gpu_access_blocked_reason); - const gpu::GpuFeatureInfo gpu_feature_info = - type == GpuFeatureInfoType::kCurrent - ? manager->GetGpuFeatureInfo() - : manager->GetGpuFeatureInfoForHardwareGpu(); - - auto problem_list = std::make_unique<base::ListValue>(); - if (!gpu_feature_info.applied_gpu_blacklist_entries.empty()) { - std::unique_ptr<gpu::GpuBlacklist> blacklist(gpu::GpuBlacklist::Create()); - blacklist->GetReasons(problem_list.get(), "disabledFeatures", - gpu_feature_info.applied_gpu_blacklist_entries); - } - if (!gpu_feature_info.applied_gpu_driver_bug_list_entries.empty()) { - std::unique_ptr<gpu::GpuDriverBugList> bug_list( - gpu::GpuDriverBugList::Create()); - bug_list->GetReasons(problem_list.get(), "workarounds", - gpu_feature_info.applied_gpu_driver_bug_list_entries); - } - - if (gpu_access_blocked) { - auto problem = std::make_unique<base::DictionaryValue>(); - problem->SetString("description", "GPU process was unable to boot: " + - gpu_access_blocked_reason); - problem->Set("crBugs", std::make_unique<base::ListValue>()); - auto disabled_features = std::make_unique<base::ListValue>(); - disabled_features->AppendString("all"); - problem->Set("affectedGpuSettings", std::move(disabled_features)); - problem->SetString("tag", "disabledFeatures"); - problem_list->Insert(0, std::move(problem)); - } - - bool eof = false; - for (size_t i = 0; !eof; ++i) { - const GpuFeatureData gpu_feature_data = - GetGpuFeatureData(gpu_feature_info, type, i, &eof); - if (gpu_feature_data.disabled) { - auto problem = std::make_unique<base::DictionaryValue>(); - problem->SetString("description", gpu_feature_data.disabled_description); - problem->Set("crBugs", std::make_unique<base::ListValue>()); - auto disabled_features = std::make_unique<base::ListValue>(); - disabled_features->AppendString(gpu_feature_data.name); - problem->Set("affectedGpuSettings", std::move(disabled_features)); - problem->SetString("tag", "disabledFeatures"); - problem_list->Append(std::move(problem)); - } - } - return problem_list; -} - -std::vector<std::string> GetDriverBugWorkaroundsImpl(GpuFeatureInfoType type) { - GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance(); - const gpu::GpuFeatureInfo gpu_feature_info = - type == GpuFeatureInfoType::kCurrent - ? manager->GetGpuFeatureInfo() - : manager->GetGpuFeatureInfoForHardwareGpu(); - - std::vector<std::string> workarounds; - for (auto workaround : gpu_feature_info.enabled_gpu_driver_bug_workarounds) { - workarounds.push_back(gpu::GpuDriverBugWorkaroundTypeToString( - static_cast<gpu::GpuDriverBugWorkaroundType>(workaround))); - } - return workarounds; -} - } // namespace int NumberOfRendererRasterThreads() { @@ -454,27 +296,106 @@ } std::unique_ptr<base::DictionaryValue> GetFeatureStatus() { - return GetFeatureStatusImpl(GpuFeatureInfoType::kCurrent); + GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance(); + bool gpu_access_blocked = !manager->GpuAccessAllowed(nullptr); + + auto feature_status_dict = std::make_unique<base::DictionaryValue>(); + + bool eof = false; + for (size_t i = 0; !eof; ++i) { + const GpuFeatureData gpu_feature_data = GetGpuFeatureData(i, &eof); + std::string status; + if (gpu_feature_data.disabled || + (gpu_feature_data.needs_gpu_access && gpu_access_blocked) || + gpu_feature_data.status == gpu::kGpuFeatureStatusDisabled) { + status = "disabled"; + if (gpu_feature_data.fallback_to_software) + status += "_software"; + else + status += "_off"; + } else if (gpu_feature_data.status == gpu::kGpuFeatureStatusBlacklisted) { + status = "unavailable_off"; + } else if (gpu_feature_data.status == gpu::kGpuFeatureStatusSoftware) { + status = "unavailable_software"; + } else { + status = "enabled"; + if ((gpu_feature_data.name == "webgl" || + gpu_feature_data.name == "webgl2") && + (manager->GetFeatureStatus(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING) != + gpu::kGpuFeatureStatusEnabled)) + status += "_readback"; + if (gpu_feature_data.name == "rasterization") { + if (IsForceGpuRasterizationEnabled()) + status += "_force"; + } + if (gpu_feature_data.name == "multiple_raster_threads") { + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); + if (command_line.HasSwitch(switches::kNumRasterThreads)) + status += "_force"; + status += "_on"; + } + if (gpu_feature_data.name == "checker_imaging") { + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); + if (command_line.HasSwitch(cc::switches::kEnableCheckerImaging)) + status += "_force"; + status += "_on"; + } + if (gpu_feature_data.name == "surface_synchronization") { + if (features::IsSurfaceSynchronizationEnabled()) + status += "_on"; + } + if (gpu_feature_data.name == "viz_display_compositor") { + if (base::FeatureList::IsEnabled(features::kVizDisplayCompositor)) + status += "_on"; + } + } + feature_status_dict->SetString(gpu_feature_data.name, status); + } + return feature_status_dict; } std::unique_ptr<base::ListValue> GetProblems() { - return GetProblemsImpl(GpuFeatureInfoType::kCurrent); + GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance(); + std::string gpu_access_blocked_reason; + bool gpu_access_blocked = + !manager->GpuAccessAllowed(&gpu_access_blocked_reason); + + auto problem_list = std::make_unique<base::ListValue>(); + manager->GetBlacklistReasons(problem_list.get()); + + if (gpu_access_blocked) { + auto problem = std::make_unique<base::DictionaryValue>(); + problem->SetString("description", "GPU was unable to initialize: " + + gpu_access_blocked_reason); + problem->Set("crBugs", std::make_unique<base::ListValue>()); + auto disabled_features = std::make_unique<base::ListValue>(); + disabled_features->AppendString("all"); + problem->Set("affectedGpuSettings", std::move(disabled_features)); + problem->SetString("tag", "disabledFeatures"); + problem_list->Insert(0, std::move(problem)); + } + + bool eof = false; + for (size_t i = 0; !eof; ++i) { + const GpuFeatureData gpu_feature_data = GetGpuFeatureData(i, &eof); + if (gpu_feature_data.disabled) { + auto problem = std::make_unique<base::DictionaryValue>(); + problem->SetString("description", gpu_feature_data.disabled_description); + problem->Set("crBugs", std::make_unique<base::ListValue>()); + auto disabled_features = std::make_unique<base::ListValue>(); + disabled_features->AppendString(gpu_feature_data.name); + problem->Set("affectedGpuSettings", std::move(disabled_features)); + problem->SetString("tag", "disabledFeatures"); + problem_list->Append(std::move(problem)); + } + } + return problem_list; } std::vector<std::string> GetDriverBugWorkarounds() { - return GetDriverBugWorkaroundsImpl(GpuFeatureInfoType::kCurrent); -} - -std::unique_ptr<base::DictionaryValue> GetFeatureStatusForHardwareGpu() { - return GetFeatureStatusImpl(GpuFeatureInfoType::kForHardwareGpu); -} - -std::unique_ptr<base::ListValue> GetProblemsForHardwareGpu() { - return GetProblemsImpl(GpuFeatureInfoType::kForHardwareGpu); -} - -std::vector<std::string> GetDriverBugWorkaroundsForHardwareGpu() { - return GetDriverBugWorkaroundsImpl(GpuFeatureInfoType::kForHardwareGpu); + return GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(); } std::vector<gfx::BufferUsageAndFormat>
diff --git a/content/browser/gpu/compositor_util.h b/content/browser/gpu/compositor_util.h index 2535f08a..d31715e 100644 --- a/content/browser/gpu/compositor_util.h +++ b/content/browser/gpu/compositor_util.h
@@ -47,11 +47,6 @@ CONTENT_EXPORT std::unique_ptr<base::ListValue> GetProblems(); CONTENT_EXPORT std::vector<std::string> GetDriverBugWorkarounds(); -CONTENT_EXPORT std::unique_ptr<base::DictionaryValue> -GetFeatureStatusForHardwareGpu(); -CONTENT_EXPORT std::unique_ptr<base::ListValue> GetProblemsForHardwareGpu(); -CONTENT_EXPORT std::vector<std::string> GetDriverBugWorkaroundsForHardwareGpu(); - // Populate a list of buffer usage/format for which a per platform specific // texture target must be used instead of GL_TEXTURE_2D. CONTENT_EXPORT std::vector<gfx::BufferUsageAndFormat>
diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc index 47dfcfa..13f75be6 100644 --- a/content/browser/gpu/gpu_data_manager_impl.cc +++ b/content/browser/gpu/gpu_data_manager_impl.cc
@@ -94,6 +94,12 @@ return private_->HardwareAccelerationEnabled(); } +void GpuDataManagerImpl::GetDisabledExtensions( + std::string* disabled_extensions) const { + base::AutoLock auto_lock(lock_); + private_->GetDisabledExtensions(disabled_extensions); +} + void GpuDataManagerImpl::RequestGpuSupportedRuntimeVersion() const { base::AutoLock auto_lock(lock_); private_->RequestGpuSupportedRuntimeVersion(); @@ -104,19 +110,21 @@ return private_->GpuProcessStartAllowed(); } -void GpuDataManagerImpl::UpdateGpuInfo( - const gpu::GPUInfo& gpu_info, - const gpu::GPUInfo* optional_gpu_info_for_hardware_gpu) { +void GpuDataManagerImpl::GetDisabledWebGLExtensions( + std::string* disabled_webgl_extensions) const { base::AutoLock auto_lock(lock_); - private_->UpdateGpuInfo(gpu_info, optional_gpu_info_for_hardware_gpu); + private_->GetDisabledWebGLExtensions(disabled_webgl_extensions); +} + +void GpuDataManagerImpl::UpdateGpuInfo(const gpu::GPUInfo& gpu_info) { + base::AutoLock auto_lock(lock_); + private_->UpdateGpuInfo(gpu_info); } void GpuDataManagerImpl::UpdateGpuFeatureInfo( - const gpu::GpuFeatureInfo& gpu_feature_info, - const gpu::GpuFeatureInfo& gpu_feature_info_for_hardware_gpu) { + const gpu::GpuFeatureInfo& gpu_feature_info) { base::AutoLock auto_lock(lock_); - private_->UpdateGpuFeatureInfo(gpu_feature_info, - gpu_feature_info_for_hardware_gpu); + private_->UpdateGpuFeatureInfo(gpu_feature_info); } gpu::GpuFeatureInfo GpuDataManagerImpl::GetGpuFeatureInfo() const { @@ -124,17 +132,6 @@ return private_->GetGpuFeatureInfo(); } -gpu::GPUInfo GpuDataManagerImpl::GetGPUInfoForHardwareGpu() const { - base::AutoLock auto_lock(lock_); - return private_->GetGPUInfoForHardwareGpu(); -} - -gpu::GpuFeatureInfo GpuDataManagerImpl::GetGpuFeatureInfoForHardwareGpu() - const { - base::AutoLock auto_lock(lock_); - return private_->GetGpuFeatureInfoForHardwareGpu(); -} - void GpuDataManagerImpl::AppendGpuCommandLine( base::CommandLine* command_line) const { base::AutoLock auto_lock(lock_); @@ -147,6 +144,16 @@ private_->UpdateGpuPreferences(gpu_preferences); } +void GpuDataManagerImpl::GetBlacklistReasons(base::ListValue* reasons) const { + base::AutoLock auto_lock(lock_); + private_->GetBlacklistReasons(reasons); +} + +std::vector<std::string> GpuDataManagerImpl::GetDriverBugWorkarounds() const { + base::AutoLock auto_lock(lock_); + return private_->GetDriverBugWorkarounds(); +} + void GpuDataManagerImpl::AddLogMessage(int level, const std::string& header, const std::string& message) { @@ -211,11 +218,6 @@ private_->OnGpuProcessInitFailure(); } -bool GpuDataManagerImpl::IsGpuProcessUsingHardwareGpu() const { - base::AutoLock auto_lock(lock_); - return private_->IsGpuProcessUsingHardwareGpu(); -} - GpuDataManagerImpl::GpuDataManagerImpl() : private_(GpuDataManagerImplPrivate::Create(this)) { }
diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h index 6b6714d5..b775788 100644 --- a/content/browser/gpu/gpu_data_manager_impl.h +++ b/content/browser/gpu/gpu_data_manager_impl.h
@@ -81,35 +81,41 @@ void RemoveObserver(GpuDataManagerObserver* observer) override; void DisableHardwareAcceleration() override; bool HardwareAccelerationEnabled() const override; + void GetDisabledExtensions(std::string* disabled_extensions) const override; void RequestGpuSupportedRuntimeVersion() const; bool GpuProcessStartAllowed() const; + void GetDisabledWebGLExtensions(std::string* disabled_webgl_extensions) const; + bool IsGpuFeatureInfoAvailable() const; gpu::GpuFeatureStatus GetFeatureStatus(gpu::GpuFeatureType feature) const; // Only update if the current GPUInfo is not finalized. If blacklist is // loaded, run through blacklist and update blacklisted features. - void UpdateGpuInfo(const gpu::GPUInfo& gpu_info, - const gpu::GPUInfo* optional_gpu_info_for_hardware_gpu); + void UpdateGpuInfo(const gpu::GPUInfo& gpu_info); // Update the GPU feature info. This updates the blacklist and enabled status // of GPU rasterization. In the future this will be used for more features. - void UpdateGpuFeatureInfo( - const gpu::GpuFeatureInfo& gpu_feature_info, - const gpu::GpuFeatureInfo& gpu_feature_info_for_hardware_gpu); + void UpdateGpuFeatureInfo(const gpu::GpuFeatureInfo& gpu_feature_info); gpu::GpuFeatureInfo GetGpuFeatureInfo() const; - gpu::GPUInfo GetGPUInfoForHardwareGpu() const; - gpu::GpuFeatureInfo GetGpuFeatureInfoForHardwareGpu() const; - // Insert switches into gpu process command line: kUseGL, etc. void AppendGpuCommandLine(base::CommandLine* command_line) const; // Update GpuPreferences based on blacklisting decisions. void UpdateGpuPreferences(gpu::GpuPreferences* gpu_preferences) const; + // Returns the reasons for the latest run of blacklisting decisions. + // For the structure of returned value, see documentation for + // GpuBlacklist::GetBlacklistedReasons(). + void GetBlacklistReasons(base::ListValue* reasons) const; + + // Returns the workarounds that are applied to the current system as + // a vector of strings. + std::vector<std::string> GetDriverBugWorkarounds() const; + void AddLogMessage(int level, const std::string& header, const std::string& message); @@ -154,10 +160,6 @@ void BlockSwiftShader(); bool SwiftShaderAllowed() const; - // Returns false if the latest GPUInfo gl_renderer is from SwiftShader or - // Disabled (in the viz case). - bool IsGpuProcessUsingHardwareGpu() const; - private: friend class GpuDataManagerImplPrivate; friend class GpuDataManagerImplPrivateTest;
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc index f1e9a9c..66b30c3 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -16,7 +16,6 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" -#include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event.h" #include "base/version.h" @@ -256,7 +255,7 @@ base::BindOnce( [](const gpu::GPUInfo& gpu_info) { TRACE_EVENT0("test_gpu", "OnGraphicsInfoCollected"); - GpuDataManagerImpl::GetInstance()->UpdateGpuInfo(gpu_info, nullptr); + GpuDataManagerImpl::GetInstance()->UpdateGpuInfo(gpu_info); }, gpu_info)); } @@ -274,7 +273,7 @@ else gpu_feature_info.status_values[ii] = gpu::kGpuFeatureStatusEnabled; } - UpdateGpuFeatureInfo(gpu_feature_info, gpu::GpuFeatureInfo()); + UpdateGpuFeatureInfo(gpu_feature_info); NotifyGpuInfoUpdate(); } @@ -282,10 +281,6 @@ return gpu_info_; } -gpu::GPUInfo GpuDataManagerImplPrivate::GetGPUInfoForHardwareGpu() const { - return gpu_info_for_hardware_gpu_; -} - bool GpuDataManagerImplPrivate::GpuAccessAllowed( std::string* reason) const { bool swiftshader_available = false; @@ -426,23 +421,13 @@ timestamps_of_gpu_resets_.clear(); } -void GpuDataManagerImplPrivate::UpdateGpuInfo( - const gpu::GPUInfo& gpu_info, - const gpu::GPUInfo* optional_gpu_info_for_hardware_gpu) { +void GpuDataManagerImplPrivate::UpdateGpuInfo(const gpu::GPUInfo& gpu_info) { bool sandboxed = gpu_info_.sandboxed; #if defined(OS_WIN) uint32_t d3d12_feature_level = gpu_info_.d3d12_feature_level; uint32_t vulkan_version = gpu_info_.vulkan_version; #endif gpu_info_ = gpu_info; - if (optional_gpu_info_for_hardware_gpu && - !gpu_info_for_hardware_gpu_.IsInitialized()) { - if (optional_gpu_info_for_hardware_gpu->IsInitialized()) { - gpu_info_for_hardware_gpu_ = *optional_gpu_info_for_hardware_gpu; - } else { - gpu_info_for_hardware_gpu_ = gpu_info; - } - } #if defined(OS_WIN) // On Windows, complete GPUInfo is collected through an unsandboxed // GPU process. If the regular GPU process is sandboxed, it should @@ -472,16 +457,8 @@ } void GpuDataManagerImplPrivate::UpdateGpuFeatureInfo( - const gpu::GpuFeatureInfo& gpu_feature_info, - const gpu::GpuFeatureInfo& gpu_feature_info_for_hardware_gpu) { + const gpu::GpuFeatureInfo& gpu_feature_info) { gpu_feature_info_ = gpu_feature_info; - if (!gpu_feature_info_for_hardware_gpu_.IsInitialized()) { - if (gpu_feature_info_for_hardware_gpu.IsInitialized()) { - gpu_feature_info_for_hardware_gpu_ = gpu_feature_info_for_hardware_gpu; - } else { - gpu_feature_info_for_hardware_gpu_ = gpu_feature_info; - } - } if (update_histograms_) { UpdateFeatureStats(gpu_feature_info); UpdateDriverBugListStats(gpu_feature_info); @@ -492,11 +469,6 @@ return gpu_feature_info_; } -gpu::GpuFeatureInfo GpuDataManagerImplPrivate::GetGpuFeatureInfoForHardwareGpu() - const { - return gpu_feature_info_for_hardware_gpu_; -} - void GpuDataManagerImplPrivate::AppendGpuCommandLine( base::CommandLine* command_line) const { DCHECK(command_line); @@ -581,14 +553,38 @@ } void GpuDataManagerImplPrivate::OnGpuBlocked() { - gpu::GpuFeatureInfo gpu_feature_info_for_hardware_gpu = gpu_feature_info_; gpu::GpuFeatureInfo gpu_feature_info = gpu::ComputeGpuFeatureInfoWithNoGpu(); - UpdateGpuFeatureInfo(gpu_feature_info, gpu_feature_info_for_hardware_gpu); + UpdateGpuFeatureInfo(gpu_feature_info); // Some observers might be waiting. NotifyGpuInfoUpdate(); } +void GpuDataManagerImplPrivate::GetBlacklistReasons( + base::ListValue* reasons) const { + if (!gpu_feature_info_.applied_gpu_blacklist_entries.empty()) { + std::unique_ptr<gpu::GpuBlacklist> blacklist(gpu::GpuBlacklist::Create()); + blacklist->GetReasons(reasons, "disabledFeatures", + gpu_feature_info_.applied_gpu_blacklist_entries); + } + if (!gpu_feature_info_.applied_gpu_driver_bug_list_entries.empty()) { + std::unique_ptr<gpu::GpuDriverBugList> bug_list( + gpu::GpuDriverBugList::Create()); + bug_list->GetReasons(reasons, "workarounds", + gpu_feature_info_.applied_gpu_driver_bug_list_entries); + } +} + +std::vector<std::string> +GpuDataManagerImplPrivate::GetDriverBugWorkarounds() const { + std::vector<std::string> workarounds; + for (auto workaround : gpu_feature_info_.enabled_gpu_driver_bug_workarounds) { + workarounds.push_back(gpu::GpuDriverBugWorkaroundTypeToString( + static_cast<gpu::GpuDriverBugWorkaroundType>(workaround))); + } + return workarounds; +} + void GpuDataManagerImplPrivate::AddLogMessage( int level, const std::string& header, const std::string& message) { // Some clients emit many log messages. This has been observed to consume GBs @@ -675,6 +671,18 @@ return true; } +void GpuDataManagerImplPrivate::GetDisabledExtensions( + std::string* disabled_extensions) const { + DCHECK(disabled_extensions); + *disabled_extensions = gpu_feature_info_.disabled_extensions; +} + +void GpuDataManagerImplPrivate::GetDisabledWebGLExtensions( + std::string* disabled_webgl_extensions) const { + DCHECK(disabled_webgl_extensions); + *disabled_webgl_extensions = gpu_feature_info_.disabled_webgl_extensions; +} + void GpuDataManagerImplPrivate::BlockDomainFrom3DAPIs( const GURL& url, GpuDataManagerImpl::DomainGuilt guilt) { BlockDomainFrom3DAPIsAtTime(url, guilt, base::Time::Now()); @@ -738,15 +746,6 @@ observer_list_->Notify(FROM_HERE, &GpuDataManagerObserver::OnGpuInfoUpdate); } -bool GpuDataManagerImplPrivate::IsGpuProcessUsingHardwareGpu() const { - if (base::StartsWith(gpu_info_.gl_renderer, "Google SwiftShader", - base::CompareCase::SENSITIVE)) - return false; - if (gpu_info_.gl_renderer == "Disabled") - return false; - return true; -} - std::string GpuDataManagerImplPrivate::GetDomainFromURL( const GURL& url) const { // For the moment, we just use the host, or its IP address, as the
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h index 44e3ba9..08b4cae 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.h +++ b/content/browser/gpu/gpu_data_manager_impl_private.h
@@ -41,7 +41,6 @@ void BlacklistWebGLForTesting(); gpu::GPUInfo GetGPUInfo() const; - gpu::GPUInfo GetGPUInfoForHardwareGpu() const; bool GpuAccessAllowed(std::string* reason) const; bool GpuProcessStartAllowed() const; void RequestCompleteGpuInfoIfNeeded(); @@ -60,18 +59,18 @@ void BlockSwiftShader(); bool SwiftShaderAllowed() const; - void UpdateGpuInfo(const gpu::GPUInfo& gpu_info, - const gpu::GPUInfo* optional_gpu_info_for_hardware_gpu); - void UpdateGpuFeatureInfo( - const gpu::GpuFeatureInfo& gpu_feature_info, - const gpu::GpuFeatureInfo& gpu_feature_info_for_hardware_gpu); + void UpdateGpuInfo(const gpu::GPUInfo& gpu_info); + void UpdateGpuFeatureInfo(const gpu::GpuFeatureInfo& gpu_feature_info); gpu::GpuFeatureInfo GetGpuFeatureInfo() const; - gpu::GpuFeatureInfo GetGpuFeatureInfoForHardwareGpu() const; void AppendGpuCommandLine(base::CommandLine* command_line) const; void UpdateGpuPreferences(gpu::GpuPreferences* gpu_preferences) const; + void GetBlacklistReasons(base::ListValue* reasons) const; + + std::vector<std::string> GetDriverBugWorkarounds() const; + void AddLogMessage(int level, const std::string& header, const std::string& message); @@ -82,6 +81,9 @@ void HandleGpuSwitch(); + void GetDisabledExtensions(std::string* disabled_extensions) const; + void GetDisabledWebGLExtensions(std::string* disabled_webgl_extensions) const; + void BlockDomainFrom3DAPIs( const GURL& url, GpuDataManagerImpl::DomainGuilt guilt); bool Are3DAPIsBlocked(const GURL& top_origin_url, @@ -103,8 +105,6 @@ // Notify all observers whenever there is a GPU info update. void NotifyGpuInfoUpdate(); - bool IsGpuProcessUsingHardwareGpu() const; - virtual ~GpuDataManagerImplPrivate(); private: @@ -171,13 +171,10 @@ bool complete_gpu_info_already_requested_; + // Eventually |blacklisted_features_| should be folded in to this. gpu::GpuFeatureInfo gpu_feature_info_; - gpu::GPUInfo gpu_info_; - // What we would have gotten if we haven't fallen back to SwiftShader or - // pure software (in the viz case). - gpu::GpuFeatureInfo gpu_feature_info_for_hardware_gpu_; - gpu::GPUInfo gpu_info_for_hardware_gpu_; + gpu::GPUInfo gpu_info_; const scoped_refptr<GpuDataManagerObserverList> observer_list_;
diff --git a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc index d445e5b..252ca41c 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
@@ -140,7 +140,7 @@ EXPECT_FALSE(observer.gpu_info_updated()); gpu::GPUInfo gpu_info; - manager->UpdateGpuInfo(gpu_info, nullptr); + manager->UpdateGpuInfo(gpu_info); { base::RunLoop run_loop; run_loop.RunUntilIdle();
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc index f476572..09ffa77 100644 --- a/content/browser/gpu/gpu_internals_ui.cc +++ b/content/browser/gpu/gpu_internals_ui.cc
@@ -144,9 +144,8 @@ vendor.c_str(), device.c_str(), gpu.active ? " *ACTIVE*" : ""); } -std::unique_ptr<base::ListValue> BasicGpuInfoAsListValue( - const gpu::GPUInfo& gpu_info, - const gpu::GpuFeatureInfo& gpu_feature_info) { +std::unique_ptr<base::DictionaryValue> GpuInfoAsDictionaryValue() { + gpu::GPUInfo gpu_info = GpuDataManagerImpl::GetInstance()->GetGPUInfo(); auto basic_info = std::make_unique<base::ListValue>(); basic_info->Append(NewDescriptionValuePair( "Initialization time", @@ -207,6 +206,14 @@ VulkanVersionToString(gpu_info.vulkan_version))); #endif + std::string disabled_extensions; + GpuDataManagerImpl::GetInstance()->GetDisabledExtensions( + &disabled_extensions); + + std::string disabled_webgl_extensions; + GpuDataManagerImpl::GetInstance()->GetDisabledWebGLExtensions( + &disabled_webgl_extensions); + basic_info->Append( NewDescriptionValuePair("Driver vendor", gpu_info.driver_vendor)); basic_info->Append(NewDescriptionValuePair("Driver version", @@ -231,10 +238,10 @@ gpu_info.gl_version)); basic_info->Append(NewDescriptionValuePair("GL_EXTENSIONS", gpu_info.gl_extensions)); - basic_info->Append(NewDescriptionValuePair( - "Disabled Extensions", gpu_feature_info.disabled_extensions)); - basic_info->Append(NewDescriptionValuePair( - "Disabled WebGL Extensions", gpu_feature_info.disabled_webgl_extensions)); + basic_info->Append(NewDescriptionValuePair("Disabled Extensions", + disabled_extensions)); + basic_info->Append(NewDescriptionValuePair("Disabled WebGL Extensions", + disabled_webgl_extensions)); basic_info->Append(NewDescriptionValuePair("Window system binding vendor", gpu_info.gl_ws_vendor)); basic_info->Append(NewDescriptionValuePair("Window system binding version", @@ -271,25 +278,8 @@ "GPU process crash count", std::make_unique<base::Value>(GpuProcessHost::GetGpuCrashCount()))); -#if defined(USE_X11) - basic_info->Append(NewDescriptionValuePair( - "System visual ID", base::NumberToString(gpu_info.system_visual))); - basic_info->Append(NewDescriptionValuePair( - "RGBA visual ID", base::NumberToString(gpu_info.rgba_visual))); -#endif - - return basic_info; -} - -std::unique_ptr<base::DictionaryValue> GpuInfoAsDictionaryValue() { auto info = std::make_unique<base::DictionaryValue>(); - const gpu::GPUInfo gpu_info = GpuDataManagerImpl::GetInstance()->GetGPUInfo(); - const gpu::GpuFeatureInfo gpu_feature_info = - GpuDataManagerImpl::GetInstance()->GetGpuFeatureInfo(); - auto basic_info = BasicGpuInfoAsListValue(gpu_info, gpu_feature_info); - info->Set("basicInfo", std::move(basic_info)); - #if defined(OS_WIN) auto dx_info = std::make_unique<base::Value>(); if (gpu_info.dx_diagnostics.children.size()) @@ -297,6 +287,14 @@ info->Set("diagnostics", std::move(dx_info)); #endif +#if defined(USE_X11) + basic_info->Append(NewDescriptionValuePair( + "System visual ID", base::NumberToString(gpu_info.system_visual))); + basic_info->Append(NewDescriptionValuePair( + "RGBA visual ID", base::NumberToString(gpu_info.rgba_visual))); +#endif + + info->Set("basic_info", std::move(basic_info)); return info; } @@ -627,41 +625,18 @@ void GpuMessageHandler::OnGpuInfoUpdate() { // Get GPU Info. - const gpu::GPUInfo gpu_info = GpuDataManagerImpl::GetInstance()->GetGPUInfo(); - auto gpu_info_val = GpuInfoAsDictionaryValue(); + std::unique_ptr<base::DictionaryValue> gpu_info_val( + GpuInfoAsDictionaryValue()); // Add in blacklisting features auto feature_status = std::make_unique<base::DictionaryValue>(); feature_status->Set("featureStatus", GetFeatureStatus()); feature_status->Set("problems", GetProblems()); auto workarounds = std::make_unique<base::ListValue>(); - for (const auto& workaround : GetDriverBugWorkarounds()) + for (const std::string& workaround : GetDriverBugWorkarounds()) workarounds->AppendString(workaround); feature_status->Set("workarounds", std::move(workarounds)); gpu_info_val->Set("featureStatus", std::move(feature_status)); - if (!GpuDataManagerImpl::GetInstance()->IsGpuProcessUsingHardwareGpu()) { - auto feature_status_for_hardware_gpu = - std::make_unique<base::DictionaryValue>(); - feature_status_for_hardware_gpu->Set("featureStatus", - GetFeatureStatusForHardwareGpu()); - feature_status_for_hardware_gpu->Set("problems", - GetProblemsForHardwareGpu()); - auto workarounds_for_hardware_gpu = std::make_unique<base::ListValue>(); - for (const auto& workaround : GetDriverBugWorkaroundsForHardwareGpu()) - workarounds_for_hardware_gpu->AppendString(workaround); - feature_status_for_hardware_gpu->Set( - "workarounds", std::move(workarounds_for_hardware_gpu)); - gpu_info_val->Set("featureStatusForHardwareGpu", - std::move(feature_status_for_hardware_gpu)); - const gpu::GPUInfo gpu_info_for_hardware_gpu = - GpuDataManagerImpl::GetInstance()->GetGPUInfoForHardwareGpu(); - const gpu::GpuFeatureInfo gpu_feature_info_for_hardware_gpu = - GpuDataManagerImpl::GetInstance()->GetGpuFeatureInfoForHardwareGpu(); - auto gpu_info_for_hardware_gpu_val = BasicGpuInfoAsListValue( - gpu_info_for_hardware_gpu, gpu_feature_info_for_hardware_gpu); - gpu_info_val->Set("basicInfoForHardwareGpu", - std::move(gpu_info_for_hardware_gpu_val)); - } gpu_info_val->Set("compositorInfo", CompositorInfo()); gpu_info_val->Set("gpuMemoryBufferInfo", GpuMemoryBufferInfo()); gpu_info_val->Set("displayInfo", getDisplayInfo());
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index 4cb1ed7..130bf011 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc
@@ -1030,9 +1030,7 @@ void GpuProcessHost::DidInitialize( const gpu::GPUInfo& gpu_info, - const gpu::GpuFeatureInfo& gpu_feature_info, - const gpu::GPUInfo& gpu_info_for_hardware_gpu, - const gpu::GpuFeatureInfo& gpu_feature_info_for_hardware_gpu) { + const gpu::GpuFeatureInfo& gpu_feature_info) { UMA_HISTOGRAM_BOOLEAN("GPU.GPUProcessInitialized", true); status_ = SUCCESS; @@ -1048,9 +1046,8 @@ GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance(); // Update GpuFeatureInfo first, because UpdateGpuInfo() will notify all // listeners. - gpu_data_manager->UpdateGpuFeatureInfo(gpu_feature_info, - gpu_feature_info_for_hardware_gpu); - gpu_data_manager->UpdateGpuInfo(gpu_info, &gpu_info_for_hardware_gpu); + gpu_data_manager->UpdateGpuFeatureInfo(gpu_feature_info); + gpu_data_manager->UpdateGpuInfo(gpu_info); RunRequestGPUInfoCallbacks(gpu_data_manager->GetGPUInfo()); }
diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h index b5a0b46..51b57b6 100644 --- a/content/browser/gpu/gpu_process_host.h +++ b/content/browser/gpu/gpu_process_host.h
@@ -203,11 +203,8 @@ void OnProcessCrashed(int exit_code) override; // viz::mojom::GpuHost: - void DidInitialize( - const gpu::GPUInfo& gpu_info, - const gpu::GpuFeatureInfo& gpu_feature_info, - const gpu::GPUInfo& gpu_info_for_hardware_gpu, - const gpu::GpuFeatureInfo& gpu_feature_info_for_hardware_gpu) override; + void DidInitialize(const gpu::GPUInfo& gpu_info, + const gpu::GpuFeatureInfo& gpu_feature_info) override; void DidFailInitialize() override; void DidCreateContextSuccessfully() override; void DidCreateOffscreenContext(const GURL& url) override;
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index c309d10..8e4198a 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -64,7 +64,6 @@ #include "components/metrics/single_sample_metrics.h" #include "components/tracing/common/tracing_switches.h" #include "components/viz/common/switches.h" -#include "components/viz/service/display_embedder/server_shared_bitmap_manager.h" #include "content/browser/appcache/appcache_dispatcher_host.h" #include "content/browser/appcache/chrome_appcache_service.h" #include "content/browser/background_fetch/background_fetch_context.h" @@ -1433,8 +1432,6 @@ instance_weak_factory_( new base::WeakPtrFactory<RenderProcessHostImpl>(this)), frame_sink_provider_(id_), - shared_bitmap_allocation_notifier_impl_( - viz::ServerSharedBitmapManager::current()), weak_factory_(this) { for (size_t i = 0; i < kNumKeepAliveClients; i++) keep_alive_client_count_[i] = 0; @@ -1932,11 +1929,6 @@ AddUIThreadInterface( registry.get(), - base::Bind(&RenderProcessHostImpl::BindSharedBitmapAllocationNotifier, - base::Unretained(this))); - - AddUIThreadInterface( - registry.get(), base::Bind(&BackgroundSyncContext::CreateService, base::Unretained( storage_partition_impl_->GetBackgroundSyncContext()))); @@ -2130,11 +2122,6 @@ std::move(request)); } -void RenderProcessHostImpl::BindSharedBitmapAllocationNotifier( - viz::mojom::SharedBitmapAllocationNotifierRequest request) { - shared_bitmap_allocation_notifier_impl_.Bind(std::move(request)); -} - void RenderProcessHostImpl::CreateStoragePartitionService( mojom::StoragePartitionServiceRequest request) { if (g_create_storage_partition) { @@ -3889,8 +3876,6 @@ compositing_mode_reporter_.reset(); - shared_bitmap_allocation_notifier_impl_.ChildDied(); - HistogramController::GetInstance()->NotifyChildDied<RenderProcessHost>(this); // This object is not deleted at this point and might be reused later. // TODO(darin): clean this up @@ -4390,11 +4375,6 @@ bad_message::RPH_MOJO_PROCESS_ERROR); } -viz::SharedBitmapAllocationNotifierImpl* -RenderProcessHostImpl::GetSharedBitmapAllocationNotifier() { - return &shared_bitmap_allocation_notifier_impl_; -} - void RenderProcessHostImpl::GetBrowserHistogram( const std::string& name, BrowserHistogramCallback callback) {
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h index 43094c054..0ea859f1 100644 --- a/content/browser/renderer_host/render_process_host_impl.h +++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -25,7 +25,6 @@ #include "base/single_thread_task_runner.h" #include "base/synchronization/waitable_event.h" #include "build/build_config.h" -#include "components/viz/service/display_embedder/shared_bitmap_allocation_notifier_impl.h" #include "content/browser/cache_storage/cache_storage_dispatcher_host.h" #include "content/browser/child_process_launcher.h" #include "content/browser/dom_storage/session_storage_namespace_impl.h" @@ -389,9 +388,6 @@ RenderProcessHost* render_process_host, const GURL& site_url); - viz::SharedBitmapAllocationNotifierImpl* GetSharedBitmapAllocationNotifier() - override; - // Return the spare RenderProcessHost, if it exists. There is at most one // globally-used spare RenderProcessHost at any time. static RenderProcessHost* GetSpareRenderProcessHostForTesting(); @@ -489,8 +485,6 @@ void BindFrameSinkProvider(mojom::FrameSinkProviderRequest request); void BindCompositingModeReporter( viz::mojom::CompositingModeReporterRequest request); - void BindSharedBitmapAllocationNotifier( - viz::mojom::SharedBitmapAllocationNotifierRequest request); void CreateStoragePartitionService( mojom::StoragePartitionServiceRequest request); void CreateRendererHost(mojom::RendererHostAssociatedRequest request); @@ -839,9 +833,6 @@ std::unique_ptr<mojo::Binding<viz::mojom::CompositingModeReporter>> compositing_mode_reporter_; - viz::SharedBitmapAllocationNotifierImpl - shared_bitmap_allocation_notifier_impl_; - base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_; DISALLOW_COPY_AND_ASSIGN(RenderProcessHostImpl);
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 72109c9..45bae40 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -389,7 +389,6 @@ CHECK(result.second) << "Inserting a duplicate item!"; process_->AddRoute(routing_id_, this); process_->AddWidget(this); - process_->GetSharedBitmapAllocationNotifier()->AddObserver(this); latency_tracker_.Initialize(routing_id_, GetProcess()->GetID()); @@ -1968,7 +1967,6 @@ for (const auto& id : owned_bitmaps_) viz::ServerSharedBitmapManager::current()->ChildDeletedSharedBitmap(id); - process_->GetSharedBitmapAllocationNotifier()->RemoveObserver(this); process_->RemoveWidget(this); process_->RemoveRoute(routing_id_); g_routing_id_widget_map.Get().erase( @@ -2930,29 +2928,6 @@ return; } - uint32_t max_sequence_number = 0; - for (const auto& resource : frame.resource_list) { - max_sequence_number = - std::max(max_sequence_number, resource.shared_bitmap_sequence_number); - } - - // If the CompositorFrame references SharedBitmaps that we are not aware of, - // defer the submission until they are registered. - uint32_t last_registered_sequence_number = - GetProcess()->GetSharedBitmapAllocationNotifier()->last_sequence_number(); - if (max_sequence_number > last_registered_sequence_number) { - saved_frame_.frame = std::move(frame); - saved_frame_.local_surface_id = local_surface_id; - saved_frame_.max_shared_bitmap_sequence_number = max_sequence_number; - saved_frame_.hit_test_region_list = std::move(hit_test_region_list); - TRACE_EVENT_ASYNC_BEGIN2("renderer_host", "PauseCompositorFrameSink", this, - "LastRegisteredSequenceNumber", - last_registered_sequence_number, - "RequiredSequenceNumber", max_sequence_number); - compositor_frame_sink_binding_.PauseIncomingMethodCallProcessing(); - return; - } - last_local_surface_id_ = local_surface_id; last_surface_properties_ = new_surface_properties; @@ -3045,24 +3020,6 @@ } #endif -void RenderWidgetHostImpl::OnSharedBitmapAllocatedByChild( - uint32_t sequence_number) { - if (saved_frame_.local_surface_id.is_valid() && - sequence_number >= saved_frame_.max_shared_bitmap_sequence_number) { - bool tracing_enabled; - TRACE_EVENT_CATEGORY_GROUP_ENABLED( - TRACE_DISABLED_BY_DEFAULT("cc.debug.ipc"), &tracing_enabled); - SubmitCompositorFrame( - saved_frame_.local_surface_id, std::move(saved_frame_.frame), - std::move(saved_frame_.hit_test_region_list), - tracing_enabled ? clock_->NowTicks().since_origin().InMicroseconds() - : 0); - saved_frame_.local_surface_id = viz::LocalSurfaceId(); - compositor_frame_sink_binding_.ResumeIncomingMethodCallProcessing(); - TRACE_EVENT_ASYNC_END0("renderer_host", "PauseCompositorFrameSink", this); - } -} - void RenderWidgetHostImpl::SetupInputRouter() { in_flight_event_count_ = 0; StopHangMonitorTimeout();
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index cbf7135..2477c43 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -30,8 +30,8 @@ #include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "build/build_config.h" +#include "components/viz/common/quads/shared_bitmap.h" #include "components/viz/common/surfaces/frame_sink_id.h" -#include "components/viz/service/display_embedder/shared_bitmap_allocation_notifier_impl.h" #include "content/browser/renderer_host/event_with_latency_info.h" #include "content/browser/renderer_host/frame_token_message_queue.h" #include "content/browser/renderer_host/input/input_disposition_handler.h" @@ -119,7 +119,6 @@ public TouchEmulatorClient, public SyntheticGestureController::Delegate, public viz::mojom::CompositorFrameSink, - public viz::SharedBitmapAllocationObserver, public IPC::Listener { public: // |routing_id| must not be MSG_ROUTING_NONE. @@ -873,9 +872,6 @@ // responsive. void StopHangMonitorTimeout(); - // viz::SharedBitmapAllocationObserver implementation. - void OnSharedBitmapAllocatedByChild( - uint32_t last_shared_bitmap_sequence_number) override; void SetupInputRouter(); bool SurfacePropertiesMismatch( @@ -1139,7 +1135,6 @@ struct { viz::LocalSurfaceId local_surface_id; viz::CompositorFrame frame; - uint32_t max_shared_bitmap_sequence_number = 0; viz::mojom::HitTestRegionListPtr hit_test_region_list; } saved_frame_;
diff --git a/content/browser/resources/gpu/info_view.html b/content/browser/resources/gpu/info_view.html index 1d44f6c..288f402d 100644 --- a/content/browser/resources/gpu/info_view.html +++ b/content/browser/resources/gpu/info_view.html
@@ -61,29 +61,6 @@ <div id="diagnostics-table">None</div> </div> - <div class='basic-info-for-hardware-gpu-div'> - <h3>Driver Information for Hardware GPU</h3> - <div id="basic-info-for-hardware-gpu"></div> - </div> - - <div class='feature-status-for-hardware-gpu-div'> - <h3>Graphics Feature Status for Hardware GPU</h3> - <ul class="feature-status-for-hardware-gpu-list"> - </ul> - </div> - - <div class='workarounds-for-hardware-gpu-div'> - <h3>Driver Bug Workarounds for Hardware GPU</h3> - <ul class="workarounds-for-hardware-gpu-list"> - </ul> - </div> - - <div class='problems-for-hardware-gpu-div'> - <h3>Problems Detected for Hardware GPU</h3> - <ul class="problems-for-hardware-gpu-list"> - </ul> - </div> - <div id="log-messages" jsdisplay="values.length"> <h3>Log Messages</h3> <ul>
diff --git a/content/browser/resources/gpu/info_view.js b/content/browser/resources/gpu/info_view.js index bb8498b7e..eca2b710 100644 --- a/content/browser/resources/gpu/info_view.js +++ b/content/browser/resources/gpu/info_view.js
@@ -99,125 +99,6 @@ this.setText_('client-info', '... loading...'); } - - // GPU info, basic - var diagnosticsDiv = this.querySelector('.diagnostics'); - var diagnosticsLoadingDiv = this.querySelector('.diagnostics-loading'); - var featureStatusList = this.querySelector('.feature-status-list'); - var problemsDiv = this.querySelector('.problems-div'); - var problemsList = this.querySelector('.problems-list'); - var workaroundsDiv = this.querySelector('.workarounds-div'); - var workaroundsList = this.querySelector('.workarounds-list'); - - var basicInfoForHardwareGpuDiv = - this.querySelector('.basic-info-for-hardware-gpu-div'); - var featureStatusForHardwareGpuDiv = - this.querySelector('.feature-status-for-hardware-gpu-div'); - var featureStatusForHardwareGpuList = - this.querySelector('.feature-status-for-hardware-gpu-list'); - var problemsForHardwareGpuDiv = - this.querySelector('.problems-for-hardware-gpu-div'); - var problemsForHardwareGpuList = - this.querySelector('.problems-for-hardware-gpu-list'); - var workaroundsForHardwareGpuDiv = - this.querySelector('.workarounds-for-hardware-gpu-div'); - var workaroundsForHardwareGpuList = - this.querySelector('.workarounds-for-hardware-gpu-list'); - - var gpuInfo = browserBridge.gpuInfo; - var i; - if (gpuInfo) { - // Not using jstemplate here for blacklist status because we construct - // href from data, which jstemplate can't seem to do. - if (gpuInfo.featureStatus) { - this.appendFeatureInfo_(gpuInfo.featureStatus, featureStatusList, - problemsDiv, problemsList, - workaroundsDiv, workaroundsList); - } else { - featureStatusList.textContent = ''; - problemsList.hidden = true; - workaroundsList.hidden = true; - } - - if (gpuInfo.featureStatusForHardwareGpu) { - basicInfoForHardwareGpuDiv.hidden = false; - featureStatusForHardwareGpuDiv.hidden = false; - problemsForHardwareGpuDiv.hidden = false; - workaroundsForHardwareGpuDiv.hidden = false; - this.appendFeatureInfo_(gpuInfo.featureStatusForHardwareGpu, - featureStatusForHardwareGpuList, - problemsForHardwareGpuDiv, - problemsForHardwareGpuList, - workaroundsForHardwareGpuDiv, - workaroundsForHardwareGpuList); - if (gpuInfo.basicInfoForHardwareGpu) { - this.setTable_('basic-info-for-hardware-gpu', - gpuInfo.basicInfoForHardwareGpu); - } else { - this.setTable_('basic-info-for-hardware-gpu', []); - } - } else { - basicInfoForHardwareGpuDiv.hidden = true; - featureStatusForHardwareGpuDiv.hidden = true; - problemsForHardwareGpuDiv.hidden = true; - workaroundsForHardwareGpuDiv.hidden = true; - } - - if (gpuInfo.basicInfo) - this.setTable_('basic-info', gpuInfo.basicInfo); - else - this.setTable_('basic-info', []); - - if (gpuInfo.compositorInfo) - this.setTable_('compositor-info', gpuInfo.compositorInfo); - else - this.setTable_('compositor-info', []); - - if (gpuInfo.gpuMemoryBufferInfo) - this.setTable_('gpu-memory-buffer-info', gpuInfo.gpuMemoryBufferInfo); - else - this.setTable_('gpu-memory-buffer-info', []); - - if (gpuInfo.displayInfo) - this.setTable_('display-info', gpuInfo.displayInfo); - else - this.setTable_('display-info', []); - - if (gpuInfo.videoAcceleratorsInfo) { - this.setTable_( - 'video-acceleration-info', gpuInfo.videoAcceleratorsInfo); - } else { - this.setTable_('video-acceleration-info', []); - } - - if (gpuInfo.diagnostics) { - diagnosticsDiv.hidden = false; - diagnosticsLoadingDiv.hidden = true; - $('diagnostics-table').hidden = false; - this.setTable_('diagnostics-table', gpuInfo.diagnostics); - } else if (gpuInfo.diagnostics === null) { - // gpu_internals.cc sets diagnostics to null when it is being loaded - diagnosticsDiv.hidden = false; - diagnosticsLoadingDiv.hidden = false; - $('diagnostics-table').hidden = true; - } else { - diagnosticsDiv.hidden = true; - } - } else { - this.setText_('basic-info', '... loading ...'); - diagnosticsDiv.hidden = true; - featureStatusList.textContent = ''; - problemsDiv.hidden = true; - } - - // Log messages - jstProcess(new JsEvalContext({values: browserBridge.logMessages}), - $('log-messages')); - }, - - appendFeatureInfo_: function(featureInfo, featureStatusList, - problemsDiv, problemsList, - workaroundsDiv, workaroundsList) { // Feature map var featureLabelMap = { '2d_canvas': 'Canvas', @@ -286,58 +167,130 @@ }, }; - // feature status list - featureStatusList.textContent = ''; - for (var featureName in featureInfo.featureStatus) { - var featureStatus = featureInfo.featureStatus[featureName]; - var featureEl = document.createElement('li'); + // GPU info, basic + var diagnosticsDiv = this.querySelector('.diagnostics'); + var diagnosticsLoadingDiv = this.querySelector('.diagnostics-loading'); + var featureStatusList = this.querySelector('.feature-status-list'); + var problemsDiv = this.querySelector('.problems-div'); + var problemsList = this.querySelector('.problems-list'); + var workaroundsDiv = this.querySelector('.workarounds-div'); + var workaroundsList = this.querySelector('.workarounds-list'); + var gpuInfo = browserBridge.gpuInfo; + var i; + if (gpuInfo) { + // Not using jstemplate here for blacklist status because we construct + // href from data, which jstemplate can't seem to do. + if (gpuInfo.featureStatus) { + // feature status list + featureStatusList.textContent = ''; + for (var featureName in gpuInfo.featureStatus.featureStatus) { + var featureStatus = + gpuInfo.featureStatus.featureStatus[featureName]; + var featureEl = document.createElement('li'); - var nameEl = document.createElement('span'); - if (!featureLabelMap[featureName]) - console.log('Missing featureLabel for', featureName); - nameEl.textContent = featureLabelMap[featureName] + ': '; - featureEl.appendChild(nameEl); + var nameEl = document.createElement('span'); + if (!featureLabelMap[featureName]) + console.log('Missing featureLabel for', featureName); + nameEl.textContent = featureLabelMap[featureName] + ': '; + featureEl.appendChild(nameEl); - var statusEl = document.createElement('span'); - var statusInfo = statusMap[featureStatus]; - if (!statusInfo) { - console.log('Missing status for ', featureStatus); - statusEl.textContent = 'Unknown'; - statusEl.className = 'feature-red'; + var statusEl = document.createElement('span'); + var statusInfo = statusMap[featureStatus]; + if (!statusInfo) { + console.log('Missing status for ', featureStatus); + statusEl.textContent = 'Unknown'; + statusEl.className = 'feature-red'; + } else { + statusEl.textContent = statusInfo['label']; + statusEl.className = statusInfo['class']; + } + featureEl.appendChild(statusEl); + + featureStatusList.appendChild(featureEl); + } + + // problems list + if (gpuInfo.featureStatus.problems.length) { + problemsDiv.hidden = false; + problemsList.textContent = ''; + for (i = 0; i < gpuInfo.featureStatus.problems.length; i++) { + var problem = gpuInfo.featureStatus.problems[i]; + var problemEl = this.createProblemEl_(problem); + problemsList.appendChild(problemEl); + } + } else { + problemsDiv.hidden = true; + } + + // driver bug workarounds list + if (gpuInfo.featureStatus.workarounds.length) { + workaroundsDiv.hidden = false; + workaroundsList.textContent = ''; + for (i = 0; i < gpuInfo.featureStatus.workarounds.length; i++) { + var workaroundEl = document.createElement('li'); + workaroundEl.textContent = gpuInfo.featureStatus.workarounds[i]; + workaroundsList.appendChild(workaroundEl); + } + } else { + workaroundsDiv.hidden = true; + } + } else { - statusEl.textContent = statusInfo['label']; - statusEl.className = statusInfo['class']; + featureStatusList.textContent = ''; + problemsList.hidden = true; + workaroundsList.hidden = true; } - featureEl.appendChild(statusEl); - featureStatusList.appendChild(featureEl); - } + if (gpuInfo.basic_info) + this.setTable_('basic-info', gpuInfo.basic_info); + else + this.setTable_('basic-info', []); - // problems list - if (featureInfo.problems.length) { - problemsDiv.hidden = false; - problemsList.textContent = ''; - for (i = 0; i < featureInfo.problems.length; i++) { - var problem = featureInfo.problems[i]; - var problemEl = this.createProblemEl_(problem); - problemsList.appendChild(problemEl); + if (gpuInfo.compositorInfo) + this.setTable_('compositor-info', gpuInfo.compositorInfo); + else + this.setTable_('compositor-info', []); + + if (gpuInfo.gpuMemoryBufferInfo) + this.setTable_('gpu-memory-buffer-info', gpuInfo.gpuMemoryBufferInfo); + else + this.setTable_('gpu-memory-buffer-info', []); + + if (gpuInfo.displayInfo) + this.setTable_('display-info', gpuInfo.displayInfo); + else + this.setTable_('display-info', []); + + if (gpuInfo.videoAcceleratorsInfo) { + this.setTable_( + 'video-acceleration-info', gpuInfo.videoAcceleratorsInfo); + } else { + this.setTable_('video-acceleration-info', []); + } + + if (gpuInfo.diagnostics) { + diagnosticsDiv.hidden = false; + diagnosticsLoadingDiv.hidden = true; + $('diagnostics-table').hidden = false; + this.setTable_('diagnostics-table', gpuInfo.diagnostics); + } else if (gpuInfo.diagnostics === null) { + // gpu_internals.cc sets diagnostics to null when it is being loaded + diagnosticsDiv.hidden = false; + diagnosticsLoadingDiv.hidden = false; + $('diagnostics-table').hidden = true; + } else { + diagnosticsDiv.hidden = true; } } else { + this.setText_('basic-info', '... loading ...'); + diagnosticsDiv.hidden = true; + featureStatusList.textContent = ''; problemsDiv.hidden = true; } - // driver bug workarounds list - if (featureInfo.workarounds.length) { - workaroundsDiv.hidden = false; - workaroundsList.textContent = ''; - for (i = 0; i < featureInfo.workarounds.length; i++) { - var workaroundEl = document.createElement('li'); - workaroundEl.textContent = featureInfo.workarounds[i]; - workaroundsList.appendChild(workaroundEl); - } - } else { - workaroundsDiv.hidden = true; - } + // Log messages + jstProcess(new JsEvalContext({values: browserBridge.logMessages}), + $('log-messages')); }, createProblemEl_: function(problem) {
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc index 070a12d..1c85c41 100644 --- a/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc
@@ -66,6 +66,8 @@ #include "content/browser/plugin_private_storage_helper.h" #endif // BUILDFLAG(ENABLE_PLUGINS) +using CookieDeletionInfo = net::CookieStore::CookieDeletionInfo; + namespace content { namespace { @@ -73,11 +75,6 @@ base::LazyInstance<StoragePartitionImpl::CreateNetworkFactoryCallback>::Leaky g_url_loader_factory_callback_for_test = LAZY_INSTANCE_INITIALIZER; -bool DoesCookieMatchHost(const std::string& host, - const net::CanonicalCookie& cookie) { - return cookie.IsHostCookie() && cookie.IsDomainMatch(host); -} - void OnClearedCookies(base::OnceClosure callback, uint32_t num_deleted) { // The final callback needs to happen from UI thread. if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) { @@ -90,36 +87,17 @@ std::move(callback).Run(); } -// Cookie matcher and storage_origin are never both populated. void ClearCookiesOnIOThread( const scoped_refptr<net::URLRequestContextGetter>& rq_context, - const base::Time begin, - const base::Time end, - const GURL& storage_origin, - const StoragePartition::CookieMatcherFunction& cookie_matcher, + CookieDeletionInfo delete_info, base::OnceClosure callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO); - DCHECK(cookie_matcher.is_null() || storage_origin.is_empty()); net::CookieStore* cookie_store = rq_context->GetURLRequestContext()->cookie_store(); - if (!cookie_matcher.is_null()) { - cookie_store->DeleteAllCreatedBetweenWithPredicateAsync( - begin, end, cookie_matcher, - base::BindOnce(&OnClearedCookies, std::move(callback))); - return; - } - if (!storage_origin.is_empty()) { - // TODO(mkwst): It's not clear whether removing host cookies is the correct - // behavior. We might want to remove all domain-matching cookies instead. - // Also, this code path may be dead anyways. - cookie_store->DeleteAllCreatedBetweenWithPredicateAsync( - begin, end, - StoragePartitionImpl::CreatePredicateForHostCookies(storage_origin), - base::BindOnce(&OnClearedCookies, std::move(callback))); - return; - } - cookie_store->DeleteAllCreatedBetweenAsync( - begin, end, base::BindOnce(&OnClearedCookies, std::move(callback))); + + cookie_store->DeleteAllMatchingInfoAsync( + std::move(delete_info), + base::BindOnce(&OnClearedCookies, std::move(callback))); } void CheckQuotaManagedDataDeletionStatus(size_t* deletion_task_count, @@ -364,12 +342,6 @@ } // static -net::CookieStore::CookiePredicate -StoragePartitionImpl::CreatePredicateForHostCookies(const GURL& url) { - return base::Bind(&DoesCookieMatchHost, url.host()); -} - -// static void StoragePartitionImpl:: SetGetURLLoaderFactoryForBrowserProcessCallbackForTesting( const CreateNetworkFactoryCallback& url_loader_factory_callback) { @@ -479,7 +451,7 @@ void ClearDataOnUIThread( const GURL& storage_origin, const OriginMatcherFunction& origin_matcher, - const CookieMatcherFunction& cookie_matcher, + CookieDeletionInfo cookie_delete_info, const base::FilePath& path, net::URLRequestContextGetter* rq_context, DOMStorageContextWrapper* dom_storage_context, @@ -889,7 +861,7 @@ uint32_t quota_storage_remove_mask, const GURL& storage_origin, const OriginMatcherFunction& origin_matcher, - const CookieMatcherFunction& cookie_matcher, + CookieDeletionInfo cookie_delete_info, const base::Time begin, const base::Time end, base::OnceClosure callback) { @@ -902,7 +874,7 @@ // DataDeletionHelper::DecrementTaskCount(). deletion_helpers_running_++; helper->ClearDataOnUIThread( - storage_origin, origin_matcher, cookie_matcher, GetPath(), + storage_origin, origin_matcher, std::move(cookie_delete_info), GetPath(), GetURLRequestContext(), dom_storage_context_.get(), quota_manager_.get(), special_storage_policy_.get(), filesystem_context_.get(), begin, end); } @@ -1049,7 +1021,7 @@ void StoragePartitionImpl::DataDeletionHelper::ClearDataOnUIThread( const GURL& storage_origin, const OriginMatcherFunction& origin_matcher, - const CookieMatcherFunction& cookie_matcher, + CookieDeletionInfo cookie_delete_info, const base::FilePath& path, net::URLRequestContextGetter* rq_context, DOMStorageContextWrapper* dom_storage_context, @@ -1070,8 +1042,8 @@ BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::BindOnce( - &ClearCookiesOnIOThread, base::WrapRefCounted(rq_context), begin, - end, storage_origin, cookie_matcher, + &ClearCookiesOnIOThread, base::WrapRefCounted(rq_context), + std::move(cookie_delete_info), // Use OwnsReference instead of Increment/DecrementTaskCount* // to handle the cookie store being destroyed and the callback // thus not being called. @@ -1140,8 +1112,11 @@ uint32_t quota_storage_remove_mask, const GURL& storage_origin) { DCHECK_CURRENTLY_ON(BrowserThread::UI); + CookieDeletionInfo delete_info; + if (!storage_origin.host().empty()) + delete_info.host = storage_origin.host(); ClearDataImpl(remove_mask, quota_storage_remove_mask, storage_origin, - OriginMatcherFunction(), CookieMatcherFunction(), base::Time(), + OriginMatcherFunction(), std::move(delete_info), base::Time(), base::Time::Max(), base::DoNothing()); } @@ -1153,8 +1128,11 @@ const base::Time begin, const base::Time end, base::OnceClosure callback) { + CookieDeletionInfo delete_info; + if (!storage_origin.host().empty()) + delete_info.host = storage_origin.host(); ClearDataImpl(remove_mask, quota_storage_remove_mask, storage_origin, - origin_matcher, CookieMatcherFunction(), begin, end, + origin_matcher, std::move(delete_info), begin, end, std::move(callback)); } @@ -1162,12 +1140,12 @@ uint32_t remove_mask, uint32_t quota_storage_remove_mask, const OriginMatcherFunction& origin_matcher, - const CookieMatcherFunction& cookie_matcher, + CookieDeletionInfo cookie_delete_info, const base::Time begin, const base::Time end, base::OnceClosure callback) { ClearDataImpl(remove_mask, quota_storage_remove_mask, GURL(), origin_matcher, - cookie_matcher, begin, end, std::move(callback)); + std::move(cookie_delete_info), begin, end, std::move(callback)); } void StoragePartitionImpl::ClearHttpAndMediaCaches(
diff --git a/content/browser/storage_partition_impl.h b/content/browser/storage_partition_impl.h index 38d0aadaa..2cf35167 100644 --- a/content/browser/storage_partition_impl.h +++ b/content/browser/storage_partition_impl.h
@@ -65,12 +65,6 @@ // StoragePartition uses. This method generates that mask. static int GenerateQuotaClientMask(uint32_t remove_mask); - // This creates a CookiePredicate that matches all host (NOT domain) cookies - // that match the host of |url|. This is intended to be used with - // DeleteAllCreatedBetweenWithPredicateAsync. - static net::CookieStore::CookiePredicate - CreatePredicateForHostCookies(const GURL& url); - // Allows overriding the URLLoaderFactory creation for // GetURLLoaderFactoryForBrowserProcess. // Passing a null callback will restore the default behavior. @@ -127,7 +121,7 @@ void ClearData(uint32_t remove_mask, uint32_t quota_storage_remove_mask, const OriginMatcherFunction& origin_matcher, - const CookieMatcherFunction& cookie_matcher, + net::CookieStore::CookieDeletionInfo delete_info, const base::Time begin, const base::Time end, base::OnceClosure callback) override; @@ -222,7 +216,8 @@ RemoveQuotaManagedIgnoreDevTools); FRIEND_TEST_ALL_PREFIXES(StoragePartitionImplTest, RemoveCookieForever); FRIEND_TEST_ALL_PREFIXES(StoragePartitionImplTest, RemoveCookieLastHour); - FRIEND_TEST_ALL_PREFIXES(StoragePartitionImplTest, RemoveCookieWithMatcher); + FRIEND_TEST_ALL_PREFIXES(StoragePartitionImplTest, + RemoveCookieWithDeleteInfo); FRIEND_TEST_ALL_PREFIXES(StoragePartitionImplTest, RemoveUnprotectedLocalStorageForever); FRIEND_TEST_ALL_PREFIXES(StoragePartitionImplTest, @@ -250,7 +245,7 @@ uint32_t quota_storage_remove_mask, const GURL& remove_origin, const OriginMatcherFunction& origin_matcher, - const CookieMatcherFunction& cookie_matcher, + net::CookieStore::CookieDeletionInfo cookie_delete_info, const base::Time begin, const base::Time end, base::OnceClosure callback);
diff --git a/content/browser/storage_partition_impl_unittest.cc b/content/browser/storage_partition_impl_unittest.cc index b51d801..e9207de 100644 --- a/content/browser/storage_partition_impl_unittest.cc +++ b/content/browser/storage_partition_impl_unittest.cc
@@ -44,6 +44,7 @@ #endif // BUILDFLAG(ENABLE_PLUGINS) using net::CanonicalCookie; +using CookieDeletionInfo = net::CookieStore::CookieDeletionInfo; namespace content { namespace { @@ -80,14 +81,6 @@ StoragePartition::REMOVE_DATA_MASK_INDEXEDDB | StoragePartition::REMOVE_DATA_MASK_WEBSQL; -bool AlwaysTrueCookiePredicate(const net::CanonicalCookie& cookie) { - return true; -} - -bool AlwaysFalseCookiePredicate(const net::CanonicalCookie& cookie) { - return false; -} - class AwaitCompletionHelper { public: AwaitCompletionHelper() : start_(false), already_quit_(false) {} @@ -573,16 +566,15 @@ delete_begin, delete_end, run_loop->QuitClosure()); } -void ClearCookiesWithMatcher( - content::StoragePartition* partition, - const base::Time delete_begin, - const base::Time delete_end, - const StoragePartition::CookieMatcherFunction& cookie_matcher, - base::RunLoop* run_loop) { +void ClearCookiesMatchingInfo(content::StoragePartition* partition, + CookieDeletionInfo delete_info, + base::RunLoop* run_loop) { + base::Time delete_begin = delete_info.creation_range.start(); + base::Time delete_end = delete_info.creation_range.end(); partition->ClearData(StoragePartition::REMOVE_DATA_MASK_COOKIES, StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL, StoragePartition::OriginMatcherFunction(), - cookie_matcher, delete_begin, delete_end, + std::move(delete_info), delete_begin, delete_end, run_loop->QuitClosure()); } @@ -1130,13 +1122,8 @@ EXPECT_FALSE(tester.ContainsCookie()); } -TEST_F(StoragePartitionImplTest, RemoveCookieWithMatcher) { +TEST_F(StoragePartitionImplTest, RemoveCookieWithDeleteInfo) { RemoveCookieTester tester(browser_context()); - StoragePartition::CookieMatcherFunction true_predicate = - base::Bind(&AlwaysTrueCookiePredicate); - - StoragePartition::CookieMatcherFunction false_predicate = - base::Bind(&AlwaysFalseCookiePredicate); tester.AddCookie(); ASSERT_TRUE(tester.ContainsCookie()); @@ -1145,21 +1132,10 @@ BrowserContext::GetDefaultStoragePartition(browser_context())); partition->SetURLRequestContext(browser_context()->GetRequestContext()); - // Return false from our predicate, and make sure the cookies is still around. - base::RunLoop run_loop; - base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, - base::BindOnce(&ClearCookiesWithMatcher, partition, base::Time(), - base::Time::Max(), std::move(false_predicate), &run_loop)); - run_loop.RunUntilIdle(); - EXPECT_TRUE(tester.ContainsCookie()); - - // Now we return true from our predicate. base::RunLoop run_loop2; base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, - base::BindOnce(&ClearCookiesWithMatcher, partition, base::Time(), - base::Time::Max(), std::move(true_predicate), &run_loop2)); + FROM_HERE, base::BindOnce(&ClearCookiesMatchingInfo, partition, + CookieDeletionInfo(), &run_loop2)); run_loop2.RunUntilIdle(); EXPECT_FALSE(tester.ContainsCookie()); } @@ -1397,8 +1373,8 @@ GURL url3("https://www.google.com/"); net::CookieOptions options; - net::CookieStore::CookiePredicate predicate = - StoragePartitionImpl::CreatePredicateForHostCookies(url); + CookieDeletionInfo delete_info; + delete_info.host = url.host(); base::Time now = base::Time::Now(); std::vector<std::unique_ptr<CanonicalCookie>> valid_cookies; @@ -1414,9 +1390,9 @@ invalid_cookies.push_back(CanonicalCookie::Create(url3, "A=B", now, options)); for (const auto& cookie : valid_cookies) - EXPECT_TRUE(predicate.Run(*cookie)) << cookie->DebugString(); + EXPECT_TRUE(delete_info.Matches(*cookie)) << cookie->DebugString(); for (const auto& cookie : invalid_cookies) - EXPECT_FALSE(predicate.Run(*cookie)) << cookie->DebugString(); + EXPECT_FALSE(delete_info.Matches(*cookie)) << cookie->DebugString(); } } // namespace content
diff --git a/content/browser/tracing/tracing_controller_impl.cc b/content/browser/tracing/tracing_controller_impl.cc index 14eff00d..1c75488 100644 --- a/content/browser/tracing/tracing_controller_impl.cc +++ b/content/browser/tracing/tracing_controller_impl.cc
@@ -406,8 +406,7 @@ CompleteFlush(); } -void TracingControllerImpl::OnMetadataAvailable( - std::unique_ptr<base::DictionaryValue> metadata) { +void TracingControllerImpl::OnMetadataAvailable(base::Value metadata) { DCHECK(!filtered_metadata_); is_metadata_available_ = true; MetadataFilterPredicate metadata_filter; @@ -416,16 +415,15 @@ metadata_filter = delegate_->GetMetadataFilterPredicate(); } if (metadata_filter.is_null()) { - filtered_metadata_ = std::move(metadata); + filtered_metadata_ = base::DictionaryValue::From( + base::Value::ToUniquePtrValue(std::move(metadata))); } else { filtered_metadata_ = std::make_unique<base::DictionaryValue>(); - for (base::DictionaryValue::Iterator it(*metadata); !it.IsAtEnd(); - it.Advance()) { - if (metadata_filter.Run(it.key())) { - filtered_metadata_->Set( - it.key(), std::make_unique<base::Value>(it.value().Clone())); + for (auto it : metadata.DictItems()) { + if (metadata_filter.Run(it.first)) { + filtered_metadata_->SetKey(it.first, std::move(it.second)); } else { - filtered_metadata_->SetString(it.key(), "__stripped__"); + filtered_metadata_->SetKey(it.first, base::Value("__stripped__")); } } }
diff --git a/content/browser/tracing/tracing_controller_impl.h b/content/browser/tracing/tracing_controller_impl.h index ea35ddd3..1d20517 100644 --- a/content/browser/tracing/tracing_controller_impl.h +++ b/content/browser/tracing/tracing_controller_impl.h
@@ -73,7 +73,7 @@ void OnDataAvailable(const void* data, size_t num_bytes) override; void OnDataComplete() override; - void OnMetadataAvailable(std::unique_ptr<base::DictionaryValue> metadata); + void OnMetadataAvailable(base::Value metadata); void CompleteFlush();
diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc index 0944458..a4ffea58 100644 --- a/content/browser/utility_process_host.cc +++ b/content/browser/utility_process_host.cc
@@ -274,6 +274,7 @@ #endif switches::kIgnoreCertificateErrors, switches::kOverrideUseSoftwareGLForTests, + switches::kOverrideEnabledCdmInterfaceVersion, switches::kProxyServer, switches::kUseFakeDeviceForMediaStream, switches::kUseFileForFakeVideoCapture,
diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/browser/webauth/authenticator_impl_unittest.cc index c5e56de4..fb4ec004 100644 --- a/content/browser/webauth/authenticator_impl_unittest.cc +++ b/content/browser/webauth/authenticator_impl_unittest.cc
@@ -69,8 +69,8 @@ constexpr char kTestOrigin1[] = "https://a.google.com"; constexpr char kTestRelyingPartyId[] = "google.com"; -// Test data. CBOR test data can be built using the given diagnostic strings -// and the utility at "http://cbor.me/". +// Test data. CBOR test data can be built using the given +// diagnostic strings and the utility at "http://CBOR.me/". constexpr int32_t kCoseEs256 = -7; constexpr uint8_t kTestChallengeBytes[] = { @@ -337,11 +337,12 @@ options->relying_party_id = origin_url.host(); options->appid = appid; - TestGetAssertionCallback cb; - authenticator->GetAssertion(std::move(options), cb.callback()); - cb.WaitForCallback(); + TestGetAssertionCallback callback_receiver; + authenticator->GetAssertion(std::move(options), + callback_receiver.callback()); + callback_receiver.WaitForCallback(); - return cb.status(); + return callback_receiver.status(); } private: @@ -361,10 +362,11 @@ PublicKeyCredentialCreationOptionsPtr options = GetTestPublicKeyCredentialCreationOptions(); options->relying_party->id = test_case.claimed_authority; - TestMakeCredentialCallback cb; - authenticator->MakeCredential(std::move(options), cb.callback()); - cb.WaitForCallback(); - EXPECT_EQ(AuthenticatorStatus::INVALID_DOMAIN, cb.status()); + TestMakeCredentialCallback callback_receiver; + authenticator->MakeCredential(std::move(options), + callback_receiver.callback()); + callback_receiver.WaitForCallback(); + EXPECT_EQ(AuthenticatorStatus::INVALID_DOMAIN, callback_receiver.status()); } // These instances pass the origin and relying party checks and return at @@ -380,10 +382,12 @@ options->relying_party->id = test_case.claimed_authority; options->public_key_parameters = GetTestPublicKeyCredentialParameters(123); - TestMakeCredentialCallback cb; - authenticator->MakeCredential(std::move(options), cb.callback()); - cb.WaitForCallback(); - EXPECT_EQ(AuthenticatorStatus::ALGORITHM_UNSUPPORTED, cb.status()); + TestMakeCredentialCallback callback_receiver; + authenticator->MakeCredential(std::move(options), + callback_receiver.callback()); + callback_receiver.WaitForCallback(); + EXPECT_EQ(AuthenticatorStatus::ALGORITHM_UNSUPPORTED, + callback_receiver.status()); } } @@ -397,10 +401,12 @@ GetTestPublicKeyCredentialCreationOptions(); options->public_key_parameters = GetTestPublicKeyCredentialParameters(123); - TestMakeCredentialCallback cb; - authenticator->MakeCredential(std::move(options), cb.callback()); - cb.WaitForCallback(); - EXPECT_EQ(AuthenticatorStatus::ALGORITHM_UNSUPPORTED, cb.status()); + TestMakeCredentialCallback callback_receiver; + authenticator->MakeCredential(std::move(options), + callback_receiver.callback()); + callback_receiver.WaitForCallback(); + EXPECT_EQ(AuthenticatorStatus::ALGORITHM_UNSUPPORTED, + callback_receiver.status()); } // Test that service returns USER_VERIFICATION_UNSUPPORTED if user verification @@ -413,10 +419,11 @@ GetTestPublicKeyCredentialRequestOptions(); options->user_verification = webauth::mojom::UserVerificationRequirement::REQUIRED; - TestGetAssertionCallback cb; - authenticator->GetAssertion(std::move(options), cb.callback()); - cb.WaitForCallback(); - EXPECT_EQ(AuthenticatorStatus::USER_VERIFICATION_UNSUPPORTED, cb.status()); + TestGetAssertionCallback callback_receiver; + authenticator->GetAssertion(std::move(options), callback_receiver.callback()); + callback_receiver.WaitForCallback(); + EXPECT_EQ(AuthenticatorStatus::USER_VERIFICATION_UNSUPPORTED, + callback_receiver.status()); } // Test that service returns AUTHENTICATOR_CRITERIA_UNSUPPORTED if user @@ -430,11 +437,12 @@ options->authenticator_selection->user_verification = webauth::mojom::UserVerificationRequirement::REQUIRED; - TestMakeCredentialCallback cb; - authenticator->MakeCredential(std::move(options), cb.callback()); - cb.WaitForCallback(); + TestMakeCredentialCallback callback_receiver; + authenticator->MakeCredential(std::move(options), + callback_receiver.callback()); + callback_receiver.WaitForCallback(); EXPECT_EQ(AuthenticatorStatus::AUTHENTICATOR_CRITERIA_UNSUPPORTED, - cb.status()); + callback_receiver.status()); } // Test that service returns AUTHENTICATOR_CRITERIA_UNSUPPORTED if resident key @@ -447,11 +455,12 @@ GetTestPublicKeyCredentialCreationOptions(); options->authenticator_selection->require_resident_key = true; - TestMakeCredentialCallback cb; - authenticator->MakeCredential(std::move(options), cb.callback()); - cb.WaitForCallback(); + TestMakeCredentialCallback callback_receiver; + authenticator->MakeCredential(std::move(options), + callback_receiver.callback()); + callback_receiver.WaitForCallback(); EXPECT_EQ(AuthenticatorStatus::AUTHENTICATOR_CRITERIA_UNSUPPORTED, - cb.status()); + callback_receiver.status()); } // Test that service returns AUTHENTICATOR_CRITERIA_UNSUPPORTED if a platform @@ -465,11 +474,12 @@ options->authenticator_selection->authenticator_attachment = webauth::mojom::AuthenticatorAttachment::PLATFORM; - TestMakeCredentialCallback cb; - authenticator->MakeCredential(std::move(options), cb.callback()); - cb.WaitForCallback(); + TestMakeCredentialCallback callback_receiver; + authenticator->MakeCredential(std::move(options), + callback_receiver.callback()); + callback_receiver.WaitForCallback(); EXPECT_EQ(AuthenticatorStatus::AUTHENTICATOR_CRITERIA_UNSUPPORTED, - cb.status()); + callback_receiver.status()); } // Parses its arguments as JSON and expects that all the keys in the first are @@ -538,7 +548,7 @@ SimulateNavigation(GURL(kTestOrigin1)); PublicKeyCredentialCreationOptionsPtr options = GetTestPublicKeyCredentialCreationOptions(); - TestMakeCredentialCallback cb; + TestMakeCredentialCallback callback_receiver; // Set up service_manager::Connector for tests. auto fake_hid_manager = std::make_unique<device::FakeHidManager>(); @@ -560,13 +570,14 @@ AuthenticatorPtr authenticator = ConnectToAuthenticator(connector.get(), std::move(timer)); - authenticator->MakeCredential(std::move(options), cb.callback()); + authenticator->MakeCredential(std::move(options), + callback_receiver.callback()); // Trigger timer. base::RunLoop().RunUntilIdle(); task_runner->FastForwardBy(base::TimeDelta::FromMinutes(1)); - cb.WaitForCallback(); - EXPECT_EQ(AuthenticatorStatus::NOT_ALLOWED_ERROR, cb.status()); + callback_receiver.WaitForCallback(); + EXPECT_EQ(AuthenticatorStatus::NOT_ALLOWED_ERROR, callback_receiver.status()); } // Verify behavior for various combinations of origins and RP IDs. @@ -584,10 +595,11 @@ GetTestPublicKeyCredentialRequestOptions(); options->relying_party_id = test_case.claimed_authority; - TestGetAssertionCallback cb; - authenticator->GetAssertion(std::move(options), cb.callback()); - cb.WaitForCallback(); - EXPECT_EQ(AuthenticatorStatus::INVALID_DOMAIN, cb.status()); + TestGetAssertionCallback callback_receiver; + authenticator->GetAssertion(std::move(options), + callback_receiver.callback()); + callback_receiver.WaitForCallback(); + EXPECT_EQ(AuthenticatorStatus::INVALID_DOMAIN, callback_receiver.status()); } } @@ -640,7 +652,7 @@ SimulateNavigation(GURL(kTestOrigin1)); PublicKeyCredentialRequestOptionsPtr options = GetTestPublicKeyCredentialRequestOptions(); - TestGetAssertionCallback cb; + TestGetAssertionCallback callback_receiver; // Set up service_manager::Connector for tests. auto fake_hid_manager = std::make_unique<device::FakeHidManager>(); @@ -662,13 +674,13 @@ AuthenticatorPtr authenticator = ConnectToAuthenticator(connector.get(), std::move(timer)); - authenticator->GetAssertion(std::move(options), cb.callback()); + authenticator->GetAssertion(std::move(options), callback_receiver.callback()); // Trigger timer. base::RunLoop().RunUntilIdle(); task_runner->FastForwardBy(base::TimeDelta::FromMinutes(1)); - cb.WaitForCallback(); - EXPECT_EQ(AuthenticatorStatus::NOT_ALLOWED_ERROR, cb.status()); + callback_receiver.WaitForCallback(); + EXPECT_EQ(AuthenticatorStatus::NOT_ALLOWED_ERROR, callback_receiver.status()); } TEST_F(AuthenticatorImplTest, OversizedCredentialId) { @@ -698,14 +710,16 @@ options->allow_credentials.emplace_back(std::move(credential)); - TestGetAssertionCallback cb; - authenticator->GetAssertion(std::move(options), cb.callback()); - cb.WaitForCallback(); + TestGetAssertionCallback callback_receiver; + authenticator->GetAssertion(std::move(options), + callback_receiver.callback()); + callback_receiver.WaitForCallback(); if (should_be_valid) { - EXPECT_EQ(AuthenticatorStatus::SUCCESS, cb.status()); + EXPECT_EQ(AuthenticatorStatus::SUCCESS, callback_receiver.status()); } else { - EXPECT_EQ(AuthenticatorStatus::CREDENTIAL_NOT_RECOGNIZED, cb.status()); + EXPECT_EQ(AuthenticatorStatus::CREDENTIAL_NOT_RECOGNIZED, + callback_receiver.status()); } } } @@ -717,7 +731,7 @@ SimulateNavigation(GURL(kTestOrigin1)); PublicKeyCredentialCreationOptionsPtr options = GetTestPublicKeyCredentialCreationOptions(); - TestMakeCredentialCallback cb; + TestMakeCredentialCallback callback_receiver; // Set up service_manager::Connector for tests. auto fake_hid_manager = std::make_unique<device::FakeHidManager>(); @@ -734,13 +748,14 @@ ConnectToAuthenticator(connector.get(), std::move(timer)); device::test::ScopedVirtualFidoDevice virtual_device; - authenticator->MakeCredential(std::move(options), cb.callback()); + authenticator->MakeCredential(std::move(options), + callback_receiver.callback()); // Trigger timer. base::RunLoop().RunUntilIdle(); task_runner->FastForwardBy(base::TimeDelta::FromMinutes(1)); - cb.WaitForCallback(); - EXPECT_EQ(AuthenticatorStatus::NOT_ALLOWED_ERROR, cb.status()); + callback_receiver.WaitForCallback(); + EXPECT_EQ(AuthenticatorStatus::NOT_ALLOWED_ERROR, callback_receiver.status()); } TEST_F(AuthenticatorImplTest, TestU2fDeviceDoesNotSupportGetAssertion) { @@ -750,7 +765,7 @@ SimulateNavigation(GURL(kTestOrigin1)); PublicKeyCredentialRequestOptionsPtr options = GetTestPublicKeyCredentialRequestOptions(); - TestGetAssertionCallback cb; + TestGetAssertionCallback callback_receiver; // Set up service_manager::Connector for tests. auto fake_hid_manager = std::make_unique<device::FakeHidManager>(); @@ -767,13 +782,13 @@ ConnectToAuthenticator(connector.get(), std::move(timer)); device::test::ScopedVirtualFidoDevice virtual_device; - authenticator->GetAssertion(std::move(options), cb.callback()); + authenticator->GetAssertion(std::move(options), callback_receiver.callback()); // Trigger timer. base::RunLoop().RunUntilIdle(); task_runner->FastForwardBy(base::TimeDelta::FromMinutes(1)); - cb.WaitForCallback(); - EXPECT_EQ(AuthenticatorStatus::NOT_ALLOWED_ERROR, cb.status()); + callback_receiver.WaitForCallback(); + EXPECT_EQ(AuthenticatorStatus::NOT_ALLOWED_ERROR, callback_receiver.status()); } TEST_F(AuthenticatorImplTest, GetAssertionWithEmptyAllowCredentials) { @@ -786,11 +801,88 @@ GetTestPublicKeyCredentialRequestOptions(); options->allow_credentials.clear(); - TestGetAssertionCallback cb; - authenticator->GetAssertion(std::move(options), cb.callback()); - cb.WaitForCallback(); + TestGetAssertionCallback callback_receiver; + authenticator->GetAssertion(std::move(options), callback_receiver.callback()); + callback_receiver.WaitForCallback(); - EXPECT_EQ(AuthenticatorStatus::EMPTY_ALLOW_CREDENTIALS, cb.status()); + EXPECT_EQ(AuthenticatorStatus::EMPTY_ALLOW_CREDENTIALS, + callback_receiver.status()); +} + +TEST_F(AuthenticatorImplTest, MakeCredentialAlreadyRegistered) { + device::test::ScopedVirtualFidoDevice scoped_virtual_device; + TestServiceManagerContext service_manager_context; + + SimulateNavigation(GURL(kTestOrigin1)); + AuthenticatorPtr authenticator = ConnectToAuthenticator(); + PublicKeyCredentialCreationOptionsPtr options = + GetTestPublicKeyCredentialCreationOptions(); + + // Exclude the one already registered credential. + options->exclude_credentials = GetTestAllowCredentials(); + ASSERT_TRUE(scoped_virtual_device.mutable_state()->InjectRegistration( + options->exclude_credentials[0]->id, kTestRelyingPartyId)); + + TestMakeCredentialCallback callback_receiver; + authenticator->MakeCredential(std::move(options), + callback_receiver.callback()); + callback_receiver.WaitForCallback(); + + EXPECT_EQ(AuthenticatorStatus::CREDENTIAL_EXCLUDED, + callback_receiver.status()); +} + +TEST_F(AuthenticatorImplTest, MakeCredentialPendingRequest) { + device::test::ScopedVirtualFidoDevice scoped_virtual_device; + TestServiceManagerContext service_manager_context; + + SimulateNavigation(GURL(kTestOrigin1)); + AuthenticatorPtr authenticator = ConnectToAuthenticator(); + + // Make first request. + PublicKeyCredentialCreationOptionsPtr options = + GetTestPublicKeyCredentialCreationOptions(); + TestMakeCredentialCallback callback_receiver; + authenticator->MakeCredential(std::move(options), + callback_receiver.callback()); + + // Make second request. + // TODO(crbug.com/785955): Rework to ensure there are potential race + // conditions once we have VirtualAuthenticatorEnvironment. + PublicKeyCredentialCreationOptionsPtr options2 = + GetTestPublicKeyCredentialCreationOptions(); + TestMakeCredentialCallback callback_receiver2; + authenticator->MakeCredential(std::move(options2), + callback_receiver2.callback()); + callback_receiver2.WaitForCallback(); + + EXPECT_EQ(AuthenticatorStatus::PENDING_REQUEST, callback_receiver2.status()); +} + +TEST_F(AuthenticatorImplTest, GetAssertionPendingRequest) { + device::test::ScopedVirtualFidoDevice scoped_virtual_device; + TestServiceManagerContext service_manager_context; + + SimulateNavigation(GURL(kTestOrigin1)); + AuthenticatorPtr authenticator = ConnectToAuthenticator(); + + // Make first request. + PublicKeyCredentialRequestOptionsPtr options = + GetTestPublicKeyCredentialRequestOptions(); + TestGetAssertionCallback callback_receiver; + authenticator->GetAssertion(std::move(options), callback_receiver.callback()); + + // Make second request. + // TODO(crbug.com/785955): Rework to ensure there are potential race + // conditions once we have VirtualAuthenticatorEnvironment. + PublicKeyCredentialRequestOptionsPtr options2 = + GetTestPublicKeyCredentialRequestOptions(); + TestGetAssertionCallback callback_receiver2; + authenticator->GetAssertion(std::move(options2), + callback_receiver2.callback()); + callback_receiver2.WaitForCallback(); + + EXPECT_EQ(AuthenticatorStatus::PENDING_REQUEST, callback_receiver2.status()); } enum class IndividualAttestation { @@ -877,10 +969,11 @@ options->relying_party->id = "example.com"; options->adjusted_timeout = base::TimeDelta::FromSeconds(1); options->attestation = test.attestation_requested; - TestMakeCredentialCallback cb; - authenticator->MakeCredential(std::move(options), cb.callback()); - cb.WaitForCallback(); - ASSERT_EQ(test.expected_status, cb.status()); + TestMakeCredentialCallback callback_receiver; + authenticator->MakeCredential(std::move(options), + callback_receiver.callback()); + callback_receiver.WaitForCallback(); + ASSERT_EQ(test.expected_status, callback_receiver.status()); if (test.expected_status != AuthenticatorStatus::SUCCESS) { ASSERT_STREQ("", test.expected_attestation_format); @@ -888,7 +981,7 @@ } base::Optional<CBORValue> attestation_value = - CBORReader::Read(cb.value()->attestation_object); + CBORReader::Read(callback_receiver.value()->attestation_object); ASSERT_TRUE(attestation_value); ASSERT_TRUE(attestation_value->is_map()); const auto& attestation = attestation_value->GetMap(); @@ -937,8 +1030,8 @@ << "', but expected to find '" << expected << "'"; } - // Asserts that the webauthn attestation CBOR map in |attestation| contains - // a single X.509 certificate containing |substring|. + // Asserts that the webauthn attestation CBOR map in + // |attestation| contains a single X.509 certificate containing |substring|. static void ExpectCertificateContainingSubstring( const CBORValue::MapValue& attestation, const std::string& substring) {
diff --git a/content/public/app/mojo/content_browser_manifest.json b/content/public/app/mojo/content_browser_manifest.json index 0ae022a3..0170b95 100644 --- a/content/public/app/mojo/content_browser_manifest.json +++ b/content/public/app/mojo/content_browser_manifest.json
@@ -66,7 +66,6 @@ "network::mojom::URLLoaderFactory", "resource_coordinator::mojom::ProcessCoordinationUnit", "ui::mojom::Gpu", - "viz::mojom::SharedBitmapAllocationNotifier", "viz::mojom::CompositingModeReporter" ], "service_manager:service_factory": [
diff --git a/content/public/browser/browsing_data_filter_builder.h b/content/public/browser/browsing_data_filter_builder.h index 1d75cd4..b4ffa39 100644 --- a/content/public/browser/browsing_data_filter_builder.h +++ b/content/public/browser/browsing_data_filter_builder.h
@@ -13,14 +13,11 @@ #include "base/callback_forward.h" #include "content/common/content_export.h" +#include "net/cookies/cookie_store.h" #include "services/network/public/mojom/network_service.mojom.h" class GURL; -namespace net { -class CanonicalCookie; -} - namespace url { class Origin; } @@ -75,10 +72,10 @@ virtual network::mojom::ClearCacheUrlFilterPtr BuildClearCacheUrlFilter() const = 0; - // Builds a filter that matches cookies whose sources are in the whitelist, - // or aren't in the blacklist. - virtual base::RepeatingCallback<bool(const net::CanonicalCookie& pattern)> - BuildCookieFilter() const = 0; + // Builds a CookieDeletionInfo object that matches cookies whose sources are + // in the whitelist, or aren't in the blacklist. + virtual net::CookieStore::CookieDeletionInfo BuildCookieDeletionInfo() + const = 0; // Builds a filter that matches channel IDs whose server identifiers are in // the whitelist, or aren't in the blacklist.
diff --git a/content/public/browser/gpu_data_manager.h b/content/public/browser/gpu_data_manager.h index 481bf03..ebe6ba5 100644 --- a/content/public/browser/gpu_data_manager.h +++ b/content/public/browser/gpu_data_manager.h
@@ -61,6 +61,10 @@ // Whether a GPU is in use (as opposed to a software renderer). virtual bool HardwareAccelerationEnabled() const = 0; + // Extensions that are currently disabled. + virtual void GetDisabledExtensions( + std::string* disabled_extensions) const = 0; + protected: virtual ~GpuDataManager() {} };
diff --git a/content/public/browser/render_process_host.h b/content/public/browser/render_process_host.h index 3e3a3530..cd4f80c 100644 --- a/content/public/browser/render_process_host.h +++ b/content/public/browser/render_process_host.h
@@ -41,10 +41,6 @@ class ProcessResourceCoordinator; } -namespace viz { -class SharedBitmapAllocationNotifierImpl; -} - namespace content { class BrowserContext; class BrowserMessageFilter; @@ -439,12 +435,6 @@ // be posted back on the UI thread). void PostTaskWhenProcessIsReady(base::OnceClosure task); - // Returns the SharedBitmapAllocationNotifier associated with this process. - // SharedBitmapAllocationNotifier manages viz::SharedBitmaps created by this - // process and can notify observers when a new SharedBitmap is allocated. - virtual viz::SharedBitmapAllocationNotifierImpl* - GetSharedBitmapAllocationNotifier() = 0; - // Static management functions ----------------------------------------------- // Possibly start an unbound, spare RenderProcessHost. A subsequent creation
diff --git a/content/public/browser/storage_partition.h b/content/public/browser/storage_partition.h index ec12926..5a3984e 100644 --- a/content/public/browser/storage_partition.h +++ b/content/public/browser/storage_partition.h
@@ -7,6 +7,7 @@ #include <stdint.h> +#include <set> #include <string> #include "base/callback_forward.h" @@ -152,9 +153,6 @@ typedef base::Callback<bool(const GURL&, storage::SpecialStoragePolicy*)> OriginMatcherFunction; - // A callback type to check if a given cookie should be cleared. - using CookieMatcherFunction = net::CookieStore::CookiePredicate; - // Similar to ClearDataForOrigin(). // Deletes all data out for the StoragePartition if |storage_origin| is empty. // |origin_matcher| is present if special storage policy is to be handled, @@ -176,20 +174,19 @@ // * |origin_matcher| is present if special storage policy is to be handled, // otherwise the callback should be null (base::Callback::is_null()==true). // The origin matcher does not apply to cookies, instead use: - // * |cookies_matcher| is present if special cookie clearing is to be handled. - // If the callback is null all cookies withing the time range will be - // cleared. + // * |cookie_delete_info| identifies which cookies to delete. // * |callback| is called when data deletion is done or at least the deletion // is scheduled. // Note: Make sure you know what you are doing before clearing cookies // selectively. You don't want to break the web. - virtual void ClearData(uint32_t remove_mask, - uint32_t quota_storage_remove_mask, - const OriginMatcherFunction& origin_matcher, - const CookieMatcherFunction& cookie_matcher, - const base::Time begin, - const base::Time end, - base::OnceClosure callback) = 0; + virtual void ClearData( + uint32_t remove_mask, + uint32_t quota_storage_remove_mask, + const OriginMatcherFunction& origin_matcher, + net::CookieStore::CookieDeletionInfo cookie_delete_info, + const base::Time begin, + const base::Time end, + base::OnceClosure callback) = 0; // Clears the HTTP and media caches associated with this StoragePartition's // request contexts. If |begin| and |end| are not null, only entries with
diff --git a/content/public/test/mock_render_process_host.cc b/content/public/test/mock_render_process_host.cc index e80091b..17599f8 100644 --- a/content/public/test/mock_render_process_host.cc +++ b/content/public/test/mock_render_process_host.cc
@@ -14,7 +14,6 @@ #include "base/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" -#include "components/viz/service/display_embedder/server_shared_bitmap_manager.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/renderer_host/render_view_host_impl.h" @@ -58,8 +57,6 @@ child_identity_(mojom::kRendererServiceName, BrowserContext::GetServiceUserIdFor(browser_context), base::StringPrintf("%d", id_)), - shared_bitmap_allocation_notifier_impl_( - viz::ServerSharedBitmapManager::current()), weak_ptr_factory_(this) { // Child process security operations can't be unit tested unless we add // ourselves as an existing child process. @@ -493,9 +490,4 @@ } } -viz::SharedBitmapAllocationNotifierImpl* -MockRenderProcessHost::GetSharedBitmapAllocationNotifier() { - return &shared_bitmap_allocation_notifier_impl_; -} - } // namespace content
diff --git a/content/public/test/mock_render_process_host.h b/content/public/test/mock_render_process_host.h index 133721f7..b243c27 100644 --- a/content/public/test/mock_render_process_host.h +++ b/content/public/test/mock_render_process_host.h
@@ -21,7 +21,6 @@ #include "base/metrics/persistent_memory_allocator.h" #include "base/observer_list.h" #include "build/build_config.h" -#include "components/viz/service/display_embedder/shared_bitmap_allocation_notifier_impl.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host_factory.h" #include "ipc/ipc_test_sink.h" @@ -143,8 +142,6 @@ bool MayReuseHost() override; bool IsUnused() override; void SetIsUsed() override; - viz::SharedBitmapAllocationNotifierImpl* GetSharedBitmapAllocationNotifier() - override; bool HostHasNotBeenUsed() override; @@ -214,8 +211,6 @@ std::unique_ptr<resource_coordinator::ProcessResourceCoordinator> process_resource_coordinator_; service_manager::Identity child_identity_; - viz::SharedBitmapAllocationNotifierImpl - shared_bitmap_allocation_notifier_impl_; bool did_frame_commit_navigation_ = false; base::WeakPtrFactory<MockRenderProcessHost> weak_ptr_factory_;
diff --git a/content/public/test/test_storage_partition.cc b/content/public/test/test_storage_partition.cc index 40f2b03..51b8421 100644 --- a/content/public/test/test_storage_partition.cc +++ b/content/public/test/test_storage_partition.cc
@@ -118,7 +118,7 @@ uint32_t remove_mask, uint32_t quota_storage_remove_mask, const OriginMatcherFunction& origin_matcher, - const CookieMatcherFunction& cookie_matcher, + net::CookieStore::CookieDeletionInfo cookie_delete_info, const base::Time begin, const base::Time end, base::OnceClosure callback) {}
diff --git a/content/public/test/test_storage_partition.h b/content/public/test/test_storage_partition.h index 43a27423..38a6b2bd 100644 --- a/content/public/test/test_storage_partition.h +++ b/content/public/test/test_storage_partition.h
@@ -153,7 +153,7 @@ void ClearData(uint32_t remove_mask, uint32_t quota_storage_remove_mask, const OriginMatcherFunction& origin_matcher, - const CookieMatcherFunction& cookie_matcher, + net::CookieStore::CookieDeletionInfo cookie_delete_info, const base::Time begin, const base::Time end, base::OnceClosure callback) override;
diff --git a/content/renderer/pepper/pepper_compositor_host.cc b/content/renderer/pepper/pepper_compositor_host.cc index e9cbae8..80d5c510 100644 --- a/content/renderer/pepper/pepper_compositor_host.cc +++ b/content/renderer/pepper/pepper_compositor_host.cc
@@ -15,7 +15,6 @@ #include "cc/layers/solid_color_layer.h" #include "cc/layers/texture_layer.h" #include "cc/trees/layer_tree_host.h" -#include "components/viz/client/client_shared_bitmap_manager.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "content/renderer/pepper/gfx_conversion.h" #include "content/renderer/pepper/host_globals.h"
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 1a57048..ca78dbce 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc
@@ -50,7 +50,6 @@ #include "components/metrics/public/interfaces/single_sample_metrics.mojom.h" #include "components/metrics/single_sample_metrics.h" #include "components/viz/client/client_layer_tree_frame_sink.h" -#include "components/viz/client/client_shared_bitmap_manager.h" #include "components/viz/client/hit_test_data_provider.h" #include "components/viz/client/hit_test_data_provider_draw_quad.h" #include "components/viz/client/hit_test_data_provider_surface_layer.h" @@ -810,16 +809,6 @@ : mojom::kBrowserServiceName, GetIOTaskRunner()); - viz::mojom::SharedBitmapAllocationNotifierPtr - shared_bitmap_allocation_notifier_ptr; - GetConnector()->BindInterface( - mojom::kBrowserServiceName, - mojo::MakeRequest(&shared_bitmap_allocation_notifier_ptr)); - shared_bitmap_manager_ = std::make_unique<viz::ClientSharedBitmapManager>( - viz::mojom::ThreadSafeSharedBitmapAllocationNotifierPtr::Create( - shared_bitmap_allocation_notifier_ptr.PassInterface(), - GetChannel()->ipc_task_runner_refptr())); - notification_dispatcher_ = new NotificationDispatcher( thread_safe_sender(), GetWebMainThreadScheduler()->IPCTaskRunner()); AddFilter(notification_dispatcher_->GetFilter());
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index c9a4255..8f1c03f 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h
@@ -121,7 +121,6 @@ namespace viz { class BeginFrameSource; -class ClientSharedBitmapManager; class RasterContextProvider; class SyntheticBeginFrameSource; } @@ -378,11 +377,6 @@ return vc_manager_.get(); } - viz::ClientSharedBitmapManager* shared_bitmap_manager() const { - DCHECK(shared_bitmap_manager_); - return shared_bitmap_manager_.get(); - } - NotificationDispatcher* notification_dispatcher() const { return notification_dispatcher_.get(); } @@ -661,8 +655,6 @@ // Used on the render thread. std::unique_ptr<VideoCaptureImplManager> vc_manager_; - std::unique_ptr<viz::ClientSharedBitmapManager> shared_bitmap_manager_; - scoped_refptr<NotificationDispatcher> notification_dispatcher_; // The count of RenderWidgets running through this thread.
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py index e114e3a..b0a00a0 100755 --- a/content/test/gpu/generate_buildbot_json.py +++ b/content/test/gpu/generate_buildbot_json.py
@@ -1257,45 +1257,47 @@ ], }, - 'angle_deqp_gles2_vulkan_tests': { - 'tester_configs': [ - { - 'predicate': Predicates.DEQP, - 'swarming_dimension_sets': [ - # NVIDIA Win 10 - { - 'gpu': NVIDIA_QUADRO_P400_ALL_DRIVERS, - 'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS, - }, - # AMD Win 7 - { - 'gpu': '1002:6613', - 'os': 'Windows-2008ServerR2-SP1' - }, - # NVIDIA Linux Quadro P400 - { - 'gpu': LINUX_QUADRO_P400_STABLE_DRIVER, - 'os': 'Ubuntu' - }, - ], - }, - ], - 'disabled_tester_configs': [ - { - 'names': [ - 'Linux FYI Ozone (Intel)', - ], - }, - ], - 'desktop_swarming': { - 'shards': 4, - }, - 'test': 'angle_deqp_gles2_tests', - 'args': [ - '--test-launcher-batch-limit=400', - '--deqp-egl-display-type=angle-vulkan' - ] - }, + # Temporarily disabled while we roll Vulkan. + # TODO(jmadill): Re-enable after roll. http://anglebug.com/2393 + # 'angle_deqp_gles2_vulkan_tests': { + # 'tester_configs': [ + # { + # 'predicate': Predicates.DEQP, + # 'swarming_dimension_sets': [ + # # NVIDIA Win 10 + # { + # 'gpu': NVIDIA_QUADRO_P400_ALL_DRIVERS, + # 'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS, + # }, + # # AMD Win 7 + # { + # 'gpu': '1002:6613', + # 'os': 'Windows-2008ServerR2-SP1' + # }, + # # NVIDIA Linux Quadro P400 + # { + # 'gpu': LINUX_QUADRO_P400_STABLE_DRIVER, + # 'os': 'Ubuntu' + # }, + # ], + # }, + # ], + # 'disabled_tester_configs': [ + # { + # 'names': [ + # 'Linux FYI Ozone (Intel)', + # ], + # }, + # ], + # 'desktop_swarming': { + # 'shards': 4, + # }, + # 'test': 'angle_deqp_gles2_tests', + # 'args': [ + # '--test-launcher-batch-limit=400', + # '--deqp-egl-display-type=angle-vulkan' + # ] + # }, 'angle_deqp_gles3_gles_tests': { 'tester_configs': [
diff --git a/content/test/gpu/gpu_tests/gpu_process_integration_test.py b/content/test/gpu/gpu_tests/gpu_process_integration_test.py index d1550ca..3360d4fd 100644 --- a/content/test/gpu/gpu_tests/gpu_process_integration_test.py +++ b/content/test/gpu/gpu_tests/gpu_process_integration_test.py
@@ -79,7 +79,6 @@ ('GpuProcess_gpu_info_complete', 'gpu/functional_3d_css.html'), ('GpuProcess_driver_bug_workarounds_in_gpu_process', 'chrome:gpu'), ('GpuProcess_readback_webgl_gpu_process', 'chrome:gpu'), - ('GpuProcess_feature_status_under_swiftshader', 'chrome:gpu'), ('GpuProcess_only_one_workaround', 'chrome:gpu'), ('GpuProcess_disable_gpu', 'gpu/functional_webgl.html'), ('GpuProcess_disable_gpu_and_swiftshader', @@ -187,7 +186,7 @@ 'workarounds are not equal: %s != %s, diff: %s' % (browser_list, gpu_list, list(diff))) - basic_infos = tab.EvaluateJavaScript('browserBridge.gpuInfo.basicInfo') + basic_infos = tab.EvaluateJavaScript('browserBridge.gpuInfo.basic_info') disabled_gl_extensions = None for info in basic_infos: if info['description'].startswith('Disabled Extensions'): @@ -263,40 +262,6 @@ if not result: self.fail('WebGL readback setup failed: %s' % feature_status_list) - def _GpuProcess_feature_status_under_swiftshader(self, test_path): - if not self._SupportsSwiftShader(): - return - # Hit test group 2 with entry 153 from kSoftwareRenderingListEntries. - self.RestartBrowserIfNecessaryWithArgs([ - '--gpu-blacklist-test-group=2']) - self._Navigate(test_path) - feature_status_list = self.tab.EvaluateJavaScript( - 'browserBridge.gpuInfo.featureStatus.featureStatus') - for name, status in feature_status_list.items(): - if name == 'webgl': - if status != 'unavailable_software': - self.fail('WebGL status for SwiftShader failed: %s' % status) - return - elif name == '2d_canvas': - if status != 'unavailable_software': - self.fail('2D Canvas status for SwiftShader failed: %s' % status) - return - else: - pass - feature_status_for_hardware_gpu_list = self.tab.EvaluateJavaScript( - 'browserBridge.gpuInfo.featureStatusForHardwareGpu.featureStatus') - for name, status in feature_status_for_hardware_gpu_list.items(): - if name == 'webgl': - if status != 'unavailable_off': - self.fail('WebGL status for hardware GPU failed: %s' % status) - return - elif name == '2d_canvas': - if status != 'enabled': - self.fail('2D Canvas status for hardware GPU failed: %s' % status) - return - else: - pass - def _GpuProcess_only_one_workaround(self, test_path): # Start this test by launching the browser with no command line # arguments.
diff --git a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py index d20ae15..dfcfbaf 100644 --- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py +++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -50,6 +50,8 @@ # Flakes heavily on many OpenGL configurations self.Fail('conformance2/transform_feedback/too-small-buffers.html', + ['no_angle'], bug=832238) + self.Fail('conformance2/transform_feedback/too-small-buffers.html', ['opengl'], bug=832238) # Failing on Windows and Linux with NVIDIA GPUs and OpenGL driver.
diff --git a/device/fido/fido_request_handler.h b/device/fido/fido_request_handler.h index 3b46f90..a72cc9f 100644 --- a/device/fido/fido_request_handler.h +++ b/device/fido/fido_request_handler.h
@@ -54,6 +54,10 @@ const auto return_code = ConvertDeviceResponseCodeToFidoReturnCode( device_response_code, response_data.has_value()); + + // Any device response codes that do not result from user consent + // imply that the device should be dropped and that other on-going + // requests should continue until timeout is reached. if (!return_code) { ongoing_tasks().erase(device->GetId()); return;
diff --git a/extensions/browser/extension_function_histogram_value.h b/extensions/browser/extension_function_histogram_value.h index fd3ff7c..24639f2 100644 --- a/extensions/browser/extension_function_histogram_value.h +++ b/extensions/browser/extension_function_histogram_value.h
@@ -1304,6 +1304,7 @@ ENTERPRISEREPORTINGPRIVATE_UPLOADCHROMEDESKTOPREPORT, CECPRIVATE_SENDSTANDBY, CECPRIVATE_SENDWAKEUP, + WEBSTOREPRIVATE_GETREFERRERCHAIN, // Last entry: Add new entries above, then run: // python tools/metrics/histograms/update_extension_histograms.py ENUM_BOUNDARY
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc index 608aac8..a932ed5 100644 --- a/extensions/browser/guest_view/web_view/web_view_guest.cc +++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -424,40 +424,39 @@ return; } - content::StoragePartition::CookieMatcherFunction cookie_matcher; + net::CookieStore::CookieDeletionInfo cookie_delete_info; + cookie_delete_info.creation_range.SetStart(remove_since); + cookie_delete_info.creation_range.SetEnd(base::Time::Now()); - bool remove_session_cookies = - !!(removal_mask & webview::WEB_VIEW_REMOVE_DATA_MASK_SESSION_COOKIES); - bool remove_persistent_cookies = - !!(removal_mask & webview::WEB_VIEW_REMOVE_DATA_MASK_PERSISTENT_COOKIES); - bool remove_all_cookies = - (!!(removal_mask & webview::WEB_VIEW_REMOVE_DATA_MASK_COOKIES)) || - (remove_session_cookies && remove_persistent_cookies); + // TODO(cmumford): Make this (and webview::* constants) constexpr. + const uint32_t ALL_COOKIES_MASK = + webview::WEB_VIEW_REMOVE_DATA_MASK_SESSION_COOKIES | + webview::WEB_VIEW_REMOVE_DATA_MASK_PERSISTENT_COOKIES; - // Leaving the cookie_matcher unset will cause all cookies to be purged. - if (!remove_all_cookies) { - if (remove_session_cookies) { - cookie_matcher = - base::Bind([](const net::CanonicalCookie& cookie) -> bool { - return !cookie.IsPersistent(); - }); - } else if (remove_persistent_cookies) { - cookie_matcher = - base::Bind([](const net::CanonicalCookie& cookie) -> bool { - return cookie.IsPersistent(); - }); - } + if ((removal_mask & ALL_COOKIES_MASK) == ALL_COOKIES_MASK) { + cookie_delete_info.session_control = + net::CookieStore::CookieDeletionInfo::SessionControl::IGNORE_CONTROL; + } else if (removal_mask & + webview::WEB_VIEW_REMOVE_DATA_MASK_SESSION_COOKIES) { + cookie_delete_info.session_control = + net::CookieStore::CookieDeletionInfo::SessionControl::SESSION_COOKIES; + } else if (removal_mask & + webview::WEB_VIEW_REMOVE_DATA_MASK_PERSISTENT_COOKIES) { + cookie_delete_info.session_control = net::CookieStore::CookieDeletionInfo:: + SessionControl::PERSISTENT_COOKIES; } content::StoragePartition* partition = content::BrowserContext::GetStoragePartition( web_contents()->GetBrowserContext(), web_contents()->GetSiteInstance()); + base::Time start_time = cookie_delete_info.creation_range.start(); + base::Time end_time = cookie_delete_info.creation_range.end(); partition->ClearData( storage_partition_removal_mask, content::StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL, - content::StoragePartition::OriginMatcherFunction(), cookie_matcher, - remove_since, base::Time::Now(), callback); + content::StoragePartition::OriginMatcherFunction(), + std::move(cookie_delete_info), start_time, end_time, callback); } void WebViewGuest::GuestViewDidStopLoading() {
diff --git a/gpu/config/gpu_info.cc b/gpu/config/gpu_info.cc index 0c092cb..29b70f43 100644 --- a/gpu/config/gpu_info.cc +++ b/gpu/config/gpu_info.cc
@@ -99,10 +99,6 @@ return gpu; } -bool GPUInfo::IsInitialized() const { - return gpu.vendor_id != 0 || !gl_vendor.empty(); -} - void GPUInfo::EnumerateFields(Enumerator* enumerator) const { struct GPUInfoKnownFields { base::TimeDelta initialization_time;
diff --git a/gpu/config/gpu_info.h b/gpu/config/gpu_info.h index 8b27e08..3562a7c 100644 --- a/gpu/config/gpu_info.h +++ b/gpu/config/gpu_info.h
@@ -119,8 +119,6 @@ // The currently active gpu. const GPUDevice& active_gpu() const; - bool IsInitialized() const; - // The amount of time taken to get from the process starting to the message // loop being pumped. base::TimeDelta initialization_time;
diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc index 16072ae..0d3ce07 100644 --- a/gpu/ipc/service/gpu_init.cc +++ b/gpu/ipc/service/gpu_init.cc
@@ -409,17 +409,14 @@ } void GpuInit::AdjustInfoToSwiftShader() { - gpu_info_for_hardware_gpu_ = gpu_info_; - gpu_feature_info_for_hardware_gpu_ = gpu_feature_info_; gpu_feature_info_ = ComputeGpuFeatureInfoForSwiftShader(); - gpu_info_.gl_vendor = "Google Inc."; - gpu_info_.gl_renderer = "Google SwiftShader"; - gpu_info_.gl_version = "OpenGL ES 2.0 SwiftShader"; + gpu_info_.gl_vendor = "Google Inc. (" + gpu_info_.gl_vendor + ")"; + gpu_info_.gl_renderer = "Google SwiftShader (" + gpu_info_.gl_renderer + ")"; + gpu_info_.gl_version = + "OpenGL ES 2.0 SwiftShader (" + gpu_info_.gl_version + ")"; } void GpuInit::AdjustInfoToNoGpu() { - gpu_info_for_hardware_gpu_ = gpu_info_; - gpu_feature_info_for_hardware_gpu_ = gpu_feature_info_; gpu_feature_info_ = ComputeGpuFeatureInfoWithNoGpu(); gpu_info_.gl_vendor = "Disabled"; gpu_info_.gl_renderer = "Disabled";
diff --git a/gpu/ipc/service/gpu_init.h b/gpu/ipc/service/gpu_init.h index 813c0e6..f104b6c 100644 --- a/gpu/ipc/service/gpu_init.h +++ b/gpu/ipc/service/gpu_init.h
@@ -48,12 +48,6 @@ const GPUInfo& gpu_info() const { return gpu_info_; } const GpuFeatureInfo& gpu_feature_info() const { return gpu_feature_info_; } - const GPUInfo& gpu_info_for_hardware_gpu() const { - return gpu_info_for_hardware_gpu_; - } - const GpuFeatureInfo& gpu_feature_info_for_hardware_gpu() const { - return gpu_feature_info_for_hardware_gpu_; - } const GpuPreferences& gpu_preferences() const { return gpu_preferences_; } std::unique_ptr<GpuWatchdogThread> TakeWatchdogThread() { return std::move(watchdog_thread_); @@ -68,11 +62,6 @@ GpuPreferences gpu_preferences_; bool init_successful_ = false; - // The following data are collected from hardware GPU and saved before - // switching to SwiftShader. - GPUInfo gpu_info_for_hardware_gpu_; - GpuFeatureInfo gpu_feature_info_for_hardware_gpu_; - bool ShouldEnableSwiftShader(base::CommandLine* command_line, bool blacklist_needs_more_info); void AdjustInfoToSwiftShader();
diff --git a/headless/public/util/testing/generic_url_request_mocks.cc b/headless/public/util/testing/generic_url_request_mocks.cc index cd6c406d..ee698c9 100644 --- a/headless/public/util/testing/generic_url_request_mocks.cc +++ b/headless/public/util/testing/generic_url_request_mocks.cc
@@ -105,17 +105,14 @@ CHECK(false); } -void MockCookieStore::DeleteAllCreatedBetweenAsync( - const base::Time& delete_begin, - const base::Time& delete_end, +void MockCookieStore::DeleteAllCreatedInTimeRangeAsync( + const TimeRange& time_range, DeleteCallback callback) { CHECK(false); } -void MockCookieStore::DeleteAllCreatedBetweenWithPredicateAsync( - const base::Time& delete_begin, - const base::Time& delete_end, - const CookiePredicate& predicate, +void MockCookieStore::DeleteAllMatchingInfoAsync( + net::CookieStore::CookieDeletionInfo delete_info, DeleteCallback callback) { CHECK(false); }
diff --git a/headless/public/util/testing/generic_url_request_mocks.h b/headless/public/util/testing/generic_url_request_mocks.h index 5236b6532..e810103 100644 --- a/headless/public/util/testing/generic_url_request_mocks.h +++ b/headless/public/util/testing/generic_url_request_mocks.h
@@ -89,14 +89,11 @@ void DeleteCanonicalCookieAsync(const net::CanonicalCookie& cookie, DeleteCallback callback) override; - void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin, - const base::Time& delete_end, - DeleteCallback callback) override; + void DeleteAllCreatedInTimeRangeAsync(const TimeRange& creation_range, + DeleteCallback callback) override; - void DeleteAllCreatedBetweenWithPredicateAsync( - const base::Time& delete_begin, - const base::Time& delete_end, - const CookiePredicate& predicate, + void DeleteAllMatchingInfoAsync( + net::CookieStore::CookieDeletionInfo delete_info, DeleteCallback callback) override; void DeleteSessionCookiesAsync(DeleteCallback) override;
diff --git a/infra/config/branch/cq.cfg b/infra/config/branch/cq.cfg index b4537c4..5942440 100644 --- a/infra/config/branch/cq.cfg +++ b/infra/config/branch/cq.cfg
@@ -106,7 +106,7 @@ } builders { name: "linux_chromium_tsan_rel_ng" - equivalent_to { bucket: "luci.chromium.try" percentage: 0 } + equivalent_to { bucket: "luci.chromium.try" percentage: 10 } } builders { # Temporary addition to gather data for LUCI migration.
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg index d671d4fa..b7485a9 100644 --- a/infra/config/global/cr-buildbucket.cfg +++ b/infra/config/global/cr-buildbucket.cfg
@@ -465,6 +465,12 @@ } builders { + name: "Android WebView N (dbg)" + mixins: "android-ci" + dimensions: "os:Ubuntu-14.04" + } + + builders { name: "Android x64 Builder (dbg)" mixins: "android-ci" dimensions: "os:Ubuntu-14.04" @@ -499,6 +505,12 @@ dimensions: "os:Ubuntu-14.04" } + builders { + name: "Nougat Phone Tester" + mixins: "android-ci" + dimensions: "os:Ubuntu-14.04" + } + # ChromeOS bots. builders { name: "chromeos-amd64-generic-rel" @@ -1134,6 +1146,7 @@ builders { mixins: "linux-try" name: "fuchsia_x64" } builders { mixins: "linux-try" name: "fuchsia_arm64_cast_audio" } builders { mixins: "linux-try" name: "fuchsia_x64_cast_audio" } + builders { mixins: "linux-try" name: "linux-blink-heap-incremental-marking" } builders { mixins: "linux-try" name: "linux-blink-heap-verification-try" } builders { mixins: "linux-try" name: "linux-jumbo-rel" } builders { mixins: "linux-try" name: "linux_android_rel_ng" }
diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg index d0b1148..f44e4f86 100644 --- a/infra/config/global/luci-milo.cfg +++ b/infra/config/global/luci-milo.cfg
@@ -1842,7 +1842,7 @@ short_name: "M" } builders: { - name: "buildbot/chromium.android/Nougat Phone Tester" + name: "buildbucket/luci.chromium.ci/Nougat Phone Tester" category: "tester|phone" short_name: "N" } @@ -1872,7 +1872,7 @@ short_name: "M" } builders: { - name: "buildbot/chromium.android/Android WebView N (dbg)" + name: "buildbucket/luci.chromium.ci/Android WebView N (dbg)" category: "webview" short_name: "N" } @@ -4419,6 +4419,9 @@ name: "buildbucket/luci.chromium.try/fuchsia" } builders: { + name: "buildbucket/luci.chromium.try/linux-blink-heap-incremental-marking" + } + builders: { name: "buildbucket/luci.chromium.try/linux-blink-heap-verification-try" } builders: {
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg index e8926de..77bb9d1c 100644 --- a/infra/config/global/luci-scheduler.cfg +++ b/infra/config/global/luci-scheduler.cfg
@@ -235,13 +235,11 @@ id: "Android WebView N (dbg)" # triggered by "Android arm64 Builder (dbg)" acl_sets: "triggered-by-parent-builders" - # TODO(bpastene): s/noop/buildbucket. - noop: {} - # buildbucket: { - # server: "cr-buildbucket.appspot.com" - # bucket: "luci.chromium.ci" - # builder: "Android WebView N (dbg)" - # } + buildbucket: { + server: "cr-buildbucket.appspot.com" + bucket: "luci.chromium.ci" + builder: "Android WebView N (dbg)" + } } job { @@ -299,13 +297,11 @@ id: "Nougat Phone Tester" # triggered by "Android arm64 Builder (dbg)" acl_sets: "triggered-by-parent-builders" - # TODO(bpastene): s/noop/buildbucket. - noop: {} - # buildbucket: { - # server: "cr-buildbucket.appspot.com" - # bucket: "luci.chromium.ci" - # builder: "Nougat Phone Tester" - # } + buildbucket: { + server: "cr-buildbucket.appspot.com" + bucket: "luci.chromium.ci" + builder: "Nougat Phone Tester" + } } job {
diff --git a/ios/chrome/app/application_delegate/app_state_unittest.mm b/ios/chrome/app/application_delegate/app_state_unittest.mm index 9c6c22f6..864bb1b 100644 --- a/ios/chrome/app/application_delegate/app_state_unittest.mm +++ b/ios/chrome/app/application_delegate/app_state_unittest.mm
@@ -187,7 +187,7 @@ void swizzleMetricsMediatorDisableReporting() { metrics_mediator_called_ = NO; - metrics_mediator_swizzle_block_ = ^() { + metrics_mediator_swizzle_block_ = ^{ metrics_mediator_called_ = YES; }; @@ -236,7 +236,7 @@ stubNullCurrentBrowserState(browser_view_information_); - void (^swizzleBlock)() = ^() { + void (^swizzleBlock)() = ^{ }; ScopedBlockSwizzler swizzler( @@ -765,7 +765,7 @@ stubNullCurrentBrowserState(browserViewInformation); - void (^swizzleBlock)() = ^() { + void (^swizzleBlock)() = ^{ }; ScopedBlockSwizzler swizzler(
diff --git a/ios/chrome/app/deferred_initialization_runner_unittest.mm b/ios/chrome/app/deferred_initialization_runner_unittest.mm index 4ef54834..99fb39b 100644 --- a/ios/chrome/app/deferred_initialization_runner_unittest.mm +++ b/ios/chrome/app/deferred_initialization_runner_unittest.mm
@@ -28,11 +28,11 @@ __block bool secondFlag = NO; DeferredInitializationRunner* runner = [DeferredInitializationRunner sharedInstance]; - ProceduralBlock firstBlock = ^() { + ProceduralBlock firstBlock = ^{ EXPECT_FALSE(firstFlag); firstFlag = YES; }; - ProceduralBlock secondBlock = ^() { + ProceduralBlock secondBlock = ^{ EXPECT_FALSE(secondFlag); secondFlag = YES; }; @@ -66,7 +66,7 @@ __block bool slowFlag = NO; DeferredInitializationRunner* runner = [DeferredInitializationRunner sharedInstance]; - ProceduralBlock quickBlock = ^() { + ProceduralBlock quickBlock = ^{ EXPECT_FALSE(quickFlag); quickFlag = YES; // Make sure we have time to go back to this test before running the second @@ -76,7 +76,7 @@ ConditionBlock quickBlockRun = ^bool { return quickFlag; }; - ProceduralBlock slowBlock = ^() { + ProceduralBlock slowBlock = ^{ EXPECT_FALSE(slowFlag); slowFlag = YES; }; @@ -109,7 +109,7 @@ runner.delayBetweenBlocks = 0.01; [runner enqueueBlockNamed:@"cancel me" - block:^() { + block:^{ blockFinished = YES; }]; ASSERT_EQ(1U, [runner numberOfBlocksRemaining]); @@ -132,7 +132,7 @@ runner.delayBetweenBlocks = 0.01; [runner enqueueBlockNamed:@"cancel me" - block:^() { + block:^{ blockFinished = YES; }]; @@ -150,7 +150,7 @@ TEST_F(DeferredInitializationRunnerTest, TestSecondBlockInvalidatesFirst) { // Setup. __block int blockRunCount = 0; - ProceduralBlock runBlock = ^() { + ProceduralBlock runBlock = ^{ ++blockRunCount; }; DeferredInitializationRunner* runner =
diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios_strings.grd index 972ee9a..fe22d587 100644 --- a/ios/chrome/app/strings/ios_strings.grd +++ b/ios/chrome/app/strings/ios_strings.grd
@@ -643,7 +643,7 @@ Download finished </message> <message name="IDS_IOS_DOWNLOAD_MANAGER_REQUESTED_ACCESSIBILITY_ANNOUNCEMENT" desc="The accessibility announcement read by Voice Over when the Download Manager UI is shown to the user. [Length: unlimited] [iOS only]"> - File download is available + File download is available. Options available near bottom of screen. </message> <message name="IDS_IOS_DOWNLOAD_MANAGER_UPLOAD_TO_GOOGLE_DRIVE" desc="Button for uploading a downloaded file to Google Drive. It's displayed on the dialog presented when no app on the device can open the file. [Length: 25em] [iOS only]"> Upload to Google Drive
diff --git a/ios/chrome/browser/about_flags.mm b/ios/chrome/browser/about_flags.mm index 56bc0b97..85fd529 100644 --- a/ios/chrome/browser/about_flags.mm +++ b/ios/chrome/browser/about_flags.mm
@@ -264,12 +264,38 @@ {"autofill-dynamic-forms", flag_descriptions::kAutofillDynamicFormsName, flag_descriptions::kAutofillDynamicFormsDescription, flags_ui::kOsIos, FEATURE_VALUE_TYPE(autofill::features::kAutofillDynamicForms)}, + {"autofill-restrict-formless-form-extraction", + flag_descriptions::kAutofillRestrictUnownedFieldsToFormlessCheckoutName, + flag_descriptions:: + kAutofillRestrictUnownedFieldsToFormlessCheckoutDescription, + flags_ui::kOsIos, + FEATURE_VALUE_TYPE( + autofill::features::kAutofillRestrictUnownedFieldsToFormlessCheckout)}, {"ui-refresh-location-bar", flag_descriptions::kUIRefreshLocationBarName, flag_descriptions::kUIRefreshLocationBarDescription, flags_ui::kOsIos, FEATURE_VALUE_TYPE(kUIRefreshLocationBar)}, {"fullscreen-content-inset", flag_descriptions::kFullscreenContentInsetName, flag_descriptions::kFullscreenContentInsetDescription, flags_ui::kOsIos, FEATURE_VALUE_TYPE(fullscreen::features::kFullscreenContentInset)}, + {"autofill-enforce-min-required-fields-for-heuristics", + flag_descriptions::kAutofillEnforceMinRequiredFieldsForHeuristicsName, + flag_descriptions:: + kAutofillEnforceMinRequiredFieldsForHeuristicsDescription, + flags_ui::kOsIos, + FEATURE_VALUE_TYPE( + autofill::features::kAutofillEnforceMinRequiredFieldsForHeuristics)}, + {"autofill-enforce-min-required-fields-for-query", + flag_descriptions::kAutofillEnforceMinRequiredFieldsForQueryName, + flag_descriptions::kAutofillEnforceMinRequiredFieldsForQueryDescription, + flags_ui::kOsIos, + FEATURE_VALUE_TYPE( + autofill::features::kAutofillEnforceMinRequiredFieldsForQuery)}, + {"autofill-enforce-min-required-fields-for-upload", + flag_descriptions::kAutofillEnforceMinRequiredFieldsForUploadName, + flag_descriptions::kAutofillEnforceMinRequiredFieldsForUploadDescription, + flags_ui::kOsIos, + FEATURE_VALUE_TYPE( + autofill::features::kAutofillEnforceMinRequiredFieldsForUpload)}, }; // Add all switches from experimental flags to |command_line|.
diff --git a/ios/chrome/browser/browsing_data/browsing_data_remover_impl.mm b/ios/chrome/browser/browsing_data/browsing_data_remover_impl.mm index 9c3daf4..82c8d8d4 100644 --- a/ios/chrome/browser/browsing_data/browsing_data_remover_impl.mm +++ b/ios/chrome/browser/browsing_data/browsing_data_remover_impl.mm
@@ -111,16 +111,14 @@ // Clears cookies. void ClearCookies( scoped_refptr<net::URLRequestContextGetter> request_context_getter, - base::Time delete_begin, - base::Time delete_end, + const net::CookieStore::TimeRange& creation_range, base::OnceClosure callback) { DCHECK_CURRENTLY_ON(web::WebThread::IO); net::CookieStore* cookie_store = request_context_getter->GetURLRequestContext()->cookie_store(); - cookie_store->DeleteAllCreatedBetweenAsync( - delete_begin, delete_end, - AdaptCallbackForRepeating( - base::BindOnce(&DeleteCallbackAdapter, std::move(callback)))); + cookie_store->DeleteAllCreatedInTimeRangeAsync( + creation_range, AdaptCallbackForRepeating(base::BindOnce( + &DeleteCallbackAdapter, std::move(callback)))); } // Clears SSL connection pool and then invoke callback. @@ -315,7 +313,8 @@ web::WebThread::PostTask( web::WebThread::IO, FROM_HERE, base::BindOnce( - &ClearCookies, context_getter_, delete_begin, delete_end, + &ClearCookies, context_getter_, + net::CookieStore::TimeRange(delete_begin, delete_end), base::BindOnce(base::IgnoreResult(&base::TaskRunner::PostTask), current_task_runner, FROM_HERE, CreatePendingTaskCompletionClosure()))); @@ -601,19 +600,16 @@ return; } - // Blocks don't play well with move-only objects, so wrap the closure as - // a repeating closure (this is better than recreating the same API with - // blocks). - base::RepeatingClosure closure = - AdaptCallbackForRepeating(CreatePendingTaskCompletionClosure()); + base::WeakPtr<BrowsingDataRemoverImpl> weak_ptr = GetWeakPtr(); + __block base::OnceClosure closure = CreatePendingTaskCompletionClosure(); ProceduralBlock completion_block = ^{ - dummy_web_view_ = nil; - closure.Run(); + if (BrowsingDataRemoverImpl* strong_ptr = weak_ptr.get()) + strong_ptr->dummy_web_view_ = nil; + std::move(closure).Run(); }; if (IsRemoveDataMaskSet(mask, BrowsingDataRemoveMask::REMOVE_VISITED_LINKS)) { ProceduralBlock previous_completion_block = completion_block; - base::WeakPtr<BrowsingDataRemoverImpl> weak_ptr = GetWeakPtr(); // TODO(crbug.com/557963): Purging the WKProcessPool is a workaround for // the fact that there is no public API to clear visited links in
diff --git a/ios/chrome/browser/find_in_page/find_tab_helper_unittest.mm b/ios/chrome/browser/find_in_page/find_tab_helper_unittest.mm index da380c60..811c13d 100644 --- a/ios/chrome/browser/find_in_page/find_tab_helper_unittest.mm +++ b/ios/chrome/browser/find_in_page/find_tab_helper_unittest.mm
@@ -35,7 +35,7 @@ void TearDown() override { // Stop any in-progress find operations when the test completes. __block BOOL completion_handler_block_was_called = NO; - FindTabHelper::FromWebState(web_state())->StopFinding(^() { + FindTabHelper::FromWebState(web_state())->StopFinding(^{ completion_handler_block_was_called = YES; }); base::test::ios::WaitUntilCondition(^bool() { @@ -114,7 +114,7 @@ base::test::ios::WaitUntilCondition(wait_block); // Stop finding and verify that the completion block was called properly. - helper->StopFinding(^() { + helper->StopFinding(^{ completion_handler_block_was_called = YES; }); base::test::ios::WaitUntilCondition(wait_block);
diff --git a/ios/chrome/browser/ios_chrome_flag_descriptions.cc b/ios/chrome/browser/ios_chrome_flag_descriptions.cc index b19e379..c9dd7e5 100644 --- a/ios/chrome/browser/ios_chrome_flag_descriptions.cc +++ b/ios/chrome/browser/ios_chrome_flag_descriptions.cc
@@ -20,6 +20,29 @@ const char kAutofillDynamicFormsDescription[] = "Refills forms that dynamically change after an initial fill"; +const char kAutofillEnforceMinRequiredFieldsForHeuristicsName[] = + "Autofill Enforce Min Required Fields For Heuristics"; +const char kAutofillEnforceMinRequiredFieldsForHeuristicsDescription[] = + "When enabled, autofill will generally require a form to have at least 3 " + "fields before allowing heuristic field-type prediction to occur."; + +const char kAutofillEnforceMinRequiredFieldsForQueryName[] = + "Autofill Enforce Min Required Fields For Query"; +const char kAutofillEnforceMinRequiredFieldsForQueryDescription[] = + "When enabled, autofill will generally require a form to have at least 3 " + "fields before querying the autofill server for field-type predictions."; + +const char kAutofillEnforceMinRequiredFieldsForUploadName[] = + "Autofill Enforce Min Required Fields For Upload"; +const char kAutofillEnforceMinRequiredFieldsForUploadDescription[] = + "When enabled, autofill will generally require a form to have at least 3 " + "fillable fields before uploading field-type votes for that form."; + +const char kAutofillRestrictUnownedFieldsToFormlessCheckoutName[] = + "Restrict formless form extraction"; +const char kAutofillRestrictUnownedFieldsToFormlessCheckoutDescription[] = + "Restrict extraction of formless forms to checkout flows"; + const char kBrowserTaskScheduler[] = "Task Scheduler"; const char kBrowserTaskSchedulerDescription[] = "Enables redirection of some task posting APIs to the task scheduler.";
diff --git a/ios/chrome/browser/ios_chrome_flag_descriptions.h b/ios/chrome/browser/ios_chrome_flag_descriptions.h index 94e11a3f..ae87cda 100644 --- a/ios/chrome/browser/ios_chrome_flag_descriptions.h +++ b/ios/chrome/browser/ios_chrome_flag_descriptions.h
@@ -15,6 +15,19 @@ extern const char kAutofillDynamicFormsName[]; extern const char kAutofillDynamicFormsDescription[]; +// Enforcing restrictions to enable/disable autofill small form support. +extern const char kAutofillEnforceMinRequiredFieldsForHeuristicsName[]; +extern const char kAutofillEnforceMinRequiredFieldsForHeuristicsDescription[]; +extern const char kAutofillEnforceMinRequiredFieldsForQueryName[]; +extern const char kAutofillEnforceMinRequiredFieldsForQueryDescription[]; +extern const char kAutofillEnforceMinRequiredFieldsForUploadName[]; +extern const char kAutofillEnforceMinRequiredFieldsForUploadDescription[]; + +// Title and description for the flag to restrict extraction of formless forms +// to checkout flows. +extern const char kAutofillRestrictUnownedFieldsToFormlessCheckoutName[]; +extern const char kAutofillRestrictUnownedFieldsToFormlessCheckoutDescription[]; + // Title and description for the flag to control redirection to the task // scheduler. extern const char kBrowserTaskScheduler[];
diff --git a/ios/chrome/browser/passwords/password_controller_unittest.mm b/ios/chrome/browser/passwords/password_controller_unittest.mm index 12156e9b..2d179cd 100644 --- a/ios/chrome/browser/passwords/password_controller_unittest.mm +++ b/ios/chrome/browser/passwords/password_controller_unittest.mm
@@ -997,7 +997,7 @@ WaitForBackgroundTasks(); } // Wait until suggestions are received. - EXPECT_TRUE(WaitUntilConditionOrTimeout(kWaitForJSCompletionTimeout, ^() { + EXPECT_TRUE(WaitUntilConditionOrTimeout(kWaitForJSCompletionTimeout, ^{ return [GetSuggestionValues() count] > 0; }));
diff --git a/ios/chrome/browser/passwords/passwords_directory_util_unittest.mm b/ios/chrome/browser/passwords/passwords_directory_util_unittest.mm index 06417f0..be6c0d7 100644 --- a/ios/chrome/browser/passwords/passwords_directory_util_unittest.mm +++ b/ios/chrome/browser/passwords/passwords_directory_util_unittest.mm
@@ -30,7 +30,7 @@ // Create a new file in the passwords directory. base::PostTaskWithTraits( FROM_HERE, {base::MayBlock(), base::TaskPriority::USER_BLOCKING}, - base::BindBlockArc(^() { + base::BindBlockArc(^{ NSFileManager* file_manager = [NSFileManager defaultManager]; if ([file_manager createDirectoryAtURL:directory_url withIntermediateDirectories:NO
diff --git a/ios/chrome/browser/share_extension/share_extension_item_receiver.mm b/ios/chrome/browser/share_extension/share_extension_item_receiver.mm index db3ee7b..b23eaed 100644 --- a/ios/chrome/browser/share_extension/share_extension_item_receiver.mm +++ b/ios/chrome/browser/share_extension/share_extension_item_receiver.mm
@@ -144,7 +144,7 @@ object:nil]; __weak ShareExtensionItemReceiver* weakSelf = self; - _taskRunner->PostTask(FROM_HERE, base::BindBlockArc(^() { + _taskRunner->PostTask(FROM_HERE, base::BindBlockArc(^{ [weakSelf createReadingListFolder]; })); } @@ -175,8 +175,7 @@ } __weak ShareExtensionItemReceiver* weakSelf = self; - web::WebThread::PostTask(web::WebThread::UI, FROM_HERE, - base::BindBlockArc(^() { + web::WebThread::PostTask(web::WebThread::UI, FROM_HERE, base::BindBlockArc(^{ [weakSelf readingListFolderCreated]; })); } @@ -243,7 +242,7 @@ SHARE_EXTENSION_SOURCE_COUNT); // Entry is valid. Add it to the reading list model. - ProceduralBlock processEntryBlock = ^() { + ProceduralBlock processEntryBlock = ^{ if (!_readingListModel || !_bookmarkModel) { // Models may have been deleted after the file // processing started. @@ -268,7 +267,7 @@ } if (completion && _taskRunner) { - _taskRunner->PostTask(FROM_HERE, base::BindBlockArc(^() { + _taskRunner->PostTask(FROM_HERE, base::BindBlockArc(^{ completion(); })); } @@ -340,7 +339,7 @@ // There may already be files. Process them. if (_taskRunner) { __weak ShareExtensionItemReceiver* weakSelf = self; - _taskRunner->PostTask(FROM_HERE, base::BindBlockArc(^() { + _taskRunner->PostTask(FROM_HERE, base::BindBlockArc(^{ [weakSelf processExistingFiles]; })); } @@ -367,7 +366,7 @@ if ([files count]) { __weak ShareExtensionItemReceiver* weakSelf = self; web::WebThread::PostTask(web::WebThread::UI, FROM_HERE, - base::BindBlockArc(^() { + base::BindBlockArc(^{ [weakSelf entriesReceived:files]; })); } @@ -383,12 +382,12 @@ for (NSURL* fileURL : files) { __block std::unique_ptr<ReadingListModel::ScopedReadingListBatchUpdate> batchToken(_readingListModel->BeginBatchUpdates()); - _taskRunner->PostTask(FROM_HERE, base::BindBlockArc(^() { + _taskRunner->PostTask(FROM_HERE, base::BindBlockArc(^{ [weakSelf handleFileAtURL:fileURL withCompletion:^{ web::WebThread::PostTask( web::WebThread::UI, FROM_HERE, - base::BindBlockArc(^() { + base::BindBlockArc(^{ batchToken.reset(); })); }]; @@ -409,7 +408,7 @@ - (void)presentedSubitemDidChangeAtURL:(NSURL*)url { if (_taskRunner) { __weak ShareExtensionItemReceiver* weakSelf = self; - _taskRunner->PostTask(FROM_HERE, base::BindBlockArc(^() { + _taskRunner->PostTask(FROM_HERE, base::BindBlockArc(^{ [weakSelf handleFileAtURL:url withCompletion:nil]; })); }
diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.mm b/ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.mm index 7386df5..286f6be 100644 --- a/ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.mm
@@ -155,7 +155,7 @@ } else { __weak BookmarkInteractionController* weakSelf = self; __weak Tab* weakTab = tab; - void (^editAction)() = ^() { + void (^editAction)() = ^{ BookmarkInteractionController* strongSelf = weakSelf; if (!strongSelf || !weakTab || !weakTab.webState) return;
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm index 8660a09..2db398d 100644 --- a/ios/chrome/browser/ui/browser_view_controller.mm +++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -2626,7 +2626,7 @@ // the feature engagement tracker will remain pointing to invalid memory if // its owner (the ChromeBrowserState) is deallocated. __weak BrowserViewController* weakSelf = self; - void (^dismissalCallback)(void) = ^() { + void (^dismissalCallback)(void) = ^{ BrowserViewController* strongSelf = weakSelf; if (strongSelf) { feature_engagement::TrackerFactory::GetForBrowserState( @@ -5023,7 +5023,7 @@ // This callback is called before webState is activated (on // kTabModelNewTabWillOpenNotification notification). Dispatch the // callback asynchronously to be sure the activation is complete. - dispatch_async(dispatch_get_main_queue(), ^() { + dispatch_async(dispatch_get_main_queue(), ^{ // Test existence again as the block may have been deleted. if (self.foregroundTabWasAddedCompletionBlock) { self.foregroundTabWasAddedCompletionBlock();
diff --git a/ios/chrome/browser/ui/bubble/bubble_view_controller_presenter_unittest.mm b/ios/chrome/browser/ui/bubble/bubble_view_controller_presenter_unittest.mm index 62215dcd..6f5284f5 100644 --- a/ios/chrome/browser/ui/bubble/bubble_view_controller_presenter_unittest.mm +++ b/ios/chrome/browser/ui/bubble/bubble_view_controller_presenter_unittest.mm
@@ -35,7 +35,7 @@ initWithText:@"Text" arrowDirection:BubbleArrowDirectionUp alignment:BubbleAlignmentCenter - dismissalCallback:^() { + dismissalCallback:^{ dismissalCallbackCount_++; }]), window_([[UIWindow alloc]
diff --git a/ios/chrome/browser/ui/chrome_web_view_factory.mm b/ios/chrome/browser/ui/chrome_web_view_factory.mm index 09aacdb..059574e 100644 --- a/ios/chrome/browser/ui/chrome_web_view_factory.mm +++ b/ios/chrome/browser/ui/chrome_web_view_factory.mm
@@ -55,14 +55,13 @@ // Clears the cookies. void ClearCookiesOnIOThread(net::URLRequestContextGetter* context_getter, - base::Time delete_begin, - base::Time delete_end) { + const net::CookieStore::TimeRange& creation_range) { DCHECK(context_getter); DCHECK_CURRENTLY_ON(web::WebThread::IO); net::CookieStore* cookie_store = context_getter->GetURLRequestContext()->cookie_store(); - cookie_store->DeleteAllCreatedBetweenAsync(delete_begin, delete_end, - base::DoNothing()); + cookie_store->DeleteAllCreatedInTimeRangeAsync(creation_range, + base::DoNothing()); } // Registers |user_agent| as the user agent string to be used by the UIWebView @@ -128,7 +127,7 @@ web::WebThread::PostTask( web::WebThread::IO, FROM_HERE, base::Bind(&ClearCookiesOnIOThread, base::RetainedRef(contextGetter), - deleteBegin, deleteEnd)); + net::CookieStore::TimeRange(deleteBegin, deleteEnd))); } + (void)clearExternalCookies:(ios::ChromeBrowserState*)browserState
diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.mm index 6843e45..6843e9bb 100644 --- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.mm +++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.mm
@@ -679,7 +679,7 @@ [[ContentSuggestionsArticlesHeaderItem alloc] initWithType:ItemTypeHeader title:sectionInfo.title - callback:^() { + callback:^{ [weakSelf.dataSource toggleArticlesVisibility]; }]; header.expanded = sectionInfo.expanded;
diff --git a/ios/chrome/browser/ui/content_suggestions/ntp_home_egtest.mm b/ios/chrome/browser/ui/content_suggestions/ntp_home_egtest.mm index a5f924c..e338c780 100644 --- a/ios/chrome/browser/ui/content_suggestions/ntp_home_egtest.mm +++ b/ios/chrome/browser/ui/content_suggestions/ntp_home_egtest.mm
@@ -417,7 +417,7 @@ // Swizzle the method that needs to be called for correct logging. __block BOOL tapped = NO; ScopedBlockSwizzler swizzler([LocationBarLegacyCoordinator class], - @selector(focusOmniboxFromFakebox), ^() { + @selector(focusOmniboxFromFakebox), ^{ tapped = YES; }); @@ -444,7 +444,7 @@ // Swizzle the method that needs to be called for correct logging. __block BOOL tapped = NO; ScopedBlockSwizzler swizzler([LocationBarCoordinator class], - @selector(focusOmniboxFromSearchButton), ^() { + @selector(focusOmniboxFromSearchButton), ^{ tapped = YES; });
diff --git a/ios/chrome/browser/ui/dialogs/dialog_presenter_unittest.mm b/ios/chrome/browser/ui/dialogs/dialog_presenter_unittest.mm index 3ca03db..5fda247 100644 --- a/ios/chrome/browser/ui/dialogs/dialog_presenter_unittest.mm +++ b/ios/chrome/browser/ui/dialogs/dialog_presenter_unittest.mm
@@ -181,7 +181,7 @@ [presenter() runJavaScriptAlertPanelWithMessage:@"" requestURL:GURL() webState:&webState2 - completionHandler:^() { + completionHandler:^{ completion_called = YES; }]; EXPECT_EQ(1U, delegate().presentedWebStates.size()); @@ -226,7 +226,7 @@ [presenter() runJavaScriptAlertPanelWithMessage:@"1" requestURL:GURL() webState:&webState1 - completionHandler:^() { + completionHandler:^{ completion1_called = YES; }]; DialogPresenterTestWebState webState2; @@ -234,7 +234,7 @@ [presenter() runJavaScriptAlertPanelWithMessage:@"2" requestURL:GURL() webState:&webState2 - completionHandler:^() { + completionHandler:^{ completion2_called = YES; }]; DialogPresenterTestWebState webState3; @@ -242,7 +242,7 @@ [presenter() runJavaScriptAlertPanelWithMessage:@"3" requestURL:GURL() webState:&webState3 - completionHandler:^() { + completionHandler:^{ completion3_called = YES; }]; EXPECT_EQ(1U, delegate().presentedWebStates.size());
diff --git a/ios/chrome/browser/ui/fullscreen/BUILD.gn b/ios/chrome/browser/ui/fullscreen/BUILD.gn index d15dcc6..3e5e7dd 100644 --- a/ios/chrome/browser/ui/fullscreen/BUILD.gn +++ b/ios/chrome/browser/ui/fullscreen/BUILD.gn
@@ -135,6 +135,8 @@ ":fullscreen", ":internal", ":ui", + "//base/test:test_support", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui:ui_util", "//ios/chrome/browser/ui/broadcaster", "//ios/chrome/browser/ui/fullscreen/test",
diff --git a/ios/chrome/browser/ui/fullscreen/fullscreen_web_state_observer_unittest.mm b/ios/chrome/browser/ui/fullscreen/fullscreen_web_state_observer_unittest.mm index 214850dc..b36b85b 100644 --- a/ios/chrome/browser/ui/fullscreen/fullscreen_web_state_observer_unittest.mm +++ b/ios/chrome/browser/ui/fullscreen/fullscreen_web_state_observer_unittest.mm
@@ -4,10 +4,12 @@ #import "ios/chrome/browser/ui/fullscreen/fullscreen_web_state_observer.h" +#include "base/test/scoped_feature_list.h" #import "ios/chrome/browser/ui/fullscreen/fullscreen_model.h" #import "ios/chrome/browser/ui/fullscreen/test/fullscreen_model_test_util.h" #import "ios/chrome/browser/ui/fullscreen/test/test_fullscreen_controller.h" #import "ios/chrome/browser/ui/fullscreen/test/test_fullscreen_mediator.h" +#include "ios/chrome/browser/ui/ui_feature_flags.h" #import "ios/web/public/navigation_item.h" #include "ios/web/public/ssl_status.h" #import "ios/web/public/test/fakes/fake_navigation_context.h" @@ -83,7 +85,10 @@ } // Tests that the model is disabled when a load is occurring. -TEST_F(FullscreenWebStateObserverTest, DisableDuringLoad) { +TEST_F(FullscreenWebStateObserverTest, DisableDuringLoadWithUIRefreshDisabled) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitAndDisableFeature(kUIRefreshPhase1); + EXPECT_TRUE(model().enabled()); web_state().SetLoading(true); EXPECT_FALSE(model().enabled()); @@ -91,6 +96,18 @@ EXPECT_TRUE(model().enabled()); } +// Tests that the model is not disabled when a load is occurring. +TEST_F(FullscreenWebStateObserverTest, DisableDuringLoadWithUIRefreshEnabled) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitAndEnableFeature(kUIRefreshPhase1); + + EXPECT_TRUE(model().enabled()); + web_state().SetLoading(true); + EXPECT_TRUE(model().enabled()); + web_state().SetLoading(false); + EXPECT_TRUE(model().enabled()); +} + // Tests that the model is disabled when the SSL status is broken. TEST_F(FullscreenWebStateObserverTest, DisableForBrokenSSL) { std::unique_ptr<web::NavigationItem> item = web::NavigationItem::Create();
diff --git a/ios/chrome/browser/ui/omnibox_perftest.mm b/ios/chrome/browser/ui/omnibox_perftest.mm index c12c976..becadc5 100644 --- a/ios/chrome/browser/ui/omnibox_perftest.mm +++ b/ios/chrome/browser/ui/omnibox_perftest.mm
@@ -244,7 +244,7 @@ ^base::TimeDelta(int index) { return EnableKeyboard(textField); }, - ^() { + ^{ DisableKeyboard(textField); }); } @@ -259,7 +259,7 @@ EnableKeyboard(textField); return TimeInsertText(textField, @"G"); }, - ^() { + ^{ [textField setText:@""]; DisableKeyboard(textField); }); @@ -290,7 +290,7 @@ NSLog(@"%2d: %@", index, logMessage); return elapsed; }, - ^() { + ^{ [textField setText:@""]; DisableKeyboard(textField); });
diff --git a/ios/chrome/browser/ui/settings/password_exporter.mm b/ios/chrome/browser/ui/settings/password_exporter.mm index 2cb839b3..051cec8 100644 --- a/ios/chrome/browser/ui/settings/password_exporter.mm +++ b/ios/chrome/browser/ui/settings/password_exporter.mm
@@ -60,7 +60,7 @@ - (void)writeData:(NSData*)data toURL:(NSURL*)fileURL handler:(void (^)(WriteToURLStatus))handler { - WriteToURLStatus (^writeToFile)() = ^() { + WriteToURLStatus (^writeToFile)() = ^{ base::AssertBlockingAllowed(); NSError* error = nil; @@ -336,7 +336,7 @@ [passwordsTempFileURL URLByDeletingLastPathComponent]; base::PostTaskWithTraits( FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND}, - base::BindBlockArc(^() { + base::BindBlockArc(^{ base::AssertBlockingAllowed(); NSFileManager* fileManager = [NSFileManager defaultManager]; [fileManager removeItemAtURL:uniqueDirectoryURL error:nil];
diff --git a/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm b/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm index 3cd5068..41592e6 100644 --- a/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm +++ b/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm
@@ -946,7 +946,7 @@ !preparingPasswordsAlert_.beingDismissed) { __weak SavePasswordsCollectionViewController* weakSelf = self; [self dismissViewControllerAnimated:YES - completion:^() { + completion:^{ [weakSelf presentViewController:viewController animated:YES completion:nil];
diff --git a/ios/chrome/browser/ui/toolbar/clean/toolbar_view_controller.mm b/ios/chrome/browser/ui/toolbar/clean/toolbar_view_controller.mm index d31eba7..8e11c23 100644 --- a/ios/chrome/browser/ui/toolbar/clean/toolbar_view_controller.mm +++ b/ios/chrome/browser/ui/toolbar/clean/toolbar_view_controller.mm
@@ -610,7 +610,7 @@ - (void)addFullscreenAnimationsToAnimator:(FullscreenAnimator*)animator { CGFloat finalProgress = animator.finalProgress; - [animator addAnimations:^() { + [animator addAnimations:^{ [self updateForFullscreenProgress:finalProgress]; }]; }
diff --git a/ios/chrome/browser/ui/toolbar/legacy/toolbar_controller.mm b/ios/chrome/browser/ui/toolbar/legacy/toolbar_controller.mm index 661ae73..9378865 100644 --- a/ios/chrome/browser/ui/toolbar/legacy/toolbar_controller.mm +++ b/ios/chrome/browser/ui/toolbar/legacy/toolbar_controller.mm
@@ -731,7 +731,7 @@ - (void)addFullscreenAnimationsToAnimator:(FullscreenAnimator*)animator { CGFloat finalProgress = animator.finalProgress; - [animator addAnimations:^() { + [animator addAnimations:^{ [self updateForFullscreenProgress:finalProgress]; }]; }
diff --git a/ios/chrome/browser/web/dom_altering_lock.mm b/ios/chrome/browser/web/dom_altering_lock.mm index 9c3e670c..f319c70 100644 --- a/ios/chrome/browser/web/dom_altering_lock.mm +++ b/ios/chrome/browser/web/dom_altering_lock.mm
@@ -31,7 +31,7 @@ lockAction(NO); return; } - [current_dom_altering_feature_ releaseDOMLockWithCompletionHandler:^() { + [current_dom_altering_feature_ releaseDOMLockWithCompletionHandler:^{ DCHECK_CURRENTLY_ON(web::WebThread::UI); DCHECK(current_dom_altering_feature_ == nil) << "The lock must be released before calling the completion handler.";
diff --git a/ios/net/cookies/cookie_store_ios.h b/ios/net/cookies/cookie_store_ios.h index 3bbe2657..44b1782 100644 --- a/ios/net/cookies/cookie_store_ios.h +++ b/ios/net/cookies/cookie_store_ios.h
@@ -96,13 +96,10 @@ base::OnceClosure callback) override; void DeleteCanonicalCookieAsync(const CanonicalCookie& cookie, DeleteCallback callback) override; - void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin, - const base::Time& delete_end, - DeleteCallback callback) override; - void DeleteAllCreatedBetweenWithPredicateAsync( - const base::Time& delete_begin, - const base::Time& delete_end, - const CookiePredicate& predicate, + void DeleteAllCreatedInTimeRangeAsync(const TimeRange& creation_range, + DeleteCallback callback) override; + void DeleteAllMatchingInfoAsync( + net::CookieStore::CookieDeletionInfo delete_info, DeleteCallback callback) override; void DeleteSessionCookiesAsync(DeleteCallback callback) override; void FlushStore(base::OnceClosure callback) override; @@ -133,11 +130,6 @@ base::CallbackList<void(const CanonicalCookie& cookie, CookieChangeCause cause)>; - // Cookie filter for DeleteCookiesWithFilter(). - // Takes a cookie and a creation time and returns true the cookie must be - // deleted. - typedef base::Callback<bool(NSHTTPCookie*, base::Time)> CookieFilterFunction; - // CookieChangeDispatcher implementation that proxies into IOSCookieStore. class CookieChangeDispatcherIOS : public CookieChangeDispatcher { public: @@ -178,8 +170,9 @@ // Inherited CookieNotificationObserver methods. void OnSystemCookiesChanged() override; - void DeleteCookiesWithFilterAsync(CookieFilterFunction filter, - DeleteCallback callback); + void DeleteCookiesMatchingInfoAsync( + CookieStore::CookieDeletionInfo delete_info, + DeleteCallback callback); // Flush to CookieMonster from |cookies|, and run |callback|. void FlushStoreFromCookies(base::OnceClosure callback,
diff --git a/ios/net/cookies/cookie_store_ios.mm b/ios/net/cookies/cookie_store_ios.mm index a3a148a..4057f13 100644 --- a/ios/net/cookies/cookie_store_ios.mm +++ b/ios/net/cookies/cookie_store_ios.mm
@@ -39,6 +39,8 @@ namespace net { +using CookieDeletionInfo = CookieStore::CookieDeletionInfo; + namespace { class CookieStoreIOSCookieChangeSubscription : public CookieChangeSubscription { @@ -161,38 +163,6 @@ return set_callback; } -// Tests whether the |cookie| is a session cookie. -bool IsCookieSessionCookie(NSHTTPCookie* cookie, base::Time time) { - return [cookie isSessionOnly]; -} - -// Tests whether the |creation_time| of |cookie| is in the time range defined -// by |time_begin| and |time_end|. A null |time_end| means end-of-time. -bool IsCookieCreatedBetween(base::Time time_begin, - base::Time time_end, - NSHTTPCookie* cookie, - base::Time creation_time) { - return time_begin <= creation_time && - (time_end.is_null() || creation_time <= time_end); -} - -// Tests whether the |creation_time| of |cookie| is in the time range defined -// by |time_begin| and |time_end| and the cookie host match |host|. A null -// |time_end| means end-of-time. -bool IsCookieCreatedBetweenWithPredicate( - base::Time time_begin, - base::Time time_end, - const net::CookieStore::CookiePredicate& predicate, - NSHTTPCookie* cookie, - base::Time creation_time) { - if (predicate.is_null()) - return false; - CanonicalCookie canonical_cookie = - CanonicalCookieFromSystemCookie(cookie, creation_time); - return IsCookieCreatedBetween(time_begin, time_end, cookie, creation_time) && - predicate.Run(canonical_cookie); -} - // Adds cookies in |cookies| with name |name| to |filtered|. void OnlyCookiesWithName(const net::CookieList& cookies, const std::string& name, @@ -434,14 +404,12 @@ DCHECK(SystemCookiesAllowed()); // This relies on the fact cookies are given unique creation dates. - CookieFilterFunction filter = base::Bind( - IsCookieCreatedBetween, cookie.CreationDate(), cookie.CreationDate()); - DeleteCookiesWithFilterAsync(std::move(filter), std::move(callback)); + CookieDeletionInfo delete_info(cookie.CreationDate(), cookie.CreationDate()); + DeleteCookiesMatchingInfoAsync(std::move(delete_info), std::move(callback)); } -void CookieStoreIOS::DeleteAllCreatedBetweenAsync( - const base::Time& delete_begin, - const base::Time& delete_end, +void CookieStoreIOS::DeleteAllCreatedInTimeRangeAsync( + const TimeRange& creation_range, DeleteCallback callback) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); @@ -452,15 +420,12 @@ if (metrics_enabled()) ResetCookieCountMetrics(); - CookieFilterFunction filter = base::Bind( - &IsCookieCreatedBetween, delete_begin, delete_end); - DeleteCookiesWithFilterAsync(std::move(filter), std::move(callback)); + CookieDeletionInfo delete_info(creation_range.start(), creation_range.end()); + DeleteCookiesMatchingInfoAsync(std::move(delete_info), std::move(callback)); } -void CookieStoreIOS::DeleteAllCreatedBetweenWithPredicateAsync( - const base::Time& delete_begin, - const base::Time& delete_end, - const CookiePredicate& predicate, +void CookieStoreIOS::DeleteAllMatchingInfoAsync( + CookieStore::CookieDeletionInfo delete_info, DeleteCallback callback) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); @@ -471,9 +436,7 @@ if (metrics_enabled()) ResetCookieCountMetrics(); - CookieFilterFunction filter = base::Bind( - IsCookieCreatedBetweenWithPredicate, delete_begin, delete_end, predicate); - DeleteCookiesWithFilterAsync(std::move(filter), std::move(callback)); + DeleteCookiesMatchingInfoAsync(std::move(delete_info), std::move(callback)); } void CookieStoreIOS::DeleteSessionCookiesAsync(DeleteCallback callback) { @@ -486,8 +449,10 @@ if (metrics_enabled()) ResetCookieCountMetrics(); - CookieFilterFunction filter = base::Bind(&IsCookieSessionCookie); - DeleteCookiesWithFilterAsync(std::move(filter), std::move(callback)); + CookieDeletionInfo delete_info; + delete_info.session_control = + CookieDeletionInfo::SessionControl::SESSION_COOKIES; + DeleteCookiesMatchingInfoAsync(std::move(delete_info), std::move(callback)); } void CookieStoreIOS::FlushStore(base::OnceClosure closure) { @@ -582,21 +547,23 @@ UMA_HISTOGRAM_COUNTS_10000("CookieIOS.CookieWrittenCount", cookie_count); } -void CookieStoreIOS::DeleteCookiesWithFilterAsync(CookieFilterFunction filter, - DeleteCallback callback) { +void CookieStoreIOS::DeleteCookiesMatchingInfoAsync( + CookieDeletionInfo delete_info, + DeleteCallback callback) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - DCHECK(!filter.is_null()); __block DeleteCallback shared_callback = std::move(callback); - __block CookieFilterFunction shared_filter = std::move(filter); + __block CookieDeletionInfo shared_delete_info = std::move(delete_info); base::WeakPtr<SystemCookieStore> weak_system_store = system_store_->GetWeakPtr(); system_store_->GetAllCookiesAsync( base::BindBlockArc(^(NSArray<NSHTTPCookie*>* cookies) { int to_delete_count = 0; for (NSHTTPCookie* cookie in cookies) { - if (weak_system_store && - shared_filter.Run( - cookie, weak_system_store->GetCookieCreationTime(cookie))) { + base::Time creation_time = + weak_system_store->GetCookieCreationTime(cookie); + CanonicalCookie cc = + CanonicalCookieFromSystemCookie(cookie, creation_time); + if (weak_system_store && shared_delete_info.Matches(cc)) { weak_system_store->DeleteCookieAsync( cookie, SystemCookieStore::SystemCookieCallback()); to_delete_count++;
diff --git a/ios/net/cookies/cookie_store_ios_persistent.h b/ios/net/cookies/cookie_store_ios_persistent.h index 09e96ce..ea0e528b 100644 --- a/ios/net/cookies/cookie_store_ios_persistent.h +++ b/ios/net/cookies/cookie_store_ios_persistent.h
@@ -55,14 +55,10 @@ base::OnceClosure callback) override; void DeleteCanonicalCookieAsync(const CanonicalCookie& cookie, DeleteCallback callback) override; - void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin, - const base::Time& delete_end, - DeleteCallback callback) override; - void DeleteAllCreatedBetweenWithPredicateAsync( - const base::Time& delete_begin, - const base::Time& delete_end, - const CookiePredicate& predicate, - DeleteCallback callback) override; + void DeleteAllCreatedInTimeRangeAsync(const TimeRange& creation_range, + DeleteCallback callback) override; + void DeleteAllMatchingInfoAsync(CookieDeletionInfo delete_info, + DeleteCallback callback) override; void DeleteSessionCookiesAsync(DeleteCallback callback) override; private:
diff --git a/ios/net/cookies/cookie_store_ios_persistent.mm b/ios/net/cookies/cookie_store_ios_persistent.mm index 3ab7a7c..f14984f3 100644 --- a/ios/net/cookies/cookie_store_ios_persistent.mm +++ b/ios/net/cookies/cookie_store_ios_persistent.mm
@@ -92,31 +92,27 @@ cookie, WrapDeleteCallback(std::move(callback))); } -void CookieStoreIOSPersistent::DeleteAllCreatedBetweenAsync( - const base::Time& delete_begin, - const base::Time& delete_end, +void CookieStoreIOSPersistent::DeleteAllCreatedInTimeRangeAsync( + const TimeRange& creation_range, DeleteCallback callback) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); if (metrics_enabled()) ResetCookieCountMetrics(); - cookie_monster()->DeleteAllCreatedBetweenAsync( - delete_begin, delete_end, WrapDeleteCallback(std::move(callback))); + cookie_monster()->DeleteAllCreatedInTimeRangeAsync( + creation_range, WrapDeleteCallback(std::move(callback))); } -void CookieStoreIOSPersistent::DeleteAllCreatedBetweenWithPredicateAsync( - const base::Time& delete_begin, - const base::Time& delete_end, - const CookiePredicate& predicate, +void CookieStoreIOSPersistent::DeleteAllMatchingInfoAsync( + CookieDeletionInfo delete_info, DeleteCallback callback) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); if (metrics_enabled()) ResetCookieCountMetrics(); - cookie_monster()->DeleteAllCreatedBetweenWithPredicateAsync( - delete_begin, delete_end, predicate, - WrapDeleteCallback(std::move(callback))); + cookie_monster()->DeleteAllMatchingInfoAsync( + std::move(delete_info), WrapDeleteCallback(std::move(callback))); } void CookieStoreIOSPersistent::DeleteSessionCookiesAsync(
diff --git a/ios/third_party/material_components_ios/README.chromium b/ios/third_party/material_components_ios/README.chromium index 9e24f21e..0897db7 100644 --- a/ios/third_party/material_components_ios/README.chromium +++ b/ios/third_party/material_components_ios/README.chromium
@@ -1,7 +1,7 @@ Name: Material Components for iOS URL: https://github.com/material-components/material-components-ios Version: 0 -Revision: fd0425eb313395a2bb6cfe820c885065290a7c05 +Revision: 58f627bcd48de53f1633cf980008dca1e33e4970 License: Apache 2.0 License File: LICENSE Security Critical: yes
diff --git a/ios/web/net/cookies/wk_http_system_cookie_store.mm b/ios/web/net/cookies/wk_http_system_cookie_store.mm index c2d4105..74c8f25 100644 --- a/ios/web/net/cookies/wk_http_system_cookie_store.mm +++ b/ios/web/net/cookies/wk_http_system_cookie_store.mm
@@ -23,12 +23,13 @@ namespace web { namespace { -// Posts |callback| to run on IO Thread, this is needed because +// Posts a task to run |block| on IO Thread. This is needed because // WKHTTPCookieStore executes callbacks on the main thread, while // SystemCookieStore should operate on IO thread. -void RunSystemCookieCallbackOnIOThread(base::OnceClosure callback) { - DCHECK(!callback.is_null()); - web::WebThread::PostTask(web::WebThread::IO, FROM_HERE, std::move(callback)); +void RunBlockOnIOThread(ProceduralBlock block) { + DCHECK(block != nil); + web::WebThread::PostTask(web::WebThread::IO, FROM_HERE, + base::BindBlockArc(block)); } // Returns wether |cookie| should be included for queries about |url|. @@ -111,12 +112,12 @@ web::WebThread::UI, FROM_HERE, base::BindBlockArc(^{ [cookie_store_ deleteCookie:block_cookie completionHandler:^{ - RunSystemCookieCallbackOnIOThread(base::BindBlockArc(^{ + RunBlockOnIOThread(^{ if (weak_time_manager) weak_time_manager->DeleteCreationTime(block_cookie); if (!shared_callback.is_null()) std::move(shared_callback).Run(); - })); + }); }]; })); } @@ -139,7 +140,7 @@ [cookie_store_ setCookie:block_cookie completionHandler:^{ - RunSystemCookieCallbackOnIOThread(base::BindBlockArc(^{ + RunBlockOnIOThread(^{ if (weak_time_manager) { weak_time_manager->SetCreationTime( block_cookie, @@ -147,7 +148,7 @@ } if (!shared_callback.is_null()) std::move(shared_callback).Run(); - })); + }); }]; })); } @@ -160,11 +161,11 @@ web::WebThread::UI, FROM_HERE, base::BindBlockArc(^{ [cookie_store_ getAllCookies:^(NSArray<NSHTTPCookie*>* cookies) { ProceduralBlock completionHandler = ^{ - RunSystemCookieCallbackOnIOThread(base::BindBlockArc(^{ + RunBlockOnIOThread(^{ if (weak_time_manager) weak_time_manager->Clear(); std::move(shared_callback).Run(); - })); + }); }; // If there are no cookies to clear, immediately invoke the @@ -208,7 +209,7 @@ NSArray* block_cookies = cookies; __block net::SystemCookieStore::SystemCookieCallbackForCookies shared_callback = std::move(callback); - RunSystemCookieCallbackOnIOThread(base::BindBlockArc(^{ + RunBlockOnIOThread(^{ if (weak_time_manager) { NSArray* result = [block_cookies sortedArrayUsingFunction:net::SystemCookieStore::CompareCookies @@ -217,7 +218,7 @@ } else { std::move(shared_callback).Run(block_cookies); } - })); + }); } } // namespace web
diff --git a/ipc/BUILD.gn b/ipc/BUILD.gn index ea68b7a..be17fd7b 100644 --- a/ipc/BUILD.gn +++ b/ipc/BUILD.gn
@@ -121,8 +121,6 @@ "ipc_mojo_message_helper.h", "ipc_platform_file.cc", "ipc_platform_file.h", - "ipc_platform_file_attachment_posix.cc", - "ipc_platform_file_attachment_posix.h", "ipc_sync_message.cc", "ipc_sync_message.h", "mach_port_attachment_mac.cc", @@ -131,6 +129,13 @@ "mach_port_mac.h", ] + if (is_posix || is_fuchsia) { + sources += [ + "ipc_platform_file_attachment_posix.cc", + "ipc_platform_file_attachment_posix.h", + ] + } + if (is_fuchsia) { sources += [ "handle_attachment_fuchsia.cc", @@ -235,7 +240,6 @@ "ipc_channel_proxy_unittest.cc", "ipc_channel_reader_unittest.cc", "ipc_fuzzing_tests.cc", - "ipc_message_attachment_set_posix_unittest.cc", "ipc_message_unittest.cc", "ipc_message_utils_unittest.cc", "ipc_mojo_bootstrap_unittest.cc", @@ -248,6 +252,10 @@ "sync_socket_unittest.cc", ] + if (is_posix || is_fuchsia) { + sources += [ "ipc_message_attachment_set_posix_unittest.cc" ] + } + if (!is_ios) { sources += [ "ipc_send_fds_test.cc" ] }
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index 89f885e..193ed69 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc
@@ -149,6 +149,20 @@ // kExternalClearKeyForTesting. const char kClearKeyCdmPathForTesting[] = "clear-key-cdm-path-for-testing"; +// Overrides the default enabled library CDM interface version(s) with the one +// specified with this switch, which will be the only version enabled. For +// example, on a build where CDM 8, CDM 9 and CDM 10 are all supported +// (implemented), but only CDM 8 and CDM 9 are enabled by default: +// --override-enabled-cdm-interface-version=8 : Only CDM 8 is enabled +// --override-enabled-cdm-interface-version=9 : Only CDM 9 is enabled +// --override-enabled-cdm-interface-version=10 : Only CDM 10 is enabled +// --override-enabled-cdm-interface-version=11 : No CDM interface is enabled +// This can be used for local testing and debugging. It can also be used to +// enable an experimental CDM interface (which is always disabled by default) +// for testing while it's still in development. +const char kOverrideEnabledCdmInterfaceVersion[] = + "override-enabled-cdm-interface-version"; + #if !defined(OS_ANDROID) // Turns on the internal media session backend. This should be used by embedders // that want to control the media playback with the media session interfaces. @@ -296,13 +310,6 @@ const base::Feature kExternalClearKeyForTesting{ "ExternalClearKeyForTesting", base::FEATURE_DISABLED_BY_DEFAULT}; -// Enables support of experimental CDM interface version(s). This is usually -// used to enable new CDM interface support for testing while it's still in -// development. This switch may not be used anywhere if there's no experimental -// CDM interface being developed. -const base::Feature kSupportExperimentalCdmInterface{ - "SupportExperimentalCdmInterface", base::FEATURE_DISABLED_BY_DEFAULT}; - // Enables low-delay video rendering in media pipeline on "live" stream. const base::Feature kLowDelayVideoRenderingOnLiveStream{ "low-delay-video-rendering-on-live-stream",
diff --git a/media/base/media_switches.h b/media/base/media_switches.h index f30cdc5..eff26615 100644 --- a/media/base/media_switches.h +++ b/media/base/media_switches.h
@@ -81,6 +81,7 @@ MEDIA_EXPORT extern const char kMSEVideoBufferSizeLimit[]; MEDIA_EXPORT extern const char kClearKeyCdmPathForTesting[]; +MEDIA_EXPORT extern const char kOverrideEnabledCdmInterfaceVersion[]; #if !defined(OS_ANDROID) MEDIA_EXPORT extern const char kEnableInternalMediaSession[]; @@ -124,7 +125,6 @@ MEDIA_EXPORT extern const base::Feature kPreloadMetadataSuspend; MEDIA_EXPORT extern const base::Feature kResumeBackgroundVideo; MEDIA_EXPORT extern const base::Feature kSpecCompliantCanPlayThrough; -MEDIA_EXPORT extern const base::Feature kSupportExperimentalCdmInterface; MEDIA_EXPORT extern const base::Feature kUseAndroidOverlay; MEDIA_EXPORT extern const base::Feature kUseAndroidOverlayAggressively; MEDIA_EXPORT extern const base::Feature kUseNewMediaCache;
diff --git a/media/cdm/cdm_adapter.cc b/media/cdm/cdm_adapter.cc index 85a3929..e1e36ef 100644 --- a/media/cdm/cdm_adapter.cc +++ b/media/cdm/cdm_adapter.cc
@@ -412,7 +412,8 @@ return nullptr; static_assert( - CheckSupportedCdmHostVersions(9, 10), + CheckSupportedCdmHostVersions(cdm::Host_9::kVersion, + cdm::Host_11::kVersion), "Mismatch between GetCdmHost() and IsSupportedCdmHostVersion()"); DCHECK(IsSupportedCdmHostVersion(host_interface_version)); @@ -424,6 +425,8 @@ return static_cast<cdm::Host_9*>(cdm_adapter); case cdm::Host_10::kVersion: return static_cast<cdm::Host_10*>(cdm_adapter); + case cdm::Host_11::kVersion: + return static_cast<cdm::Host_11*>(cdm_adapter); default: NOTREACHED() << "Unexpected host interface version " << host_interface_version;
diff --git a/media/cdm/cdm_adapter.h b/media/cdm/cdm_adapter.h index 4f68041..7d915e0 100644 --- a/media/cdm/cdm_adapter.h +++ b/media/cdm/cdm_adapter.h
@@ -40,7 +40,8 @@ public CdmContext, public Decryptor, public cdm::Host_9, - public cdm::Host_10 { + public cdm::Host_10, + public cdm::Host_11 { public: // Creates the CDM and initialize it using |key_system| and |cdm_config|. // |allocator| is to be used whenever the CDM needs memory and to create @@ -151,6 +152,8 @@ // cdm::Host_10 specific implementation. void OnInitialized(bool success) override; + + // cdm::Host_11 specific implementation. cdm::CdmProxy* RequestCdmProxy(cdm::CdmProxyClient* client) override; private:
diff --git a/media/cdm/cdm_adapter_unittest.cc b/media/cdm/cdm_adapter_unittest.cc index 0ced276..4122dbf2 100644 --- a/media/cdm/cdm_adapter_unittest.cc +++ b/media/cdm/cdm_adapter_unittest.cc
@@ -8,10 +8,11 @@ #include <memory> #include "base/bind.h" +#include "base/command_line.h" #include "base/logging.h" #include "base/macros.h" #include "base/run_loop.h" -#include "base/test/scoped_feature_list.h" +#include "base/strings/string_number_conversions.h" #include "base/test/scoped_task_environment.h" #include "media/base/cdm_callback_promise.h" #include "media/base/cdm_key_information.h" @@ -27,6 +28,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +using ::testing::Values; using ::testing::SaveArg; using ::testing::StrictMock; using ::testing::_; @@ -85,20 +87,16 @@ "}"; // Tests CdmAdapter with the following parameter: -// - bool: whether experimental CDM interface should be enabled. +// - int: CDM interface version to test. class CdmAdapterTest : public testing::Test, - public testing::WithParamInterface<bool> { + public testing::WithParamInterface<int> { public: enum ExpectedResult { SUCCESS, FAILURE }; - bool UseExperimentalCdmInterface() { return GetParam(); } - CdmAdapterTest() { - // Enable use of External Clear Key CDM. - if (UseExperimentalCdmInterface()) { - scoped_feature_list_.InitWithFeatures( - {media::kSupportExperimentalCdmInterface}, {}); - } + base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( + switches::kOverrideEnabledCdmInterfaceVersion, + base::IntToString(GetCdmInterfaceVersion())); #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) CdmModule::GetInstance()->Initialize(helper_.LibraryPath(), {}); @@ -110,6 +108,8 @@ ~CdmAdapterTest() override { CdmModule::ResetInstanceForTesting(); } protected: + int GetCdmInterfaceVersion() { return GetParam(); } + // Initializes the adapter. |expected_result| tests that the call succeeds // or generates an error. void InitializeAndExpect(ExpectedResult expected_result) { @@ -197,12 +197,8 @@ if (cdm) { ASSERT_EQ(expected_result, SUCCESS) << "CDM creation succeeded unexpectedly."; - CdmAdapter* cdm_adapter = static_cast<CdmAdapter*>(cdm.get()); - - ASSERT_EQ(UseExperimentalCdmInterface(), - cdm_adapter->GetInterfaceVersion() > - cdm::ContentDecryptionModule::kVersion); + ASSERT_EQ(GetCdmInterfaceVersion(), cdm_adapter->GetInterfaceVersion()); cdm_ = cdm; } else { ASSERT_EQ(expected_result, FAILURE) << error_message; @@ -266,18 +262,12 @@ std::string session_id_; base::test::ScopedTaskEnvironment scoped_task_environment_; - base::test::ScopedFeatureList scoped_feature_list_; DISALLOW_COPY_AND_ASSIGN(CdmAdapterTest); }; -INSTANTIATE_TEST_CASE_P(StableCdmInterface, - CdmAdapterTest, - testing::Values(false)); - -INSTANTIATE_TEST_CASE_P(ExperimentalCdmInterface, - CdmAdapterTest, - testing::Values(true)); +INSTANTIATE_TEST_CASE_P(CDM_9, CdmAdapterTest, Values(9)); +INSTANTIATE_TEST_CASE_P(CDM_10, CdmAdapterTest, Values(10)); TEST_P(CdmAdapterTest, Initialize) { InitializeAndExpect(SUCCESS);
diff --git a/media/cdm/cdm_wrapper.h b/media/cdm/cdm_wrapper.h index 3e884d8..2339fffb 100644 --- a/media/cdm/cdm_wrapper.h +++ b/media/cdm/cdm_wrapper.h
@@ -21,13 +21,9 @@ namespace { -bool IsExperimentalCdmInterfaceSupported() { - return base::FeatureList::IsEnabled(media::kSupportExperimentalCdmInterface); -} - bool IsEncryptionSchemeSupportedByLegacyCdms( const cdm::EncryptionScheme& scheme) { - // CDM_8 and CDM_9 don't check the encryption scheme, so do it here. + // CDM_9 don't check the encryption scheme, so do it here. return scheme == cdm::EncryptionScheme::kUnencrypted || scheme == cdm::EncryptionScheme::kCenc; } @@ -171,20 +167,6 @@ DISALLOW_COPY_AND_ASSIGN(CdmWrapper); }; -// Traits for CDM Interfaces -template <int CdmInterfaceVersion> -struct CdmInterfaceTraits {}; - -template <> -struct CdmInterfaceTraits<9> { - using CdmInterface = cdm::ContentDecryptionModule_9; -}; - -template <> -struct CdmInterfaceTraits<10> { - using CdmInterface = cdm::ContentDecryptionModule_10; -}; - // Template class that does the CdmWrapper -> CdmInterface conversion. Default // implementations are provided. Any methods that need special treatment should // be specialized. @@ -409,7 +391,7 @@ uint32_t key_system_size, GetCdmHostFunc get_cdm_host_func, void* user_data) { - static_assert(CheckSupportedCdmInterfaceVersions(9, 10), + static_assert(CheckSupportedCdmInterfaceVersions(9, 11), "Mismatch between CdmWrapper::Create() and " "IsSupportedCdmInterfaceVersion()"); @@ -418,15 +400,23 @@ CdmWrapper* cdm_wrapper = nullptr; // TODO(xhwang): Check whether we can use static loops to simplify this code. - if (IsExperimentalCdmInterfaceSupported()) { + + // Try to use the latest supported and enabled CDM interface first. If it's + // not supported by the CDM, try to create the CDM using older supported + // versions. + if (IsSupportedAndEnabledCdmInterfaceVersion(11)) { + cdm_wrapper = + CdmWrapperImpl<11>::Create(create_cdm_func, key_system, key_system_size, + get_cdm_host_func, user_data); + } + + if (!cdm_wrapper && IsSupportedAndEnabledCdmInterfaceVersion(10)) { cdm_wrapper = CdmWrapperImpl<10>::Create(create_cdm_func, key_system, key_system_size, get_cdm_host_func, user_data); } - // If |cdm_wrapper| is NULL, try to create the CDM using older supported - // versions of the CDM interface here. - if (!cdm_wrapper) { + if (!cdm_wrapper && IsSupportedAndEnabledCdmInterfaceVersion(9)) { cdm_wrapper = CdmWrapperImpl<9>::Create(create_cdm_func, key_system, key_system_size, get_cdm_host_func, user_data);
diff --git a/media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy_impl.h b/media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy_impl.h index d1c0fa6..9de0550 100644 --- a/media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy_impl.h +++ b/media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy_impl.h
@@ -138,6 +138,15 @@ return nullptr; } +// Specialization for cdm::Host_10 methods. + +template <> +cdm::CdmProxy* CdmHostProxyImpl<cdm::Host_10>::RequestCdmProxy( + cdm::CdmProxyClient* /* client */) { + NOTREACHED() << "cdm::ContentDecryptionModule_10 CDM should never call this."; + return nullptr; +} + } // namespace media #endif // MEDIA_CDM_LIBRARY_CDM_CLEAR_KEY_CDM_CDM_HOST_PROXY_IMPL_H_
diff --git a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc index 1dfa51e..06cd504 100644 --- a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc +++ b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc
@@ -260,9 +260,10 @@ return nullptr; } - // We support both CDM_9 and CDM_10. + // We support CDM_9, CDM_10 and CDM_11. using CDM_9 = cdm::ContentDecryptionModule_9; using CDM_10 = cdm::ContentDecryptionModule_10; + using CDM_11 = cdm::ContentDecryptionModule_11; if (cdm_interface_version == CDM_9::kVersion) { CDM_9::Host* host = static_cast<CDM_9::Host*>( @@ -285,6 +286,17 @@ new media::ClearKeyCdm(host, key_system_string)); } + if (cdm_interface_version == CDM_11::kVersion) { + CDM_11::Host* host = static_cast<CDM_11::Host*>( + get_cdm_host_func(CDM_11::Host::kVersion, user_data)); + if (!host) + return nullptr; + + DVLOG(1) << __func__ << ": Create ClearKeyCdm with CDM_11::Host."; + return static_cast<CDM_11*>( + new media::ClearKeyCdm(host, key_system_string)); + } + return nullptr; }
diff --git a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.h b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.h index 143fd20..4b6c0e3 100644 --- a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.h +++ b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.h
@@ -32,7 +32,8 @@ // Clear key implementation of the cdm::ContentDecryptionModule interfaces. class ClearKeyCdm : public cdm::ContentDecryptionModule_9, - public cdm::ContentDecryptionModule_10 { + public cdm::ContentDecryptionModule_10, + public cdm::ContentDecryptionModule_11 { public: template <typename HostInterface> ClearKeyCdm(HostInterface* host, const std::string& key_system); @@ -53,7 +54,7 @@ const cdm::InputBuffer_1& encrypted_buffer, cdm::AudioFrames* audio_frames) override; - // cdm::ContentDecryptionModule_10 implementation. + // cdm::ContentDecryptionModule_10/11 implementation. void Initialize(bool allow_distinctive_identifier, bool allow_persistent_state, bool use_hw_secure_codecs) override;
diff --git a/media/cdm/supported_cdm_versions.cc b/media/cdm/supported_cdm_versions.cc index 495fb47b..03b4c840 100644 --- a/media/cdm/supported_cdm_versions.cc +++ b/media/cdm/supported_cdm_versions.cc
@@ -4,16 +4,59 @@ #include "media/cdm/supported_cdm_versions.h" +#include "base/command_line.h" +#include "base/optional.h" +#include "base/strings/string_number_conversions.h" +#include "media/base/media_switches.h" + namespace media { -bool IsSupportedCdmModuleVersion(int version) { +namespace { + +// Returns the overridden supported CDM interface version speficied on command +// line, which can be null if not specified. +base::Optional<int> GetSupportedCdmInterfaceVersionOverrideFromCommandLine() { + auto* command_line = base::CommandLine::ForCurrentProcess(); + if (!command_line) + return base::nullopt; + + auto version_string = command_line->GetSwitchValueASCII( + switches::kOverrideEnabledCdmInterfaceVersion); + + int version = 0; + if (!base::StringToInt(version_string, &version)) + return base::nullopt; + else + return version; +} + +// Returns whether the CDM interface of |version| is enabled by default. +constexpr bool IsCdmInterfaceVersionEnabledByDefault(int version) { switch (version) { - // Latest. - case CDM_MODULE_VERSION: - return true; + // Supported versions in decreasing order. + case 11: + return CdmInterfaceTraits<11>::IsEnabledByDefault(); + case 10: + return CdmInterfaceTraits<10>::IsEnabledByDefault(); + case 9: + return CdmInterfaceTraits<9>::IsEnabledByDefault(); default: return false; } } +} // namespace + +bool IsSupportedAndEnabledCdmInterfaceVersion(int version) { + if (!IsSupportedCdmInterfaceVersion(version)) + return false; + + auto version_override = + GetSupportedCdmInterfaceVersionOverrideFromCommandLine(); + if (version_override) + return version == version_override; + + return IsCdmInterfaceVersionEnabledByDefault(version); +} + } // namespace media
diff --git a/media/cdm/supported_cdm_versions.h b/media/cdm/supported_cdm_versions.h index 4c57b92..ae86d4e 100644 --- a/media/cdm/supported_cdm_versions.h +++ b/media/cdm/supported_cdm_versions.h
@@ -8,6 +8,21 @@ #include "media/base/media_export.h" #include "media/cdm/api/content_decryption_module.h" +// A library CDM interface is "supported" if it's implemented by CdmAdapter and +// CdmWrapper. Typically multiple CDM interfaces are supported: +// - The latest stable CDM interface. +// - Previous stable CDM interface(s), for supporting older CDMs. +// - Experimental CDM interface(s), for development. +// +// A library CDM interface is "enabled" if it's enabled at runtime, e.g. being +// able to be registered and creating CDM instances. Typically experimental CDM +// interfaces are supported, but not enabled by default. +// +// Whether a CDM interface is enabled can also be overridden by using command +// line switch switches::kOverrideEnabledCdmInterfaceVersion for finer control +// in a test environment or for local debugging, including enabling experimental +// CDM interfaces. + namespace media { namespace { @@ -33,14 +48,44 @@ } // namespace -MEDIA_EXPORT bool IsSupportedCdmModuleVersion(int version); +// Traits for CDM Interfaces +template <int CdmInterfaceVersion> +struct CdmInterfaceTraits {}; +template <> +struct CdmInterfaceTraits<9> { + using CdmInterface = cdm::ContentDecryptionModule_9; + static_assert(CdmInterface::kVersion == 9, "CDM interface version mismatch"); + static constexpr bool IsEnabledByDefault() { return true; } +}; + +template <> +struct CdmInterfaceTraits<10> { + using CdmInterface = cdm::ContentDecryptionModule_10; + static_assert(CdmInterface::kVersion == 10, "CDM interface version mismatch"); + static constexpr bool IsEnabledByDefault() { return false; } +}; + +template <> +struct CdmInterfaceTraits<11> { + using CdmInterface = cdm::ContentDecryptionModule_11; + static_assert(CdmInterface::kVersion == 11, "CDM interface version mismatch"); + static constexpr bool IsEnabledByDefault() { return false; } +}; + +constexpr bool IsSupportedCdmModuleVersion(int version) { + return version == CDM_MODULE_VERSION; +} + +// Returns whether the CDM interface of |version| is supported in the +// implementation. constexpr bool IsSupportedCdmInterfaceVersion(int version) { static_assert(cdm::ContentDecryptionModule::kVersion == cdm::ContentDecryptionModule_9::kVersion, "update the code below"); switch (version) { // Supported versions in decreasing order. + case cdm::ContentDecryptionModule_11::kVersion: case cdm::ContentDecryptionModule_10::kVersion: case cdm::ContentDecryptionModule_9::kVersion: return true; @@ -49,12 +94,16 @@ } } +// Returns whether the CDM host interface of |version| is supported in the +// implementation. Currently there's no way to disable a supported CDM host +// interface at run time. constexpr bool IsSupportedCdmHostVersion(int version) { static_assert(cdm::ContentDecryptionModule::Host::kVersion == cdm::ContentDecryptionModule_9::Host::kVersion, "update the code below"); switch (version) { // Supported versions in decreasing order. + case cdm::Host_11::kVersion: case cdm::Host_10::kVersion: case cdm::Host_9::kVersion: return true; @@ -64,7 +113,7 @@ } // Ensures CDM interface versions in and only in the range [min_version, -// max_version] are supported. +// max_version] are supported in the implementation. constexpr bool CheckSupportedCdmInterfaceVersions(int min_version, int max_version) { // The latest stable CDM interface should always be supported. @@ -79,7 +128,7 @@ } // Ensures CDM host interface versions in and only in the range [min_version, -// max_version] are supported. +// max_version] are supported in the implementation. constexpr bool CheckSupportedCdmHostVersions(int min_version, int max_version) { // The latest stable CDM Host interface should always be supported. int latest_stable_version = cdm::ContentDecryptionModule::Host::kVersion; @@ -92,6 +141,10 @@ max_version); } +// Returns whether the CDM interface of |version| is supported in the +// implementation and enabled at runtime. +MEDIA_EXPORT bool IsSupportedAndEnabledCdmInterfaceVersion(int version); + } // namespace media #endif // MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_
diff --git a/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.cc b/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.cc index 060fea19..7d51640 100644 --- a/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.cc +++ b/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.cc
@@ -64,15 +64,6 @@ } while (0) namespace media { -namespace { -void DropGLImage(scoped_refptr<gl::GLImage> gl_image, - BindGLImageCallback bind_image_cb, - GLuint client_texture_id, - GLuint texture_target) { - bind_image_cb.Run(client_texture_id, texture_target, nullptr, false); -} - -} // namespace // static const uint32_t V4L2SliceVideoDecodeAccelerator::supported_input_fourccs_[] = { @@ -1521,13 +1512,6 @@ VLOGF(1) << "eglDestroySyncKHR failed."; } - if (output_record.gl_image) { - child_task_runner_->PostTask( - FROM_HERE, base::Bind(&DropGLImage, std::move(output_record.gl_image), - bind_image_cb_, output_record.client_texture_id, - device_->GetTextureTarget())); - } - picture_buffers_to_dismiss.push_back(output_record.picture_id); } @@ -1639,7 +1623,6 @@ OutputRecord& output_record = output_buffer_map_[i]; DCHECK(!output_record.at_device); DCHECK(!output_record.at_client); - DCHECK(!output_record.gl_image); DCHECK_EQ(output_record.egl_sync, EGL_NO_SYNC_KHR); DCHECK_EQ(output_record.picture_id, -1); DCHECK(output_record.dmabuf_fds.empty()); @@ -1723,15 +1706,14 @@ true); decoder_thread_task_runner_->PostTask( FROM_HERE, - base::Bind(&V4L2SliceVideoDecodeAccelerator::AssignGLImage, - base::Unretained(this), buffer_index, picture_buffer_id, - gl_image, base::Passed(&passed_dmabuf_fds))); + base::BindOnce(&V4L2SliceVideoDecodeAccelerator::AssignDmaBufs, + base::Unretained(this), buffer_index, picture_buffer_id, + base::Passed(&passed_dmabuf_fds))); } -void V4L2SliceVideoDecodeAccelerator::AssignGLImage( +void V4L2SliceVideoDecodeAccelerator::AssignDmaBufs( size_t buffer_index, int32_t picture_buffer_id, - scoped_refptr<gl::GLImage> gl_image, std::unique_ptr<std::vector<base::ScopedFD>> passed_dmabuf_fds) { DVLOGF(3) << "index=" << buffer_index; DCHECK(decoder_thread_task_runner_->BelongsToCurrentThread()); @@ -1750,12 +1732,10 @@ } OutputRecord& output_record = output_buffer_map_[buffer_index]; - DCHECK(!output_record.gl_image); DCHECK_EQ(output_record.egl_sync, EGL_NO_SYNC_KHR); DCHECK(!output_record.at_client); DCHECK(!output_record.at_device); - output_record.gl_image = gl_image; if (output_mode_ == Config::OutputMode::IMPORT) { DCHECK(output_record.dmabuf_fds.empty()); output_record.dmabuf_fds = std::move(*passed_dmabuf_fds); @@ -1839,7 +1819,6 @@ DCHECK(!iter->at_device); iter->at_client = false; if (iter->texture_id != 0) { - iter->gl_image = nullptr; child_task_runner_->PostTask( FROM_HERE, base::Bind(&V4L2SliceVideoDecodeAccelerator::CreateGLImageFor,
diff --git a/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.h b/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.h index 5838beb..fcf8e82 100644 --- a/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.h +++ b/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.h
@@ -90,7 +90,6 @@ int32_t picture_id; GLuint client_texture_id; GLuint texture_id; - scoped_refptr<gl::GLImage> gl_image; EGLSyncKHR egl_sync; std::vector<base::ScopedFD> dmabuf_fds; bool cleared; @@ -269,13 +268,12 @@ const gfx::Size& size, uint32_t fourcc); - // Take the GLImage |gl_image|, created for |picture_buffer_id|, and use it + // Take the dmabuf |passed_dmabuf_fds|, for |picture_buffer_id|, and use it // for OutputRecord at |buffer_index|. The buffer is backed by // |passed_dmabuf_fds|, and the OutputRecord takes ownership of them. - void AssignGLImage( + void AssignDmaBufs( size_t buffer_index, int32_t picture_buffer_id, - scoped_refptr<gl::GLImage> gl_image, // TODO(posciak): (https://crbug.com/561749) we should normally be able to // pass the vector by itself via std::move, but it's not possible to do // this if this method is used as a callback.
diff --git a/net/BUILD.gn b/net/BUILD.gn index ba7259f2..dba51e5 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn
@@ -133,7 +133,6 @@ "base/net_error_list.h", "base/net_errors.cc", "base/net_errors.h", - "base/net_errors_posix.cc", "base/net_export.h", "base/net_module.cc", "base/net_module.h", @@ -361,6 +360,10 @@ ] net_unfiltered_sources = [] + if (is_posix || is_fuchsia) { + sources += [ "base/net_errors_posix.cc" ] + } + deps = [ ":constants", ":net_resources", @@ -426,7 +429,6 @@ "base/file_stream.h", "base/file_stream_context.cc", "base/file_stream_context.h", - "base/file_stream_context_posix.cc", "base/file_stream_context_win.cc", "base/filename_util.cc", "base/filename_util.h", @@ -476,8 +478,6 @@ "base/network_interfaces_linux.cc", "base/network_interfaces_linux.h", "base/network_interfaces_nacl.cc", - "base/network_interfaces_posix.cc", - "base/network_interfaces_posix.h", "base/network_interfaces_win.cc", "base/network_interfaces_win.h", "base/platform_mime_util.h", @@ -648,7 +648,6 @@ "disk_cache/blockfile/file_ios.cc", "disk_cache/blockfile/file_lock.cc", "disk_cache/blockfile/file_lock.h", - "disk_cache/blockfile/file_posix.cc", "disk_cache/blockfile/file_win.cc", "disk_cache/blockfile/histogram_macros.h", "disk_cache/blockfile/in_flight_backend_io.cc", @@ -657,8 +656,6 @@ "disk_cache/blockfile/in_flight_io.h", "disk_cache/blockfile/mapped_file.cc", "disk_cache/blockfile/mapped_file.h", - "disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc", - "disk_cache/blockfile/mapped_file_posix.cc", "disk_cache/blockfile/mapped_file_win.cc", "disk_cache/blockfile/rankings.cc", "disk_cache/blockfile/rankings.h", @@ -675,7 +672,6 @@ "disk_cache/blockfile/webfonts_histogram.h", "disk_cache/cache_util.cc", "disk_cache/cache_util.h", - "disk_cache/cache_util_posix.cc", "disk_cache/cache_util_win.cc", "disk_cache/disk_cache.cc", "disk_cache/disk_cache.h", @@ -705,7 +701,6 @@ "disk_cache/simple/simple_index_delegate.h", "disk_cache/simple/simple_index_file.cc", "disk_cache/simple/simple_index_file.h", - "disk_cache/simple/simple_index_file_posix.cc", "disk_cache/simple/simple_index_file_win.cc", "disk_cache/simple/simple_net_log_parameters.cc", "disk_cache/simple/simple_net_log_parameters.h", @@ -713,20 +708,14 @@ "disk_cache/simple/simple_synchronous_entry.h", "disk_cache/simple/simple_util.cc", "disk_cache/simple/simple_util.h", - "disk_cache/simple/simple_util_posix.cc", "disk_cache/simple/simple_util_win.cc", "disk_cache/simple/simple_version_upgrade.cc", "disk_cache/simple/simple_version_upgrade.h", "dns/address_sorter.h", - "dns/address_sorter_posix.cc", - "dns/address_sorter_posix.h", "dns/address_sorter_win.cc", - "dns/dns_client.cc", "dns/dns_client.h", "dns/dns_config_service.cc", "dns/dns_config_service.h", - "dns/dns_config_service_posix.cc", - "dns/dns_config_service_posix.h", "dns/dns_config_service_win.cc", "dns/dns_config_service_win.h", "dns/dns_config_watcher_mac.cc", @@ -797,8 +786,6 @@ "http/http_auth_controller.h", "http/http_auth_filter.cc", "http/http_auth_filter.h", - "http/http_auth_gssapi_posix.cc", - "http/http_auth_gssapi_posix.h", "http/http_auth_handler.cc", "http/http_auth_handler.h", "http/http_auth_handler_basic.cc", @@ -889,7 +876,6 @@ "http/transport_security_persister.h", "http/url_security_manager.cc", "http/url_security_manager.h", - "http/url_security_manager_posix.cc", "http/url_security_manager_win.cc", "log/file_net_log_observer.cc", "log/file_net_log_observer.h", @@ -1470,8 +1456,6 @@ "socket/socket_net_log_params.h", "socket/socket_options.cc", "socket/socket_options.h", - "socket/socket_posix.cc", - "socket/socket_posix.h", "socket/socket_tag.cc", "socket/socket_tag.h", "socket/socks5_client_socket.cc", @@ -1490,8 +1474,6 @@ "socket/tcp_server_socket.cc", "socket/tcp_server_socket.h", "socket/tcp_socket.h", - "socket/tcp_socket_posix.cc", - "socket/tcp_socket_posix.h", "socket/tcp_socket_win.cc", "socket/tcp_socket_win.h", "socket/transport_client_socket.h", @@ -1504,8 +1486,6 @@ "socket/udp_server_socket.cc", "socket/udp_server_socket.h", "socket/udp_socket.h", - "socket/udp_socket_posix.cc", - "socket/udp_socket_posix.h", "socket/udp_socket_win.cc", "socket/udp_socket_win.h", "socket/websocket_endpoint_lock_manager.cc", @@ -1860,10 +1840,28 @@ } if (is_posix || is_fuchsia) { + sources += [ + "base/file_stream_context_posix.cc", + "base/network_interfaces_posix.cc", + "base/network_interfaces_posix.h", + "disk_cache/blockfile/file_posix.cc", + "disk_cache/cache_util_posix.cc", + "disk_cache/simple/simple_index_file_posix.cc", + "disk_cache/simple/simple_util_posix.cc", + "dns/dns_config_service_posix.cc", + "dns/dns_config_service_posix.h", + "http/url_security_manager_posix.cc", + "socket/socket_posix.cc", + "socket/socket_posix.h", + "socket/tcp_socket_posix.cc", + "socket/tcp_socket_posix.h", + "socket/udp_socket_posix.cc", + "socket/udp_socket_posix.h", + ] if (posix_avoid_mmap) { - sources -= [ "disk_cache/blockfile/mapped_file_posix.cc" ] + sources += [ "disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc" ] } else { - sources -= [ "disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc" ] + sources += [ "disk_cache/blockfile/mapped_file_posix.cc" ] } } @@ -1881,16 +1879,18 @@ ] } - if (!enable_built_in_dns) { - sources -= [ - "dns/address_sorter_posix.cc", - "dns/address_sorter_posix.h", - "dns/dns_client.cc", - ] + if (enable_built_in_dns) { + sources += [ "dns/dns_client.cc" ] + if (is_posix || is_fuchsia) { + sources += [ + "dns/address_sorter_posix.cc", + "dns/address_sorter_posix.h", + ] + } } - if (!use_kerberos || is_android) { - sources -= [ + if (use_kerberos && ((is_posix && !is_android) || is_fuchsia)) { + sources += [ "http/http_auth_gssapi_posix.cc", "http/http_auth_gssapi_posix.h", ] @@ -2732,9 +2732,12 @@ sources += [ "test/spawned_test_server/local_test_server.cc", "test/spawned_test_server/local_test_server.h", - "test/spawned_test_server/local_test_server_posix.cc", - "test/spawned_test_server/local_test_server_win.cc", ] + if (is_win) { + sources += [ "test/spawned_test_server/local_test_server_win.cc" ] + } else if (is_posix || is_fuchsia) { + sources += [ "test/spawned_test_server/local_test_server_posix.cc" ] + } } if (enable_python_utils) { @@ -4822,9 +4825,6 @@ "disk_cache/simple/simple_test_util.h", "disk_cache/simple/simple_util_unittest.cc", "disk_cache/simple/simple_version_upgrade_unittest.cc", - "dns/address_sorter_posix_unittest.cc", - "dns/address_sorter_unittest.cc", - "dns/dns_config_service_posix_unittest.cc", "dns/dns_config_service_unittest.cc", "dns/dns_config_service_win_unittest.cc", "dns/dns_hosts_unittest.cc", @@ -4864,7 +4864,6 @@ "http/http_auth_challenge_tokenizer_unittest.cc", "http/http_auth_controller_unittest.cc", "http/http_auth_filter_unittest.cc", - "http/http_auth_gssapi_posix_unittest.cc", "http/http_auth_handler_basic_unittest.cc", "http/http_auth_handler_digest_unittest.cc", "http/http_auth_handler_factory_unittest.cc", @@ -4907,8 +4906,6 @@ "http/http_vary_data_unittest.cc", "http/mock_allow_http_auth_preferences.cc", "http/mock_allow_http_auth_preferences.h", - "http/mock_gssapi_library_posix.cc", - "http/mock_gssapi_library_posix.h", "http/mock_http_cache.cc", "http/mock_http_cache.h", "http/mock_sspi_library_win.cc", @@ -5229,7 +5226,6 @@ "socket/transport_client_socket_pool_test_util.h", "socket/transport_client_socket_pool_unittest.cc", "socket/transport_client_socket_unittest.cc", - "socket/udp_socket_posix_unittest.cc", "socket/udp_socket_unittest.cc", "socket/websocket_endpoint_lock_manager_unittest.cc", "socket/websocket_transport_client_socket_pool_unittest.cc", @@ -5367,6 +5363,13 @@ "//url:url_features", ] + if (is_posix || is_fuchsia) { + sources += [ + "dns/dns_config_service_posix_unittest.cc", + "socket/udp_socket_posix_unittest.cc", + ] + } + if (enable_reporting) { sources += [ "network_error_logging/network_error_logging_end_to_end_test.cc", @@ -5511,8 +5514,8 @@ # These are excluded on Android, because the actual Kerberos support, which # these test, is in a separate app on Android. - if (!use_kerberos || is_android) { - sources -= [ + if (use_kerberos && ((is_posix && !is_android) || is_fuchsia)) { + sources += [ "http/http_auth_gssapi_posix_unittest.cc", "http/mock_gssapi_library_posix.cc", "http/mock_gssapi_library_posix.h", @@ -5583,11 +5586,11 @@ ] } - if (!enable_built_in_dns) { - sources -= [ - "dns/address_sorter_posix_unittest.cc", - "dns/address_sorter_unittest.cc", - ] + if (enable_built_in_dns) { + sources += [ "dns/address_sorter_unittest.cc" ] + if (is_posix || is_fuchsia) { + sources += [ "dns/address_sorter_posix_unittest.cc" ] + } } if (use_v8_in_net) {
diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc index 46df1b2..86d2701 100644 --- a/net/cookies/cookie_monster.cc +++ b/net/cookies/cookie_monster.cc
@@ -507,34 +507,25 @@ std::move(callback))); } -void CookieMonster::DeleteAllCreatedBetweenAsync(const Time& delete_begin, - const Time& delete_end, - DeleteCallback callback) { +void CookieMonster::DeleteAllCreatedInTimeRangeAsync( + const TimeRange& creation_range, + DeleteCallback callback) { DoCookieCallback(base::BindOnce( // base::Unretained is safe as DoCookieCallbackForURL stores // the callback on |*this|, so the callback will not outlive // the object. - &CookieMonster::DeleteAllCreatedBetween, base::Unretained(this), - delete_begin, delete_end, std::move(callback))); + &CookieMonster::DeleteAllCreatedInTimeRange, base::Unretained(this), + creation_range, std::move(callback))); } -void CookieMonster::DeleteAllCreatedBetweenWithPredicateAsync( - const Time& delete_begin, - const Time& delete_end, - const base::Callback<bool(const CanonicalCookie&)>& predicate, - DeleteCallback callback) { - if (predicate.is_null()) { - MaybeRunCookieCallback(std::move(callback), 0u); - return; - } - +void CookieMonster::DeleteAllMatchingInfoAsync(CookieDeletionInfo delete_info, + DeleteCallback callback) { DoCookieCallback(base::BindOnce( // base::Unretained is safe as DoCookieCallbackForURL stores // the callback on |*this|, so the callback will not outlive // the object. - &CookieMonster::DeleteAllCreatedBetweenWithPredicate, - base::Unretained(this), delete_begin, delete_end, predicate, - std::move(callback))); + &CookieMonster::DeleteAllMatchingInfo, base::Unretained(this), + std::move(delete_info), std::move(callback))); } void CookieMonster::DeleteSessionCookiesAsync( @@ -678,9 +669,8 @@ MaybeRunCookieCallback(std::move(callback), cookies); } -void CookieMonster::DeleteAllCreatedBetween(const Time& delete_begin, - const Time& delete_end, - DeleteCallback callback) { +void CookieMonster::DeleteAllCreatedInTimeRange(const TimeRange& creation_range, + DeleteCallback callback) { DCHECK(thread_checker_.CalledOnValidThread()); uint32_t num_deleted = 0; @@ -689,8 +679,7 @@ CanonicalCookie* cc = curit->second.get(); ++it; - if (cc->CreationDate() >= delete_begin && - (delete_end.is_null() || cc->CreationDate() < delete_end)) { + if (creation_range.Contains(cc->CreationDate())) { InternalDeleteCookie(curit, true, /*sync_to_store*/ DELETE_COOKIE_EXPLICIT); ++num_deleted; @@ -703,22 +692,15 @@ : base::OnceClosure())); } -void CookieMonster::DeleteAllCreatedBetweenWithPredicate( - const base::Time& delete_begin, - const base::Time& delete_end, - const base::Callback<bool(const CanonicalCookie&)>& predicate, - DeleteCallback callback) { +void CookieMonster::DeleteAllMatchingInfo(CookieDeletionInfo delete_info, + DeleteCallback callback) { uint32_t num_deleted = 0; for (CookieMap::iterator it = cookies_.begin(); it != cookies_.end();) { CookieMap::iterator curit = it; CanonicalCookie* cc = curit->second.get(); ++it; - if (cc->CreationDate() >= delete_begin && - // The assumption that null |delete_end| is equivalent to - // Time::Max() is confusing. - (delete_end.is_null() || cc->CreationDate() < delete_end) && - predicate.Run(*cc)) { + if (delete_info.Matches(*cc)) { InternalDeleteCookie(curit, true, /*sync_to_store*/ DELETE_COOKIE_EXPLICIT); ++num_deleted;
diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h index 2a691c76..e85e06d 100644 --- a/net/cookies/cookie_monster.h +++ b/net/cookies/cookie_monster.h
@@ -171,14 +171,10 @@ base::OnceClosure callback) override; void DeleteCanonicalCookieAsync(const CanonicalCookie& cookie, DeleteCallback callback) override; - void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin, - const base::Time& delete_end, - DeleteCallback callback) override; - void DeleteAllCreatedBetweenWithPredicateAsync( - const base::Time& delete_begin, - const base::Time& delete_end, - const base::Callback<bool(const CanonicalCookie&)>& predicate, - DeleteCallback callback) override; + void DeleteAllCreatedInTimeRangeAsync(const TimeRange& creation_range, + DeleteCallback callback) override; + void DeleteAllMatchingInfoAsync(CookieDeletionInfo delete_info, + DeleteCallback callback) override; void DeleteSessionCookiesAsync(DeleteCallback) override; void FlushStore(base::OnceClosure callback) override; void SetForceKeepSessionState() override; @@ -377,16 +373,11 @@ const CookieOptions& options, GetCookieListCallback callback); - void DeleteAllCreatedBetween(const base::Time& delete_begin, - const base::Time& delete_end, - DeleteCallback callback); + void DeleteAllCreatedInTimeRange(const TimeRange& creation_range, + DeleteCallback callback); - // Predicate will be called with the calling thread. - void DeleteAllCreatedBetweenWithPredicate( - const base::Time& delete_begin, - const base::Time& delete_end, - const base::Callback<bool(const CanonicalCookie&)>& predicate, - DeleteCallback callback); + void DeleteAllMatchingInfo(net::CookieStore::CookieDeletionInfo delete_info, + DeleteCallback callback); void SetCookieWithOptions(const GURL& url, const std::string& cookie_line,
diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc index 84a386d..8ab479ac 100644 --- a/net/cookies/cookie_monster_unittest.cc +++ b/net/cookies/cookie_monster_unittest.cc
@@ -48,9 +48,10 @@ namespace net { -using CookiePredicate = CookieStore::CookiePredicate; using base::Time; using base::TimeDelta; +using CookieDeletionInfo = net::CookieStore::CookieDeletionInfo; +using TimeRange = CookieStore::TimeRange; namespace { @@ -89,25 +90,6 @@ const char kTopLevelDomainPlus3[] = "http://www.bourbaki.math.harvard.edu"; const char kOtherDomain[] = "http://www.mit.edu"; -bool AlwaysTrueCookiePredicate(CanonicalCookie* to_save, - const CanonicalCookie& cookie) { - if (to_save) - *to_save = cookie; - return true; -} - -bool AlwaysFalseCookiePredicate(CanonicalCookie* to_save, - const CanonicalCookie& cookie) { - if (to_save) - *to_save = cookie; - return false; -} - -bool CookieValuePredicate(const std::string& true_value, - const CanonicalCookie& cookie) { - return cookie.Value() == true_value; -} - struct CookieMonsterTestTraits { static std::unique_ptr<CookieStore> Create() { return std::make_unique<CookieMonster>(nullptr); @@ -191,28 +173,24 @@ return callback.result(); } - uint32_t DeleteAllCreatedBetween(CookieMonster* cm, - const base::Time& delete_begin, - const base::Time& delete_end) { + uint32_t DeleteAllCreatedInTimeRange(CookieMonster* cm, + const TimeRange& creation_range) { DCHECK(cm); ResultSavingCookieCallback<uint32_t> callback; - cm->DeleteAllCreatedBetweenAsync( - delete_begin, delete_end, - base::Bind(&ResultSavingCookieCallback<uint32_t>::Run, - base::Unretained(&callback))); + cm->DeleteAllCreatedInTimeRangeAsync( + creation_range, + base::BindRepeating(&ResultSavingCookieCallback<uint32_t>::Run, + base::Unretained(&callback))); callback.WaitUntilDone(); return callback.result(); } - uint32_t DeleteAllCreatedBetweenWithPredicate( - CookieMonster* cm, - const base::Time delete_begin, - const base::Time delete_end, - const CookiePredicate& predicate) { + uint32_t DeleteAllMatchingInfo(CookieMonster* cm, + CookieDeletionInfo delete_info) { DCHECK(cm); ResultSavingCookieCallback<uint32_t> callback; - cm->DeleteAllCreatedBetweenWithPredicateAsync( - delete_begin, delete_end, predicate, + cm->DeleteAllMatchingInfoAsync( + std::move(delete_info), base::Bind(&ResultSavingCookieCallback<uint32_t>::Run, base::Unretained(&callback))); callback.WaitUntilDone(); @@ -912,26 +890,23 @@ ACTION_P3(SetAllCookiesAction, cookie_monster, list, callback) { cookie_monster->SetAllCookiesAsync(list, callback->Get()); } -ACTION_P4(DeleteAllCreatedBetweenAction, +ACTION_P3(DeleteAllCreatedInTimeRangeAction, cookie_monster, - delete_begin, - delete_end, + creation_range, callback) { - cookie_monster->DeleteAllCreatedBetweenAsync(delete_begin, delete_end, - callback->Get()); + cookie_monster->DeleteAllCreatedInTimeRangeAsync(creation_range, + callback->Get()); } ACTION_P2(GetAllCookiesAction, cookie_monster, callback) { cookie_monster->GetAllCookiesAsync(callback->Get()); } -ACTION_P5(DeleteAllCreatedBetweenWithPredicateAction, +ACTION_P3(DeleteAllCreatedMatchingInfoAction, cookie_monster, - delete_begin, - delete_end, - predicate, + delete_info, callback) { - cookie_monster->DeleteAllCreatedBetweenWithPredicateAsync( - delete_begin, delete_end, predicate, callback->Get()); + cookie_monster->DeleteAllMatchingInfoAsync(std::move(delete_info), + callback->Get()); } ACTION_P3(DeleteCanonicalCookieAction, cookie_monster, cookie, callback) { @@ -1247,18 +1222,18 @@ loop.Run(); } -TEST_F(DeferredCookieTaskTest, DeferredDeleteAllCreatedBetweenCookies) { +TEST_F(DeferredCookieTaskTest, DeferredDeleteAllCreatedInTimeRangeCookies) { MockDeleteCallback delete_callback; - BeginWith(DeleteAllCreatedBetweenAction(&cookie_monster(), base::Time(), - base::Time::Now(), &delete_callback)); + const TimeRange time_range(base::Time(), base::Time::Now()); + BeginWith(DeleteAllCreatedInTimeRangeAction(&cookie_monster(), time_range, + &delete_callback)); WaitForLoadCall(); EXPECT_CALL(delete_callback, Run(false)) - .WillOnce(DeleteAllCreatedBetweenAction(&cookie_monster(), base::Time(), - base::Time::Now(), - &delete_callback)); + .WillOnce(DeleteAllCreatedInTimeRangeAction(&cookie_monster(), time_range, + &delete_callback)); base::RunLoop loop; EXPECT_CALL(delete_callback, Run(false)).WillOnce(QuitRunLoop(&loop)); @@ -1267,20 +1242,18 @@ } TEST_F(DeferredCookieTaskTest, - DeferredDeleteAllWithPredicateCreatedBetweenCookies) { + DeferredDeleteAllWithPredicateCreatedInTimeRangeCookies) { MockDeleteCallback delete_callback; - CookiePredicate predicate = base::Bind(&AlwaysTrueCookiePredicate, nullptr); - - BeginWith(DeleteAllCreatedBetweenWithPredicateAction( - &cookie_monster(), base::Time(), base::Time::Now(), predicate, + BeginWith(DeleteAllCreatedMatchingInfoAction( + &cookie_monster(), CookieDeletionInfo(Time(), Time::Now()), &delete_callback)); WaitForLoadCall(); EXPECT_CALL(delete_callback, Run(false)) - .WillOnce(DeleteAllCreatedBetweenWithPredicateAction( - &cookie_monster(), base::Time(), base::Time::Now(), predicate, + .WillOnce(DeleteAllCreatedMatchingInfoAction( + &cookie_monster(), CookieDeletionInfo(Time(), Time::Now()), &delete_callback)); base::RunLoop loop; EXPECT_CALL(delete_callback, Run(false)).WillOnce(QuitRunLoop(&loop)); @@ -1398,13 +1371,14 @@ EXPECT_EQ("", GetCookiesWithOptions(cm.get(), http_www_foo_.url(), options)); } -TEST_F(CookieMonsterTest, TestCookieDeleteAllCreatedBetweenTimestamps) { +TEST_F(CookieMonsterTest, TestCookieDeleteAllCreatedInTimeRangeTimestamps) { std::unique_ptr<CookieMonster> cm(new CookieMonster(nullptr)); Time now = Time::Now(); // Nothing has been added so nothing should be deleted. - EXPECT_EQ(0u, DeleteAllCreatedBetween(cm.get(), now - TimeDelta::FromDays(99), - Time())); + EXPECT_EQ(0u, + DeleteAllCreatedInTimeRange( + cm.get(), TimeRange(now - TimeDelta::FromDays(99), Time()))); // Create 5 cookies with different creation dates. EXPECT_TRUE( @@ -1423,41 +1397,37 @@ now - TimeDelta::FromDays(7))); // Try to delete threedays and the daybefore. - EXPECT_EQ(2u, DeleteAllCreatedBetween(cm.get(), now - TimeDelta::FromDays(3), - now - TimeDelta::FromDays(1))); + EXPECT_EQ(2u, DeleteAllCreatedInTimeRange( + cm.get(), TimeRange(now - TimeDelta::FromDays(3), + now - TimeDelta::FromDays(1)))); // Try to delete yesterday, also make sure that delete_end is not // inclusive. - EXPECT_EQ( - 1u, DeleteAllCreatedBetween(cm.get(), now - TimeDelta::FromDays(2), now)); + EXPECT_EQ(1u, DeleteAllCreatedInTimeRange( + cm.get(), TimeRange(now - TimeDelta::FromDays(2), now))); // Make sure the delete_begin is inclusive. - EXPECT_EQ( - 1u, DeleteAllCreatedBetween(cm.get(), now - TimeDelta::FromDays(7), now)); + EXPECT_EQ(1u, DeleteAllCreatedInTimeRange( + cm.get(), TimeRange(now - TimeDelta::FromDays(7), now))); // Delete the last (now) item. - EXPECT_EQ(1u, DeleteAllCreatedBetween(cm.get(), Time(), Time())); + EXPECT_EQ(1u, DeleteAllCreatedInTimeRange(cm.get(), TimeRange())); // Really make sure everything is gone. EXPECT_EQ(0u, DeleteAll(cm.get())); } TEST_F(CookieMonsterTest, - TestCookieDeleteAllCreatedBetweenTimestampsWithPredicate) { + TestCookieDeleteAllCreatedInTimeRangeTimestampsWithInfo) { std::unique_ptr<CookieMonster> cm(new CookieMonster(nullptr)); Time now = Time::Now(); CanonicalCookie test_cookie; - CookiePredicate true_predicate = - base::Bind(&AlwaysTrueCookiePredicate, &test_cookie); - - CookiePredicate false_predicate = - base::Bind(&AlwaysFalseCookiePredicate, &test_cookie); // Nothing has been added so nothing should be deleted. - EXPECT_EQ( - 0u, DeleteAllCreatedBetweenWithPredicate( - cm.get(), now - TimeDelta::FromDays(99), Time(), true_predicate)); + EXPECT_EQ(0u, DeleteAllMatchingInfo( + cm.get(), + CookieDeletionInfo(now - TimeDelta::FromDays(99), Time()))); // Create 5 cookies with different creation dates. EXPECT_TRUE( @@ -1475,56 +1445,24 @@ "T-7=LastWeek", now - TimeDelta::FromDays(7))); - // Try to delete threedays and the daybefore, but we should do nothing due - // to the predicate. - EXPECT_EQ(0u, DeleteAllCreatedBetweenWithPredicate( - cm.get(), now - TimeDelta::FromDays(3), - now - TimeDelta::FromDays(1), false_predicate)); - // Same as above with a null predicate, so it shouldn't delete anything. - EXPECT_EQ(0u, DeleteAllCreatedBetweenWithPredicate( - cm.get(), now - TimeDelta::FromDays(3), - now - TimeDelta::FromDays(1), CookiePredicate())); - // Same as above, but we use the true_predicate, so it works. - EXPECT_EQ(2u, DeleteAllCreatedBetweenWithPredicate( - cm.get(), now - TimeDelta::FromDays(3), - now - TimeDelta::FromDays(1), true_predicate)); + // Delete threedays and the daybefore. + EXPECT_EQ(2u, + DeleteAllMatchingInfo( + cm.get(), CookieDeletionInfo(now - TimeDelta::FromDays(3), + now - TimeDelta::FromDays(1)))); - // Try to delete yesterday, also make sure that delete_end is not - // inclusive. - EXPECT_EQ(0u, - DeleteAllCreatedBetweenWithPredicate( - cm.get(), now - TimeDelta::FromDays(2), now, false_predicate)); - EXPECT_EQ(1u, - DeleteAllCreatedBetweenWithPredicate( - cm.get(), now - TimeDelta::FromDays(2), now, true_predicate)); - // Check our cookie values. - std::unique_ptr<CanonicalCookie> expected_cookie = - CanonicalCookie::Create(http_www_foo_.url(), "T-1=Yesterday", - now - TimeDelta::FromDays(1), CookieOptions()); - EXPECT_THAT(test_cookie, CookieEquals(*expected_cookie)) - << "Actual:\n" - << test_cookie.DebugString() << "\nExpected:\n" - << expected_cookie->DebugString(); + // Delete yesterday, also make sure that delete_end is not inclusive. + EXPECT_EQ( + 1u, DeleteAllMatchingInfo( + cm.get(), CookieDeletionInfo(now - TimeDelta::FromDays(2), now))); // Make sure the delete_begin is inclusive. - EXPECT_EQ(0u, - DeleteAllCreatedBetweenWithPredicate( - cm.get(), now - TimeDelta::FromDays(7), now, false_predicate)); - EXPECT_EQ(1u, - DeleteAllCreatedBetweenWithPredicate( - cm.get(), now - TimeDelta::FromDays(7), now, true_predicate)); + EXPECT_EQ( + 1u, DeleteAllMatchingInfo( + cm.get(), CookieDeletionInfo(now - TimeDelta::FromDays(7), now))); // Delete the last (now) item. - EXPECT_EQ(0u, DeleteAllCreatedBetweenWithPredicate(cm.get(), Time(), Time(), - false_predicate)); - EXPECT_EQ(1u, DeleteAllCreatedBetweenWithPredicate(cm.get(), Time(), Time(), - true_predicate)); - expected_cookie = CanonicalCookie::Create(http_www_foo_.url(), "T-0=Now", now, - CookieOptions()); - EXPECT_THAT(test_cookie, CookieEquals(*expected_cookie)) - << "Actual:\n" - << test_cookie.DebugString() << "\nExpected:\n" - << expected_cookie->DebugString(); + EXPECT_EQ(1u, DeleteAllMatchingInfo(cm.get(), CookieDeletionInfo())); // Really make sure everything is gone. EXPECT_EQ(0u, DeleteAll(cm.get())); @@ -1914,15 +1852,14 @@ } TEST_F(CookieMonsterTest, PredicateSeesAllCookies) { - const std::string kTrueValue = "A"; std::unique_ptr<CookieMonster> cm(new CookieMonster(nullptr)); - // We test that we can see all cookies with our predicate. This includes - // host, http_only, host secure, and all domain cookies. - CookiePredicate value_matcher = base::Bind(&CookieValuePredicate, kTrueValue); - PopulateCmForPredicateCheck(cm.get()); - EXPECT_EQ(7u, DeleteAllCreatedBetweenWithPredicate( - cm.get(), base::Time(), base::Time::Now(), value_matcher)); + // We test that we can see all cookies with |delete_info|. This includes + // host, http_only, host secure, and all domain cookies. + CookieDeletionInfo delete_info(base::Time(), base::Time::Now()); + delete_info.value_for_testing = "A"; + + EXPECT_EQ(7u, DeleteAllMatchingInfo(cm.get(), std::move(delete_info))); EXPECT_EQ("dom_2=B; dom_3=C; host_3=C", GetCookies(cm.get(), GURL(kTopLevelDomainPlus3)));
diff --git a/net/cookies/cookie_store.cc b/net/cookies/cookie_store.cc index e536dbd..17e8a6e4 100644 --- a/net/cookies/cookie_store.cc +++ b/net/cookies/cookie_store.cc
@@ -6,15 +6,46 @@ #include "base/bind.h" #include "base/callback.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/cookie_options.h" namespace net { +namespace { + +// Return true if the eTLD+1 of the cookies domain matches any of the strings +// in |match_domains|, false otherwise. +bool DomainMatchesDomainSet(const net::CanonicalCookie& cookie, + const std::set<std::string>& match_domains) { + if (match_domains.empty()) + return false; + + // If domain is an IP address it returns an empty string. + std::string effective_domain( + net::registry_controlled_domains::GetDomainAndRegistry( + // GetDomainAndRegistry() is insensitive to leading dots, i.e. + // to host/domain cookie distinctions. + cookie.Domain(), + net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES)); + // If the cookie's domain is is not parsed as belonging to a registry + // (e.g. for IP addresses or internal hostnames) an empty string will be + // returned. In this case, use the domain in the cookie. + if (effective_domain.empty()) { + if (cookie.IsDomainCookie()) + effective_domain = cookie.Domain().substr(1); + else + effective_domain = cookie.Domain(); + } + + return match_domains.count(effective_domain) != 0; +} + +} // anonymous namespace + CookieStore::~CookieStore() = default; void CookieStore::DeleteAllAsync(DeleteCallback callback) { - DeleteAllCreatedBetweenAsync(base::Time(), base::Time::Max(), - std::move(callback)); + DeleteAllCreatedInTimeRangeAsync(TimeRange(), std::move(callback)); } void CookieStore::SetForceKeepSessionState() { @@ -46,4 +77,96 @@ CookieStore::CookieStore() : channel_id_service_id_(-1) {} +CookieStore::TimeRange::TimeRange() = default; + +CookieStore::TimeRange::TimeRange(const TimeRange& other) = default; + +CookieStore::TimeRange::TimeRange(base::Time start, base::Time end) + : start_(start), end_(end) { + if (!start.is_null() && !end.is_null()) + DCHECK_GE(end, start); +} + +CookieStore::TimeRange& CookieStore::TimeRange::operator=( + const TimeRange& rhs) = default; + +bool CookieStore::TimeRange::Contains(const base::Time& time) const { + DCHECK(!time.is_null()); + + if (!start_.is_null() && start_ == end_) + return time == start_; + return (start_.is_null() || start_ <= time) && + (end_.is_null() || time < end_); +} + +void CookieStore::TimeRange::SetStart(base::Time value) { + start_ = value; +} + +void CookieStore::TimeRange::SetEnd(base::Time value) { + end_ = value; +} + +CookieStore::CookieDeletionInfo::CookieDeletionInfo() = default; + +CookieStore::CookieDeletionInfo::CookieDeletionInfo(base::Time start_time, + base::Time end_time) + : creation_range(start_time, end_time) {} + +CookieStore::CookieDeletionInfo::CookieDeletionInfo( + CookieDeletionInfo&& other) = default; + +CookieStore::CookieDeletionInfo::CookieDeletionInfo( + const CookieDeletionInfo& other) = default; + +CookieStore::CookieDeletionInfo::~CookieDeletionInfo() = default; + +CookieStore::CookieDeletionInfo& CookieStore::CookieDeletionInfo::operator=( + CookieDeletionInfo&& rhs) = default; + +CookieStore::CookieDeletionInfo& CookieStore::CookieDeletionInfo::operator=( + const CookieDeletionInfo& rhs) = default; + +bool CookieStore::CookieDeletionInfo::Matches( + const CanonicalCookie& cookie) const { + if (session_control != SessionControl::IGNORE_CONTROL && + (cookie.IsPersistent() != + (session_control == SessionControl::PERSISTENT_COOKIES))) { + return false; + } + + if (!creation_range.Contains(cookie.CreationDate())) + return false; + + if (host.has_value() && + !(cookie.IsHostCookie() && cookie.IsDomainMatch(host.value()))) { + return false; + } + + if (name.has_value() && cookie.Name() != name) + return false; + + if (value_for_testing.has_value() && + value_for_testing.value() != cookie.Value()) { + return false; + } + + if (url.has_value() && + !cookie.IncludeForRequestURL(url.value(), cookie_options)) { + return false; + } + + if (!domains_and_ips_to_delete.empty() && + !DomainMatchesDomainSet(cookie, domains_and_ips_to_delete)) { + return false; + } + + if (!domains_and_ips_to_ignore.empty() && + DomainMatchesDomainSet(cookie, domains_and_ips_to_ignore)) { + return false; + } + + return true; +} + } // namespace net
diff --git a/net/cookies/cookie_store.h b/net/cookies/cookie_store.h index 980da01..e24858d 100644 --- a/net/cookies/cookie_store.h +++ b/net/cookies/cookie_store.h
@@ -10,10 +10,12 @@ #include <stdint.h> #include <memory> +#include <set> #include <string> #include <vector> #include "base/callback_forward.h" +#include "base/optional.h" #include "base/time/time.h" #include "net/base/net_export.h" #include "net/cookies/canonical_cookie.h" @@ -46,7 +48,124 @@ typedef base::OnceCallback<void(bool success)> SetCookiesCallback; typedef base::OnceCallback<void(uint32_t num_deleted)> DeleteCallback; - typedef base::Callback<bool(const CanonicalCookie& cookie)> CookiePredicate; + // Define a range of time from [start, end) where start is inclusive and end + // is exclusive. There is a special case where |start| == |end| (matching a + // single time) where |end| is inclusive. This special case is for iOS that + // will be removed in the future. + // + // TODO(crbug.com/830689): Delete the start=end special case. + class NET_EXPORT TimeRange { + public: + // Default constructor matches any non-null time. + TimeRange(); + TimeRange(const TimeRange& other); + TimeRange(base::Time start, base::Time end); + TimeRange& operator=(const TimeRange& rhs); + + // Is |time| within this time range? + // + // Will return true if: + // + // |start_| <= |time| < |end_| + // + // If |start_| is null then the range is unbounded on the lower range. + // If |end_| is null then the range is unbounded on the upper range. + // + // Note 1: |time| cannot be null. + // Note 2: If |start_| == |end_| then end_ is inclusive. + // + bool Contains(const base::Time& time) const; + + // Set the range start time. Set to null (i.e. Time()) to indicated an + // unbounded lower range. + void SetStart(base::Time value); + + // Set the range end time. Set to null (i.e. Time()) to indicated an + // unbounded upper range. + void SetEnd(base::Time value); + + // Return the start time. + base::Time start() const { return start_; } + + // Return the end time. + base::Time end() const { return end_; } + + private: + // The inclusive start time of this range. + base::Time start_; + // The exclusive end time of this range. + base::Time end_; + }; + + // Used to specify which cookies to delete. All members are ANDed together. + struct NET_EXPORT CookieDeletionInfo { + // TODO(cmumford): Combine with + // network::mojom::CookieDeletionSessionControl. + enum SessionControl { + IGNORE_CONTROL, + SESSION_COOKIES, + PERSISTENT_COOKIES, + }; + + CookieDeletionInfo(); + CookieDeletionInfo(CookieDeletionInfo&& other); + CookieDeletionInfo(const CookieDeletionInfo& other); + CookieDeletionInfo(base::Time start_time, base::Time end_time); + ~CookieDeletionInfo(); + + CookieDeletionInfo& operator=(CookieDeletionInfo&& rhs); + CookieDeletionInfo& operator=(const CookieDeletionInfo& rhs); + + // Return true if |cookie| matches all members of this instance. All members + // are ANDed together. For example: if the |cookie| creation date is within + // |creation_range| AND the |cookie| name is equal to |name|, etc. then true + // will be returned. If not false. + // + // All members are used. See comments above other members for specifics + // about how checking is done for that value. + bool Matches(const CanonicalCookie& cookie) const; + + // See comment above for TimeRange::Contains() for more info. + TimeRange creation_range; + + // By default ignore session type and delete both session and persistent + // cookies. + SessionControl session_control = SessionControl::IGNORE_CONTROL; + + // If has a value then cookie.Host() must equal |host|. + base::Optional<std::string> host; + + // If has a value then cookie.Name() must equal |name|. + base::Optional<std::string> name; + + // If has a value then will match if the cookie being evaluated would be + // included for a request of |url|. + base::Optional<GURL> url; + + // Only used for |url| comparison. + CookieOptions cookie_options; + + // If this is not empty then any cookie with a domain/ip contained in this + // set will be deleted (assuming other fields match). + // Domains must not have a leading period. e.g "example.com" and not + // ".example.com". + // + // Note: |domains_and_ips_to_ignore| takes precedence. For example if this + // has a value of ["A", "B"] and |domains_and_ips_to_ignore| is ["B", "C"] + // then only "A" will be deleted. + std::set<std::string> domains_and_ips_to_delete; + + // If this is not empty then any cookie with a domain/ip contained in this + // set will be ignored (and not deleted). + // Domains must not have a leading period. e.g "example.com" and not + // ".example.com". + // + // See precedence note above. + std::set<std::string> domains_and_ips_to_ignore; + + // Used only for testing purposes. + base::Optional<std::string> value_for_testing; + }; virtual ~CookieStore(); @@ -107,26 +226,18 @@ virtual void DeleteCanonicalCookieAsync(const CanonicalCookie& cookie, DeleteCallback callback) = 0; - // Deletes all of the cookies that have a creation_date greater than or equal - // to |delete_begin| and less than |delete_end| + // Deletes all of the cookies that have a creation_date matching + // |creation_range|. See TimeRange::Matches(). // Calls |callback| with the number of cookies deleted. - virtual void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin, - const base::Time& delete_end, - DeleteCallback callback) = 0; + virtual void DeleteAllCreatedInTimeRangeAsync(const TimeRange& creation_range, + DeleteCallback callback) = 0; - // Deletes all of the cookies that match the given predicate and that have a - // creation_date greater than or equal to |delete_begin| and smaller than - // |delete_end|. Null times do not cap their ranges (i.e. - // |delete_end.is_null()| would mean that there is no time after which - // cookies are not deleted). This includes all http_only and secure - // cookies. Avoid deleting cookies that could leave websites with a - // partial set of visible cookies. + // Deletes all of the cookies matching |delete_info|. This includes all + // http_only and secure cookies. Avoid deleting cookies that could leave + // websites with a partial set of visible cookies. // Calls |callback| with the number of cookies deleted. - virtual void DeleteAllCreatedBetweenWithPredicateAsync( - const base::Time& delete_begin, - const base::Time& delete_end, - const CookiePredicate& predicate, - DeleteCallback callback) = 0; + virtual void DeleteAllMatchingInfoAsync(CookieDeletionInfo delete_info, + DeleteCallback callback) = 0; virtual void DeleteSessionCookiesAsync(DeleteCallback) = 0;
diff --git a/net/cookies/cookie_store_test_helpers.cc b/net/cookies/cookie_store_test_helpers.cc index 66d6660..9c2b35c 100644 --- a/net/cookies/cookie_store_test_helpers.cc +++ b/net/cookies/cookie_store_test_helpers.cc
@@ -175,17 +175,14 @@ ADD_FAILURE(); } -void DelayedCookieMonster::DeleteAllCreatedBetweenAsync( - const base::Time& delete_begin, - const base::Time& delete_end, +void DelayedCookieMonster::DeleteAllCreatedInTimeRangeAsync( + const TimeRange& creation_range, DeleteCallback callback) { ADD_FAILURE(); } -void DelayedCookieMonster::DeleteAllCreatedBetweenWithPredicateAsync( - const base::Time& delete_begin, - const base::Time& delete_end, - const base::Callback<bool(const CanonicalCookie&)>& predicate, +void DelayedCookieMonster::DeleteAllMatchingInfoAsync( + net::CookieStore::CookieDeletionInfo delete_info, DeleteCallback callback) { ADD_FAILURE(); }
diff --git a/net/cookies/cookie_store_test_helpers.h b/net/cookies/cookie_store_test_helpers.h index 440f70c..e5a755a 100644 --- a/net/cookies/cookie_store_test_helpers.h +++ b/net/cookies/cookie_store_test_helpers.h
@@ -81,14 +81,11 @@ void DeleteCanonicalCookieAsync(const CanonicalCookie& cookie, DeleteCallback callback) override; - void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin, - const base::Time& delete_end, - DeleteCallback callback) override; + void DeleteAllCreatedInTimeRangeAsync(const TimeRange& creation_range, + DeleteCallback callback) override; - void DeleteAllCreatedBetweenWithPredicateAsync( - const base::Time& delete_begin, - const base::Time& delete_end, - const base::Callback<bool(const CanonicalCookie&)>& predicate, + void DeleteAllMatchingInfoAsync( + net::CookieStore::CookieDeletionInfo delete_info, DeleteCallback callback) override; void DeleteSessionCookiesAsync(DeleteCallback) override;
diff --git a/net/cookies/cookie_store_unittest.h b/net/cookies/cookie_store_unittest.h index c715a19..4da4241 100644 --- a/net/cookies/cookie_store_unittest.h +++ b/net/cookies/cookie_store_unittest.h
@@ -37,6 +37,7 @@ namespace net { using base::Thread; +using CookieDeletionInfo = CookieStore::CookieDeletionInfo; const int kTimeout = 1000; @@ -247,28 +248,25 @@ return callback.result(); } - uint32_t DeleteCreatedBetween(CookieStore* cs, - const base::Time& delete_begin, - const base::Time& delete_end) { + uint32_t DeleteCreatedInTimeRange( + CookieStore* cs, + const CookieStore::TimeRange& creation_range) { DCHECK(cs); ResultSavingCookieCallback<uint32_t> callback; - cs->DeleteAllCreatedBetweenAsync( - delete_begin, delete_end, - base::Bind(&ResultSavingCookieCallback<uint32_t>::Run, - base::Unretained(&callback))); + cs->DeleteAllCreatedInTimeRangeAsync( + creation_range, + base::BindRepeating(&ResultSavingCookieCallback<uint32_t>::Run, + base::Unretained(&callback))); callback.WaitUntilDone(); return callback.result(); } - uint32_t DeleteAllCreatedBetweenWithPredicate( - CookieStore* cs, - const base::Time delete_begin, - const base::Time delete_end, - const CookieStore::CookiePredicate& predicate) { + uint32_t DeleteAllCreatedInTimeRange(CookieStore* cs, + CookieDeletionInfo delete_info) { DCHECK(cs); ResultSavingCookieCallback<uint32_t> callback; - cs->DeleteAllCreatedBetweenWithPredicateAsync( - delete_begin, delete_end, predicate, + cs->DeleteAllMatchingInfoAsync( + std::move(delete_info), base::Bind(&ResultSavingCookieCallback<uint32_t>::Run, base::Unretained(&callback))); callback.WaitUntilDone(); @@ -1282,7 +1280,7 @@ EXPECT_EQ(0u, this->GetAllCookies(cs).size()); } -TYPED_TEST_P(CookieStoreTest, TestDeleteAllCreatedBetween) { +TYPED_TEST_P(CookieStoreTest, TestDeleteAllCreatedInTimeRange) { CookieStore* cs = this->GetCookieStore(); const base::Time last_month = base::Time::Now() - base::TimeDelta::FromDays(30); @@ -1300,14 +1298,17 @@ this->GetCookies(cs, this->http_www_foo_.url())); // Remove cookies in empty intervals. - EXPECT_EQ(0u, this->DeleteCreatedBetween(cs, last_month, last_minute)); - EXPECT_EQ(0u, this->DeleteCreatedBetween(cs, next_minute, next_month)); + EXPECT_EQ(0u, this->DeleteCreatedInTimeRange( + cs, CookieStore::TimeRange(last_month, last_minute))); + EXPECT_EQ(0u, this->DeleteCreatedInTimeRange( + cs, CookieStore::TimeRange(next_minute, next_month))); // Check that the cookie is still there. this->MatchCookieLines("A=B", this->GetCookies(cs, this->http_www_foo_.url())); // Remove the cookie with an interval defined by two dates. - EXPECT_EQ(1u, this->DeleteCreatedBetween(cs, last_minute, next_minute)); + EXPECT_EQ(1u, this->DeleteCreatedInTimeRange( + cs, CookieStore::TimeRange(last_minute, next_minute))); // Check that the cookie disappeared. this->MatchCookieLines(std::string(), this->GetCookies(cs, this->http_www_foo_.url())); @@ -1319,25 +1320,18 @@ this->GetCookies(cs, this->http_www_foo_.url())); // Remove the cookie with a null ending time. - EXPECT_EQ(1u, this->DeleteCreatedBetween(cs, last_minute, base::Time())); + EXPECT_EQ(1u, this->DeleteCreatedInTimeRange( + cs, CookieStore::TimeRange(last_minute, base::Time()))); // Check that the cookie disappeared. this->MatchCookieLines(std::string(), this->GetCookies(cs, this->http_www_foo_.url())); } -namespace { -static bool CookieHasValue(const std::string& value, - const CanonicalCookie& cookie) { - return cookie.Value() == value; -} -} - -TYPED_TEST_P(CookieStoreTest, TestDeleteAllCreatedBetweenWithPredicate) { +TYPED_TEST_P(CookieStoreTest, TestDeleteAllWithInfo) { CookieStore* cs = this->GetCookieStore(); base::Time now = base::Time::Now(); base::Time last_month = base::Time::Now() - base::TimeDelta::FromDays(30); base::Time last_minute = base::Time::Now() - base::TimeDelta::FromMinutes(1); - std::string desired_value("B"); // These 3 cookies match the time range and host. EXPECT_TRUE(this->SetCookie(cs, this->http_www_foo_.url(), "A=B")); @@ -1346,31 +1340,25 @@ EXPECT_TRUE(this->SetCookie(cs, this->https_www_foo_.url(), "E=B")); // Delete cookies. + CookieDeletionInfo delete_info(now, base::Time::Max()); + delete_info.value_for_testing = "B"; EXPECT_EQ(2u, // Deletes A=B, E=B - this->DeleteAllCreatedBetweenWithPredicate( - cs, now, base::Time::Max(), - base::BindRepeating(&CookieHasValue, desired_value))); + this->DeleteAllCreatedInTimeRange(cs, std::move(delete_info))); // Check that we deleted the right ones. this->MatchCookieLines("C=D;Y=Z", this->GetCookies(cs, this->https_www_foo_.url())); - // Now check that using a null predicate will do nothing. - EXPECT_EQ(0u, - this->DeleteAllCreatedBetweenWithPredicate( - cs, now, base::Time::Max(), CookieStore::CookiePredicate())); - // Finally, check that we don't delete cookies when our time range is off. - desired_value = "D"; - EXPECT_EQ(0u, this->DeleteAllCreatedBetweenWithPredicate( - cs, last_month, last_minute, - base::BindRepeating(&CookieHasValue, desired_value))); + delete_info = CookieDeletionInfo(last_month, last_minute); + delete_info.value_for_testing = "D"; + EXPECT_EQ(0u, this->DeleteAllCreatedInTimeRange(cs, std::move(delete_info))); this->MatchCookieLines("C=D;Y=Z", this->GetCookies(cs, this->https_www_foo_.url())); // Same thing, but with a good time range. - EXPECT_EQ(1u, this->DeleteAllCreatedBetweenWithPredicate( - cs, now, base::Time::Max(), - base::BindRepeating(&CookieHasValue, desired_value))); + delete_info = CookieDeletionInfo(now, base::Time::Max()); + delete_info.value_for_testing = "D"; + EXPECT_EQ(1u, this->DeleteAllCreatedInTimeRange(cs, std::move(delete_info))); this->MatchCookieLines("Y=Z", this->GetCookies(cs, this->https_www_foo_.url())); } @@ -1676,6 +1664,315 @@ EXPECT_EQ("C=D", this->GetCookies(cs, this->http_www_foo_.url())); } +TYPED_TEST_P(CookieStoreTest, TimeRangeValues) { + CookieStore::TimeRange range; + EXPECT_EQ(base::Time(), range.start()); + EXPECT_EQ(base::Time(), range.end()); + + const base::Time kTestStart = base::Time::FromDoubleT(1000); + const base::Time kTestEnd = base::Time::FromDoubleT(10000); + + EXPECT_EQ(kTestStart, + CookieStore::TimeRange(kTestStart, base::Time()).start()); + EXPECT_EQ(base::Time(), + CookieStore::TimeRange(kTestStart, base::Time()).end()); + + EXPECT_EQ(kTestStart, CookieStore::TimeRange(kTestStart, kTestEnd).start()); + EXPECT_EQ(kTestEnd, CookieStore::TimeRange(kTestStart, kTestEnd).end()); + + CookieStore::TimeRange range2; + range2.SetStart(kTestStart); + EXPECT_EQ(kTestStart, range2.start()); + EXPECT_EQ(base::Time(), range2.end()); + range2.SetEnd(kTestEnd); + EXPECT_EQ(kTestStart, range2.start()); + EXPECT_EQ(kTestEnd, range2.end()); +} + +TYPED_TEST_P(CookieStoreTest, TimeRangeContains) { + // Default TimeRange matches all time values. + CookieStore::TimeRange range; + EXPECT_TRUE(range.Contains(base::Time::Now())); + EXPECT_TRUE(range.Contains(base::Time::Max())); + + // With a start, but no end. + const double kTestMinEpoch = 1000; + range.SetStart(base::Time::FromDoubleT(kTestMinEpoch)); + EXPECT_FALSE(range.Contains(base::Time::Min())); + EXPECT_FALSE(range.Contains(base::Time::FromDoubleT(kTestMinEpoch - 1))); + EXPECT_TRUE(range.Contains(base::Time::FromDoubleT(kTestMinEpoch))); + EXPECT_TRUE(range.Contains(base::Time::FromDoubleT(kTestMinEpoch + 1))); + EXPECT_TRUE(range.Contains(base::Time::Max())); + + // With an end, but no start. + const double kTestMaxEpoch = 10000000; + range = CookieStore::TimeRange(); + range.SetEnd(base::Time::FromDoubleT(kTestMaxEpoch)); + EXPECT_TRUE(range.Contains(base::Time::Min())); + EXPECT_TRUE(range.Contains(base::Time::FromDoubleT(kTestMaxEpoch - 1))); + EXPECT_FALSE(range.Contains(base::Time::FromDoubleT(kTestMaxEpoch))); + EXPECT_FALSE(range.Contains(base::Time::FromDoubleT(kTestMaxEpoch + 1))); + EXPECT_FALSE(range.Contains(base::Time::Max())); + + // With both a start and an end. + range.SetStart(base::Time::FromDoubleT(kTestMinEpoch)); + EXPECT_FALSE(range.Contains(base::Time::Min())); + EXPECT_FALSE(range.Contains(base::Time::FromDoubleT(kTestMinEpoch - 1))); + EXPECT_TRUE(range.Contains(base::Time::FromDoubleT(kTestMinEpoch))); + EXPECT_TRUE(range.Contains(base::Time::FromDoubleT(kTestMinEpoch + 1))); + EXPECT_TRUE(range.Contains(base::Time::FromDoubleT(kTestMaxEpoch - 1))); + EXPECT_FALSE(range.Contains(base::Time::FromDoubleT(kTestMaxEpoch))); + EXPECT_FALSE(range.Contains(base::Time::FromDoubleT(kTestMaxEpoch + 1))); + EXPECT_FALSE(range.Contains(base::Time::Max())); + + // And where start==end. + range = CookieStore::TimeRange(base::Time::FromDoubleT(kTestMinEpoch), + base::Time::FromDoubleT(kTestMinEpoch)); + EXPECT_FALSE(range.Contains(base::Time::Min())); + EXPECT_FALSE(range.Contains(base::Time::FromDoubleT(kTestMinEpoch - 1))); + EXPECT_TRUE(range.Contains(base::Time::FromDoubleT(kTestMinEpoch))); + EXPECT_FALSE(range.Contains(base::Time::FromDoubleT(kTestMinEpoch + 1))); +} + +TYPED_TEST_P(CookieStoreTest, CookieDeletionInfoMatchSessionControl) { + CanonicalCookie persistent_cookie("persistent-cookie", "persistent-value", + "persistent-domain", "persistent-path", + /*creation=*/base::Time::Now(), + /*expiration=*/base::Time::Max(), + /*last_access=*/base::Time::Now(), + /*secure=*/false, + /*httponly=*/false, + CookieSameSite::DEFAULT_MODE, + CookiePriority::COOKIE_PRIORITY_DEFAULT); + + CanonicalCookie session_cookie( + "session-cookie", "session-value", "session-domain", "session-path", + /*creation=*/base::Time::Now(), + /*expiration=*/base::Time(), + /*last_access=*/base::Time::Now(), + /*secure=*/false, + /*httponly=*/false, CookieSameSite::DEFAULT_MODE, + CookiePriority::COOKIE_PRIORITY_DEFAULT); + + CookieDeletionInfo delete_info; + EXPECT_TRUE(delete_info.Matches(persistent_cookie)); + EXPECT_TRUE(delete_info.Matches(session_cookie)); + + delete_info.session_control = + CookieDeletionInfo::SessionControl::PERSISTENT_COOKIES; + EXPECT_TRUE(delete_info.Matches(persistent_cookie)); + EXPECT_FALSE(delete_info.Matches(session_cookie)); + + delete_info.session_control = + CookieDeletionInfo::SessionControl::SESSION_COOKIES; + EXPECT_FALSE(delete_info.Matches(persistent_cookie)); + EXPECT_TRUE(delete_info.Matches(session_cookie)); +} + +TYPED_TEST_P(CookieStoreTest, CookieDeletionInfoMatchHost) { + CanonicalCookie domain_cookie("domain-cookie", "domain-cookie-value", + /*domain=*/".example.com", "/path", + /*creation=*/base::Time::Now(), + /*expiration=*/base::Time::Max(), + /*last_access=*/base::Time::Now(), + /*secure=*/false, + /*httponly=*/false, + CookieSameSite::DEFAULT_MODE, + CookiePriority::COOKIE_PRIORITY_DEFAULT); + + CanonicalCookie host_cookie("host-cookie", "host-cookie-value", + /*domain=*/"thehost.hosting.com", "/path", + /*creation=*/base::Time::Now(), + /*expiration=*/base::Time::Max(), + /*last_access=*/base::Time::Now(), + /*secure=*/false, + /*httponly=*/false, CookieSameSite::DEFAULT_MODE, + CookiePriority::COOKIE_PRIORITY_DEFAULT); + + EXPECT_TRUE(domain_cookie.IsDomainCookie()); + EXPECT_TRUE(host_cookie.IsHostCookie()); + + CookieDeletionInfo delete_info; + EXPECT_TRUE(delete_info.Matches(domain_cookie)); + EXPECT_TRUE(delete_info.Matches(host_cookie)); + + delete_info.host = "thehost.hosting.com"; + EXPECT_FALSE(delete_info.Matches(domain_cookie)); + EXPECT_TRUE(delete_info.Matches(host_cookie)); + + delete_info.host = "otherhost.hosting.com"; + EXPECT_FALSE(delete_info.Matches(domain_cookie)); + EXPECT_FALSE(delete_info.Matches(host_cookie)); + + delete_info.host = "thehost.otherhosting.com"; + EXPECT_FALSE(delete_info.Matches(domain_cookie)); + EXPECT_FALSE(delete_info.Matches(host_cookie)); +} + +TYPED_TEST_P(CookieStoreTest, CookieDeletionInfoMatchName) { + CanonicalCookie cookie1("cookie1-name", "cookie1-value", + /*domain=*/".example.com", "/path", + /*creation=*/base::Time::Now(), + /*expiration=*/base::Time::Max(), + /*last_access=*/base::Time::Now(), + /*secure=*/false, + /*httponly=*/false, CookieSameSite::DEFAULT_MODE, + CookiePriority::COOKIE_PRIORITY_DEFAULT); + CanonicalCookie cookie2("cookie2-name", "cookie2-value", + /*domain=*/".example.com", "/path", + /*creation=*/base::Time::Now(), + /*expiration=*/base::Time::Max(), + /*last_access=*/base::Time::Now(), + /*secure=*/false, + /*httponly=*/false, CookieSameSite::DEFAULT_MODE, + CookiePriority::COOKIE_PRIORITY_DEFAULT); + + CookieDeletionInfo delete_info; + delete_info.name = "cookie1-name"; + EXPECT_TRUE(delete_info.Matches(cookie1)); + EXPECT_FALSE(delete_info.Matches(cookie2)); +} + +TYPED_TEST_P(CookieStoreTest, CookieDeletionInfoMatchValue) { + CanonicalCookie cookie1("cookie1-name", "cookie1-value", + /*domain=*/".example.com", "/path", + /*creation=*/base::Time::Now(), + /*expiration=*/base::Time::Max(), + /*last_access=*/base::Time::Now(), + /*secure=*/false, + /*httponly=*/false, CookieSameSite::DEFAULT_MODE, + CookiePriority::COOKIE_PRIORITY_DEFAULT); + CanonicalCookie cookie2("cookie2-name", "cookie2-value", + /*domain=*/".example.com", "/path", + /*creation=*/base::Time::Now(), + /*expiration=*/base::Time::Max(), + /*last_access=*/base::Time::Now(), + /*secure=*/false, + /*httponly=*/false, CookieSameSite::DEFAULT_MODE, + CookiePriority::COOKIE_PRIORITY_DEFAULT); + + CookieDeletionInfo delete_info; + delete_info.value_for_testing = "cookie2-value"; + EXPECT_FALSE(delete_info.Matches(cookie1)); + EXPECT_TRUE(delete_info.Matches(cookie2)); +} + +TYPED_TEST_P(CookieStoreTest, CookieDeletionInfoMatchUrl) { + CanonicalCookie cookie("cookie-name", "cookie-value", + /*domain=*/"www.example.com", "/path", + /*creation=*/base::Time::Now(), + /*expiration=*/base::Time::Max(), + /*last_access=*/base::Time::Now(), + /*secure=*/false, + /*httponly=*/false, CookieSameSite::NO_RESTRICTION, + CookiePriority::COOKIE_PRIORITY_DEFAULT); + + CookieDeletionInfo delete_info; + delete_info.url = GURL("https://www.example.com/path"); + EXPECT_TRUE(delete_info.Matches(cookie)); + + delete_info.url = GURL("https://www.example.com/another/path"); + EXPECT_FALSE(delete_info.Matches(cookie)); +} + +TYPED_TEST_P(CookieStoreTest, CookieDeletionInfoDomainMatchesDomain) { + CookieDeletionInfo delete_info; + + const double kTestMinEpoch = 1000; + const double kTestMaxEpoch = 10000000; + delete_info.creation_range.SetStart(base::Time::FromDoubleT(kTestMinEpoch)); + delete_info.creation_range.SetEnd(base::Time::FromDoubleT(kTestMaxEpoch)); + + auto create_cookie = [kTestMinEpoch](std::string cookie_domain) { + CanonicalCookie cookie( + /*name=*/"test-cookie", + /*value=*/"cookie-value", cookie_domain, + /*path=*/"cookie/path", + /*creation=*/base::Time::FromDoubleT(kTestMinEpoch + 1), + /*expiration=*/base::Time::Max(), + /*last_access=*/base::Time::FromDoubleT(kTestMinEpoch + 1), + /*secure=*/false, + /*httponly=*/false, + /*same_site=*/CookieSameSite::DEFAULT_MODE, + /*priority=*/CookiePriority::COOKIE_PRIORITY_DEFAULT); + return cookie; + }; + + // by default empty domain list and default match action will match. + EXPECT_TRUE(delete_info.Matches(create_cookie("example.com"))); + + const char kExtensionHostname[] = "mgndgikekgjfcpckkfioiadnlibdjbkf"; + + // Only using the inclusion list because this is only testing + // DomainMatchesDomainSet and not CookieStore::CookieDeletionInfo::Matches. + delete_info.domains_and_ips_to_delete = + std::set<std::string>({"example.com", "another.com", "192.168.0.1"}); + EXPECT_TRUE(delete_info.Matches(create_cookie(".example.com"))); + EXPECT_TRUE(delete_info.Matches(create_cookie("example.com"))); + EXPECT_TRUE(delete_info.Matches(create_cookie(".another.com"))); + EXPECT_TRUE(delete_info.Matches(create_cookie("192.168.0.1"))); + EXPECT_FALSE(delete_info.Matches(create_cookie(".nomatch.com"))); + EXPECT_FALSE(delete_info.Matches(create_cookie("192.168.0.2"))); + EXPECT_FALSE(delete_info.Matches(create_cookie(kExtensionHostname))); +} + +TYPED_TEST_P(CookieStoreTest, CookieDeletionInfoMatchesDomainList) { + CookieDeletionInfo delete_info; + + auto create_cookie = [](std::string cookie_domain) { + CanonicalCookie cookie( + /*name=*/"test-cookie", + /*value=*/"cookie-value", cookie_domain, + /*path=*/"cookie/path", + /*creation=*/base::Time::Now(), + /*expiration=*/base::Time::Max(), + /*last_access=*/base::Time::Now(), + /*secure=*/false, + /*httponly=*/false, + /*same_site=*/CookieSameSite::DEFAULT_MODE, + /*priority=*/CookiePriority::COOKIE_PRIORITY_DEFAULT); + return cookie; + }; + + // With two empty lists (default) should match any domain. + EXPECT_TRUE(delete_info.Matches(create_cookie("anything.com"))); + + // With only an inclusion list. + delete_info.domains_and_ips_to_delete = + std::set<std::string>({"includea.com", "includeb.com"}); + EXPECT_TRUE(delete_info.Matches(create_cookie("includea.com"))); + EXPECT_TRUE(delete_info.Matches(create_cookie("includeb.com"))); + EXPECT_FALSE(delete_info.Matches(create_cookie("anything.com"))); + + // With only an exclusion list. + delete_info.domains_and_ips_to_delete.clear(); + delete_info.domains_and_ips_to_ignore.insert("exclude.com"); + EXPECT_TRUE(delete_info.Matches(create_cookie("anything.com"))); + EXPECT_FALSE(delete_info.Matches(create_cookie("exclude.com"))); + + // Now with both lists populated. + // + // +----------------------+ + // | inclusion | outside.com + // | | + // | left.com +---------------------+ + // | | mid.com | exclusion | + // | | | | + // +------------|---------+ | + // | right.com | + // | | + // +---------------------+ + delete_info.domains_and_ips_to_delete = + std::set<std::string>({"left.com", "mid.com"}); + delete_info.domains_and_ips_to_ignore = + std::set<std::string>({"mid.com", "right.com"}); + + EXPECT_TRUE(delete_info.Matches(create_cookie("left.com"))); + EXPECT_FALSE(delete_info.Matches(create_cookie("mid.com"))); + EXPECT_FALSE(delete_info.Matches(create_cookie("right.com"))); + EXPECT_FALSE(delete_info.Matches(create_cookie("outside.com"))); +} + REGISTER_TYPED_TEST_CASE_P(CookieStoreTest, FilterTest, SetCanonicalCookieTest, @@ -1706,8 +2003,8 @@ HttpOnlyTest, TestCookieDeletion, TestDeleteAll, - TestDeleteAllCreatedBetween, - TestDeleteAllCreatedBetweenWithPredicate, + TestDeleteAllCreatedInTimeRange, + TestDeleteAllWithInfo, TestSecure, NetUtilCookieTest, OverwritePersistentCookie, @@ -1716,7 +2013,16 @@ GetAllCookiesAsync, DeleteCookieAsync, DeleteCanonicalCookieAsync, - DeleteSessionCookie); + DeleteSessionCookie, + TimeRangeValues, + TimeRangeContains, + CookieDeletionInfoDomainMatchesDomain, + CookieDeletionInfoMatchesDomainList, + CookieDeletionInfoMatchSessionControl, + CookieDeletionInfoMatchHost, + CookieDeletionInfoMatchName, + CookieDeletionInfoMatchValue, + CookieDeletionInfoMatchUrl); } // namespace net
diff --git a/net/quic/core/quic_flags_list.h b/net/quic/core/quic_flags_list.h index 21c65b2..c6787b7 100644 --- a/net/quic/core/quic_flags_list.h +++ b/net/quic/core/quic_flags_list.h
@@ -243,7 +243,7 @@ // If true, check again that the writer isn\'t blocked before calling // QuicConnection::OnCanWrite from WriteAndBundleAcksIfNotBlocked -QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_is_write_blocked, false) +QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_is_write_blocked, true) // If true, use the send alarm instead of the resume_writes alarm in // QuicConnection.
diff --git a/net/spdy/chromium/spdy_network_transaction_unittest.cc b/net/spdy/chromium/spdy_network_transaction_unittest.cc index db1ef62d..bfdd095 100644 --- a/net/spdy/chromium/spdy_network_transaction_unittest.cc +++ b/net/spdy/chromium/spdy_network_transaction_unittest.cc
@@ -76,6 +76,8 @@ } // namespace +const char kPushedUrl[] = "https://www.example.org/foo.dat"; + class SpdyNetworkTransactionTest : public ::testing::Test { protected: SpdyNetworkTransactionTest() @@ -278,7 +280,7 @@ HttpRequestInfo CreateGetPushRequest() const WARN_UNUSED_RESULT { HttpRequestInfo request; request.method = "GET"; - request.url = GURL("https://www.example.org/foo.dat"); + request.url = GURL(kPushedUrl); request.traffic_annotation = net::MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS); return request; @@ -2283,7 +2285,6 @@ } TEST_F(SpdyNetworkTransactionTest, RedirectServerPush) { - const char url[] = "https://www.example.org/foo.dat"; const char redirected_url[] = "https://www.foo.com/index.php"; SpdyURLRequestContext spdy_url_request_context; @@ -2308,8 +2309,8 @@ CreateMockWrite(rst, 5)}; SpdySerializedFrame resp0(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); - SpdySerializedFrame push(spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 1, url, - "301", redirected_url)); + SpdySerializedFrame push(spdy_util_.ConstructSpdyPush( + nullptr, 0, 2, 1, kPushedUrl, "301", redirected_url)); SpdySerializedFrame body0(spdy_util_.ConstructSpdyDataFrame(1, true)); MockRead reads[] = {CreateMockRead(resp0, 1), CreateMockRead(push, 2), CreateMockRead(body0, 4), MockRead(ASYNC, 0, 6)}; @@ -2351,7 +2352,8 @@ TestDelegate delegate1; std::unique_ptr<URLRequest> request1 = spdy_url_request_context.CreateRequest( - GURL(url), DEFAULT_PRIORITY, &delegate1, TRAFFIC_ANNOTATION_FOR_TESTS); + GURL(kPushedUrl), DEFAULT_PRIORITY, &delegate1, + TRAFFIC_ANNOTATION_FOR_TESTS); delegate1.set_quit_on_redirect(true); request1->Start(); @@ -2382,8 +2384,8 @@ SpdySerializedFrame stream1_reply( spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); - SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 1, "https://www.example.org/foo.dat")); + SpdySerializedFrame stream2_syn( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 1, kPushedUrl)); SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true)); const char kPushedData[] = "pushed"; SpdySerializedFrame stream2_body( @@ -2420,8 +2422,7 @@ SpdyHeaderBlock push_promise_header_block; push_promise_header_block[kHttp2MethodHeader] = "HEAD"; - spdy_util_.AddUrlToHeaderBlock("https://www.example.org/foo.dat", - &push_promise_header_block); + spdy_util_.AddUrlToHeaderBlock(kPushedUrl, &push_promise_header_block); SpdySerializedFrame push_promise(spdy_util_.ConstructSpdyPushPromise( 1, 2, std::move(push_promise_header_block))); @@ -2478,15 +2479,13 @@ SpdySerializedFrame priority( spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true)); spdy_util_.UpdateWithStreamDestruction(1); - SpdySerializedFrame req2(spdy_util_.ConstructSpdyGet( - "https://www.example.org/foo.dat", 3, LOWEST)); + SpdySerializedFrame req2(spdy_util_.ConstructSpdyGet(kPushedUrl, 3, LOWEST)); MockWrite writes[] = {CreateMockWrite(req1, 0), CreateMockWrite(priority, 2), CreateMockWrite(req2, 6)}; SpdyHeaderBlock push_promise_header_block; push_promise_header_block[kHttp2MethodHeader] = "HEAD"; - spdy_util_.AddUrlToHeaderBlock("https://www.example.org/foo.dat", - &push_promise_header_block); + spdy_util_.AddUrlToHeaderBlock(kPushedUrl, &push_promise_header_block); SpdySerializedFrame push_promise(spdy_util_.ConstructSpdyPushPromise( 1, 2, std::move(push_promise_header_block))); @@ -2553,8 +2552,8 @@ CreateMockWrite(stream1_syn, 0), CreateMockWrite(stream2_priority, 2), }; - SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 1, "https://www.example.org/foo.dat")); + SpdySerializedFrame stream2_syn( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 1, kPushedUrl)); SpdySerializedFrame stream1_reply( spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true)); @@ -2598,8 +2597,8 @@ SpdySerializedFrame stream1_reply( spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); - SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 1, "https://www.example.org/foo.dat")); + SpdySerializedFrame stream2_syn( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 1, kPushedUrl)); const char kPushedData[] = "pushed"; SpdySerializedFrame stream2_body( spdy_util_.ConstructSpdyDataFrame(2, kPushedData, true)); @@ -2666,8 +2665,8 @@ SpdySerializedFrame stream5_reply( spdy_util_.ConstructSpdyGetReply(nullptr, 0, 5)); - SpdySerializedFrame stream2_push(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 1, "https://www.example.org/foo.dat")); + SpdySerializedFrame stream2_push( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 1, kPushedUrl)); SpdySerializedFrame stream4_push(spdy_util_.ConstructSpdyPush( nullptr, 0, 4, 1, "https://www.example.org/bar.dat")); @@ -2746,8 +2745,8 @@ SpdySerializedFrame stream1_reply( spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); - SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 1, "https://www.example.org/foo.dat")); + SpdySerializedFrame stream2_syn( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 1, kPushedUrl)); SpdySerializedFrame stream2_rst( spdy_util_.ConstructSpdyRstStream(2, ERROR_CODE_PROTOCOL_ERROR)); SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true)); @@ -2801,10 +2800,10 @@ SpdySerializedFrame stream1_reply( spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); - SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 1, "https://www.example.org/foo.dat")); - SpdySerializedFrame stream3_syn(spdy_util_.ConstructSpdyPush( - nullptr, 0, 4, 1, "https://www.example.org/foo.dat")); + SpdySerializedFrame stream2_syn( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 1, kPushedUrl)); + SpdySerializedFrame stream3_syn( + spdy_util_.ConstructSpdyPush(nullptr, 0, 4, 1, kPushedUrl)); const char kPushedData[] = "pushed"; SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true)); @@ -2849,8 +2848,8 @@ SpdySerializedFrame stream1_reply( spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); - SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 1, "https://www.example.org/foo.dat")); + SpdySerializedFrame stream2_syn( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 1, kPushedUrl)); static const char kPushedData[] = "pushed payload for chunked test"; SpdySerializedFrame stream2_body_base( spdy_util_.ConstructSpdyDataFrame(2, kPushedData, true)); @@ -2902,8 +2901,8 @@ SpdySerializedFrame stream1_reply( spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); - SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 1, "https://www.example.org/foo.dat")); + SpdySerializedFrame stream2_syn( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 1, kPushedUrl)); static const char kPushedData[] = "pushed payload for chunked test"; SpdySerializedFrame stream2_body_base( spdy_util_.ConstructSpdyDataFrame(2, kPushedData, true)); @@ -2983,8 +2982,8 @@ SpdySerializedFrame stream1_reply( spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); - SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 0, "https://www.example.org/foo.dat")); + SpdySerializedFrame stream2_syn( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 0, kPushedUrl)); MockRead reads[] = { CreateMockRead(stream1_reply, 1), CreateMockRead(stream2_syn, 2), }; @@ -3004,8 +3003,8 @@ SpdySerializedFrame stream1_reply( spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); - SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 9, "https://www.example.org/foo.dat")); + SpdySerializedFrame stream2_syn( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 9, kPushedUrl)); MockRead reads[] = { CreateMockRead(stream1_reply, 1), CreateMockRead(stream2_syn, 2), CreateMockRead(stream1_body, 4), @@ -3059,8 +3058,8 @@ SpdySerializedFrame stream1_reply( spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); - SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 1, "https://www.example.org/foo.dat")); + SpdySerializedFrame stream2_syn( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 1, kPushedUrl)); SpdySerializedFrame stream3_syn(spdy_util_.ConstructSpdyPush( nullptr, 0, 4, 2, "https://www.example.org/bar.dat")); MockRead reads[] = { @@ -3086,8 +3085,8 @@ SpdySerializedFrame stream1_reply( spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true)); - SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 1, "https://www.example.org/foo.dat")); + SpdySerializedFrame stream2_syn( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 1, kPushedUrl)); MockRead reads[] = { CreateMockRead(stream1_reply, 1), CreateMockRead(stream1_body, 2), CreateMockRead(stream2_syn, 3), MockRead(SYNCHRONOUS, ERR_IO_PENDING, 4), @@ -3131,8 +3130,8 @@ CreateMockWrite(stream2_priority, 3), CreateMockWrite(goaway, 8)}; - SpdySerializedFrame stream2_syn(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 1, "https://www.example.org/foo.dat")); + SpdySerializedFrame stream2_syn( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 1, kPushedUrl)); SpdySerializedFrame stream1_reply( spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true)); @@ -3186,14 +3185,13 @@ SpdySerializedFrame priority( spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true)); spdy_util_.UpdateWithStreamDestruction(1); - SpdySerializedFrame req2(spdy_util_.ConstructSpdyGet( - "https://www.example.org/foo.dat", 3, LOWEST)); + SpdySerializedFrame req2(spdy_util_.ConstructSpdyGet(kPushedUrl, 3, LOWEST)); MockWrite writes1[] = {CreateMockWrite(req1, 0), CreateMockWrite(priority, 3), CreateMockWrite(req2, 6)}; SpdySerializedFrame reply1(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); - SpdySerializedFrame push(spdy_util_.ConstructSpdyPush( - nullptr, 0, 2, 1, "https://www.example.org/foo.dat")); + SpdySerializedFrame push( + spdy_util_.ConstructSpdyPush(nullptr, 0, 2, 1, kPushedUrl)); SpdySerializedFrame body1(spdy_util_.ConstructSpdyDataFrame(1, true)); SpdySerializedFrame rst( spdy_util_.ConstructSpdyRstStream(2, ERROR_CODE_INTERNAL_ERROR)); @@ -3406,8 +3404,7 @@ SpdySerializedFrame reply(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); SpdyHeaderBlock push_promise_header_block; - spdy_util_.AddUrlToHeaderBlock("https://www.example.org/foo.dat", - &push_promise_header_block); + spdy_util_.AddUrlToHeaderBlock(kPushedUrl, &push_promise_header_block); SpdySerializedFrame push_promise(spdy_util_.ConstructSpdyPushPromise( 1, 2, std::move(push_promise_header_block))); @@ -3432,8 +3429,7 @@ SpdyHeaderBlock push_promise_header_block; push_promise_header_block[":method"] = "POST"; - spdy_util_.AddUrlToHeaderBlock("https://www.example.org/foo.dat", - &push_promise_header_block); + spdy_util_.AddUrlToHeaderBlock(kPushedUrl, &push_promise_header_block); SpdySerializedFrame push_promise(spdy_util_.ConstructSpdyPushPromise( 1, 2, std::move(push_promise_header_block))); @@ -4744,8 +4740,7 @@ "Host: www.example.org:443\r\n" "Proxy-Connection: keep-alive\r\n\r\n"}; const char kHTTP200[] = {"HTTP/1.1 200 OK\r\n\r\n"}; - SpdySerializedFrame req2(spdy_util_2.ConstructSpdyGet( - "https://www.example.org/foo.dat", 1, LOWEST)); + SpdySerializedFrame req2(spdy_util_2.ConstructSpdyGet(kPushedUrl, 1, LOWEST)); SpdySerializedFrame resp2(spdy_util_2.ConstructSpdyGetReply(nullptr, 0, 1)); SpdySerializedFrame body2(spdy_util_2.ConstructSpdyDataFrame(1, true)); @@ -4764,7 +4759,7 @@ // Create another request to www.example.org, but this time through a proxy. request_.method = "GET"; - request_.url = GURL("https://www.example.org/foo.dat"); + request_.url = GURL(kPushedUrl); auto session_deps_proxy = std::make_unique<SpdySessionDependencies>( ProxyResolutionService::CreateFixedFromPacResult( "PROXY myproxy:70", TRAFFIC_ANNOTATION_FOR_TESTS)); @@ -4963,227 +4958,154 @@ EXPECT_TRUE(response_restart->auth_challenge.get() == nullptr); } -TEST_F(SpdyNetworkTransactionTest, ServerPushWithHeaders) { - SpdySerializedFrame stream1_syn( - spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST)); - SpdySerializedFrame stream2_priority( - spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true)); - MockWrite writes[] = { - CreateMockWrite(stream1_syn, 0), CreateMockWrite(stream2_priority, 3), +TEST_F(SpdyNetworkTransactionTest, ServerPushMatching) { + struct { + std::vector<std::pair<base::StringPiece, base::StringPiece>> + extra_request_headers; + std::vector<std::pair<base::StringPiece, base::StringPiece>> + extra_pushed_request_headers; + std::vector<std::pair<base::StringPiece, base::StringPiece>> + extra_pushed_response_headers; + base::StringPiece pushed_status_code; + bool push_accepted; + } test_cases[] = { + // Base case: no extra headers. + {{}, {}, {}, "200", true}, + // Cookie headers match. + {{{"cookie", "value=foo"}}, + {{"cookie", "value=foo"}}, + {{"vary", "Cookie"}}, + "200", + true}, + // Cookie headers mismatch. + {{{"cookie", "value=foo"}}, + {{"cookie", "value=bar"}}, + {{"vary", "Cookie"}}, + "200", + false}, + // Partial Content response, no Range headers. + {{}, {}, {}, "206", false}, + // Partial Content response, no Range headers in pushed request. + {{{"range", "0-42"}}, {}, {}, "206", false}, + // Partial Content response, no Range headers in client request. + {{}, {{"range", "0-42"}}, {}, "206", false}, + // Partial Content response, mismatching Range headers. + {{{"range", "0-42"}}, {{"range", "10-42"}}, {}, "206", false}, + // Partial Content response, matching Range headers. + {{{"range", "0-42"}}, {{"range", "0-42"}}, {}, "206", true}, }; - SpdySerializedFrame stream1_reply( - spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); + for (auto test_case : test_cases) { + SpdyTestUtil spdy_util; + int seq = 0; + std::vector<MockWrite> writes; + std::vector<MockRead> reads; - SpdyHeaderBlock initial_headers; - initial_headers[":method"] = "GET"; - spdy_util_.AddUrlToHeaderBlock("https://www.example.org/foo.dat", - &initial_headers); - SpdySerializedFrame stream2_syn( - spdy_util_.ConstructSpdyPushPromise(1, 2, std::move(initial_headers))); + SpdySerializedFrame req1(spdy_util.ConstructSpdyGet(nullptr, 0, 1, LOWEST)); + writes.push_back(CreateMockWrite(req1, seq++)); - SpdyHeaderBlock late_headers; - late_headers[kHttp2StatusHeader] = "200"; - late_headers["hello"] = "bye"; - SpdySerializedFrame stream2_headers(spdy_util_.ConstructSpdyResponseHeaders( - 2, std::move(late_headers), false)); + SpdyHeaderBlock pushed_request_headers; + pushed_request_headers[kHttp2MethodHeader] = "GET"; + for (const auto& header : test_case.extra_pushed_request_headers) { + pushed_request_headers.insert(header); + } + spdy_util.AddUrlToHeaderBlock(kPushedUrl, &pushed_request_headers); + SpdySerializedFrame pushed_request(spdy_util.ConstructSpdyPushPromise( + 1, 2, std::move(pushed_request_headers))); + reads.push_back(CreateMockRead(pushed_request, seq++)); - SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true)); + SpdySerializedFrame priority( + spdy_util.ConstructSpdyPriority(2, 1, IDLE, true)); + writes.push_back(CreateMockWrite(priority, seq++)); - const char kPushedData[] = "pushed"; - SpdySerializedFrame stream2_body( - spdy_util_.ConstructSpdyDataFrame(2, kPushedData, true)); + SpdyHeaderBlock pushed_response_headers; + pushed_response_headers[kHttp2StatusHeader] = test_case.pushed_status_code; + for (const auto& header : test_case.extra_pushed_response_headers) { + pushed_response_headers.insert(header); + } + SpdySerializedFrame pushed_response( + spdy_util.ConstructSpdyReply(2, std::move(pushed_response_headers))); + reads.push_back(CreateMockRead(pushed_response, seq++)); - MockRead reads[] = { - CreateMockRead(stream1_reply, 1), - CreateMockRead(stream2_syn, 2), - CreateMockRead(stream2_headers, 4), - CreateMockRead(stream1_body, 5, SYNCHRONOUS), - CreateMockRead(stream2_body, 6), - MockRead(SYNCHRONOUS, ERR_IO_PENDING, 7), // Force a pause - }; + SpdySerializedFrame resp1(spdy_util.ConstructSpdyGetReply(nullptr, 0, 1)); + reads.push_back(CreateMockRead(resp1, seq++)); - HttpResponseInfo response; - HttpResponseInfo response2; - SpdyString expected_push_result("pushed"); - SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes)); - RunServerPushTest(&data, - &response, - &response2, - expected_push_result); + SpdySerializedFrame body1(spdy_util.ConstructSpdyDataFrame(1, true)); + reads.push_back(CreateMockRead(body1, seq++)); + spdy_util.UpdateWithStreamDestruction(1); - // Verify the response headers. - EXPECT_TRUE(response.headers); - EXPECT_EQ("HTTP/1.1 200", response.headers->GetStatusLine()); + SpdySerializedFrame pushed_body( + spdy_util.ConstructSpdyDataFrame(2, "This is pushed.", true)); + reads.push_back(CreateMockRead(pushed_body, seq++)); - // Verify the pushed stream. - EXPECT_TRUE(response2.headers); - EXPECT_EQ("HTTP/1.1 200", response2.headers->GetStatusLine()); -} + // If push is not accepted, a new request is sent on the wire. + SpdySerializedFrame req2; + SpdySerializedFrame resp2; + SpdySerializedFrame body2; + if (!test_case.push_accepted) { + SpdyHeaderBlock request_headers2( + spdy_util.ConstructGetHeaderBlock(kPushedUrl)); + for (const auto& header : test_case.extra_request_headers) { + request_headers2.insert(header); + } + req2 = spdy_util.ConstructSpdyHeaders(3, std::move(request_headers2), + LOWEST, true); + writes.push_back(CreateMockWrite(req2, seq++)); -TEST_F(SpdyNetworkTransactionTest, ServerPushVaryMatch) { - const char kPushedUrl[] = "https://www.example.org/foo.dat"; + resp2 = spdy_util.ConstructSpdyGetReply(nullptr, 0, 3); + reads.push_back(CreateMockRead(resp2, seq++)); - SpdySerializedFrame req1(spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST)); - SpdySerializedFrame priority( - spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true)); - MockWrite writes[] = {CreateMockWrite(req1, 0), CreateMockWrite(priority, 2)}; + body2 = spdy_util.ConstructSpdyDataFrame(3, "This is not pushed.", true); + reads.push_back(CreateMockRead(body2, seq++)); + } - SpdyHeaderBlock pushed_request_headers; - pushed_request_headers[kHttp2MethodHeader] = "GET"; - pushed_request_headers["cookie"] = "value=foo"; - spdy_util_.AddUrlToHeaderBlock(kPushedUrl, &pushed_request_headers); - SpdySerializedFrame pushed_request(spdy_util_.ConstructSpdyPushPromise( - 1, 2, std::move(pushed_request_headers))); + reads.push_back(MockRead(ASYNC, ERR_IO_PENDING, seq++)); - SpdyHeaderBlock pushed_response_headers; - pushed_response_headers[kHttp2StatusHeader] = "200"; - pushed_response_headers["vary"] = "Cookie"; - SpdySerializedFrame pushed_response( - spdy_util_.ConstructSpdyReply(2, std::move(pushed_response_headers))); + reads.push_back(MockRead(ASYNC, 0, seq++)); - SpdySerializedFrame resp1(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); + SequencedSocketData data(reads.data(), reads.size(), writes.data(), + writes.size()); - SpdySerializedFrame body1(spdy_util_.ConstructSpdyDataFrame(1, true)); - SpdySerializedFrame pushed_body( - spdy_util_.ConstructSpdyDataFrame(2, "This is pushed.", true)); + NormalSpdyTransactionHelper helper(request_, DEFAULT_PRIORITY, log_, + nullptr); + helper.RunPreTestSetup(); + helper.AddData(&data); - MockRead reads[] = {CreateMockRead(pushed_request, 1), - CreateMockRead(pushed_response, 3), - CreateMockRead(resp1, 4), - CreateMockRead(body1, 5), - CreateMockRead(pushed_body, 6), - MockRead(ASYNC, ERR_IO_PENDING, 7), - MockRead(ASYNC, 0, 8)}; + HttpNetworkTransaction* trans = helper.trans(); + TestCompletionCallback callback1; + int rv = trans->Start(&request_, callback1.callback(), log_); + EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); + rv = callback1.WaitForResult(); + EXPECT_THAT(rv, IsOk()); - SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes)); + const HttpResponseInfo* const response1 = trans->GetResponseInfo(); + EXPECT_TRUE(response1->headers); + EXPECT_EQ("HTTP/1.1 200", response1->headers->GetStatusLine()); - NormalSpdyTransactionHelper helper(request_, DEFAULT_PRIORITY, log_, nullptr); - helper.RunPreTestSetup(); - helper.AddData(&data); + SpdyString result1; + ReadResult(trans, &result1); + EXPECT_EQ(result1, "hello!"); - HttpNetworkTransaction* trans = helper.trans(); - TestCompletionCallback callback1; - int rv = trans->Start(&request_, callback1.callback(), log_); - EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); - rv = callback1.WaitForResult(); - EXPECT_THAT(rv, IsOk()); + HttpRequestInfo request2 = CreateGetPushRequest(); + for (const auto& header : test_case.extra_request_headers) { + request2.extra_headers.SetHeader(header.first, header.second); + } + HttpNetworkTransaction trans2(DEFAULT_PRIORITY, helper.session()); + TestCompletionCallback callback2; + rv = trans2.Start(&request2, callback2.callback(), log_); + EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); + rv = callback2.WaitForResult(); + EXPECT_THAT(rv, IsOk()); - const HttpResponseInfo* const response1 = trans->GetResponseInfo(); - EXPECT_TRUE(response1->headers); - EXPECT_EQ("HTTP/1.1 200", response1->headers->GetStatusLine()); + SpdyString result2; + ReadResult(&trans2, &result2); + EXPECT_EQ(result2, test_case.push_accepted ? "This is pushed." + : "This is not pushed."); - SpdyString result1; - ReadResult(trans, &result1); - EXPECT_EQ(result1, "hello!"); - - HttpRequestInfo request2 = CreateGetPushRequest(); - request2.extra_headers.SetHeader("Cookie", "value=foo"); - HttpNetworkTransaction trans2(DEFAULT_PRIORITY, helper.session()); - TestCompletionCallback callback2; - rv = trans2.Start(&request2, callback2.callback(), log_); - EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); - rv = callback2.WaitForResult(); - EXPECT_THAT(rv, IsOk()); - - const HttpResponseInfo* const response2 = trans2.GetResponseInfo(); - EXPECT_TRUE(response2->headers); - EXPECT_EQ("HTTP/1.1 200", response2->headers->GetStatusLine()); - - SpdyString result2; - ReadResult(&trans2, &result2); - EXPECT_EQ(result2, "This is pushed."); - - data.Resume(); - base::RunLoop().RunUntilIdle(); - helper.VerifyDataConsumed(); -} - -TEST_F(SpdyNetworkTransactionTest, ServerPushVaryMismatch) { - const char kPushedUrl[] = "https://www.example.org/foo.dat"; - - SpdySerializedFrame req1(spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST)); - SpdySerializedFrame priority( - spdy_util_.ConstructSpdyPriority(2, 1, IDLE, true)); - spdy_util_.UpdateWithStreamDestruction(1); - - SpdyHeaderBlock request_headers2( - spdy_util_.ConstructGetHeaderBlock(kPushedUrl)); - request_headers2["cookie"] = "value=foo"; - SpdySerializedFrame req2(spdy_util_.ConstructSpdyHeaders( - 3, std::move(request_headers2), LOWEST, true)); - - MockWrite writes[] = {CreateMockWrite(req1, 0), CreateMockWrite(priority, 2), - CreateMockWrite(req2, 6)}; - - SpdyHeaderBlock pushed_request_headers; - pushed_request_headers[kHttp2MethodHeader] = "GET"; - pushed_request_headers["cookie"] = "value=bar"; - spdy_util_.AddUrlToHeaderBlock(kPushedUrl, &pushed_request_headers); - SpdySerializedFrame pushed_request(spdy_util_.ConstructSpdyPushPromise( - 1, 2, std::move(pushed_request_headers))); - - SpdyHeaderBlock pushed_response_headers; - pushed_response_headers[kHttp2StatusHeader] = "200"; - pushed_response_headers["vary"] = "Cookie"; - SpdySerializedFrame pushed_response( - spdy_util_.ConstructSpdyReply(2, std::move(pushed_response_headers))); - - SpdySerializedFrame resp1(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); - SpdySerializedFrame resp2(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 3)); - - SpdySerializedFrame body1(spdy_util_.ConstructSpdyDataFrame(1, true)); - SpdySerializedFrame body2( - spdy_util_.ConstructSpdyDataFrame(3, "This is not pushed.", true)); - - MockRead reads[] = {CreateMockRead(pushed_request, 1), - CreateMockRead(pushed_response, 3), - CreateMockRead(resp1, 4), - CreateMockRead(body1, 5), - CreateMockRead(resp2, 7), - CreateMockRead(body2, 8), - MockRead(ASYNC, 0, 9)}; - - SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes)); - - NormalSpdyTransactionHelper helper(request_, DEFAULT_PRIORITY, log_, nullptr); - helper.RunPreTestSetup(); - helper.AddData(&data); - - HttpNetworkTransaction* trans = helper.trans(); - TestCompletionCallback callback1; - int rv = trans->Start(&request_, callback1.callback(), log_); - EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); - rv = callback1.WaitForResult(); - EXPECT_THAT(rv, IsOk()); - - const HttpResponseInfo* const response1 = trans->GetResponseInfo(); - EXPECT_TRUE(response1->headers); - EXPECT_EQ("HTTP/1.1 200", response1->headers->GetStatusLine()); - - SpdyString result1; - ReadResult(trans, &result1); - EXPECT_EQ(result1, "hello!"); - - HttpRequestInfo request2 = CreateGetPushRequest(); - request2.extra_headers.SetHeader("Cookie", "value=foo"); - HttpNetworkTransaction trans2(DEFAULT_PRIORITY, helper.session()); - TestCompletionCallback callback2; - rv = trans2.Start(&request2, callback2.callback(), log_); - EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); - rv = callback2.WaitForResult(); - EXPECT_THAT(rv, IsOk()); - - const HttpResponseInfo* const response2 = trans2.GetResponseInfo(); - EXPECT_TRUE(response2->headers); - EXPECT_EQ("HTTP/1.1 200", response2->headers->GetStatusLine()); - - SpdyString result2; - ReadResult(&trans2, &result2); - EXPECT_EQ(result2, "This is not pushed."); - - base::RunLoop().RunUntilIdle(); - helper.VerifyDataConsumed(); + data.Resume(); + base::RunLoop().RunUntilIdle(); + helper.VerifyDataConsumed(); + } } TEST_F(SpdyNetworkTransactionTest, ServerPushClaimBeforeHeaders) { @@ -5201,8 +5123,7 @@ spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1)); SpdyHeaderBlock initial_headers; initial_headers[":method"] = "GET"; - spdy_util_.AddUrlToHeaderBlock("https://www.example.org/foo.dat", - &initial_headers); + spdy_util_.AddUrlToHeaderBlock(kPushedUrl, &initial_headers); SpdySerializedFrame stream2_syn( spdy_util_.ConstructSpdyPushPromise(1, 2, std::move(initial_headers))); SpdySerializedFrame stream1_body(spdy_util_.ConstructSpdyDataFrame(1, true));
diff --git a/net/spdy/chromium/spdy_session.cc b/net/spdy/chromium/spdy_session.cc index 52d9979..474e167 100644 --- a/net/spdy/chromium/spdy_session.cc +++ b/net/spdy/chromium/spdy_session.cc
@@ -1437,6 +1437,35 @@ return false; } + SpdyHeaderBlock::const_iterator status_it = + stream_it->second->response_headers().find(kHttp2StatusHeader); + // Had there not been a status header, SpdyHeadersToHttpResponse() would have + // returned true just above. + DCHECK(status_it != stream_it->second->response_headers().end()); + // 206 Partial Content and 416 Requested Range Not Satisfiable are range + // responses. + if (status_it->second == "206" || status_it->second == "416") { + SpdyHeaderBlock::const_iterator client_request_range_it = + stream_it->second->request_headers().find("range"); + if (client_request_range_it == stream_it->second->request_headers().end()) { + // Client initiated request is not a range request. + // TODO(https://crbug.com/831536): Add histogram. + return false; + } + std::string pushed_request_range; + if (!request_info.extra_headers.GetHeader(HttpRequestHeaders::kRange, + &pushed_request_range)) { + // Pushed request is not a range request. + // TODO(https://crbug.com/831536): Add histogram. + return false; + } + if (client_request_range_it->second != pushed_request_range) { + // Client and pushed request ranges do not match. + // TODO(https://crbug.com/831536): Add histogram. + return false; + } + } + HttpVaryData vary_data; if (!vary_data.Init(pushed_request_info, *pushed_response_info.headers.get())) { @@ -3053,6 +3082,7 @@ DCHECK_EQ(SPDY_PUSH_STREAM, stream->type()); if (max_concurrent_pushed_streams_ && num_active_pushed_streams_ >= max_concurrent_pushed_streams_) { + // TODO(https://crbug.com/831536): Add histogram. ResetStream(stream_id, ERROR_CODE_REFUSED_STREAM, "Stream concurrency limit reached."); return;
diff --git a/notification_helper/BUILD.gn b/notification_helper/BUILD.gn index 7068bf82..f74d202 100644 --- a/notification_helper/BUILD.gn +++ b/notification_helper/BUILD.gn
@@ -72,6 +72,7 @@ "//base/test:test_support", "//chrome/install_static:install_static_util", "//chrome/install_static/test:test_support", + "//chrome/installer/setup:lib", "//chrome/installer/util:with_no_strings", "//testing/gtest", ]
diff --git a/notification_helper/DEPS b/notification_helper/DEPS index 6769e27a..ae61178 100644 --- a/notification_helper/DEPS +++ b/notification_helper/DEPS
@@ -9,3 +9,9 @@ "+components/crash/content/app/crash_reporter_client.h", "+components/version_info/channel.h", ] + +specific_include_rules ={ + ".*_unittest\.cc": [ + "+chrome/installer/setup", + ], +}
diff --git a/notification_helper/notification_helper_process_unittest.cc b/notification_helper/notification_helper_process_unittest.cc index 3b226401d..7236f68 100644 --- a/notification_helper/notification_helper_process_unittest.cc +++ b/notification_helper/notification_helper_process_unittest.cc
@@ -20,6 +20,7 @@ #include "base/win/scoped_winrt_initializer.h" #include "base/win/windows_types.h" #include "chrome/install_static/install_util.h" +#include "chrome/installer/setup/install_worker.h" #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/registry_key_backup.h" #include "chrome/installer/util/util_constants.h" @@ -100,22 +101,8 @@ base::FilePath notification_helper = dir_exe.Append(installer::kNotificationHelperExe); - base::string16 toast_activator_server_path = toast_activator_reg_path_; - toast_activator_server_path.append(L"\\LocalServer32"); - - // Command-line featuring the quoted path to the exe. - base::string16 command(1, L'"'); - command.append(notification_helper.value()).append(1, L'"'); - - list->AddCreateRegKeyWorkItem(root_, toast_activator_server_path, - WorkItem::kWow64Default); - - list->AddSetRegValueWorkItem(root_, toast_activator_server_path, - WorkItem::kWow64Default, L"", command, true); - - list->AddSetRegValueWorkItem(root_, toast_activator_server_path, - WorkItem::kWow64Default, L"ServerExecutable", - notification_helper.value(), true); + installer::AddNativeNotificationInstallWorkItems( + root_, notification_helper, toast_activator_reg_path_, list.get()); ASSERT_TRUE(list->Do()); }
diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc index 208bbe9..5a0a6d1 100644 --- a/printing/printing_context_win.cc +++ b/printing/printing_context_win.cc
@@ -37,10 +37,13 @@ // static std::unique_ptr<PrintingContext> PrintingContext::Create(Delegate* delegate) { -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) - return base::WrapUnique(new PrintingContextWin(delegate)); -#else +#if BUILDFLAG(ENABLE_PRINTING) return base::WrapUnique(new PrintingContextSystemDialogWin(delegate)); +#else + // The code in printing/ is still built when the GN |enable_basic_printing| + // variable is set to false. Just return PrintingContextWin as a dummy + // context. + return base::WrapUnique(new PrintingContextWin(delegate)); #endif }
diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn index 08851e9c..08abc30 100644 --- a/remoting/host/BUILD.gn +++ b/remoting/host/BUILD.gn
@@ -161,7 +161,6 @@ "host_details.cc", "host_details.h", "host_event_logger.h", - "host_event_logger_posix.cc", "host_event_logger_win.cc", "host_exit_codes.cc", "host_exit_codes.h", @@ -235,8 +234,6 @@ "pin_hash.h", "policy_watcher.cc", "policy_watcher.h", - "posix/signal_handler.cc", - "posix/signal_handler.h", "process_stats_agent.h", "process_stats_sender.cc", "process_stats_sender.h", @@ -320,6 +317,14 @@ "//ipc", ] + if (is_posix) { + sources += [ + "host_event_logger_posix.cc", + "posix/signal_handler.cc", + "posix/signal_handler.h", + ] + } + if (!is_ios) { deps += [ "//components/policy:generated" ] } @@ -695,8 +700,6 @@ if (enable_me2me_host) { static_library("remoting_me2me_host_static") { sources = [ - "pam_authorization_factory_posix.cc", - "pam_authorization_factory_posix.h", "remoting_me2me_host.cc", ] defines = [] @@ -718,6 +721,13 @@ "//third_party/webrtc/modules/desktop_capture", ] + if (is_posix) { + sources += [ + "pam_authorization_factory_posix.cc", + "pam_authorization_factory_posix.h", + ] + } + if (!is_ios) { deps += [ "//components/policy:generated" ] }
diff --git a/remoting/host/security_key/BUILD.gn b/remoting/host/security_key/BUILD.gn index 641103ca..d865abe 100644 --- a/remoting/host/security_key/BUILD.gn +++ b/remoting/host/security_key/BUILD.gn
@@ -7,7 +7,6 @@ source_set("security_key") { sources = [ "security_key_auth_handler.h", - "security_key_auth_handler_posix.cc", "security_key_auth_handler_win.cc", "security_key_extension.cc", "security_key_extension.h", @@ -41,6 +40,10 @@ "//remoting/proto", "//third_party/webrtc/modules/desktop_capture", ] + + if (is_posix) { + sources += [ "security_key_auth_handler_posix.cc" ] + } } source_set("main") { @@ -83,7 +86,6 @@ testonly = true sources = [ - "security_key_auth_handler_posix_unittest.cc", "security_key_auth_handler_win_unittest.cc", "security_key_extension_session_unittest.cc", "security_key_ipc_client_unittest.cc", @@ -99,6 +101,10 @@ deps = [ "//mojo/edk/test:test_support", ] + + if (is_posix) { + sources += [ "security_key_auth_handler_posix_unittest.cc" ] + } } static_library("test_support") {
diff --git a/remoting/ios/app/host_view_controller.mm b/remoting/ios/app/host_view_controller.mm index c4ca37b7..4a70da9 100644 --- a/remoting/ios/app/host_view_controller.mm +++ b/remoting/ios/app/host_view_controller.mm
@@ -490,13 +490,13 @@ title:IDS_HIDE_KEYBOARD style:UIAlertActionStyleDefault restoresKeyboard:NO - handler:^() { + handler:^{ weakClientKeyboard.showsSoftKeyboard = NO; }]; } else { [self addActionToAlert:alert title:IDS_SHOW_KEYBOARD - handler:^() { + handler:^{ weakClientKeyboard.showsSoftKeyboard = YES; }]; } @@ -507,7 +507,7 @@ currentInputMode == remoting::GestureInterpreter::DIRECT_INPUT_MODE ? IDS_SELECT_TRACKPAD_MODE : IDS_SELECT_TOUCH_MODE; - void (^switchInputModeHandler)() = ^() { + void (^switchInputModeHandler)() = ^{ switch (currentInputMode) { case remoting::GestureInterpreter::DIRECT_INPUT_MODE: [self useTrackpadInputMode]; @@ -522,7 +522,7 @@ title:switchInputModeTitle handler:switchInputModeHandler]; - void (^disconnectHandler)() = ^() { + void (^disconnectHandler)() = ^{ [weakSelf disconnectFromHost]; [weakSelf.navigationController popToRootViewControllerAnimated:YES]; }; @@ -532,7 +532,7 @@ restoresKeyboard:NO handler:disconnectHandler]; - void (^settingsHandler)() = ^() { + void (^settingsHandler)() = ^{ RemotingSettingsViewController* settingsViewController = [[RemotingSettingsViewController alloc] init]; settingsViewController.delegate = weakSelf; @@ -553,12 +553,12 @@ [self addActionToAlert:alert title:(_fabIsRight) ? IDS_MOVE_FAB_LEFT_BUTTON : IDS_MOVE_FAB_RIGHT_BUTTON - handler:^() { + handler:^{ [weakSelf moveFAB]; }]; __weak UIAlertController* weakAlert = alert; - void (^cancelHandler)() = ^() { + void (^cancelHandler)() = ^{ [weakAlert dismissViewControllerAnimated:YES completion:nil]; }; [self addActionToAlert:alert
diff --git a/remoting/ios/display/gl_display_handler.mm b/remoting/ios/display/gl_display_handler.mm index f963e34..c4e847de 100644 --- a/remoting/ios/display/gl_display_handler.mm +++ b/remoting/ios/display/gl_display_handler.mm
@@ -177,7 +177,7 @@ // block to dereference |this|, which is thread unsafe because it doesn't // support ARC. __weak id<GlDisplayHandlerDelegate> handler_delegate = handler_delegate_; - runtime_->ui_task_runner()->PostTask(FROM_HERE, base::BindBlockArc(^() { + runtime_->ui_task_runner()->PostTask(FROM_HERE, base::BindBlockArc(^{ [handler_delegate rendererTicked]; })); } @@ -186,7 +186,7 @@ DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread()); __weak id<GlDisplayHandlerDelegate> handler_delegate = handler_delegate_; runtime_->ui_task_runner()->PostTask( - FROM_HERE, base::BindBlockArc(^() { + FROM_HERE, base::BindBlockArc(^{ [handler_delegate canvasSizeChanged:CGSizeMake(width, height)]; })); } @@ -200,7 +200,7 @@ } view_ = view; - runtime_->ui_task_runner()->PostTask(FROM_HERE, base::BindBlockArc(^() { + runtime_->ui_task_runner()->PostTask(FROM_HERE, base::BindBlockArc(^{ [view startWithContext:eagl_context_]; })); @@ -224,7 +224,7 @@ renderer_->OnSurfaceDestroyed(); __weak EAGLView* view = view_; - runtime_->ui_task_runner()->PostTask(FROM_HERE, base::BindBlockArc(^() { + runtime_->ui_task_runner()->PostTask(FROM_HERE, base::BindBlockArc(^{ [view stop]; })); view_ = nil;
diff --git a/rlz/BUILD.gn b/rlz/BUILD.gn index cf56eb5..fee26a7 100644 --- a/rlz/BUILD.gn +++ b/rlz/BUILD.gn
@@ -49,8 +49,6 @@ "lib/financial_ping.h", "lib/machine_id.cc", "lib/machine_id.h", - "lib/recursive_cross_process_lock_posix.cc", - "lib/recursive_cross_process_lock_posix.h", "lib/rlz_lib.cc", "lib/rlz_lib.h", "lib/rlz_lib_clear.cc", @@ -85,6 +83,12 @@ "//url", ] + if (is_posix) { + sources += [ + "lib/recursive_cross_process_lock_posix.cc", + "lib/recursive_cross_process_lock_posix.h", + ] + } if (is_chromeos) { deps += [ "//chromeos" ] }
diff --git a/services/BUILD.gn b/services/BUILD.gn index 0409311..9226215e 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn
@@ -163,8 +163,8 @@ android_library("service_javatests") { testonly = true java_files = [ - #"shape_detection/android/javatests/src/org/chromium/shape_detection/BarcodeDetectionImplTest.java", - #"shape_detection/android/javatests/src/org/chromium/shape_detection/FaceDetectionImplTest.java", + "shape_detection/android/javatests/src/org/chromium/shape_detection/BarcodeDetectionImplTest.java", + "shape_detection/android/javatests/src/org/chromium/shape_detection/FaceDetectionImplTest.java", "shape_detection/android/javatests/src/org/chromium/shape_detection/TestUtils.java", "shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java", ]
diff --git a/services/network/cookie_manager.cc b/services/network/cookie_manager.cc index d486ea14..b51f7fcb 100644 --- a/services/network/cookie_manager.cc +++ b/services/network/cookie_manager.cc
@@ -10,116 +10,14 @@ #include "net/cookies/cookie_options.h" #include "url/gurl.h" +using CookieDeletionInfo = net::CookieStore::CookieDeletionInfo; +using CookieDeleteSessionControl = + net::CookieStore::CookieDeletionInfo::SessionControl; + namespace network { namespace { -// Class to wrap a CookieDeletionFilterPtr and provide a predicate for -// use by DeleteAllCreatedBetweenWithPredicateAsync. -class PredicateWrapper { - public: - explicit PredicateWrapper(network::mojom::CookieDeletionFilterPtr filter) - : use_excluding_domains_(filter->excluding_domains.has_value()), - excluding_domains_(filter->excluding_domains.has_value() - ? std::set<std::string>( - filter->excluding_domains.value().begin(), - filter->excluding_domains.value().end()) - : std::set<std::string>()), - use_including_domains_(filter->including_domains.has_value()), - including_domains_(filter->including_domains.has_value() - ? std::set<std::string>( - filter->including_domains.value().begin(), - filter->including_domains.value().end()) - : std::set<std::string>()), - use_cookie_name_(filter->cookie_name.has_value()), - cookie_name_(filter->cookie_name.has_value() - ? filter->cookie_name.value() - : std::string()), - use_url_(filter->url.has_value()), - url_(filter->url.has_value() ? filter->url.value() : GURL()), - session_control_(filter->session_control) { - // Options to use for deletion of cookies associated with - // a particular URL. These options will make sure that all - // cookies associated with the URL are deleted. - const_cast<net::CookieOptions&>(options_).set_include_httponly(); - const_cast<net::CookieOptions&>(options_).set_same_site_cookie_mode( - net::CookieOptions::SameSiteCookieMode::INCLUDE_STRICT_AND_LAX); - } - - // Return true if the given cookie should be deleted. - bool Predicate(const net::CanonicalCookie& cookie) { - // Ignore begin/end times; they're handled by method args. - // Deleted cookies must satisfy all conditions, so if any of the - // below matches fail return false early. - - // Delete if the cookie is not in excluding_domains_. - if (use_excluding_domains_ && DomainMatches(cookie, excluding_domains_)) - return false; - - // Delete if the cookie is in including_domains_. - if (use_including_domains_ && !DomainMatches(cookie, including_domains_)) - return false; - - // Delete if the cookie has a specified name. - if (use_cookie_name_ && !(cookie_name_ == cookie.Name())) - return false; - - // Delete if the cookie matches the URL. - if (use_url_ && !cookie.IncludeForRequestURL(url_, options_)) - return false; - - // Delete if the cookie is not the correct persistent or session type. - if (session_control_ != - network::mojom::CookieDeletionSessionControl::IGNORE_CONTROL && - (cookie.IsPersistent() != - (session_control_ == - network::mojom::CookieDeletionSessionControl::PERSISTENT_COOKIES))) { - return false; - } - - return true; - } - - private: - // Return true if the eTLD+1 of the domain matches any of the strings - // in |match_domains|, false otherwise. - bool DomainMatches(const net::CanonicalCookie& cookie, - const std::set<std::string>& match_domains) { - std::string effective_domain( - net::registry_controlled_domains::GetDomainAndRegistry( - // GetDomainAndRegistry() is insensitive to leading dots, i.e. - // to host/domain cookie distinctions. - cookie.Domain(), - net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES)); - // If the cookie's domain is is not parsed as belonging to a registry - // (e.g. for IP addresses or internal hostnames) an empty string will be - // returned. In this case, use the domain in the cookie. - if (effective_domain.empty()) - effective_domain = cookie.Domain(); - - return match_domains.count(effective_domain) != 0; - } - - const bool use_excluding_domains_; - const std::set<std::string> excluding_domains_; - - const bool use_including_domains_; - const std::set<std::string> including_domains_; - - const bool use_cookie_name_; - const std::string cookie_name_; - - const bool use_url_; - const GURL url_; - - const network::mojom::CookieDeletionSessionControl session_control_; - - // Set at construction; used for IncludeForRequestURL(). - const net::CookieOptions options_; - - DISALLOW_COPY_AND_ASSIGN(PredicateWrapper); -}; - network::mojom::CookieChangeCause ChangeCauseTranslation( net::CookieChangeCause net_cause) { switch (net_cause) { @@ -186,21 +84,8 @@ void CookieManager::DeleteCookies( network::mojom::CookieDeletionFilterPtr filter, DeleteCookiesCallback callback) { - base::Time start_time; - base::Time end_time; - - if (filter->created_after_time.has_value()) - start_time = filter->created_after_time.value(); - - if (filter->created_before_time.has_value()) - end_time = filter->created_before_time.value(); - - cookie_store_->DeleteAllCreatedBetweenWithPredicateAsync( - start_time, end_time, - base::BindRepeating( - &PredicateWrapper::Predicate, - std::make_unique<PredicateWrapper>(std::move(filter))), - std::move(callback)); + cookie_store_->DeleteAllMatchingInfoAsync( + DeletionFilterToInfo(std::move(filter)), std::move(callback)); } void CookieManager::AddCookieChangeListener( @@ -290,4 +175,54 @@ cookie_store_->FlushStore(std::move(callback)); } +CookieDeletionInfo DeletionFilterToInfo( + network::mojom::CookieDeletionFilterPtr filter) { + CookieDeletionInfo delete_info; + + if (filter->created_after_time.has_value() && + !filter->created_after_time.value().is_null()) { + delete_info.creation_range.SetStart(filter->created_after_time.value()); + } + if (filter->created_before_time.has_value() && + !filter->created_before_time.value().is_null()) { + delete_info.creation_range.SetEnd(filter->created_before_time.value()); + } + delete_info.name = filter->cookie_name; + delete_info.url = filter->url; + + switch (filter->session_control) { + case network::mojom::CookieDeletionSessionControl::IGNORE_CONTROL: + delete_info.session_control = CookieDeleteSessionControl::IGNORE_CONTROL; + break; + case network::mojom::CookieDeletionSessionControl::SESSION_COOKIES: + delete_info.session_control = CookieDeleteSessionControl::SESSION_COOKIES; + break; + case network::mojom::CookieDeletionSessionControl::PERSISTENT_COOKIES: + delete_info.session_control = + CookieDeleteSessionControl::PERSISTENT_COOKIES; + break; + } + + if (filter->including_domains.has_value()) { + delete_info.domains_and_ips_to_delete.insert( + filter->including_domains.value().begin(), + filter->including_domains.value().end()); + } + if (filter->excluding_domains.has_value()) { + delete_info.domains_and_ips_to_ignore.insert( + filter->excluding_domains.value().begin(), + filter->excluding_domains.value().end()); + } + if (filter->url.has_value()) { + // Options to use for deletion of cookies associated with + // a particular URL. These options will make sure that all + // cookies associated with the URL are deleted. + delete_info.cookie_options.set_include_httponly(); + delete_info.cookie_options.set_same_site_cookie_mode( + net::CookieOptions::SameSiteCookieMode::INCLUDE_STRICT_AND_LAX); + } + + return delete_info; +} + } // namespace network
diff --git a/services/network/cookie_manager.h b/services/network/cookie_manager.h index 4054689..7caba6b 100644 --- a/services/network/cookie_manager.h +++ b/services/network/cookie_manager.h
@@ -97,6 +97,10 @@ DISALLOW_COPY_AND_ASSIGN(CookieManager); }; +COMPONENT_EXPORT(NETWORK_SERVICE) +net::CookieStore::CookieDeletionInfo DeletionFilterToInfo( + network::mojom::CookieDeletionFilterPtr filter); + } // namespace network #endif // SERVICES_NETWORK_COOKIE_MANAGER_H_
diff --git a/services/network/cookie_manager_unittest.cc b/services/network/cookie_manager_unittest.cc index 863c1b8..1f5175b 100644 --- a/services/network/cookie_manager_unittest.cc +++ b/services/network/cookie_manager_unittest.cc
@@ -36,6 +36,8 @@ // sort cookie list responses from the network::mojom::CookieManager. // * CompareCookiesByValue: As above, but only by value. +using CookieDeletionInfo = net::CookieStore::CookieDeletionInfo; + namespace network { // Wraps a network::mojom::CookieManager in synchronous, blocking calls to make @@ -360,7 +362,7 @@ std::vector<net::CanonicalCookie> cookies = service_wrapper()->GetCookieList( GURL("https://foo_host/with/path"), net::CookieOptions()); - EXPECT_EQ(2u, cookies.size()); + ASSERT_EQ(2u, cookies.size()); std::sort(cookies.begin(), cookies.end(), &CompareCanonicalCookies); EXPECT_EQ("A", cookies[0].Name()); @@ -393,14 +395,14 @@ EXPECT_TRUE(options.exclude_httponly()); std::vector<net::CanonicalCookie> cookies = service_wrapper()->GetCookieList( GURL("https://foo_host/with/path"), options); - EXPECT_EQ(1u, cookies.size()); + ASSERT_EQ(1u, cookies.size()); EXPECT_EQ("C", cookies[0].Name()); // Retrieve with httponly cookies. options.set_include_httponly(); cookies = service_wrapper()->GetCookieList(GURL("https://foo_host/with/path"), options); - EXPECT_EQ(2u, cookies.size()); + ASSERT_EQ(2u, cookies.size()); std::sort(cookies.begin(), cookies.end(), &CompareCanonicalCookies); EXPECT_EQ("A", cookies[0].Name()); @@ -438,7 +440,7 @@ options.same_site_cookie_mode()); std::vector<net::CanonicalCookie> cookies = service_wrapper()->GetCookieList( GURL("https://foo_host/with/path"), options); - EXPECT_EQ(1u, cookies.size()); + ASSERT_EQ(1u, cookies.size()); EXPECT_EQ("A", cookies[0].Name()); // Retrieve unrestricted and lax cookies. @@ -446,7 +448,7 @@ net::CookieOptions::SameSiteCookieMode::INCLUDE_LAX); cookies = service_wrapper()->GetCookieList(GURL("https://foo_host/with/path"), options); - EXPECT_EQ(2u, cookies.size()); + ASSERT_EQ(2u, cookies.size()); std::sort(cookies.begin(), cookies.end(), &CompareCanonicalCookies); EXPECT_EQ("A", cookies[0].Name()); EXPECT_EQ("C", cookies[1].Name()); @@ -456,7 +458,7 @@ net::CookieOptions::SameSiteCookieMode::INCLUDE_STRICT_AND_LAX); cookies = service_wrapper()->GetCookieList(GURL("https://foo_host/with/path"), options); - EXPECT_EQ(3u, cookies.size()); + ASSERT_EQ(3u, cookies.size()); std::sort(cookies.begin(), cookies.end(), &CompareCanonicalCookies); EXPECT_EQ("A", cookies[0].Name()); EXPECT_EQ("C", cookies[1].Name()); @@ -768,7 +770,7 @@ EXPECT_EQ(2u, service_wrapper()->DeleteCookies(filter)); std::vector<net::CanonicalCookie> cookies = service_wrapper()->GetAllCookies(); - EXPECT_EQ(1u, cookies.size()); + ASSERT_EQ(1u, cookies.size()); EXPECT_EQ("A3", cookies[0].Name()); filter = network::mojom::CookieDeletionFilter(); EXPECT_EQ(1u, service_wrapper()->DeleteCookies(filter)); @@ -796,7 +798,7 @@ filter.including_domains->push_back("example.co.uk"); EXPECT_EQ(2u, service_wrapper()->DeleteCookies(filter)); cookies = service_wrapper()->GetAllCookies(); - EXPECT_EQ(1u, cookies.size()); + ASSERT_EQ(1u, cookies.size()); EXPECT_EQ("A3", cookies[0].Name()); filter = network::mojom::CookieDeletionFilter(); EXPECT_EQ(1u, service_wrapper()->DeleteCookies(filter)); @@ -825,7 +827,7 @@ filter.including_domains->push_back("co.uk"); EXPECT_EQ(0u, service_wrapper()->DeleteCookies(filter)); cookies = service_wrapper()->GetAllCookies(); - EXPECT_EQ(3u, cookies.size()); + ASSERT_EQ(3u, cookies.size()); EXPECT_EQ("A1", cookies[0].Name()); EXPECT_EQ("A2", cookies[1].Name()); EXPECT_EQ("A3", cookies[2].Name()); @@ -867,7 +869,7 @@ EXPECT_EQ(2u, service_wrapper()->DeleteCookies(filter)); std::vector<net::CanonicalCookie> cookies = service_wrapper()->GetAllCookies(); - EXPECT_EQ(2u, cookies.size()); + ASSERT_EQ(2u, cookies.size()); std::sort(cookies.begin(), cookies.end(), &CompareCanonicalCookies); EXPECT_EQ("A3", cookies[0].Name()); EXPECT_EQ("A4", cookies[1].Name()); @@ -1829,4 +1831,62 @@ ASSERT_EQ(2U, service_wrapper()->callback_count()); } +TEST_F(FlushableCookieManagerTest, DeletionFilterToInfo) { + mojom::CookieDeletionFilterPtr filter_ptr = + mojom::CookieDeletionFilter::New(); + + // First test the default values. + CookieDeletionInfo delete_info = DeletionFilterToInfo(std::move(filter_ptr)); + EXPECT_TRUE(delete_info.creation_range.start().is_null()); + EXPECT_TRUE(delete_info.creation_range.end().is_null()); + EXPECT_EQ(CookieDeletionInfo::SessionControl::IGNORE_CONTROL, + delete_info.session_control); + EXPECT_FALSE(delete_info.host.has_value()); + EXPECT_FALSE(delete_info.name.has_value()); + EXPECT_FALSE(delete_info.url.has_value()); + EXPECT_TRUE(delete_info.domains_and_ips_to_delete.empty()); + EXPECT_TRUE(delete_info.domains_and_ips_to_ignore.empty()); + EXPECT_FALSE(delete_info.value_for_testing.has_value()); + + // Then test all with non-default values. + const double kTestStartEpoch = 1000; + const double kTestEndEpoch = 10000000; + filter_ptr = mojom::CookieDeletionFilter::New(); + filter_ptr->created_after_time = base::Time::FromDoubleT(kTestStartEpoch); + filter_ptr->created_before_time = base::Time::FromDoubleT(kTestEndEpoch); + filter_ptr->cookie_name = "cookie-name"; + filter_ptr->including_domains = + std::vector<std::string>({"first.com", "second.com", "third.com"}); + filter_ptr->excluding_domains = + std::vector<std::string>({"ten.com", "twelve.com"}); + filter_ptr->url = GURL("https://www.example.com"); + filter_ptr->session_control = + mojom::CookieDeletionSessionControl::PERSISTENT_COOKIES; + + delete_info = DeletionFilterToInfo(std::move(filter_ptr)); + EXPECT_EQ(base::Time::FromDoubleT(kTestStartEpoch), + delete_info.creation_range.start()); + EXPECT_EQ(base::Time::FromDoubleT(kTestEndEpoch), + delete_info.creation_range.end()); + + EXPECT_EQ(CookieDeletionInfo::SessionControl::PERSISTENT_COOKIES, + delete_info.session_control); + EXPECT_FALSE(delete_info.host.has_value()); + EXPECT_EQ("cookie-name", delete_info.name.value()); + EXPECT_EQ(GURL("https://www.example.com"), delete_info.url.value()); + EXPECT_EQ(3u, delete_info.domains_and_ips_to_delete.size()); + EXPECT_NE(delete_info.domains_and_ips_to_delete.find("first.com"), + delete_info.domains_and_ips_to_delete.end()); + EXPECT_NE(delete_info.domains_and_ips_to_delete.find("second.com"), + delete_info.domains_and_ips_to_delete.end()); + EXPECT_NE(delete_info.domains_and_ips_to_delete.find("third.com"), + delete_info.domains_and_ips_to_delete.end()); + EXPECT_EQ(2u, delete_info.domains_and_ips_to_ignore.size()); + EXPECT_NE(delete_info.domains_and_ips_to_ignore.find("ten.com"), + delete_info.domains_and_ips_to_ignore.end()); + EXPECT_NE(delete_info.domains_and_ips_to_ignore.find("twelve.com"), + delete_info.domains_and_ips_to_ignore.end()); + EXPECT_FALSE(delete_info.value_for_testing.has_value()); +} + } // namespace network
diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java index a1eca5a..a9d47ac 100644 --- a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java +++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java
@@ -103,10 +103,9 @@ || landmarkType == Landmark.BOTTOM_MOUTH) { org.chromium.shape_detection.mojom.Landmark mojoLandmark = new org.chromium.shape_detection.mojom.Landmark(); - mojoLandmark.locations = new org.chromium.gfx.mojom.PointF[1]; - mojoLandmark.locations[0] = new org.chromium.gfx.mojom.PointF(); - mojoLandmark.locations[0].x = landmark.getPosition().x; - mojoLandmark.locations[0].y = landmark.getPosition().y; + mojoLandmark.location = new org.chromium.gfx.mojom.PointF(); + mojoLandmark.location.x = landmark.getPosition().x; + mojoLandmark.location.y = landmark.getPosition().y; mojoLandmark.type = landmarkType == Landmark.BOTTOM_MOUTH ? LandmarkType.MOUTH : LandmarkType.EYE; mojoLandmarks.add(mojoLandmark);
diff --git a/services/shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java b/services/shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java index 560e1509..91b867c 100644 --- a/services/shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java +++ b/services/shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java
@@ -11,7 +11,6 @@ import org.junit.runner.RunWith; import org.chromium.base.test.BaseJUnit4ClassRunner; -import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; import org.chromium.gfx.mojom.RectF; import org.chromium.shape_detection.mojom.TextDetection; @@ -53,7 +52,6 @@ } @Test - @DisabledTest(message = "crbug.com/835331") @SmallTest @Feature({"ShapeDetection"}) public void testDetectSucceedsOnValidBitmap() { @@ -80,4 +78,4 @@ Assert.assertEquals(results[i].cornerPoints[3].y, results[i].cornerPoints[2].y, 0.0); } } -} \ No newline at end of file +}
diff --git a/services/shape_detection/face_detection_impl_mac.mm b/services/shape_detection/face_detection_impl_mac.mm index 28dddd5c..3c7804e 100644 --- a/services/shape_detection/face_detection_impl_mac.mm +++ b/services/shape_detection/face_detection_impl_mac.mm
@@ -42,22 +42,22 @@ if (f.hasLeftEyePosition) { auto landmark = shape_detection::mojom::Landmark::New(); landmark->type = shape_detection::mojom::LandmarkType::EYE; - landmark->locations.emplace_back(f.leftEyePosition.x, - height - f.leftEyePosition.y); + landmark->location = + gfx::PointF(f.leftEyePosition.x, height - f.leftEyePosition.y); face->landmarks.push_back(std::move(landmark)); } if (f.hasRightEyePosition) { auto landmark = shape_detection::mojom::Landmark::New(); landmark->type = shape_detection::mojom::LandmarkType::EYE; - landmark->locations.emplace_back(f.rightEyePosition.x, - height - f.rightEyePosition.y); + landmark->location = + gfx::PointF(f.rightEyePosition.x, height - f.rightEyePosition.y); face->landmarks.push_back(std::move(landmark)); } if (f.hasMouthPosition) { auto landmark = shape_detection::mojom::Landmark::New(); landmark->type = shape_detection::mojom::LandmarkType::MOUTH; - landmark->locations.emplace_back(f.mouthPosition.x, - height - f.mouthPosition.y); + landmark->location = + gfx::PointF(f.mouthPosition.x, height - f.mouthPosition.y); face->landmarks.push_back(std::move(landmark)); }
diff --git a/services/shape_detection/face_detection_impl_mac_vision.mm b/services/shape_detection/face_detection_impl_mac_vision.mm index e36ebe8e..fe167f3 100644 --- a/services/shape_detection/face_detection_impl_mac_vision.mm +++ b/services/shape_detection/face_detection_impl_mac_vision.mm
@@ -19,26 +19,6 @@ namespace shape_detection { -namespace { - -mojom::LandmarkPtr BuildLandmark(VNFaceLandmarkRegion2D* landmark_region, - mojom::LandmarkType landmark_type, - gfx::RectF bounding_box) { - auto landmark = mojom::Landmark::New(); - landmark->type = landmark_type; - landmark->locations.reserve(landmark_region.pointCount); - for (NSUInteger i = 0; i < landmark_region.pointCount; ++i) { - // The points are normalized to the bounding box of the detected face. - landmark->locations.emplace_back( - landmark_region.normalizedPoints[i].x * bounding_box.width() + - bounding_box.x(), - (1 - landmark_region.normalizedPoints[i].y) * bounding_box.height() + - bounding_box.y()); - } - return landmark; -} -} - // The VisionAPIAsyncRequestMac class submits an image analysis request for // asynchronous execution on a dispatch queue with default priority. class API_AVAILABLE(macos(10.13)) @@ -167,7 +147,7 @@ std::vector<mojom::FaceDetectionResultPtr> results; for (VNFaceObservation* const observation in request.results) { - auto face = mojom::FaceDetectionResult::New(); + auto face = shape_detection::mojom::FaceDetectionResult::New(); // The coordinate are normalized to the dimensions of the processed image. face->bounding_box = ConvertCGToGfxCoordinates( CGRectMake(observation.boundingBox.origin.x * image_size_.width, @@ -176,19 +156,6 @@ observation.boundingBox.size.height * image_size_.height), image_size_.height); - if (VNFaceLandmarkRegion2D* leftEye = observation.landmarks.leftEye) { - face->landmarks.push_back( - BuildLandmark(leftEye, mojom::LandmarkType::EYE, face->bounding_box)); - } - if (VNFaceLandmarkRegion2D* rightEye = observation.landmarks.rightEye) { - face->landmarks.push_back(BuildLandmark( - rightEye, mojom::LandmarkType::EYE, face->bounding_box)); - } - if (VNFaceLandmarkRegion2D* outerLips = observation.landmarks.outerLips) { - face->landmarks.push_back(BuildLandmark( - outerLips, mojom::LandmarkType::MOUTH, face->bounding_box)); - } - results.push_back(std::move(face)); } std::move(detected_callback_).Run(std::move(results));
diff --git a/services/shape_detection/public/mojom/facedetection.mojom b/services/shape_detection/public/mojom/facedetection.mojom index 28afbb6..eb90fa99 100644 --- a/services/shape_detection/public/mojom/facedetection.mojom +++ b/services/shape_detection/public/mojom/facedetection.mojom
@@ -14,7 +14,7 @@ // https://wicg.github.io/shape-detection-api/#dictdef-landmark struct Landmark { - array<gfx.mojom.PointF> locations; + gfx.mojom.PointF location; LandmarkType type; };
diff --git a/services/tracing/coordinator.cc b/services/tracing/coordinator.cc index 53f84e8..55149c6b 100644 --- a/services/tracing/coordinator.cc +++ b/services/tracing/coordinator.cc
@@ -289,7 +289,7 @@ Coordinator::~Coordinator() { if (!stop_and_flush_callback_.is_null()) { base::ResetAndReturn(&stop_and_flush_callback_) - .Run(std::make_unique<base::DictionaryValue>()); + .Run(base::Value(base::Value::Type::DICTIONARY)); } if (!start_tracing_callback_.is_null()) base::ResetAndReturn(&start_tracing_callback_).Run(false); @@ -375,7 +375,7 @@ StopAndFlushCallback callback) { if (!is_tracing_) { stream.reset(); - std::move(callback).Run(std::make_unique<base::DictionaryValue>()); + std::move(callback).Run(base::Value(base::Value::Type::DICTIONARY)); return; } DCHECK(!trace_streamer_); @@ -482,7 +482,7 @@ void Coordinator::OnFlushDone() { base::ResetAndReturn(&stop_and_flush_callback_) - .Run(trace_streamer_->GetMetadata()); + .Run(std::move(*trace_streamer_->GetMetadata())); background_task_runner_->DeleteSoon(FROM_HERE, trace_streamer_.release()); agent_registry_->ForAllAgents([this](AgentRegistry::AgentEntry* agent_entry) { agent_entry->set_is_tracing(false);
diff --git a/services/tracing/coordinator_unittest.cc b/services/tracing/coordinator_unittest.cc index e8e318d..47b8154 100644 --- a/services/tracing/coordinator_unittest.cc +++ b/services/tracing/coordinator_unittest.cc
@@ -100,8 +100,7 @@ void StopAndFlush() { mojo::DataPipe data_pipe; - auto dummy_callback = [](std::unique_ptr<base::DictionaryValue> metadata) { - }; + auto dummy_callback = [](base::Value metadata) {}; coordinator_->StopAndFlush(std::move(data_pipe.producer_handle), base::BindRepeating(dummy_callback)); drainer_.reset(
diff --git a/services/tracing/public/cpp/chrome_trace_event_agent.cc b/services/tracing/public/cpp/chrome_trace_event_agent.cc index 3561832..3e6c16f5 100644 --- a/services/tracing/public/cpp/chrome_trace_event_agent.cc +++ b/services/tracing/public/cpp/chrome_trace_event_agent.cc
@@ -92,7 +92,7 @@ for (const auto& generator : metadata_generator_functions_) { auto metadata = generator.Run(); if (metadata) - recorder_->AddMetadata(std::move(metadata)); + recorder_->AddMetadata(std::move(*metadata)); } trace_log_needs_me_ = true; base::trace_event::TraceLog::GetInstance()->Flush(base::Bind(
diff --git a/services/tracing/public/cpp/chrome_trace_event_agent_unittest.cc b/services/tracing/public/cpp/chrome_trace_event_agent_unittest.cc index 990c794..481e36eb 100644 --- a/services/tracing/public/cpp/chrome_trace_event_agent_unittest.cc +++ b/services/tracing/public/cpp/chrome_trace_event_agent_unittest.cc
@@ -60,9 +60,9 @@ } } - void AddMetadata(std::unique_ptr<base::DictionaryValue> metadata) override { + void AddMetadata(base::Value metadata) override { base::DictionaryValue* dict = nullptr; - EXPECT_TRUE(metadata->GetAsDictionary(&dict)); + EXPECT_TRUE(metadata.GetAsDictionary(&dict)); std::string value; if (dict->GetString(kTestMetadataKey, &value)) Append(&metadata_, value);
diff --git a/services/tracing/public/mojom/BUILD.gn b/services/tracing/public/mojom/BUILD.gn index 9047c50..9958f38 100644 --- a/services/tracing/public/mojom/BUILD.gn +++ b/services/tracing/public/mojom/BUILD.gn
@@ -15,7 +15,6 @@ ] public_deps = [ - "//mojo/common:common_custom_types", "//mojo/public/mojom/base", ] }
diff --git a/services/tracing/public/mojom/tracing.mojom b/services/tracing/public/mojom/tracing.mojom index 51a84d6..667b3704 100644 --- a/services/tracing/public/mojom/tracing.mojom +++ b/services/tracing/public/mojom/tracing.mojom
@@ -5,7 +5,7 @@ module tracing.mojom; import "mojo/public/mojom/base/time.mojom"; -import "mojo/common/values.mojom"; +import "mojo/public/mojom/base/values.mojom"; // The JSON type of data coming from a tracing agents. // @@ -37,12 +37,12 @@ // close the recorder connection to signal the tracing service that no more data // will be sent. interface Agent { - StartTracing(string config, mojo_base.mojom.TimeTicks coordinator_time) => ( - bool success); + StartTracing(string config, mojo_base.mojom.TimeTicks coordinator_time) + => (bool success); StopAndFlush(Recorder recorder); - RequestClockSyncMarker(string sync_id) => ( - mojo_base.mojom.TimeTicks issue_ts, - mojo_base.mojom.TimeTicks issue_end_ts); + RequestClockSyncMarker(string sync_id) + => (mojo_base.mojom.TimeTicks issue_ts, + mojo_base.mojom.TimeTicks issue_end_ts); RequestBufferStatus() => (uint32 capacity, uint32 count); GetCategories() => (string categories); }; @@ -53,7 +53,7 @@ // their trace data would be mixed up. interface Recorder { AddChunk(string chunk); - AddMetadata(mojo.common.mojom.DictionaryValue metadata); + AddMetadata(mojo_base.mojom.DictionaryValue metadata); }; // A tracing controller uses this interface to coordinate trace data collection @@ -64,12 +64,12 @@ // config. Otherwise, true is returned as soon as the service receives acks // from all existing agents and agents that connect during |StartTracing|. StartTracing(string config) => (bool success); - StopAndFlush(handle<data_pipe_producer> stream) => ( - mojo.common.mojom.DictionaryValue metadata); + StopAndFlush(handle<data_pipe_producer> stream) + => (mojo_base.mojom.DictionaryValue metadata); // Same as |StopAndFlush| but only write data from a certain |agent_label| to // the |stream|. - StopAndFlushAgent(handle<data_pipe_producer> stream, string agent_label) => ( - mojo.common.mojom.DictionaryValue metadata); + StopAndFlushAgent(handle<data_pipe_producer> stream, string agent_label) + => (mojo_base.mojom.DictionaryValue metadata); IsTracing() => (bool is_tracing); RequestBufferUsage() => (bool success, float percent_full, uint32 approximate_count);
diff --git a/services/tracing/recorder.cc b/services/tracing/recorder.cc index 4c25d9c..54fa59f19 100644 --- a/services/tracing/recorder.cc +++ b/services/tracing/recorder.cc
@@ -35,8 +35,12 @@ on_data_change_callback_.Run(); } -void Recorder::AddMetadata(std::unique_ptr<base::DictionaryValue> metadata) { - metadata_.MergeDictionary(metadata.get()); +void Recorder::AddMetadata(base::Value metadata) { + base::DictionaryValue* dict; + bool result = metadata.GetAsDictionary(&dict); + DCHECK(result); + + metadata_.MergeDictionary(static_cast<base::DictionaryValue*>(&metadata)); } void Recorder::OnConnectionError() {
diff --git a/services/tracing/recorder.h b/services/tracing/recorder.h index 1178004..86fe765 100644 --- a/services/tracing/recorder.h +++ b/services/tracing/recorder.h
@@ -50,7 +50,7 @@ // mojom::Recorder // These are called by agents for sending trace data to the tracing service. void AddChunk(const std::string& chunk) override; - void AddMetadata(std::unique_ptr<base::DictionaryValue> metadata) override; + void AddMetadata(base::Value metadata) override; void OnConnectionError();
diff --git a/services/tracing/recorder_unittest.cc b/services/tracing/recorder_unittest.cc index 9462477..311677e7 100644 --- a/services/tracing/recorder_unittest.cc +++ b/services/tracing/recorder_unittest.cc
@@ -38,7 +38,7 @@ void AddChunk(const std::string& chunk) { recorder_->AddChunk(chunk); } - void AddMetadata(std::unique_ptr<base::DictionaryValue> metadata) { + void AddMetadata(base::Value metadata) { recorder_->AddMetadata(std::move(metadata)); } @@ -95,12 +95,12 @@ TEST_F(RecorderTest, AddMetadata) { CreateRecorder(mojom::TraceDataType::ARRAY, base::BindRepeating([] {})); - auto dict1 = std::make_unique<base::DictionaryValue>(); - dict1->SetString("network-type", "Ethernet"); + base::DictionaryValue dict1; + dict1.SetKey("network-type", base::Value("Ethernet")); AddMetadata(std::move(dict1)); - auto dict2 = std::make_unique<base::DictionaryValue>(); - dict2->SetString("os-name", "CrOS"); + base::DictionaryValue dict2; + dict2.SetKey("os-name", base::Value("CrOS")); AddMetadata(std::move(dict2)); EXPECT_EQ(2u, recorder_->metadata().size());
diff --git a/services/tracing/test_util.cc b/services/tracing/test_util.cc index 518b5570..e976116 100644 --- a/services/tracing/test_util.cc +++ b/services/tracing/test_util.cc
@@ -30,7 +30,7 @@ void MockAgent::StopAndFlush(mojom::RecorderPtr recorder) { call_stat_.push_back("StopAndFlush"); if (!metadata_.empty()) - recorder->AddMetadata(metadata_.CreateDeepCopy()); + recorder->AddMetadata(metadata_.Clone()); for (const auto& chunk : data_) { recorder->AddChunk(chunk); }
diff --git a/services/ui/ws/gpu_host.cc b/services/ui/ws/gpu_host.cc index 2394ce4..29bd6d0 100644 --- a/services/ui/ws/gpu_host.cc +++ b/services/ui/ws/gpu_host.cc
@@ -158,13 +158,9 @@ void DefaultGpuHost::DidInitialize( const gpu::GPUInfo& gpu_info, - const gpu::GpuFeatureInfo& gpu_feature_info, - const gpu::GPUInfo& gpu_info_for_hardware_gpu, - const gpu::GpuFeatureInfo& gpu_feature_info_for_hardware_gpu) { + const gpu::GpuFeatureInfo& gpu_feature_info) { gpu_info_ = gpu_info; gpu_feature_info_ = gpu_feature_info; - gpu_info_for_hardware_gpu_ = gpu_info_for_hardware_gpu; - gpu_feature_info_for_hardware_gpu_ = gpu_feature_info_for_hardware_gpu; delegate_->OnGpuServiceInitialized(); }
diff --git a/services/ui/ws/gpu_host.h b/services/ui/ws/gpu_host.h index b6024b3..e2f8b25 100644 --- a/services/ui/ws/gpu_host.h +++ b/services/ui/ws/gpu_host.h
@@ -96,11 +96,8 @@ #endif // defined(OS_CHROMEOS) // viz::mojom::GpuHost: - void DidInitialize( - const gpu::GPUInfo& gpu_info, - const gpu::GpuFeatureInfo& gpu_feature_info, - const gpu::GPUInfo& gpu_info_for_hardware_gpu, - const gpu::GpuFeatureInfo& gpu_feature_info_for_hardware_gpu) override; + void DidInitialize(const gpu::GPUInfo& gpu_info, + const gpu::GpuFeatureInfo& gpu_feature_info) override; void DidFailInitialize() override; void DidCreateContextSuccessfully() override; void DidCreateOffscreenContext(const GURL& url) override; @@ -125,12 +122,6 @@ mojo::Binding<viz::mojom::GpuHost> gpu_host_binding_; gpu::GPUInfo gpu_info_; gpu::GpuFeatureInfo gpu_feature_info_; - - // What we would have gotten if we haven't fallen back to SwiftShader or - // pure software (in the viz case). - gpu::GPUInfo gpu_info_for_hardware_gpu_; - gpu::GpuFeatureInfo gpu_feature_info_for_hardware_gpu_; - std::unique_ptr<viz::ServerGpuMemoryBufferManager> gpu_memory_buffer_manager_; viz::mojom::VizMainPtr viz_main_;
diff --git a/services/ui/ws/gpu_host_unittest.cc b/services/ui/ws/gpu_host_unittest.cc index f7dbc5d..7da8f46 100644 --- a/services/ui/ws/gpu_host_unittest.cc +++ b/services/ui/ws/gpu_host_unittest.cc
@@ -54,9 +54,7 @@ nullptr /* watchdog_thread */, std::move(io_runner), gpu::GpuFeatureInfo(), - gpu::GpuPreferences(), - gpu::GPUInfo(), - gpu::GpuFeatureInfo()) {} + gpu::GpuPreferences()) {} } // namespace
diff --git a/services/viz/privileged/interfaces/gl/gpu_host.mojom b/services/viz/privileged/interfaces/gl/gpu_host.mojom index eee8440b..3c8d839 100644 --- a/services/viz/privileged/interfaces/gl/gpu_host.mojom +++ b/services/viz/privileged/interfaces/gl/gpu_host.mojom
@@ -13,13 +13,8 @@ // Communication channel from the gpu process to the gpu host. This interface // should never have any sync function calls. interface GpuHost { - // If |gpu_info| and |gpu_feature_info| are for hardware GPU, then - // |gpu_info_for_hardware_gpu| and |gpu_feature_info_for_hardware_gpu| can - // be uninitialized data. DidInitialize(gpu.mojom.GpuInfo gpu_info, - gpu.mojom.GpuFeatureInfo gpu_feature_info, - gpu.mojom.GpuInfo gpu_info_for_hardware_gpu, - gpu.mojom.GpuFeatureInfo gpu_feature_info_for_hardware_gpu); + gpu.mojom.GpuFeatureInfo gpu_feature_info); DidFailInitialize(); DidCreateContextSuccessfully();
diff --git a/services/viz/public/interfaces/BUILD.gn b/services/viz/public/interfaces/BUILD.gn index 9bbb279..b524101 100644 --- a/services/viz/public/interfaces/BUILD.gn +++ b/services/viz/public/interfaces/BUILD.gn
@@ -24,7 +24,6 @@ "compositing/resource_settings.mojom", "compositing/returned_resource.mojom", "compositing/selection.mojom", - "compositing/shared_bitmap_allocation_notifier.mojom", "compositing/shared_quad_state.mojom", "compositing/surface_id.mojom", "compositing/surface_info.mojom",
diff --git a/services/viz/public/interfaces/compositing/shared_bitmap_allocation_notifier.mojom b/services/viz/public/interfaces/compositing/shared_bitmap_allocation_notifier.mojom deleted file mode 100644 index d8017cd..0000000 --- a/services/viz/public/interfaces/compositing/shared_bitmap_allocation_notifier.mojom +++ /dev/null
@@ -1,17 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module viz.mojom; - -import "gpu/ipc/common/mailbox.mojom"; - -// This interface is used when allocating shared bitmaps to be shared with a -// display compositor. -interface SharedBitmapAllocationNotifier { - // Informs the display compositor that the child allocated a shared bitmap. - DidAllocateSharedBitmap(handle<shared_buffer> buffer, gpu.mojom.Mailbox id); - - // Informs the display compositor that the child deleted a shared bitmap. - DidDeleteSharedBitmap(gpu.mojom.Mailbox id); -};
diff --git a/sql/sqlite_features_unittest.cc b/sql/sqlite_features_unittest.cc index 6585ce0..ce3e7291 100644 --- a/sql/sqlite_features_unittest.cc +++ b/sql/sqlite_features_unittest.cc
@@ -155,6 +155,34 @@ EXPECT_EQ("", ExecuteWithResult(&db(), kSelectChildren)); } +// Ensure that our SQLite version supports booleans. +TEST_F(SQLiteFeaturesTest, BooleanSupport) { + ASSERT_TRUE( + db().Execute("CREATE TABLE flags (" + " id INTEGER PRIMARY KEY," + " true_flag BOOL NOT NULL DEFAULT TRUE," + " false_flag BOOL NOT NULL DEFAULT FALSE)")); + ASSERT_TRUE(db().Execute( + "ALTER TABLE flags ADD COLUMN true_flag2 BOOL NOT NULL DEFAULT TRUE")); + ASSERT_TRUE(db().Execute( + "ALTER TABLE flags ADD COLUMN false_flag2 BOOL NOT NULL DEFAULT FALSE")); + ASSERT_TRUE(db().Execute("INSERT INTO flags (id) VALUES (1)")); + + sql::Statement s(db().GetUniqueStatement( + "SELECT true_flag, false_flag, true_flag2, false_flag2" + " FROM flags WHERE id=1;")); + ASSERT_TRUE(s.Step()); + + // TODO(pwnall): Enable this check after upgrading to SQLite 3.23. + // EXPECT_TRUE(s.ColumnBool(0)) << " default TRUE at table creation time"; + EXPECT_TRUE(!s.ColumnBool(1)) << " default FALSE at table creation time"; + + // TODO(pwnall): Enable this check after upgrading to SQLite 3.23. + // EXPECT_TRUE(s.ColumnBool(2)) + // << " default TRUE added by altering the table"; + EXPECT_TRUE(!s.ColumnBool(3)) << " default FALSE added by altering the table"; +} + #if defined(OS_FUCHSIA) // If the platform cannot support SQLite mmap'ed I/O, make sure SQLite isn't // offering to support it.
diff --git a/storage/browser/blob/blob_registry_impl_unittest.cc b/storage/browser/blob/blob_registry_impl_unittest.cc index a4957a0..6278a21 100644 --- a/storage/browser/blob/blob_registry_impl_unittest.cc +++ b/storage/browser/blob/blob_registry_impl_unittest.cc
@@ -99,7 +99,8 @@ std::vector<std::unique_ptr<FileSystemBackend>>(), std::vector<URLRequestAutoMountHandler>(), data_dir_.GetPath(), FileSystemOptions(FileSystemOptions::PROFILE_MODE_INCOGNITO, - std::vector<std::string>(), nullptr)); + false /* force_in_memory */, + std::vector<std::string>())); registry_impl_ = std::make_unique<BlobRegistryImpl>(context_->AsWeakPtr(), file_system_context_); auto delegate = std::make_unique<MockBlobRegistryDelegate>();
diff --git a/storage/browser/fileapi/file_system_context.cc b/storage/browser/fileapi/file_system_context.cc index 435954b6..5e75a15 100644 --- a/storage/browser/fileapi/file_system_context.cc +++ b/storage/browser/fileapi/file_system_context.cc
@@ -37,6 +37,7 @@ #include "storage/browser/quota/special_storage_policy.h" #include "storage/common/fileapi/file_system_info.h" #include "storage/common/fileapi/file_system_util.h" +#include "third_party/leveldatabase/leveldb_chrome.h" #include "url/gurl.h" using storage::QuotaClient; @@ -146,7 +147,10 @@ const std::vector<URLRequestAutoMountHandler>& auto_mount_handlers, const base::FilePath& partition_path, const FileSystemOptions& options) - : io_task_runner_(io_task_runner), + : env_override_(options.is_in_memory() + ? leveldb_chrome::NewMemEnv("FileSystem") + : nullptr), + io_task_runner_(io_task_runner), default_file_task_runner_(file_task_runner), quota_manager_proxy_(quota_manager_proxy), sandbox_delegate_( @@ -154,13 +158,15 @@ file_task_runner, partition_path, special_storage_policy, - options)), + options, + env_override_.get())), sandbox_backend_(new SandboxFileSystemBackend(sandbox_delegate_.get())), plugin_private_backend_( new PluginPrivateFileSystemBackend(file_task_runner, partition_path, special_storage_policy, - options)), + options, + env_override_.get())), additional_backends_(std::move(additional_backends)), auto_mount_handlers_(auto_mount_handlers), external_mount_points_(external_mount_points), @@ -501,7 +507,11 @@ origin_url, type, filesystem_id, plugin_id, mode, std::move(callback)); } -FileSystemContext::~FileSystemContext() = default; +FileSystemContext::~FileSystemContext() { + // TODO(crbug.com/823854) This is a leak. Delete env after the backends have + // been deleted. + env_override_.release(); +} void FileSystemContext::DeleteOnCorrectSequence() const { if (!io_task_runner_->RunsTasksInCurrentSequence() &&
diff --git a/storage/browser/fileapi/file_system_context.h b/storage/browser/fileapi/file_system_context.h index 77848ec..f643806 100644 --- a/storage/browser/fileapi/file_system_context.h +++ b/storage/browser/fileapi/file_system_context.h
@@ -32,9 +32,8 @@ class SingleThreadTaskRunner; } -namespace storage { -class QuotaManagerProxy; -class SpecialStoragePolicy; +namespace leveleb { +class Env; } namespace net { @@ -42,15 +41,12 @@ } namespace storage { -class FileStreamReader; -} - -namespace storage { class AsyncFileUtil; class CopyOrMoveFileValidatorFactory; class ExternalFileSystemBackend; class ExternalMountPoints; +class FileStreamReader; class FileStreamWriter; class FileSystemBackend; class FileSystemOperation; @@ -60,8 +56,10 @@ class FileSystemURL; class IsolatedFileSystemBackend; class MountPoints; +class QuotaManagerProxy; class QuotaReservation; class SandboxFileSystemBackend; +class SpecialStoragePolicy; struct DefaultContextDeleter; struct FileSystemInfo; @@ -105,8 +103,9 @@ // Unless a FileSystemBackend is overridden in CreateFileSystemOperation, // it is used for all file operations and file related meta operations. // The code assumes that file_task_runner->RunsTasksInCurrentSequence() - // returns false if the current task is not running on the sequence that allows - // blocking file operations (like SequencedWorkerPool implementation does). + // returns false if the current task is not running on the sequence that + // allows blocking file operations (like SequencedWorkerPool implementation + // does). // // |external_mount_points| contains non-system external mount points available // in the context. If not NULL, it will be used during URL cracking. @@ -371,6 +370,9 @@ return plugin_private_backend_.get(); } + // Override the default leveldb Env with |env_override_| if set. + std::unique_ptr<leveldb::Env> env_override_; + scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; scoped_refptr<base::SequencedTaskRunner> default_file_task_runner_;
diff --git a/storage/browser/fileapi/file_system_options.cc b/storage/browser/fileapi/file_system_options.cc index cee38100d..8160497c 100644 --- a/storage/browser/fileapi/file_system_options.cc +++ b/storage/browser/fileapi/file_system_options.cc
@@ -7,16 +7,19 @@ namespace storage { FileSystemOptions::FileSystemOptions( - ProfileMode profile_mode, - const std::vector<std::string>& additional_allowed_schemes, - leveldb::Env* env_override) - : profile_mode_(profile_mode), - additional_allowed_schemes_(additional_allowed_schemes), - env_override_(env_override) { -} + ProfileMode profile_mode, + bool force_in_memory, + const std::vector<std::string>& additional_allowed_schemes) + : profile_mode_(profile_mode), + force_in_memory_(force_in_memory), + additional_allowed_schemes_(additional_allowed_schemes) {} FileSystemOptions::FileSystemOptions(const FileSystemOptions& other) = default; FileSystemOptions::~FileSystemOptions() = default; +bool FileSystemOptions::is_in_memory() const { + return force_in_memory_ || is_incognito(); +} + } // namespace storage
diff --git a/storage/browser/fileapi/file_system_options.h b/storage/browser/fileapi/file_system_options.h index 717d60c..c0228a3 100644 --- a/storage/browser/fileapi/file_system_options.h +++ b/storage/browser/fileapi/file_system_options.h
@@ -10,10 +10,6 @@ #include "storage/browser/storage_browser_export.h" -namespace leveldb { -class Env; -} - namespace storage { // Provides runtime options that may change FileSystem API behavior. @@ -28,13 +24,14 @@ // |profile_mode| specifies if the profile (for this filesystem) // is running in incognito mode (PROFILE_MODE_INCOGNITO) or no // (PROFILE_MODE_NORMAL). + // A FileSystem will be created in-memory when |profile_mode| is incognito, + // but it can be forced to be in-memory by setting |force_in_memory| to + // true - this is only to support testing. // |additional_allowed_schemes| specifies schemes that are allowed // to access FileSystem API in addition to "http" and "https". - // Non-NULL |env_override| overrides internal LevelDB environment. - FileSystemOptions( - ProfileMode profile_mode, - const std::vector<std::string>& additional_allowed_schemes, - leveldb::Env* env_override); + FileSystemOptions(ProfileMode profile_mode, + bool force_in_memory, + const std::vector<std::string>& additional_allowed_schemes); FileSystemOptions(const FileSystemOptions& other); ~FileSystemOptions(); @@ -42,6 +39,9 @@ // Returns true if it is running in the incognito mode. bool is_incognito() const { return profile_mode_ == PROFILE_MODE_INCOGNITO; } + // Returns true if filesystem is in-memory. + bool is_in_memory() const; + // Returns the schemes that must be allowed to access FileSystem API // in addition to standard "http" and "https". // (e.g. If the --allow-file-access-from-files option is given in chrome @@ -50,12 +50,10 @@ return additional_allowed_schemes_; } - leveldb::Env* env_override() const { return env_override_; } - private: const ProfileMode profile_mode_; + const bool force_in_memory_; const std::vector<std::string> additional_allowed_schemes_; - leveldb::Env* env_override_; }; } // namespace storage
diff --git a/storage/browser/fileapi/plugin_private_file_system_backend.cc b/storage/browser/fileapi/plugin_private_file_system_backend.cc index fa0dfa0..6c9ceda 100644 --- a/storage/browser/fileapi/plugin_private_file_system_backend.cc +++ b/storage/browser/fileapi/plugin_private_file_system_backend.cc
@@ -94,21 +94,19 @@ base::SequencedTaskRunner* file_task_runner, const base::FilePath& profile_path, storage::SpecialStoragePolicy* special_storage_policy, - const FileSystemOptions& file_system_options) + const FileSystemOptions& file_system_options, + leveldb::Env* env_override) : file_task_runner_(file_task_runner), file_system_options_(file_system_options), base_path_(profile_path.Append(kFileSystemDirectory) .Append(kPluginPrivateDirectory)), plugin_map_(new FileSystemIDToPluginMap(file_task_runner)), weak_factory_(this) { - file_util_.reset( - new AsyncFileUtilAdapter(new ObfuscatedFileUtil( - special_storage_policy, - base_path_, file_system_options.env_override(), - base::Bind(&FileSystemIDToPluginMap::GetPluginIDForURL, - base::Owned(plugin_map_)), - std::set<std::string>(), - NULL))); + file_util_.reset(new AsyncFileUtilAdapter(new ObfuscatedFileUtil( + special_storage_policy, base_path_, env_override, + base::Bind(&FileSystemIDToPluginMap::GetPluginIDForURL, + base::Owned(plugin_map_)), + std::set<std::string>(), NULL))); } PluginPrivateFileSystemBackend::~PluginPrivateFileSystemBackend() {
diff --git a/storage/browser/fileapi/plugin_private_file_system_backend.h b/storage/browser/fileapi/plugin_private_file_system_backend.h index 78a2f6e..9fc44127 100644 --- a/storage/browser/fileapi/plugin_private_file_system_backend.h +++ b/storage/browser/fileapi/plugin_private_file_system_backend.h
@@ -27,13 +27,14 @@ class PluginPrivateFileSystemBackendTest; } -namespace storage { -class SpecialStoragePolicy; +namespace leveldb { +class Env; } namespace storage { class ObfuscatedFileUtil; +class SpecialStoragePolicy; class WatcherManager; class STORAGE_EXPORT PluginPrivateFileSystemBackend @@ -47,7 +48,8 @@ base::SequencedTaskRunner* file_task_runner, const base::FilePath& profile_path, storage::SpecialStoragePolicy* special_storage_policy, - const FileSystemOptions& file_system_options); + const FileSystemOptions& file_system_options, + leveldb::Env* env_override); ~PluginPrivateFileSystemBackend() override; // This must be used to open 'private' filesystem instead of regular
diff --git a/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc b/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc index f0acae732..30a6ff0 100644 --- a/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc +++ b/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc
@@ -179,13 +179,14 @@ base::SequencedTaskRunner* file_task_runner, const base::FilePath& profile_path, storage::SpecialStoragePolicy* special_storage_policy, - const FileSystemOptions& file_system_options) + const FileSystemOptions& file_system_options, + leveldb::Env* env_override) : file_task_runner_(file_task_runner), quota_manager_proxy_(quota_manager_proxy), sandbox_file_util_(new AsyncFileUtilAdapter( new ObfuscatedFileUtil(special_storage_policy, profile_path.Append(kFileSystemDirectory), - file_system_options.env_override(), + env_override, base::Bind(&GetTypeStringForURL), GetKnownTypeStrings(), this))),
diff --git a/storage/browser/fileapi/sandbox_file_system_backend_delegate.h b/storage/browser/fileapi/sandbox_file_system_backend_delegate.h index a243a20..2d540b2a 100644 --- a/storage/browser/fileapi/sandbox_file_system_backend_delegate.h +++ b/storage/browser/fileapi/sandbox_file_system_backend_delegate.h
@@ -34,6 +34,10 @@ class SandboxFileSystemTestHelper; } +namespace leveldb { +class Env; +} + namespace storage { class QuotaManagerProxy; class SpecialStoragePolicy; @@ -86,7 +90,8 @@ base::SequencedTaskRunner* file_task_runner, const base::FilePath& profile_path, storage::SpecialStoragePolicy* special_storage_policy, - const FileSystemOptions& file_system_options); + const FileSystemOptions& file_system_options, + leveldb::Env* env_override); ~SandboxFileSystemBackendDelegate() override;
diff --git a/storage/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc b/storage/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc index fc716f7..cf49cd91 100644 --- a/storage/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc +++ b/storage/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc
@@ -43,7 +43,7 @@ delegate_.reset(new storage::SandboxFileSystemBackendDelegate( quota_manager_proxy_.get(), base::ThreadTaskRunnerHandle::Get().get(), data_dir_.GetPath(), NULL /* special_storage_policy */, - CreateAllowFileAccessOptions())); + CreateAllowFileAccessOptions(), nullptr /* env_override */)); } bool IsAccessValid(const FileSystemURL& url) const {
diff --git a/storage/browser/fileapi/sandbox_file_system_backend_unittest.cc b/storage/browser/fileapi/sandbox_file_system_backend_unittest.cc index 7f3ef5ee..4f0017f 100644 --- a/storage/browser/fileapi/sandbox_file_system_backend_unittest.cc +++ b/storage/browser/fileapi/sandbox_file_system_backend_unittest.cc
@@ -79,9 +79,10 @@ void SetUpNewDelegate(const storage::FileSystemOptions& options) { delegate_.reset(new SandboxFileSystemBackendDelegate( - NULL /* quota_manager_proxy */, + nullptr /* quota_manager_proxy */, base::ThreadTaskRunnerHandle::Get().get(), data_dir_.GetPath(), - NULL /* special_storage_policy */, options)); + nullptr /* special_storage_policy */, options, + nullptr /* env_override */)); } void SetUpNewBackend(const storage::FileSystemOptions& options) {
diff --git a/storage/browser/test/test_file_system_options.cc b/storage/browser/test/test_file_system_options.cc index e3ec55ef..f0d30056 100644 --- a/storage/browser/test/test_file_system_options.cc +++ b/storage/browser/test/test_file_system_options.cc
@@ -18,7 +18,8 @@ additional_allowed_schemes.push_back("chrome-extension"); #endif return FileSystemOptions(FileSystemOptions::PROFILE_MODE_INCOGNITO, - additional_allowed_schemes, NULL); + false /* force_in_memory */, + additional_allowed_schemes); } FileSystemOptions CreateAllowFileAccessOptions() { @@ -28,7 +29,8 @@ additional_allowed_schemes.push_back("chrome-extension"); #endif return FileSystemOptions(FileSystemOptions::PROFILE_MODE_NORMAL, - additional_allowed_schemes, NULL); + false /* force_in_memory */, + additional_allowed_schemes); } FileSystemOptions CreateDisallowFileAccessOptions() { @@ -37,7 +39,8 @@ additional_allowed_schemes.push_back("chrome-extension"); #endif return FileSystemOptions(FileSystemOptions::PROFILE_MODE_NORMAL, - additional_allowed_schemes, NULL); + false /* force_in_memory */, + additional_allowed_schemes); } } // namespace content
diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json index 033c096..64eca9d 100644 --- a/testing/buildbot/chromium.gpu.fyi.json +++ b/testing/buildbot/chromium.gpu.fyi.json
@@ -5800,26 +5800,6 @@ { "args": [ "--test-launcher-batch-limit=400", - "--deqp-egl-display-type=angle-vulkan" - ], - "name": "angle_deqp_gles2_vulkan_tests", - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:1cb3-384.90", - "os": "Ubuntu", - "pool": "Chrome-GPU" - } - ], - "shards": 4 - }, - "test": "angle_deqp_gles2_tests", - "use_xvfb": false - }, - { - "args": [ - "--test-launcher-batch-limit=400", "--deqp-egl-display-type=angle-gl" ], "name": "angle_deqp_gles31_gl_tests", @@ -15246,26 +15226,6 @@ { "args": [ "--test-launcher-batch-limit=400", - "--deqp-egl-display-type=angle-vulkan" - ], - "name": "angle_deqp_gles2_vulkan_tests", - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:1cb3-23.21.13.8816", - "os": "Windows-10", - "pool": "Chrome-GPU" - } - ], - "shards": 4 - }, - "test": "angle_deqp_gles2_tests", - "use_xvfb": false - }, - { - "args": [ - "--test-launcher-batch-limit=400", "--deqp-egl-display-type=angle-d3d11" ], "name": "angle_deqp_gles31_d3d11_tests", @@ -18417,26 +18377,6 @@ }, "test": "angle_deqp_gles2_tests", "use_xvfb": false - }, - { - "args": [ - "--test-launcher-batch-limit=400", - "--deqp-egl-display-type=angle-vulkan" - ], - "name": "angle_deqp_gles2_vulkan_tests", - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "1002:6613", - "os": "Windows-2008ServerR2-SP1", - "pool": "Chrome-GPU" - } - ], - "shards": 4 - }, - "test": "angle_deqp_gles2_tests", - "use_xvfb": false } ], "isolated_scripts": []
diff --git a/testing/buildbot/chromium.perf.json b/testing/buildbot/chromium.perf.json index 865a928..606805f 100644 --- a/testing/buildbot/chromium.perf.json +++ b/testing/buildbot/chromium.perf.json
@@ -753,26 +753,6 @@ }, { "args": [], - "isolate_name": "cc_perftests", - "name": "cc_perftests", - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "id": "build13-b1--device2", - "os": "Android", - "pool": "Chrome-perf" - } - ], - "expiration": 36000, - "hard_timeout": 10800, - "ignore_task_failure": false, - "io_timeout": 1200, - "upload_test_results": true - } - }, - { - "args": [], "isolate_name": "components_perftests", "name": "components_perftests", "swarming": { @@ -12520,26 +12500,6 @@ } }, { - "args": [], - "isolate_name": "cc_perftests", - "name": "cc_perftests", - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "id": "build45-b1--device2", - "os": "Android", - "pool": "Chrome-perf" - } - ], - "expiration": 36000, - "hard_timeout": 10800, - "ignore_task_failure": false, - "io_timeout": 1200, - "upload_test_results": true - } - }, - { "args": [ "dromaeo", "-v", @@ -19537,26 +19497,6 @@ } }, { - "args": [], - "isolate_name": "cc_perftests", - "name": "cc_perftests", - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "id": "build49-b1--device2", - "os": "Android", - "pool": "Chrome-perf" - } - ], - "expiration": 36000, - "hard_timeout": 10800, - "ignore_task_failure": false, - "io_timeout": 1200, - "upload_test_results": true - } - }, - { "args": [ "dromaeo", "-v",
diff --git a/testing/buildbot/filters/mash.browser_tests.filter b/testing/buildbot/filters/mash.browser_tests.filter index 333a7ff..dad8300 100644 --- a/testing/buildbot/filters/mash.browser_tests.filter +++ b/testing/buildbot/filters/mash.browser_tests.filter
@@ -124,9 +124,6 @@ # SystemLogsFetcher -> TouchLogSource -> ash::TouchHudDebug -> ash::Shell -FeedbackTest.* -# FirstRunController -> ash::Shell --FirstRunUIBrowserTest.* - # ash::Shell::display_manager() to update displays. # http://crbug.com/831826 -ForceMaximizeOnFirstRunTest.* @@ -186,7 +183,7 @@ # OutputProtection problems: # interface_endpoint_client.cc(32) Check failed: !is_valid. The callback passed to OutputProtection::QueryStatus() was never run. # binder_registry.h(89) Failed to locate a binder for interface: display::mojom::OutputProtection --ECKEncryptedMediaTest.OutputProtectionTest +-*ECKEncryptedMediaTest.OutputProtectionTest* -OutOfProcessPPAPITest.* # ash::FocusRingController::SetVisible() from LoginDisplayHostWebUI. @@ -295,16 +292,15 @@ -WebViewScrollGuestContent/WebViewScrollGuestContentTest.OverscrollControllerSeesConsumedScrollsInGuest/0 # Viz is not supported, https://crbug.com/827327 +-*ECKEncryptedMediaTest.* -MSE_ClearKey/EncryptedMediaTest.* -MSE_ExternalClearKey/EncryptedMediaTest.* --EncryptedMediaTestExperimentalCdmInterface.* -AudioPlayerBrowserTestInGuestMode.OpenAudioOnDownloads -AutoplayExtensionBrowserTest.AutoplayAllowed -MediaEngagementBrowserTest.* -MediaEngagementAutoplayBrowserTest.* -UnifiedAutoplayBrowserTest.* -AutoplayPolicyTest.* --ECKEncryptedMediaTest.* -ExtensionResourceRequestPolicyTest.Audio -ExtensionResourceRequestPolicyTest.Video -DeferredMediaBrowserTest.BackgroundMediaIsDeferred
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl index a9067e0c..24f652d 100644 --- a/testing/buildbot/gn_isolate_map.pyl +++ b/testing/buildbot/gn_isolate_map.pyl
@@ -1130,16 +1130,6 @@ "//tools/traffic_annotation/auditor:traffic_annotation_auditor_unittests", "type": "console_test_launcher", }, - "cc_perftests": { - "label": "//cc:cc_perftests", - "type": "script", - "script": "//testing/scripts/run_gtest_perf_test.py", - "args": [ - "cc_perftests", - "--adb-path", - "src/third_party/android_tools/sdk/platform-tools/adb" - ], - }, "media_perftests": { "label": "//media:media_perftests", "type": "script",
diff --git a/testing/libfuzzer/libprotobuf-mutator.md b/testing/libfuzzer/libprotobuf-mutator.md index f7f6760..38d6e21 100644 --- a/testing/libfuzzer/libprotobuf-mutator.md +++ b/testing/libfuzzer/libprotobuf-mutator.md
@@ -54,14 +54,11 @@ ```c++ // my_fuzzer.cc -#include "third_party/libprotobuf-mutator/src/src/libfuzzer/libfuzzer_macro.h" +#include "testing/libfuzzer/proto/lpm_interface.h" // Assuming the .proto file is path/to/your/proto_file/my_proto.proto. #include "path/to/your/proto_file/my_proto.pb.h" -// Silence libprotobuf_mutator's logging. -protobuf_mutator::protobuf::LogSilencer log_silencer; - DEFINE_BINARY_PROTO_FUZZER( const my_proto::MyProtoMessage& my_proto_message) { targeted_code(my_proto_message); @@ -161,16 +158,15 @@ // Needed since we use std::cout. #include <iostream> -#include "third_party/libprotobuf-mutator/src/src/libfuzzer/libfuzzer_macro.h" +#include "testing/libfuzzer/proto/lpm_interface.h" // Assuming the .proto file is path/to/your/proto_file/my_format.proto. #include "path/to/your/proto_file/my_format.pb.h" -// Silence logging from the protobuf library. -protobuf_mutator::protobuf::LogSilencer log_silencer; - // Put your conversion code here (if needed) and then pass the result to - // your fuzzing code (or just pass "my_format", if your target accepts - // protobufs). +// Put your conversion code here (if needed) and then pass the result to +// your fuzzing code (or just pass "my_format", if your target accepts +// protobufs). + DEFINE_BINARY_PROTO_FUZZER(const my_fuzzer::MyFormat& my_proto_format) { // Convert your protobuf to whatever format your targeted code accepts // if it doesn't accept protobufs. @@ -268,7 +264,7 @@ And here is the C++ code that converts it. ```c++ -std::string Convert(MyFormat& my_format) { +std::string Convert(const MyFormat& my_format) { if (my_format.has_message_a()) return ConvertMessageA(my_format.message_a()); else if (my_format.has_message_b())
diff --git a/testing/libfuzzer/proto/skia_image_filter.proto b/testing/libfuzzer/proto/skia_image_filter.proto index 0cbbc6b..a495618 100644 --- a/testing/libfuzzer/proto/skia_image_filter.proto +++ b/testing/libfuzzer/proto/skia_image_filter.proto
@@ -733,20 +733,9 @@ oneof children { BlurMaskFilter blur_mask_filter_impl = 1; EmbossMaskFilter emboss_mask_filter = 2; - RRectsGaussianEdgeMaskFilterImpl r_rects_gaussian_edge_mask_filter_impl = 3; } } -message RRectsGaussianEdgeMaskFilterImpl { - required Rectangle rect_1 = 1; - required float x_rad_1 = 2; - required float y_rad_1 = 3; - required Rectangle rect_2 = 4; - required float x_rad_2 = 5; - required float y_rad_2 = 6; - required float radius = 7; -} - message EmbossMaskFilterLight { required float direction_x = 1; required float direction_y = 2;
diff --git a/testing/libfuzzer/proto/skia_image_filter_proto_converter.cc b/testing/libfuzzer/proto/skia_image_filter_proto_converter.cc index 82547c8..94cb29d0 100644 --- a/testing/libfuzzer/proto/skia_image_filter_proto_converter.cc +++ b/testing/libfuzzer/proto/skia_image_filter_proto_converter.cc
@@ -1419,14 +1419,6 @@ CheckAlignment(); } -void Converter::Visit(const RRectsGaussianEdgeMaskFilterImpl& - r_rects_gaussian_edge_mask_filter_impl) { - Visit(r_rects_gaussian_edge_mask_filter_impl.rect_1()); - WriteFields(r_rects_gaussian_edge_mask_filter_impl, 2, 3); - Visit(r_rects_gaussian_edge_mask_filter_impl.rect_2()); - WriteFields(r_rects_gaussian_edge_mask_filter_impl, 5); -} - void Converter::Visit(const BlurMaskFilter& blur_mask_filter) { // Sigma must be a finite number <= 0. float sigma = fabs(BoundFloat(blur_mask_filter.sigma())); @@ -1980,7 +1972,6 @@ void Converter::Visit(const MaskFilterChild& mask_filter) { bool flattenable_visited = false; VISIT_ONEOF_FLATTENABLE(mask_filter, emboss_mask_filter); - VISIT_ONEOF_FLATTENABLE(mask_filter, r_rects_gaussian_edge_mask_filter_impl); VISIT_DEFAULT_FLATTENABLE(mask_filter, blur_mask_filter_impl); }
diff --git a/testing/libfuzzer/proto/skia_image_filter_proto_converter.h b/testing/libfuzzer/proto/skia_image_filter_proto_converter.h index 9e9b6f1..e6c17199 100644 --- a/testing/libfuzzer/proto/skia_image_filter_proto_converter.h +++ b/testing/libfuzzer/proto/skia_image_filter_proto_converter.h
@@ -242,7 +242,6 @@ void Visit(const LightChild&); void Visit(const CropRectangle&); void Visit(const Rectangle&); - void Visit(const RRectsGaussianEdgeMaskFilterImpl&); void Visit(const PictureInfo&); void Visit(const BlurMaskFilter&); void Visit(const HighContrast_Filter&);
diff --git a/third_party/WebKit/LayoutTests/fast/frames/viewsource/viewsource-3-expected.txt b/third_party/WebKit/LayoutTests/fast/frames/viewsource/viewsource-3-expected.txt index 8b9e33e..5950516 100644 --- a/third_party/WebKit/LayoutTests/fast/frames/viewsource/viewsource-3-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/frames/viewsource/viewsource-3-expected.txt
@@ -1 +1 @@ -<html><head></head><body><div class="line-gutter-backdrop"></div><table><tbody><tr><td class="line-number" value="1"></td><td class="line-content"><span class="html-tag"><head></span><span class="html-tag"><base <span class="html-attribute-name">href</span><base href="http://example.org/foo/">="<a class="html-attribute-value html-resource-link" target="_blank" href="http://example.org/foo/">http://example.org/foo/</a>"></span><span class="html-tag"></head></span></td></tr><tr><td class="line-number" value="2"></td><td class="line-content"><span class="html-tag"><body></span></td></tr><tr><td class="line-number" value="3"></td><td class="line-content"><span class="html-tag"><a <span class="html-attribute-name">href</span>="<a class="html-attribute-value html-external-link" target="_blank" href="bar">bar</a>"></span>http://example.org/foo/bar<span class="html-tag"></a></span><span class="html-tag"><br></span></td></tr><tr><td class="line-number" value="4"></td><td class="line-content"><span class="html-tag"><a <span class="html-attribute-name">href</span>="<a class="html-attribute-value html-external-link" target="_blank" href="/bar">/bar</a>"></span>http://example.org/bar<span class="html-tag"></a></span><span class="html-tag"><br></span></td></tr><tr><td class="line-number" value="5"></td><td class="line-content"><span class="html-tag"><a <span class="html-attribute-name">href</span>="<a class="html-attribute-value html-external-link" target="_blank" href="http://example.org/foobar">http://example.org/foobar</a>"></span>http://example.org/foobar<span class="html-tag"></a></span><span class="html-tag"><br></span></td></tr><tr><td class="line-number" value="6"></td><td class="line-content"><span class="html-tag"><a <span class="html-attribute-name">href</span>="<a class="html-attribute-value html-external-link" target="_blank" href="bar?a&b">bar?a&amp;b</a>"></span>http://example.org/foo/bar?a&b<span class="html-tag"></a></span></td></tr><tr><td class="line-number" value="7"></td><td class="line-content"><span class="html-tag"></body></span></td></tr><tr><td class="line-number" value="8"></td><td class="line-content"><span class="html-end-of-file"></span></td></tr></tbody></table></body></html> +<html><head></head><body><div class="line-gutter-backdrop"></div><table><tbody><tr><td class="line-number" value="1"></td><td class="line-content"><span class="html-tag"><head></span><span class="html-tag"><base <span class="html-attribute-name">href</span><base href="http://example.org/foo/">="<a class="html-attribute-value html-resource-link" target="_blank" href="http://example.org/foo/" rel="noreferrer noopener">http://example.org/foo/</a>"></span><span class="html-tag"></head></span></td></tr><tr><td class="line-number" value="2"></td><td class="line-content"><span class="html-tag"><body></span></td></tr><tr><td class="line-number" value="3"></td><td class="line-content"><span class="html-tag"><a <span class="html-attribute-name">href</span>="<a class="html-attribute-value html-external-link" target="_blank" href="bar" rel="noreferrer noopener">bar</a>"></span>http://example.org/foo/bar<span class="html-tag"></a></span><span class="html-tag"><br></span></td></tr><tr><td class="line-number" value="4"></td><td class="line-content"><span class="html-tag"><a <span class="html-attribute-name">href</span>="<a class="html-attribute-value html-external-link" target="_blank" href="/bar" rel="noreferrer noopener">/bar</a>"></span>http://example.org/bar<span class="html-tag"></a></span><span class="html-tag"><br></span></td></tr><tr><td class="line-number" value="5"></td><td class="line-content"><span class="html-tag"><a <span class="html-attribute-name">href</span>="<a class="html-attribute-value html-external-link" target="_blank" href="http://example.org/foobar" rel="noreferrer noopener">http://example.org/foobar</a>"></span>http://example.org/foobar<span class="html-tag"></a></span><span class="html-tag"><br></span></td></tr><tr><td class="line-number" value="6"></td><td class="line-content"><span class="html-tag"><a <span class="html-attribute-name">href</span>="<a class="html-attribute-value html-external-link" target="_blank" href="bar?a&b" rel="noreferrer noopener">bar?a&amp;b</a>"></span>http://example.org/foo/bar?a&b<span class="html-tag"></a></span></td></tr><tr><td class="line-number" value="7"></td><td class="line-content"><span class="html-tag"></body></span></td></tr><tr><td class="line-number" value="8"></td><td class="line-content"><span class="html-end-of-file"></span></td></tr></tbody></table></body></html>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/viewsource/viewsource-4-expected.txt b/third_party/WebKit/LayoutTests/fast/frames/viewsource/viewsource-4-expected.txt index a094918..59ca5502 100644 --- a/third_party/WebKit/LayoutTests/fast/frames/viewsource/viewsource-4-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/frames/viewsource/viewsource-4-expected.txt
@@ -1 +1 @@ -<html><head></head><body><div class="line-gutter-backdrop"></div><table><tbody><tr><td class="line-number" value="1"></td><td class="line-content"><span class="html-tag"><HEAD></span><span class="html-tag"><BASE <span class="html-attribute-name">HREF</span><base href="http://example.org/foo/">="<a class="html-attribute-value html-resource-link" target="_blank" href="http://example.org/foo/">http://example.org/foo/</a>"></span><span class="html-tag"></HEAD></span></td></tr><tr><td class="line-number" value="2"></td><td class="line-content"><span class="html-tag"><BODY></span></td></tr><tr><td class="line-number" value="3"></td><td class="line-content"><span class="html-tag"><A <span class="html-attribute-name">HREF</span>="<a class="html-attribute-value html-external-link" target="_blank" href="bar">bar</a>"></span>http://example.org/foo/bar<span class="html-tag"></A></span><span class="html-tag"><BR></span></td></tr><tr><td class="line-number" value="4"></td><td class="line-content"><span class="html-tag"><A <span class="html-attribute-name">HREF</span>="<a class="html-attribute-value html-external-link" target="_blank" href="/bar">/bar</a>"></span>http://example.org/bar<span class="html-tag"></A></span><span class="html-tag"><BR></span></td></tr><tr><td class="line-number" value="5"></td><td class="line-content"><span class="html-tag"><A <span class="html-attribute-name">HREF</span>="<a class="html-attribute-value html-external-link" target="_blank" href="http://example.org/foobar">http://example.org/foobar</a>"></span>http://example.org/foobar<span class="html-tag"></A></span><span class="html-tag"><BR></span></td></tr><tr><td class="line-number" value="6"></td><td class="line-content"><span class="html-tag"><A <span class="html-attribute-name">HREF</span>="<a class="html-attribute-value html-external-link" target="_blank" href="bar?a&b">bar?a&amp;b</a>"></span>http://example.org/foo/bar?a&b<span class="html-tag"></A></span></td></tr><tr><td class="line-number" value="7"></td><td class="line-content"><span class="html-tag"></BODY></span></td></tr><tr><td class="line-number" value="8"></td><td class="line-content"><span class="html-end-of-file"></span></td></tr></tbody></table></body></html> +<html><head></head><body><div class="line-gutter-backdrop"></div><table><tbody><tr><td class="line-number" value="1"></td><td class="line-content"><span class="html-tag"><HEAD></span><span class="html-tag"><BASE <span class="html-attribute-name">HREF</span><base href="http://example.org/foo/">="<a class="html-attribute-value html-resource-link" target="_blank" href="http://example.org/foo/" rel="noreferrer noopener">http://example.org/foo/</a>"></span><span class="html-tag"></HEAD></span></td></tr><tr><td class="line-number" value="2"></td><td class="line-content"><span class="html-tag"><BODY></span></td></tr><tr><td class="line-number" value="3"></td><td class="line-content"><span class="html-tag"><A <span class="html-attribute-name">HREF</span>="<a class="html-attribute-value html-external-link" target="_blank" href="bar" rel="noreferrer noopener">bar</a>"></span>http://example.org/foo/bar<span class="html-tag"></A></span><span class="html-tag"><BR></span></td></tr><tr><td class="line-number" value="4"></td><td class="line-content"><span class="html-tag"><A <span class="html-attribute-name">HREF</span>="<a class="html-attribute-value html-external-link" target="_blank" href="/bar" rel="noreferrer noopener">/bar</a>"></span>http://example.org/bar<span class="html-tag"></A></span><span class="html-tag"><BR></span></td></tr><tr><td class="line-number" value="5"></td><td class="line-content"><span class="html-tag"><A <span class="html-attribute-name">HREF</span>="<a class="html-attribute-value html-external-link" target="_blank" href="http://example.org/foobar" rel="noreferrer noopener">http://example.org/foobar</a>"></span>http://example.org/foobar<span class="html-tag"></A></span><span class="html-tag"><BR></span></td></tr><tr><td class="line-number" value="6"></td><td class="line-content"><span class="html-tag"><A <span class="html-attribute-name">HREF</span>="<a class="html-attribute-value html-external-link" target="_blank" href="bar?a&b" rel="noreferrer noopener">bar?a&amp;b</a>"></span>http://example.org/foo/bar?a&b<span class="html-tag"></A></span></td></tr><tr><td class="line-number" value="7"></td><td class="line-content"><span class="html-tag"></BODY></span></td></tr><tr><td class="line-number" value="8"></td><td class="line-content"><span class="html-end-of-file"></span></td></tr></tbody></table></body></html>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/viewsource/viewsource-8-expected.txt b/third_party/WebKit/LayoutTests/fast/frames/viewsource/viewsource-8-expected.txt index 2293822..40ca6eed 100644 --- a/third_party/WebKit/LayoutTests/fast/frames/viewsource/viewsource-8-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/frames/viewsource/viewsource-8-expected.txt
@@ -1 +1 @@ -<html><head></head><body><div class="line-gutter-backdrop"></div><table><tbody><tr><td class="line-number" value="1"></td><td class="line-content"><span class="html-doctype"><!DOCTYPE html></span></td></tr><tr><td class="line-number" value="2"></td><td class="line-content"><span class="html-tag"><html></span></td></tr><tr><td class="line-number" value="3"></td><td class="line-content"><span class="html-tag"><body></span></td></tr><tr><td class="line-number" value="4"></td><td class="line-content"><span class="html-tag"><img <span class="html-attribute-name">src</span>="<a class="html-attribute-value html-resource-link" target="_blank" href="img.png">img.png</a>" /></span></td></tr><tr><td class="line-number" value="5"></td><td class="line-content"><span class="html-tag"><img <span class="html-attribute-name">srcset</span>="<a class="html-attribute-value html-resource-link" target="_blank" href="img.png">img.png</a>,<a class="html-attribute-value html-resource-link" target="_blank" href="img2.png"> img2.png</a>" /></span></td></tr><tr><td class="line-number" value="6"></td><td class="line-content"><span class="html-tag"><img <span class="html-attribute-name">src</span>="<a class="html-attribute-value html-resource-link" target="_blank" href="img.png">img.png</a>" <span class="html-attribute-name">srcset</span>="<a class="html-attribute-value html-resource-link" target="_blank" href="img.png">img.png 1x</a>,<a class="html-attribute-value html-resource-link" target="_blank" href="img2.png"> img2.png 2x</a>,<a class="html-attribute-value html-resource-link" target="_blank" href="img3.png"> img3.png 3x</a>" /></span></td></tr><tr><td class="line-number" value="7"></td><td class="line-content"><span class="html-tag"><img <span class="html-attribute-name">srcset</span>="<a class="html-attribute-value html-resource-link" target="_blank" href="img.png">img.png 480w</a>,<a class="html-attribute-value html-resource-link" target="_blank" href="img2.png"> img2.png 640w</a>,<a class="html-attribute-value html-resource-link" target="_blank" href="img3.png"> img3.png 1024w</a>" /></span></td></tr><tr><td class="line-number" value="8"></td><td class="line-content"><span class="html-tag"></body></span></td></tr><tr><td class="line-number" value="9"></td><td class="line-content"><span class="html-tag"></html></span></td></tr><tr><td class="line-number" value="10"></td><td class="line-content"><span class="html-end-of-file"></span></td></tr></tbody></table></body></html> +<html><head></head><body><div class="line-gutter-backdrop"></div><table><tbody><tr><td class="line-number" value="1"></td><td class="line-content"><span class="html-doctype"><!DOCTYPE html></span></td></tr><tr><td class="line-number" value="2"></td><td class="line-content"><span class="html-tag"><html></span></td></tr><tr><td class="line-number" value="3"></td><td class="line-content"><span class="html-tag"><body></span></td></tr><tr><td class="line-number" value="4"></td><td class="line-content"><span class="html-tag"><img <span class="html-attribute-name">src</span>="<a class="html-attribute-value html-resource-link" target="_blank" href="img.png" rel="noreferrer noopener">img.png</a>" /></span></td></tr><tr><td class="line-number" value="5"></td><td class="line-content"><span class="html-tag"><img <span class="html-attribute-name">srcset</span>="<a class="html-attribute-value html-resource-link" target="_blank" href="img.png" rel="noreferrer noopener">img.png</a>,<a class="html-attribute-value html-resource-link" target="_blank" href="img2.png" rel="noreferrer noopener"> img2.png</a>" /></span></td></tr><tr><td class="line-number" value="6"></td><td class="line-content"><span class="html-tag"><img <span class="html-attribute-name">src</span>="<a class="html-attribute-value html-resource-link" target="_blank" href="img.png" rel="noreferrer noopener">img.png</a>" <span class="html-attribute-name">srcset</span>="<a class="html-attribute-value html-resource-link" target="_blank" href="img.png" rel="noreferrer noopener">img.png 1x</a>,<a class="html-attribute-value html-resource-link" target="_blank" href="img2.png" rel="noreferrer noopener"> img2.png 2x</a>,<a class="html-attribute-value html-resource-link" target="_blank" href="img3.png" rel="noreferrer noopener"> img3.png 3x</a>" /></span></td></tr><tr><td class="line-number" value="7"></td><td class="line-content"><span class="html-tag"><img <span class="html-attribute-name">srcset</span>="<a class="html-attribute-value html-resource-link" target="_blank" href="img.png" rel="noreferrer noopener">img.png 480w</a>,<a class="html-attribute-value html-resource-link" target="_blank" href="img2.png" rel="noreferrer noopener"> img2.png 640w</a>,<a class="html-attribute-value html-resource-link" target="_blank" href="img3.png" rel="noreferrer noopener"> img3.png 1024w</a>" /></span></td></tr><tr><td class="line-number" value="8"></td><td class="line-content"><span class="html-tag"></body></span></td></tr><tr><td class="line-number" value="9"></td><td class="line-content"><span class="html-tag"></html></span></td></tr><tr><td class="line-number" value="10"></td><td class="line-content"><span class="html-end-of-file"></span></td></tr></tbody></table></body></html>
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/runtime/evaluate-timeout-expected.txt b/third_party/WebKit/LayoutTests/http/tests/devtools/runtime/evaluate-timeout-expected.txt new file mode 100644 index 0000000..15cefe18 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/devtools/runtime/evaluate-timeout-expected.txt
@@ -0,0 +1,12 @@ +Test frontend's timeout support. + + +Testing expression 1 + 1 with timeout: 0 +Result: 2 + +Testing expression while (1){} with timeout: 0 +error: Execution was terminated +Error occurred. + +Does the runtime support side effect checks? true +
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/runtime/evaluate-timeout.js b/third_party/WebKit/LayoutTests/http/tests/devtools/runtime/evaluate-timeout.js new file mode 100644 index 0000000..60bd3b0 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/devtools/runtime/evaluate-timeout.js
@@ -0,0 +1,37 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +(async function() { + await TestRunner.loadModule('sources_test_runner'); + TestRunner.addResult("Test frontend's timeout support.\n"); + + const executionContext = UI.context.flavor(SDK.ExecutionContext); + const regularExpression = '1 + 1'; + const infiniteExpression = 'while (1){}'; + + await runtimeTestCase(regularExpression); + await runtimeTestCase(infiniteExpression); + + let supports = executionContext.runtimeModel.hasSideEffectSupport(); + TestRunner.addResult(`\nDoes the runtime support side effect checks? ${supports}`); + TestRunner.completeTest(); + + async function runtimeTestCase(expression) { + TestRunner.addResult(`\nTesting expression ${expression} with timeout: 0`); + const result = await executionContext.evaluate({expression, timeout: 0}); + printDetails(result); + } + + function printDetails(result) { + if (result.error) { + TestRunner.addResult(`Error occurred.`); + } else if (result.exceptionDetails) { + let exceptionDescription = result.exceptionDetails.exception.description; + TestRunner.addResult(`Exception: ${exceptionDescription.split("\n")[0]}`); + } else if (result.object) { + let objectDescription = result.object.description; + TestRunner.addResult(`Result: ${objectDescription}`); + } + } + })();
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/resources/echo-style-attr-value.pl b/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/resources/echo-style-attr-value.pl new file mode 100755 index 0000000..e1f86d7a --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/resources/echo-style-attr-value.pl
@@ -0,0 +1,14 @@ +#!/usr/bin/perl -wT +use strict; +use CGI; + +my $cgi = new CGI; + +print "X-XSS-Protection: 1\n"; +print "Content-Type: text/html; charset=UTF-8\n\n"; + +print "<!DOCTYPE html>\n"; +print "<html>\n"; +print "<body style=\"background: ".$cgi->param('q').";\">\n"; +print "</body>\n"; +print "</html>\n";
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/style-attribute-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/style-attribute-expected.txt new file mode 100644 index 0000000..2e6730f --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/style-attribute-expected.txt
@@ -0,0 +1,2 @@ +CONSOLE ERROR: line 3: The XSS Auditor refused to execute a script in 'http://localhost:8000/security/xssAuditor/resources/echo-style-attr-value.pl?q=%22onload=%22alert(42)' because its source code was found within the request. The server sent an 'X-XSS-Protection' header requesting this behavior. +
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/style-attribute.html b/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/style-attribute.html new file mode 100644 index 0000000..6ac8f06 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/style-attribute.html
@@ -0,0 +1,15 @@ +<!DOCTYPE html> +<html> +<head> +<script> +if (window.testRunner) { + testRunner.dumpAsText(); + testRunner.setXSSAuditorEnabled(true); +} +</script> +</head> +<body> +<iframe src="http://localhost:8000/security/xssAuditor/resources/echo-style-attr-value.pl?q=%22onload=%22alert(42)"> +</iframe> +</body> +</html>
diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.png index ee2d896e..67a3e6d2 100644 --- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.png +++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-inner-bleed-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-inner-bleed-expected.png index aa638e3..3b8a790 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-inner-bleed-expected.png +++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-inner-bleed-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-inner-bleed-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-inner-bleed-expected.png index 7901e87..d1cd892 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-inner-bleed-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-inner-bleed-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-inner-bleed-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-inner-bleed-expected.png index ad78986..6abf236b 100644 --- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-inner-bleed-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-inner-bleed-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/shapedetection/detection-HTMLImageElement.html b/third_party/WebKit/LayoutTests/shapedetection/detection-HTMLImageElement.html index 2d1d7524..a65d3c9 100644 --- a/third_party/WebKit/LayoutTests/shapedetection/detection-HTMLImageElement.html +++ b/third_party/WebKit/LayoutTests/shapedetection/detection-HTMLImageElement.html
@@ -37,12 +37,10 @@ const GREEN_PIXEL = 0xFF00FF00; assert_equals(imageReceivedByMock[0], GREEN_PIXEL, "Pixel color"); assert_equals(detectionResult.length, 3, "Number of faces"); - assert_equals(detectionResult[0].landmarks.length, 2, "Number of landmarks"); + assert_equals(detectionResult[0].landmarks.length, 1, "Number of landmarks"); assert_object_equals(detectionResult[0].landmarks[0], {type : 'eye', locations : [{x : 4.0, y : 5.0}]}, "landmark #1"); - assert_equals(detectionResult[0].landmarks[1].locations.length, 8, - "Number of locations along the landmark"); } function BarcodeDetectorDetectionResultTest(detectionResult, mock) {
diff --git a/third_party/WebKit/LayoutTests/shapedetection/resources/mock-facedetection.js b/third_party/WebKit/LayoutTests/shapedetection/resources/mock-facedetection.js index b403da4..638d053f 100644 --- a/third_party/WebKit/LayoutTests/shapedetection/resources/mock-facedetection.js +++ b/third_party/WebKit/LayoutTests/shapedetection/resources/mock-facedetection.js
@@ -46,15 +46,7 @@ boundingBox: {x: 1.0, y: 1.0, width: 100.0, height: 100.0}, landmarks: [{ type: shapeDetection.mojom.LandmarkType.EYE, - locations: [{x: 4.0, y: 5.0}] - }, - { - type: shapeDetection.mojom.LandmarkType.EYE, - locations: [ - {x: 4.0, y: 5.0}, {x: 5.0, y: 4.0}, {x: 6.0, y: 3.0}, - {x: 7.0, y: 4.0}, {x: 8.0, y: 5.0}, {x: 7.0, y: 6.0}, - {x: 6.0, y: 7.0}, {x: 5.0, y: 6.0} - ] + location: {x: 4.0, y: 5.0} }] }, {
diff --git a/third_party/WebKit/LayoutTests/fast/canvas-api/OffscreenCanvas-convertToBlob-failures.html b/third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/OffscreenCanvas-convertToBlob-failures.html similarity index 94% rename from third_party/WebKit/LayoutTests/fast/canvas-api/OffscreenCanvas-convertToBlob-failures.html rename to third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/OffscreenCanvas-convertToBlob-failures.html index 2795ffa2..5a2d79c 100644 --- a/third_party/WebKit/LayoutTests/fast/canvas-api/OffscreenCanvas-convertToBlob-failures.html +++ b/third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/OffscreenCanvas-convertToBlob-failures.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> -<script src="../../resources/testharness.js"></script> -<script src="../../resources/testharnessreport.js"></script> +<script src="../../../../resources/testharness.js"></script> +<script src="../../../../resources/testharnessreport.js"></script> <script id="myWorker" type="text/worker"> self.onmessage = function(e) { };
diff --git a/third_party/WebKit/LayoutTests/fast/canvas-api/canvas-toBlob-case-insensitive-mimetype.html b/third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/canvas-toBlob-case-insensitive-mimetype.html similarity index 87% rename from third_party/WebKit/LayoutTests/fast/canvas-api/canvas-toBlob-case-insensitive-mimetype.html rename to third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/canvas-toBlob-case-insensitive-mimetype.html index 28b9b09..cb27ae9 100644 --- a/third_party/WebKit/LayoutTests/fast/canvas-api/canvas-toBlob-case-insensitive-mimetype.html +++ b/third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/canvas-toBlob-case-insensitive-mimetype.html
@@ -1,5 +1,5 @@ -<script src="../../resources/testharness.js"></script> -<script src="../../resources/testharnessreport.js"></script> +<script src="../../../../resources/testharness.js"></script> +<script src="../../../../resources/testharnessreport.js"></script> <script> canvas = document.createElement('canvas');
diff --git a/third_party/WebKit/LayoutTests/fast/canvas-api/canvas-toBlob-file-vs-blob.html b/third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/canvas-toBlob-file-vs-blob.html similarity index 74% rename from third_party/WebKit/LayoutTests/fast/canvas-api/canvas-toBlob-file-vs-blob.html rename to third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/canvas-toBlob-file-vs-blob.html index cb0d9842..5381e87c 100644 --- a/third_party/WebKit/LayoutTests/fast/canvas-api/canvas-toBlob-file-vs-blob.html +++ b/third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/canvas-toBlob-file-vs-blob.html
@@ -1,5 +1,5 @@ -<script src="../../resources/testharness.js"></script> -<script src="../../resources/testharnessreport.js"></script> +<script src="../../../../resources/testharness.js"></script> +<script src="../../../../resources/testharnessreport.js"></script> <script> async_test(t => {
diff --git a/third_party/WebKit/LayoutTests/fast/canvas-api/canvas-toBlob-invalid.html b/third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/canvas-toBlob-invalid.html similarity index 87% rename from third_party/WebKit/LayoutTests/fast/canvas-api/canvas-toBlob-invalid.html rename to third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/canvas-toBlob-invalid.html index 8318291..a7a2c9a 100644 --- a/third_party/WebKit/LayoutTests/fast/canvas-api/canvas-toBlob-invalid.html +++ b/third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/canvas-toBlob-invalid.html
@@ -1,5 +1,5 @@ -<script src="../../resources/testharness.js"></script> -<script src="../../resources/testharnessreport.js"></script> +<script src="../../../../resources/testharness.js"></script> +<script src="../../../../resources/testharnessreport.js"></script> <script type='text/javascript'> async_test(t => {
diff --git a/third_party/blink/renderer/core/editing/BUILD.gn b/third_party/blink/renderer/core/editing/BUILD.gn index e5dcc13f..ff6e80f0 100644 --- a/third_party/blink/renderer/core/editing/BUILD.gn +++ b/third_party/blink/renderer/core/editing/BUILD.gn
@@ -388,6 +388,7 @@ "rendered_position_test.cc", "selection_adjuster_test.cc", "selection_controller_test.cc", + "selection_modifier_character_test.cc", "selection_modifier_test.cc", "selection_template_test.cc", "serializers/styled_markup_serializer_test.cc",
diff --git a/third_party/blink/renderer/core/editing/selection_modifier_character.cc b/third_party/blink/renderer/core/editing/selection_modifier_character.cc index 01c8d9c..c6b8ca1 100644 --- a/third_party/blink/renderer/core/editing/selection_modifier_character.cc +++ b/third_party/blink/renderer/core/editing/selection_modifier_character.cc
@@ -238,7 +238,7 @@ bool IsAfterAtomicInlineOrLineBreak(const InlineBox& box, int offset) { if (offset != Traversal::CaretEndOffsetOf(box)) return false; - if (box.IsText() && ToInlineTextBox(box).IsLineBreak()) + if (box.IsInlineTextBox() && ToInlineTextBox(box).IsLineBreak()) return true; return box.GetLineLayoutItem().IsAtomicInlineLevel(); }
diff --git a/third_party/blink/renderer/core/editing/selection_modifier_character_test.cc b/third_party/blink/renderer/core/editing/selection_modifier_character_test.cc new file mode 100644 index 0000000..bba8250 --- /dev/null +++ b/third_party/blink/renderer/core/editing/selection_modifier_character_test.cc
@@ -0,0 +1,25 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "third_party/blink/renderer/core/editing/selection_modifier.h" + +#include "third_party/blink/renderer/core/editing/testing/editing_test_base.h" + +namespace blink { + +class SelectionModifierCharacterTest : public EditingTestBase {}; + +// Regression test for crbug.com/834850 +TEST_F(SelectionModifierCharacterTest, MoveLeftTowardsListMarkerNoCrash) { + const SelectionInDOMTree selection = + SetSelectionTextToBody("<ol contenteditable><li>|<br></li></ol>"); + SelectionModifier modifier(GetFrame(), selection); + modifier.Modify(SelectionModifyAlteration::kMove, + SelectionModifyDirection::kLeft, TextGranularity::kCharacter); + // Shouldn't crash here. + EXPECT_EQ("<ol contenteditable><li>|<br></li></ol>", + GetSelectionTextFromBody(modifier.Selection().AsSelection())); +} + +} // namespace blink
diff --git a/third_party/blink/renderer/core/html/html_view_source_document.cc b/third_party/blink/renderer/core/html/html_view_source_document.cc index 219b1bd..cd50273 100644 --- a/third_party/blink/renderer/core/html/html_view_source_document.cc +++ b/third_party/blink/renderer/core/html/html_view_source_document.cc
@@ -314,6 +314,7 @@ anchor->setAttribute(classAttr, class_value); anchor->setAttribute(targetAttr, "_blank"); anchor->setAttribute(hrefAttr, url); + anchor->setAttribute(relAttr, "noreferrer noopener"); // Disallow JavaScript hrefs. https://crbug.com/808407 if (anchor->Url().ProtocolIsJavaScript()) anchor->setAttribute(hrefAttr, "about:blank");
diff --git a/third_party/blink/renderer/core/html/parser/xss_auditor.cc b/third_party/blink/renderer/core/html/parser/xss_auditor.cc index 3e9bb97..edb8d5c 100644 --- a/third_party/blink/renderer/core/html/parser/xss_auditor.cc +++ b/third_party/blink/renderer/core/html/parser/xss_auditor.cc
@@ -94,7 +94,7 @@ static bool IsTerminatingCharacter(UChar c) { return (c == '&' || c == '/' || c == '"' || c == '\'' || c == '<' || - c == '>' || c == ','); + c == '>' || c == ',' || c == ';'); } static bool IsSlash(UChar c) {
diff --git a/third_party/blink/renderer/devtools/front_end/sdk/DebuggerModel.js b/third_party/blink/renderer/devtools/front_end/sdk/DebuggerModel.js index c71ecb3..dc3d22d 100644 --- a/third_party/blink/renderer/devtools/front_end/sdk/DebuggerModel.js +++ b/third_party/blink/renderer/devtools/front_end/sdk/DebuggerModel.js
@@ -1297,6 +1297,9 @@ (runtimeModel.hasSideEffectSupport() === false || (runtimeModel.hasSideEffectSupport() === null && !await runtimeModel.checkSideEffectSupport()))) return {error: 'Side-effect checks not supported by backend.'}; + // TODO(luoe): remove this check when evaluateOnCallFrame supports timeout. + if (typeof options.timeout !== 'undefined') + return {error: 'Evaluation with timeout on pause not supported by backend.'}; const response = await this.debuggerModel._agent.invoke_evaluateOnCallFrame({ callFrameId: this.id,
diff --git a/third_party/blink/renderer/devtools/front_end/sdk/RuntimeModel.js b/third_party/blink/renderer/devtools/front_end/sdk/RuntimeModel.js index 4d454d7..dae718f 100644 --- a/third_party/blink/renderer/devtools/front_end/sdk/RuntimeModel.js +++ b/third_party/blink/renderer/devtools/front_end/sdk/RuntimeModel.js
@@ -559,7 +559,8 @@ * silent: (boolean|undefined), * returnByValue: (boolean|undefined), * generatePreview: (boolean|undefined), - * throwOnSideEffect: (boolean|undefined) + * throwOnSideEffect: (boolean|undefined), + * timeout: (number|undefined) * }} */ SDK.RuntimeModel.EvaluationOptions; @@ -738,7 +739,9 @@ // FIXME: It will be moved to separate ExecutionContext. if (this.debuggerModel.selectedCallFrame()) return this.debuggerModel.evaluateOnSelectedCallFrame(options); - if (!options.throwOnSideEffect || this.runtimeModel.hasSideEffectSupport()) + // Assume backends either support both throwOnSideEffect and timeout options or neither. + const needsTerminationOptions = !!options.throwOnSideEffect || options.timeout !== undefined; + if (!needsTerminationOptions || this.runtimeModel.hasSideEffectSupport()) return this._evaluateGlobal(options, userGesture, awaitPromise); /** @type {!SDK.RuntimeModel.EvaluationResult} */ @@ -793,7 +796,8 @@ generatePreview: options.generatePreview, userGesture: userGesture, awaitPromise: awaitPromise, - throwOnSideEffect: options.throwOnSideEffect + throwOnSideEffect: options.throwOnSideEffect, + timeout: options.timeout }); const error = response[Protocol.Error];
diff --git a/third_party/blink/renderer/modules/credentialmanager/credentials_container.cc b/third_party/blink/renderer/modules/credentialmanager/credentials_container.cc index ac15b42d..0b88d76 100644 --- a/third_party/blink/renderer/modules/credentialmanager/credentials_container.cc +++ b/third_party/blink/renderer/modules/credentialmanager/credentials_container.cc
@@ -79,11 +79,12 @@ private: void OnConnectionError() { // The only anticapted reason for a connection error is that the embedder - // does not implement mojom::CredentialManager, so go out on a limb and try - // to provide an actionable error message. + // does not implement mojom::CredentialManager, or mojom::AuthenticatorImpl, + // so go out on a limb and try to provide an actionable error message. resolver_->Reject(DOMException::Create( kNotSupportedError, - "The user agent does not implement a password store.")); + "The user agent either does not implement a password store or does" + "not support public key credentials.")); } Persistent<ScriptPromiseResolver> resolver_;
diff --git a/third_party/blink/renderer/modules/shapedetection/face_detector.cc b/third_party/blink/renderer/modules/shapedetection/face_detector.cc index 0540d44..f0644b1 100644 --- a/third_party/blink/renderer/modules/shapedetection/face_detector.cc +++ b/third_party/blink/renderer/modules/shapedetection/face_detector.cc
@@ -71,13 +71,11 @@ for (const auto& face : face_detection_results) { HeapVector<Landmark> landmarks; for (const auto& landmark : face->landmarks) { + Point2D location; + location.setX(landmark->location.x); + location.setY(landmark->location.y); HeapVector<Point2D> locations; - for (const auto& location : landmark->locations) { - Point2D web_location; - web_location.setX(location.x); - web_location.setY(location.y); - locations.push_back(web_location); - } + locations.push_back(location); Landmark web_landmark; web_landmark.setLocations(locations);
diff --git a/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer.cc b/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer.cc index 04771b9..520b5351 100644 --- a/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer.cc +++ b/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer.cc
@@ -132,7 +132,9 @@ void ApplyTransform(const TransformPaintPropertyNode* target_transform) { if (target_transform == current_transform_) return; - cc_list_.push<cc::ConcatOp>(GetSkMatrix(target_transform)); + auto sk_matrix = GetSkMatrix(target_transform); + if (!sk_matrix.isIdentity()) + cc_list_.push<cc::ConcatOp>(sk_matrix); } SkMatrix GetSkMatrix( @@ -319,8 +321,12 @@ bool has_rounded_clip_or_clip_path = sub_clip->ClipRect().IsRounded() || sub_clip->ClipPath(); if (!has_rounded_clip_or_clip_path && pending_combined_clip_rect && - sub_clip->Parent()->LocalTransformSpace() == - sub_clip->LocalTransformSpace()) { + (sub_clip->Parent()->LocalTransformSpace() == + sub_clip->LocalTransformSpace() || + GeometryMapper::SourceToDestinationProjection( + sub_clip->Parent()->LocalTransformSpace(), + sub_clip->LocalTransformSpace()) + .IsIdentity())) { // Continue to combine rectangular clips in the same transform space. pending_combined_clip_rect->Intersect(sub_clip->ClipRect().Rect()); lowest_combined_clip_node = sub_clip; @@ -605,10 +611,16 @@ return; EndTransform(); + if (target_transform == current_transform_) + return; + + auto sk_matrix = GetSkMatrix(target_transform); + if (sk_matrix.isIdentity()) + return; cc_list_.StartPaint(); cc_list_.push<cc::SaveOp>(); - ApplyTransform(target_transform); + cc_list_.push<cc::ConcatOp>(sk_matrix); cc_list_.EndPaintOfPairedBegin(); previous_transform_ = current_transform_; current_transform_ = target_transform;
diff --git a/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer_test.cc b/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer_test.cc index 34ca1de..f9728e0f 100644 --- a/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer_test.cc +++ b/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer_test.cc
@@ -829,5 +829,42 @@ cc::PaintOpType::Restore})); // </c1></t1> } +TEST_F(PaintChunksToCcLayerTest, NoOpForIdentityTransforms) { + auto t1 = CreateTransform(t0(), TransformationMatrix()); + auto t2 = CreateTransform(t1.get(), TransformationMatrix()); + auto t3 = CreateTransform(t2.get(), TransformationMatrix()); + auto c1 = + ClipPaintPropertyNode::Create(c0(), t2, FloatRoundedRect(0, 0, 100, 100)); + auto c2 = + ClipPaintPropertyNode::Create(c1, t3, FloatRoundedRect(0, 0, 200, 50)); + + TestChunks chunks; + chunks.AddChunk(t0(), c0(), e0()); + chunks.AddChunk(t1.get(), c0(), e0()); + chunks.AddChunk(t0(), c0(), e0()); + chunks.AddChunk(t1.get(), c0(), e0()); + chunks.AddChunk(t2.get(), c0(), e0()); + chunks.AddChunk(t1.get(), c0(), e0()); + chunks.AddChunk(t1.get(), c2.get(), e0()); + + auto output = + PaintChunksToCcLayer::Convert( + chunks.chunks, PropertyTreeState(t0(), c0(), e0()), gfx::Vector2dF(), + chunks.items, cc::DisplayItemList::kToBeReleasedAsPaintOpBuffer) + ->ReleaseAsRecord(); + + EXPECT_THAT(*output, + PaintRecordMatcher::Make( + {cc::PaintOpType::DrawRecord, // <p0/> + cc::PaintOpType::DrawRecord, // <p1/> + cc::PaintOpType::DrawRecord, // <p2/> + cc::PaintOpType::DrawRecord, // <p3/> + cc::PaintOpType::DrawRecord, // <p4/> + cc::PaintOpType::DrawRecord, // <p5/> + cc::PaintOpType::Save, cc::PaintOpType::ClipRect, // <c1+c2> + cc::PaintOpType::DrawRecord, // <p6/> + cc::PaintOpType::Restore})); // </c1+c2> +} + } // namespace } // namespace blink
diff --git a/third_party/blink/renderer/platform/graphics/paint/paint_chunker.cc b/third_party/blink/renderer/platform/graphics/paint/paint_chunker.cc index 0baeacd..76461ca 100644 --- a/third_party/blink/renderer/platform/graphics/paint/paint_chunker.cc +++ b/third_party/blink/renderer/platform/graphics/paint/paint_chunker.cc
@@ -49,6 +49,12 @@ // new chunk id will be treated as having no id to avoid the chunk from // using the same id as the chunk before the forced chunk. current_chunk_id_ = WTF::nullopt; + } else if (force_new_chunk_ && data_.chunks.size() && + data_.chunks.back().id == current_chunk_id_) { + // For other forced_new_chunk_ reasons (e.g. subsequences), use the first + // display items' id if the client didn't specify an id for the forced new + // chunk (i.e. |current_chunk_id_| has been used by the previous chunk). + current_chunk_id_ = WTF::nullopt; } size_t new_chunk_begin_index;
diff --git a/third_party/blink/renderer/platform/graphics/paint/paint_chunker_test.cc b/third_party/blink/renderer/platform/graphics/paint/paint_chunker_test.cc index b49c43b8..7a833bb 100644 --- a/third_party/blink/renderer/platform/graphics/paint/paint_chunker_test.cc +++ b/third_party/blink/renderer/platform/graphics/paint/paint_chunker_test.cc
@@ -281,7 +281,7 @@ PaintChunk(5, 6, i3.GetId(), DefaultPaintChunkProperties()))); } -TEST_F(PaintChunkerTest, ForceNewChunk) { +TEST_F(PaintChunkerTest, ForceNewChunkWithNewId) { PaintChunker chunker; PaintChunk::Id id0(client_, DisplayItemType(0)); chunker.UpdateCurrentPaintChunkProperties(id0, DefaultPaintChunkProperties()); @@ -294,9 +294,9 @@ chunker.IncrementDisplayItemIndex(TestChunkerDisplayItem(client_)); chunker.IncrementDisplayItemIndex(TestChunkerDisplayItem(client_)); + chunker.ForceNewChunk(); PaintChunk::Id id2(client_, DisplayItemType(20)); chunker.UpdateCurrentPaintChunkProperties(id2, DefaultPaintChunkProperties()); - chunker.ForceNewChunk(); chunker.IncrementDisplayItemIndex(TestChunkerDisplayItem(client_)); chunker.IncrementDisplayItemIndex(TestChunkerDisplayItem(client_)); @@ -308,6 +308,37 @@ PaintChunk(4, 6, id2, DefaultPaintChunkProperties()))); } +TEST_F(PaintChunkerTest, ForceNewChunkWithoutNewId) { + PaintChunker chunker; + PaintChunk::Id id0(client_, DisplayItemType(0)); + chunker.UpdateCurrentPaintChunkProperties(WTF::nullopt, + DefaultPaintChunkProperties()); + chunker.IncrementDisplayItemIndex( + TestChunkerDisplayItem(id0.client, id0.type)); + chunker.IncrementDisplayItemIndex(TestChunkerDisplayItem(client_)); + + chunker.ForceNewChunk(); + PaintChunk::Id id1(client_, DisplayItemType(10)); + chunker.IncrementDisplayItemIndex( + TestChunkerDisplayItem(id1.client, id1.type)); + chunker.IncrementDisplayItemIndex( + TestChunkerDisplayItem(client_, DisplayItemType(11))); + + chunker.ForceNewChunk(); + PaintChunk::Id id2(client_, DisplayItemType(20)); + chunker.IncrementDisplayItemIndex( + TestChunkerDisplayItem(id2.client, id2.type)); + chunker.IncrementDisplayItemIndex( + TestChunkerDisplayItem(client_, DisplayItemType(21))); + + Vector<PaintChunk> chunks = chunker.PaintChunks(); + EXPECT_THAT( + chunks, + ElementsAre(PaintChunk(0, 2, id0, DefaultPaintChunkProperties()), + PaintChunk(2, 4, id1, DefaultPaintChunkProperties()), + PaintChunk(4, 6, id2, DefaultPaintChunkProperties()))); +} + class TestScrollHitTestRequiringSeparateChunk : public TestChunkerDisplayItem { public: TestScrollHitTestRequiringSeparateChunk(const DisplayItemClient& client)
diff --git a/third_party/blink/renderer/platform/graphics/paint/paint_controller_test.cc b/third_party/blink/renderer/platform/graphics/paint/paint_controller_test.cc index 913708d..bd381cb 100644 --- a/third_party/blink/renderer/platform/graphics/paint/paint_controller_test.cc +++ b/third_party/blink/renderer/platform/graphics/paint/paint_controller_test.cc
@@ -851,6 +851,16 @@ GetPaintController().CommitNewDisplayItems(); + // Even though the paint properties match, |container| should receive its + // own PaintChunk because it created a subsequence. + EXPECT_EQ(3u, GetPaintController().GetPaintArtifact().PaintChunks().size()); + EXPECT_EQ(root, + GetPaintController().GetPaintArtifact().PaintChunks()[0].id.client); + EXPECT_EQ(container, + GetPaintController().GetPaintArtifact().PaintChunks()[1].id.client); + EXPECT_EQ(root, + GetPaintController().GetPaintArtifact().PaintChunks()[2].id.client); + root_properties.backface_hidden = true; // This time, record the fist chunk with backface_hidden == true GetPaintController().UpdateCurrentPaintChunkProperties(root_id, @@ -860,8 +870,8 @@ DrawRect(context, root, kForegroundType, FloatRect(100, 100, 100, 100)); GetPaintController().CommitNewDisplayItems(); - // Even though the paint properties match, |container| should receive its - // own PaintChunk because it is a cached subsequence. + // |container| should still receive its own PaintChunk because it is a cached + // subsequence. EXPECT_EQ(3u, GetPaintController().GetPaintArtifact().PaintChunks().size()); EXPECT_EQ(root, GetPaintController().GetPaintArtifact().PaintChunks()[0].id.client);
diff --git a/third_party/libvpx/README.chromium b/third_party/libvpx/README.chromium index ef97e284..a5e9b06 100644 --- a/third_party/libvpx/README.chromium +++ b/third_party/libvpx/README.chromium
@@ -5,9 +5,9 @@ License File: source/libvpx/LICENSE Security Critical: yes -Date: Monday April 09 2018 +Date: Thursday April 19 2018 Branch: master -Commit: be5df6080154e58db88fa3640e127efd18c04bde +Commit: 3b460db214b5bec07a3da6914a224d90c361ccac Description: Contains the sources used to compile libvpx binaries used by Google Chrome and
diff --git a/third_party/libvpx/source/config/ios/arm-neon/vp8_rtcd.h b/third_party/libvpx/source/config/ios/arm-neon/vp8_rtcd.h index 737afd5..3bd769d5 100644 --- a/third_party/libvpx/source/config/ios/arm-neon/vp8_rtcd.h +++ b/third_party/libvpx/source/config/ios/arm-neon/vp8_rtcd.h
@@ -27,455 +27,273 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict16x16_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict16x16_neon(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict16x16 vp8_bilinear_predict16x16_neon -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict4x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_neon -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_neon -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x8 vp8_bilinear_predict8x8_neon -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); #define vp8_block_error vp8_block_error_c -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem16x16_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +void vp8_copy_mem16x16_neon(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); #define vp8_copy_mem16x16 vp8_copy_mem16x16_neon -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_neon -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x8 vp8_copy_mem8x8_neon -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -void vp8_dc_only_idct_add_neon(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +void vp8_dc_only_idct_add_neon(short input, unsigned char *pred, + int pred_stride, unsigned char *dst, int dst_stride); #define vp8_dc_only_idct_add vp8_dc_only_idct_add_neon -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_neon(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_neon(unsigned char *mc_running_avg_y, + int mc_avg_y_stride, unsigned char *running_avg_y, + int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter vp8_denoiser_filter_neon -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_neon(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_uv_neon(unsigned char *mc_running_avg, + int mc_avg_stride, unsigned char *running_avg, + int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_neon -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); -void vp8_dequant_idct_add_neon(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_neon(short *input, short *dq, unsigned char *output, int stride); #define vp8_dequant_idct_add vp8_dequant_idct_add_neon -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -void vp8_dequant_idct_add_uv_block_neon(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +void vp8_dequant_idct_add_uv_block_neon(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_neon -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -void vp8_dequant_idct_add_y_block_neon(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +void vp8_dequant_idct_add_y_block_neon(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_neon -void vp8_dequantize_b_c(struct blockd*, short* dqc); -void vp8_dequantize_b_neon(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); +void vp8_dequantize_b_neon(struct blockd *, short *dqc); #define vp8_dequantize_b vp8_dequantize_b_neon -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_diamond_search_sad vp8_diamond_search_sad_c -void vp8_fast_quantize_b_c(struct block*, struct blockd*); -void vp8_fast_quantize_b_neon(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); +void vp8_fast_quantize_b_neon(struct block *, struct blockd *); #define vp8_fast_quantize_b vp8_fast_quantize_b_neon -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_c -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_c -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_full_search_sad vp8_full_search_sad_c -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bh_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bh_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bh vp8_loop_filter_bh_neon -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bv_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bv_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bv vp8_loop_filter_bv_neon -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbh_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbh_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbh vp8_loop_filter_mbh_neon -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbv_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbv_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbv vp8_loop_filter_mbv_neon -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bhs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bhs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_neon -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bvs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bvs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_neon -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_mbhs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_mbhs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbh vp8_loop_filter_mbhs_neon -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_mbvs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_mbvs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbv vp8_loop_filter_mbvs_neon -int vp8_mbblock_error_c(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); #define vp8_mbblock_error vp8_mbblock_error_c -int vp8_mbuverror_c(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); #define vp8_mbuverror vp8_mbuverror_c -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_refining_search_sad vp8_refining_search_sad_c -void vp8_regular_quantize_b_c(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); #define vp8_regular_quantize_b vp8_regular_quantize_b_c -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); -void vp8_short_fdct4x4_neon(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); +void vp8_short_fdct4x4_neon(short *input, short *output, int pitch); #define vp8_short_fdct4x4 vp8_short_fdct4x4_neon -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); -void vp8_short_fdct8x4_neon(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); +void vp8_short_fdct8x4_neon(short *input, short *output, int pitch); #define vp8_short_fdct8x4 vp8_short_fdct8x4_neon -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -void vp8_short_idct4x4llm_neon(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +void vp8_short_idct4x4llm_neon(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); #define vp8_short_idct4x4llm vp8_short_idct4x4llm_neon -void vp8_short_inv_walsh4x4_c(short* input, short* output); -void vp8_short_inv_walsh4x4_neon(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); +void vp8_short_inv_walsh4x4_neon(short *input, short *output); #define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_neon -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); -void vp8_short_walsh4x4_neon(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); +void vp8_short_walsh4x4_neon(short *input, short *output, int pitch); #define vp8_short_walsh4x4 vp8_short_walsh4x4_neon -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict16x16 vp8_sixtap_predict16x16_neon -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_neon -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x4 vp8_sixtap_predict8x4_neon -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x8 vp8_sixtap_predict8x8_neon void vp8_rtcd(void);
diff --git a/third_party/libvpx/source/config/ios/arm-neon/vp9_rtcd.h b/third_party/libvpx/source/config/ios/arm-neon/vp9_rtcd.h index 309c7808..8fe8182 100644 --- a/third_party/libvpx/source/config/ios/arm-neon/vp9_rtcd.h +++ b/third_party/libvpx/source/config/ios/arm-neon/vp9_rtcd.h
@@ -31,198 +31,125 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); #define vp9_block_error vp9_block_error_c -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); -int64_t vp9_block_error_fp_neon(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); +int64_t vp9_block_error_fp_neon(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); #define vp9_block_error_fp vp9_block_error_fp_neon -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); -int vp9_denoiser_filter_neon(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); +int vp9_denoiser_filter_neon(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); #define vp9_denoiser_filter vp9_denoiser_filter_neon -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); #define vp9_diamond_search_sad vp9_diamond_search_sad_c -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_fdct8x8_quant_neon(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_fdct8x8_quant_neon(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_fdct8x8_quant vp9_fdct8x8_quant_neon -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_c -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht4x4 vp9_fht4x4_c -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_c -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); -void vp9_iht16x16_256_add_neon(const tran_low_t* input, - uint8_t* output, - int pitch, - int tx_type); +void vp9_iht16x16_256_add_neon(const tran_low_t *input, uint8_t *output, + int pitch, int tx_type); #define vp9_iht16x16_256_add vp9_iht16x16_256_add_neon -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht4x4_16_add_neon(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht4x4_16_add vp9_iht4x4_16_add_neon -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht8x8_64_add_neon(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht8x8_64_add vp9_iht8x8_64_add_neon -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_quantize_fp vp9_quantize_fp_neon -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_32x32_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vp9_quantize_fp_32x32_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_neon -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); -void vp9_scale_and_extend_frame_neon(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); +void vp9_scale_and_extend_frame_neon(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler); #define vp9_scale_and_extend_frame vp9_scale_and_extend_frame_neon
diff --git a/third_party/libvpx/source/config/ios/arm-neon/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/ios/arm-neon/vpx_dsp_rtcd.h index cc0b382..cd34634 100644 --- a/third_party/libvpx/source/config/ios/arm-neon/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/ios/arm-neon/vpx_dsp_rtcd.h
@@ -20,2442 +20,1539 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); -unsigned int vpx_avg_4x4_neon(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); +unsigned int vpx_avg_4x4_neon(const uint8_t *, int p); #define vpx_avg_4x4 vpx_avg_4x4_neon -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); -unsigned int vpx_avg_8x8_neon(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); +unsigned int vpx_avg_8x8_neon(const uint8_t *, int p); #define vpx_avg_8x8 vpx_avg_8x8_neon -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -void vpx_comp_avg_pred_neon(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +void vpx_comp_avg_pred_neon(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); #define vpx_comp_avg_pred vpx_comp_avg_pred_neon -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_neon(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve8 vpx_convolve8_neon -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg vpx_convolve8_avg_neon -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_horiz_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_avg_horiz_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve8_avg_horiz vpx_convolve8_avg_horiz_neon -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_vert vpx_convolve8_avg_vert_neon -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_horiz_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_horiz_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_horiz vpx_convolve8_horiz_neon -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_vert_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_vert_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_vert vpx_convolve8_vert_neon -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_avg_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_avg_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_avg vpx_convolve_avg_neon -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_copy_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_copy_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_copy vpx_convolve_copy_neon -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_neon -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_neon -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_neon -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_neon -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_16x16 vpx_d153_predictor_16x16_c -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_32x32 vpx_d153_predictor_32x32_c -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_4x4 vpx_d153_predictor_4x4_c -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_8x8 vpx_d153_predictor_8x8_c -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_16x16 vpx_d207_predictor_16x16_c -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_32x32 vpx_d207_predictor_32x32_c -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_c -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_8x8 vpx_d207_predictor_8x8_c -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_16x16 vpx_d45_predictor_16x16_neon -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_32x32 vpx_d45_predictor_32x32_neon -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_neon -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_neon -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_16x16 vpx_d63_predictor_16x16_c -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_32x32 vpx_d63_predictor_32x32_c -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_4x4 vpx_d63_predictor_4x4_c -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_8x8 vpx_d63_predictor_8x8_c -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_neon -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_neon -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_neon -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_neon -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_neon -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_neon -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_neon -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_neon -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_neon -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_neon -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_neon -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_neon -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_neon -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_neon -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_neon -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_neon -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16 vpx_fdct16x16_neon -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16_1 vpx_fdct16x16_1_neon -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32 vpx_fdct32x32_neon -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_1 vpx_fdct32x32_1_neon -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_rd_neon(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_rd_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_rd vpx_fdct32x32_rd_neon -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4 vpx_fdct4x4_neon -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4_1 vpx_fdct4x4_1_neon -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8 vpx_fdct8x8_neon -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8_1 vpx_fdct8x8_1_neon -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get16x16var vpx_get16x16var_neon -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); -unsigned int vpx_get4x4sse_cs_neon(const unsigned char* src_ptr, +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); +unsigned int vpx_get4x4sse_cs_neon(const unsigned char *src_ptr, int source_stride, - const unsigned char* ref_ptr, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_neon -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get8x8var_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); +void vpx_get8x8var_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get8x8var vpx_get8x8var_neon -unsigned int vpx_get_mb_ss_c(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); #define vpx_get_mb_ss vpx_get_mb_ss_c -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_16x16 vpx_h_predictor_16x16_neon -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_32x32 vpx_h_predictor_32x32_neon -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_4x4 vpx_h_predictor_4x4_neon -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_8x8 vpx_h_predictor_8x8_neon -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); -void vpx_hadamard_16x16_neon(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); +void vpx_hadamard_16x16_neon(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_16x16 vpx_hadamard_16x16_neon -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); -void vpx_hadamard_8x8_neon(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); +void vpx_hadamard_8x8_neon(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_8x8 vpx_hadamard_8x8_neon -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_10_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_10_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_10_add vpx_idct16x16_10_add_neon -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_1_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_1_add vpx_idct16x16_1_add_neon -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_256_add vpx_idct16x16_256_add_neon -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_38_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_38_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_38_add vpx_idct16x16_38_add_neon -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_neon -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_135_add vpx_idct32x32_135_add_neon -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_1_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1_add vpx_idct32x32_1_add_neon -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_34_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_34_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_34_add vpx_idct32x32_34_add_neon -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_16_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_16_add vpx_idct4x4_16_add_neon -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_1_add_neon(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_1_add vpx_idct4x4_1_add_neon -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_12_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_12_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_12_add vpx_idct8x8_12_add_neon -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_1_add_neon(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_1_add vpx_idct8x8_1_add_neon -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_64_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_64_add vpx_idct8x8_64_add_neon -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); -int16_t vpx_int_pro_col_neon(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); +int16_t vpx_int_pro_col_neon(const uint8_t *ref, const int width); #define vpx_int_pro_col vpx_int_pro_col_neon -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); -void vpx_int_pro_row_neon(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); +void vpx_int_pro_row_neon(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); #define vpx_int_pro_row vpx_int_pro_row_neon -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_c -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16 vpx_lpf_horizontal_16_neon -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_neon(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); #define vpx_lpf_horizontal_16_dual vpx_lpf_horizontal_16_dual_neon -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_4_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_4_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_neon -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_4_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_4_dual_neon( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_neon -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_8_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_neon -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_8_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_8_dual_neon( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_neon -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16 vpx_lpf_vertical_16_neon -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_neon -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_4_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_4_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_4 vpx_lpf_vertical_4_neon -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_4_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_4_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_4_dual vpx_lpf_vertical_4_dual_neon -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_8_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_8 vpx_lpf_vertical_8_neon -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_8_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_8_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_neon -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -void vpx_mbpost_proc_across_ip_neon(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +void vpx_mbpost_proc_across_ip_neon(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_across_ip vpx_mbpost_proc_across_ip_neon -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); -void vpx_mbpost_proc_down_neon(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_down_neon(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_down vpx_mbpost_proc_down_neon -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -void vpx_minmax_8x8_neon(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +void vpx_minmax_8x8_neon(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_minmax_8x8 vpx_minmax_8x8_neon -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x16 vpx_mse16x16_neon -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x8 vpx_mse16x8_c -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x16 vpx_mse8x16_c -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x8 vpx_mse8x8_c -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); #define vpx_plane_add_noise vpx_plane_add_noise_c -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); -void vpx_post_proc_down_and_across_mb_row_neon(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); +void vpx_post_proc_down_and_across_mb_row_neon(unsigned char *src, + unsigned char *dst, + int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); #define vpx_post_proc_down_and_across_mb_row \ vpx_post_proc_down_and_across_mb_row_neon -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vpx_quantize_b vpx_quantize_b_neon -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_quantize_b_32x32 vpx_quantize_b_32x32_neon -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x16 vpx_sad16x16_neon -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x16_avg vpx_sad16x16_avg_neon -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x3 vpx_sad16x16x3_c -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x4d vpx_sad16x16x4d_neon -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x8 vpx_sad16x16x8_c -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x32 vpx_sad16x32_neon -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x32_avg vpx_sad16x32_avg_neon -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x32x4d vpx_sad16x32x4d_neon -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x8 vpx_sad16x8_neon -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x8_avg vpx_sad16x8_avg_neon -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x3 vpx_sad16x8x3_c -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x4d vpx_sad16x8x4d_neon -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x8 vpx_sad16x8x8_c -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x16 vpx_sad32x16_neon -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x16_avg vpx_sad32x16_avg_neon -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x16x4d vpx_sad32x16x4d_neon -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x32 vpx_sad32x32_neon -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x32_avg vpx_sad32x32_avg_neon -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x32x4d vpx_sad32x32x4d_neon -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x64 vpx_sad32x64_neon -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x64_avg vpx_sad32x64_avg_neon -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x64x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x64x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x64x4d vpx_sad32x64x4d_neon -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x4_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x4_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x4 vpx_sad4x4_neon -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x4_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x4_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x4_avg vpx_sad4x4_avg_neon -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x3 vpx_sad4x4x3_c -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x4d vpx_sad4x4x4d_neon -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x8 vpx_sad4x4x8_c -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x8 vpx_sad4x8_neon -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x8_avg vpx_sad4x8_avg_neon -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x8x4d vpx_sad4x8x4d_neon -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x32 vpx_sad64x32_neon -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x32_avg vpx_sad64x32_avg_neon -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x32x4d vpx_sad64x32x4d_neon -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x64 vpx_sad64x64_neon -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x64_avg vpx_sad64x64_avg_neon -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x64x4d vpx_sad64x64x4d_neon -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x16 vpx_sad8x16_neon -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x16_avg vpx_sad8x16_avg_neon -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x3 vpx_sad8x16x3_c -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x4d vpx_sad8x16x4d_neon -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x8 vpx_sad8x16x8_c -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x4_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x4_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x4 vpx_sad8x4_neon -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x4_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x4_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x4_avg vpx_sad8x4_avg_neon -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x4x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x4x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x4x4d vpx_sad8x4x4d_neon -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x8 vpx_sad8x8_neon -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x8_avg vpx_sad8x8_avg_neon -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x3 vpx_sad8x8x3_c -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x4d vpx_sad8x8x4d_neon -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x8 vpx_sad8x8x8_c -int vpx_satd_c(const int16_t* coeff, int length); -int vpx_satd_neon(const int16_t* coeff, int length); +int vpx_satd_c(const int16_t *coeff, int length); +int vpx_satd_neon(const int16_t *coeff, int length); #define vpx_satd vpx_satd_neon -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_scaled_2d_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_2d_neon(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_2d vpx_scaled_2d_neon -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x16 vpx_sub_pixel_avg_variance16x16_neon -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x32 vpx_sub_pixel_avg_variance16x32_neon -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x8 vpx_sub_pixel_avg_variance16x8_neon -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x16 vpx_sub_pixel_avg_variance32x16_neon -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x32 vpx_sub_pixel_avg_variance32x32_neon -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x64 vpx_sub_pixel_avg_variance32x64_neon -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x4 vpx_sub_pixel_avg_variance4x4_neon -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x8 vpx_sub_pixel_avg_variance4x8_neon -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x32 vpx_sub_pixel_avg_variance64x32_neon -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x64 vpx_sub_pixel_avg_variance64x64_neon -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x16 vpx_sub_pixel_avg_variance8x16_neon -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x4 vpx_sub_pixel_avg_variance8x4_neon -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x8 vpx_sub_pixel_avg_variance8x8_neon -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x16 vpx_sub_pixel_variance16x16_neon -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x32 vpx_sub_pixel_variance16x32_neon -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x8 vpx_sub_pixel_variance16x8_neon -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x16 vpx_sub_pixel_variance32x16_neon -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x32 vpx_sub_pixel_variance32x32_neon -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x64 vpx_sub_pixel_variance32x64_neon -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance4x4 vpx_sub_pixel_variance4x4_neon -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance4x8 vpx_sub_pixel_variance4x8_neon -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x32 vpx_sub_pixel_variance64x32_neon -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x64 vpx_sub_pixel_variance64x64_neon -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance8x16 vpx_sub_pixel_variance8x16_neon -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_neon -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_neon -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -void vpx_subtract_block_neon(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_neon(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); #define vpx_subtract_block vpx_subtract_block_neon -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_neon -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_neon -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_neon -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_neon -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_16x16 vpx_v_predictor_16x16_neon -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_32x32 vpx_v_predictor_32x32_neon -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_4x4 vpx_v_predictor_4x4_neon -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_neon -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x16 vpx_variance16x16_neon -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x32 vpx_variance16x32_neon -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x8 vpx_variance16x8_neon -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x16 vpx_variance32x16_neon -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x32 vpx_variance32x32_neon -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x64 vpx_variance32x64_neon -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x4_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x4 vpx_variance4x4_neon -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x8 vpx_variance4x8_neon -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x32 vpx_variance64x32_neon -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x64 vpx_variance64x64_neon -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x16 vpx_variance8x16_neon -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x4_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x4 vpx_variance8x4_neon -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x8 vpx_variance8x8_neon -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); -int vpx_vector_var_neon(const int16_t* ref, const int16_t* src, const int bwl); +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); +int vpx_vector_var_neon(const int16_t *ref, const int16_t *src, const int bwl); #define vpx_vector_var vpx_vector_var_neon void vpx_dsp_rtcd(void);
diff --git a/third_party/libvpx/source/config/ios/arm-neon/vpx_scale_rtcd.h b/third_party/libvpx/source/config/ios/arm-neon/vpx_scale_rtcd.h index 555013e..62b2537 100644 --- a/third_party/libvpx/source/config/ios/arm-neon/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/ios/arm-neon/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/ios/arm64/vp8_rtcd.h b/third_party/libvpx/source/config/ios/arm64/vp8_rtcd.h index 737afd5..3bd769d5 100644 --- a/third_party/libvpx/source/config/ios/arm64/vp8_rtcd.h +++ b/third_party/libvpx/source/config/ios/arm64/vp8_rtcd.h
@@ -27,455 +27,273 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict16x16_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict16x16_neon(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict16x16 vp8_bilinear_predict16x16_neon -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict4x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_neon -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_neon -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x8 vp8_bilinear_predict8x8_neon -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); #define vp8_block_error vp8_block_error_c -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem16x16_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +void vp8_copy_mem16x16_neon(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); #define vp8_copy_mem16x16 vp8_copy_mem16x16_neon -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_neon -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x8 vp8_copy_mem8x8_neon -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -void vp8_dc_only_idct_add_neon(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +void vp8_dc_only_idct_add_neon(short input, unsigned char *pred, + int pred_stride, unsigned char *dst, int dst_stride); #define vp8_dc_only_idct_add vp8_dc_only_idct_add_neon -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_neon(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_neon(unsigned char *mc_running_avg_y, + int mc_avg_y_stride, unsigned char *running_avg_y, + int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter vp8_denoiser_filter_neon -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_neon(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_uv_neon(unsigned char *mc_running_avg, + int mc_avg_stride, unsigned char *running_avg, + int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_neon -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); -void vp8_dequant_idct_add_neon(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_neon(short *input, short *dq, unsigned char *output, int stride); #define vp8_dequant_idct_add vp8_dequant_idct_add_neon -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -void vp8_dequant_idct_add_uv_block_neon(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +void vp8_dequant_idct_add_uv_block_neon(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_neon -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -void vp8_dequant_idct_add_y_block_neon(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +void vp8_dequant_idct_add_y_block_neon(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_neon -void vp8_dequantize_b_c(struct blockd*, short* dqc); -void vp8_dequantize_b_neon(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); +void vp8_dequantize_b_neon(struct blockd *, short *dqc); #define vp8_dequantize_b vp8_dequantize_b_neon -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_diamond_search_sad vp8_diamond_search_sad_c -void vp8_fast_quantize_b_c(struct block*, struct blockd*); -void vp8_fast_quantize_b_neon(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); +void vp8_fast_quantize_b_neon(struct block *, struct blockd *); #define vp8_fast_quantize_b vp8_fast_quantize_b_neon -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_c -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_c -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_full_search_sad vp8_full_search_sad_c -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bh_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bh_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bh vp8_loop_filter_bh_neon -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bv_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bv_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bv vp8_loop_filter_bv_neon -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbh_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbh_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbh vp8_loop_filter_mbh_neon -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbv_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbv_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbv vp8_loop_filter_mbv_neon -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bhs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bhs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_neon -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bvs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bvs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_neon -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_mbhs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_mbhs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbh vp8_loop_filter_mbhs_neon -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_mbvs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_mbvs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbv vp8_loop_filter_mbvs_neon -int vp8_mbblock_error_c(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); #define vp8_mbblock_error vp8_mbblock_error_c -int vp8_mbuverror_c(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); #define vp8_mbuverror vp8_mbuverror_c -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_refining_search_sad vp8_refining_search_sad_c -void vp8_regular_quantize_b_c(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); #define vp8_regular_quantize_b vp8_regular_quantize_b_c -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); -void vp8_short_fdct4x4_neon(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); +void vp8_short_fdct4x4_neon(short *input, short *output, int pitch); #define vp8_short_fdct4x4 vp8_short_fdct4x4_neon -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); -void vp8_short_fdct8x4_neon(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); +void vp8_short_fdct8x4_neon(short *input, short *output, int pitch); #define vp8_short_fdct8x4 vp8_short_fdct8x4_neon -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -void vp8_short_idct4x4llm_neon(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +void vp8_short_idct4x4llm_neon(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); #define vp8_short_idct4x4llm vp8_short_idct4x4llm_neon -void vp8_short_inv_walsh4x4_c(short* input, short* output); -void vp8_short_inv_walsh4x4_neon(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); +void vp8_short_inv_walsh4x4_neon(short *input, short *output); #define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_neon -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); -void vp8_short_walsh4x4_neon(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); +void vp8_short_walsh4x4_neon(short *input, short *output, int pitch); #define vp8_short_walsh4x4 vp8_short_walsh4x4_neon -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict16x16 vp8_sixtap_predict16x16_neon -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_neon -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x4 vp8_sixtap_predict8x4_neon -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x8 vp8_sixtap_predict8x8_neon void vp8_rtcd(void);
diff --git a/third_party/libvpx/source/config/ios/arm64/vp9_rtcd.h b/third_party/libvpx/source/config/ios/arm64/vp9_rtcd.h index 309c7808..8fe8182 100644 --- a/third_party/libvpx/source/config/ios/arm64/vp9_rtcd.h +++ b/third_party/libvpx/source/config/ios/arm64/vp9_rtcd.h
@@ -31,198 +31,125 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); #define vp9_block_error vp9_block_error_c -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); -int64_t vp9_block_error_fp_neon(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); +int64_t vp9_block_error_fp_neon(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); #define vp9_block_error_fp vp9_block_error_fp_neon -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); -int vp9_denoiser_filter_neon(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); +int vp9_denoiser_filter_neon(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); #define vp9_denoiser_filter vp9_denoiser_filter_neon -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); #define vp9_diamond_search_sad vp9_diamond_search_sad_c -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_fdct8x8_quant_neon(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_fdct8x8_quant_neon(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_fdct8x8_quant vp9_fdct8x8_quant_neon -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_c -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht4x4 vp9_fht4x4_c -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_c -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); -void vp9_iht16x16_256_add_neon(const tran_low_t* input, - uint8_t* output, - int pitch, - int tx_type); +void vp9_iht16x16_256_add_neon(const tran_low_t *input, uint8_t *output, + int pitch, int tx_type); #define vp9_iht16x16_256_add vp9_iht16x16_256_add_neon -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht4x4_16_add_neon(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht4x4_16_add vp9_iht4x4_16_add_neon -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht8x8_64_add_neon(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht8x8_64_add vp9_iht8x8_64_add_neon -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_quantize_fp vp9_quantize_fp_neon -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_32x32_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vp9_quantize_fp_32x32_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_neon -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); -void vp9_scale_and_extend_frame_neon(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); +void vp9_scale_and_extend_frame_neon(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler); #define vp9_scale_and_extend_frame vp9_scale_and_extend_frame_neon
diff --git a/third_party/libvpx/source/config/ios/arm64/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/ios/arm64/vpx_dsp_rtcd.h index cc0b382..cd34634 100644 --- a/third_party/libvpx/source/config/ios/arm64/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/ios/arm64/vpx_dsp_rtcd.h
@@ -20,2442 +20,1539 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); -unsigned int vpx_avg_4x4_neon(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); +unsigned int vpx_avg_4x4_neon(const uint8_t *, int p); #define vpx_avg_4x4 vpx_avg_4x4_neon -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); -unsigned int vpx_avg_8x8_neon(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); +unsigned int vpx_avg_8x8_neon(const uint8_t *, int p); #define vpx_avg_8x8 vpx_avg_8x8_neon -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -void vpx_comp_avg_pred_neon(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +void vpx_comp_avg_pred_neon(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); #define vpx_comp_avg_pred vpx_comp_avg_pred_neon -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_neon(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve8 vpx_convolve8_neon -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg vpx_convolve8_avg_neon -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_horiz_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_avg_horiz_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve8_avg_horiz vpx_convolve8_avg_horiz_neon -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_vert vpx_convolve8_avg_vert_neon -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_horiz_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_horiz_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_horiz vpx_convolve8_horiz_neon -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_vert_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_vert_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_vert vpx_convolve8_vert_neon -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_avg_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_avg_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_avg vpx_convolve_avg_neon -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_copy_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_copy_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_copy vpx_convolve_copy_neon -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_neon -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_neon -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_neon -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_neon -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_16x16 vpx_d153_predictor_16x16_c -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_32x32 vpx_d153_predictor_32x32_c -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_4x4 vpx_d153_predictor_4x4_c -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_8x8 vpx_d153_predictor_8x8_c -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_16x16 vpx_d207_predictor_16x16_c -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_32x32 vpx_d207_predictor_32x32_c -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_c -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_8x8 vpx_d207_predictor_8x8_c -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_16x16 vpx_d45_predictor_16x16_neon -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_32x32 vpx_d45_predictor_32x32_neon -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_neon -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_neon -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_16x16 vpx_d63_predictor_16x16_c -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_32x32 vpx_d63_predictor_32x32_c -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_4x4 vpx_d63_predictor_4x4_c -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_8x8 vpx_d63_predictor_8x8_c -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_neon -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_neon -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_neon -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_neon -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_neon -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_neon -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_neon -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_neon -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_neon -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_neon -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_neon -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_neon -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_neon -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_neon -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_neon -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_neon -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16 vpx_fdct16x16_neon -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16_1 vpx_fdct16x16_1_neon -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32 vpx_fdct32x32_neon -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_1 vpx_fdct32x32_1_neon -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_rd_neon(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_rd_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_rd vpx_fdct32x32_rd_neon -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4 vpx_fdct4x4_neon -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4_1 vpx_fdct4x4_1_neon -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8 vpx_fdct8x8_neon -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8_1 vpx_fdct8x8_1_neon -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get16x16var vpx_get16x16var_neon -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); -unsigned int vpx_get4x4sse_cs_neon(const unsigned char* src_ptr, +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); +unsigned int vpx_get4x4sse_cs_neon(const unsigned char *src_ptr, int source_stride, - const unsigned char* ref_ptr, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_neon -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get8x8var_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); +void vpx_get8x8var_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get8x8var vpx_get8x8var_neon -unsigned int vpx_get_mb_ss_c(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); #define vpx_get_mb_ss vpx_get_mb_ss_c -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_16x16 vpx_h_predictor_16x16_neon -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_32x32 vpx_h_predictor_32x32_neon -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_4x4 vpx_h_predictor_4x4_neon -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_8x8 vpx_h_predictor_8x8_neon -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); -void vpx_hadamard_16x16_neon(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); +void vpx_hadamard_16x16_neon(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_16x16 vpx_hadamard_16x16_neon -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); -void vpx_hadamard_8x8_neon(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); +void vpx_hadamard_8x8_neon(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_8x8 vpx_hadamard_8x8_neon -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_10_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_10_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_10_add vpx_idct16x16_10_add_neon -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_1_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_1_add vpx_idct16x16_1_add_neon -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_256_add vpx_idct16x16_256_add_neon -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_38_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_38_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_38_add vpx_idct16x16_38_add_neon -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_neon -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_135_add vpx_idct32x32_135_add_neon -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_1_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1_add vpx_idct32x32_1_add_neon -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_34_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_34_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_34_add vpx_idct32x32_34_add_neon -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_16_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_16_add vpx_idct4x4_16_add_neon -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_1_add_neon(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_1_add vpx_idct4x4_1_add_neon -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_12_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_12_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_12_add vpx_idct8x8_12_add_neon -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_1_add_neon(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_1_add vpx_idct8x8_1_add_neon -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_64_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_64_add vpx_idct8x8_64_add_neon -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); -int16_t vpx_int_pro_col_neon(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); +int16_t vpx_int_pro_col_neon(const uint8_t *ref, const int width); #define vpx_int_pro_col vpx_int_pro_col_neon -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); -void vpx_int_pro_row_neon(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); +void vpx_int_pro_row_neon(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); #define vpx_int_pro_row vpx_int_pro_row_neon -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_c -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16 vpx_lpf_horizontal_16_neon -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_neon(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); #define vpx_lpf_horizontal_16_dual vpx_lpf_horizontal_16_dual_neon -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_4_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_4_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_neon -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_4_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_4_dual_neon( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_neon -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_8_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_neon -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_8_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_8_dual_neon( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_neon -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16 vpx_lpf_vertical_16_neon -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_neon -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_4_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_4_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_4 vpx_lpf_vertical_4_neon -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_4_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_4_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_4_dual vpx_lpf_vertical_4_dual_neon -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_8_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_8 vpx_lpf_vertical_8_neon -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_8_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_8_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_neon -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -void vpx_mbpost_proc_across_ip_neon(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +void vpx_mbpost_proc_across_ip_neon(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_across_ip vpx_mbpost_proc_across_ip_neon -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); -void vpx_mbpost_proc_down_neon(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_down_neon(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_down vpx_mbpost_proc_down_neon -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -void vpx_minmax_8x8_neon(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +void vpx_minmax_8x8_neon(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_minmax_8x8 vpx_minmax_8x8_neon -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x16 vpx_mse16x16_neon -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x8 vpx_mse16x8_c -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x16 vpx_mse8x16_c -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x8 vpx_mse8x8_c -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); #define vpx_plane_add_noise vpx_plane_add_noise_c -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); -void vpx_post_proc_down_and_across_mb_row_neon(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); +void vpx_post_proc_down_and_across_mb_row_neon(unsigned char *src, + unsigned char *dst, + int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); #define vpx_post_proc_down_and_across_mb_row \ vpx_post_proc_down_and_across_mb_row_neon -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vpx_quantize_b vpx_quantize_b_neon -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_quantize_b_32x32 vpx_quantize_b_32x32_neon -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x16 vpx_sad16x16_neon -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x16_avg vpx_sad16x16_avg_neon -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x3 vpx_sad16x16x3_c -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x4d vpx_sad16x16x4d_neon -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x8 vpx_sad16x16x8_c -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x32 vpx_sad16x32_neon -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x32_avg vpx_sad16x32_avg_neon -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x32x4d vpx_sad16x32x4d_neon -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x8 vpx_sad16x8_neon -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x8_avg vpx_sad16x8_avg_neon -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x3 vpx_sad16x8x3_c -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x4d vpx_sad16x8x4d_neon -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x8 vpx_sad16x8x8_c -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x16 vpx_sad32x16_neon -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x16_avg vpx_sad32x16_avg_neon -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x16x4d vpx_sad32x16x4d_neon -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x32 vpx_sad32x32_neon -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x32_avg vpx_sad32x32_avg_neon -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x32x4d vpx_sad32x32x4d_neon -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x64 vpx_sad32x64_neon -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x64_avg vpx_sad32x64_avg_neon -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x64x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x64x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x64x4d vpx_sad32x64x4d_neon -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x4_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x4_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x4 vpx_sad4x4_neon -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x4_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x4_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x4_avg vpx_sad4x4_avg_neon -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x3 vpx_sad4x4x3_c -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x4d vpx_sad4x4x4d_neon -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x8 vpx_sad4x4x8_c -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x8 vpx_sad4x8_neon -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x8_avg vpx_sad4x8_avg_neon -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x8x4d vpx_sad4x8x4d_neon -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x32 vpx_sad64x32_neon -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x32_avg vpx_sad64x32_avg_neon -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x32x4d vpx_sad64x32x4d_neon -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x64 vpx_sad64x64_neon -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x64_avg vpx_sad64x64_avg_neon -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x64x4d vpx_sad64x64x4d_neon -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x16 vpx_sad8x16_neon -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x16_avg vpx_sad8x16_avg_neon -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x3 vpx_sad8x16x3_c -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x4d vpx_sad8x16x4d_neon -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x8 vpx_sad8x16x8_c -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x4_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x4_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x4 vpx_sad8x4_neon -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x4_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x4_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x4_avg vpx_sad8x4_avg_neon -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x4x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x4x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x4x4d vpx_sad8x4x4d_neon -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x8 vpx_sad8x8_neon -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x8_avg vpx_sad8x8_avg_neon -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x3 vpx_sad8x8x3_c -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x4d vpx_sad8x8x4d_neon -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x8 vpx_sad8x8x8_c -int vpx_satd_c(const int16_t* coeff, int length); -int vpx_satd_neon(const int16_t* coeff, int length); +int vpx_satd_c(const int16_t *coeff, int length); +int vpx_satd_neon(const int16_t *coeff, int length); #define vpx_satd vpx_satd_neon -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_scaled_2d_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_2d_neon(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_2d vpx_scaled_2d_neon -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x16 vpx_sub_pixel_avg_variance16x16_neon -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x32 vpx_sub_pixel_avg_variance16x32_neon -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x8 vpx_sub_pixel_avg_variance16x8_neon -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x16 vpx_sub_pixel_avg_variance32x16_neon -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x32 vpx_sub_pixel_avg_variance32x32_neon -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x64 vpx_sub_pixel_avg_variance32x64_neon -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x4 vpx_sub_pixel_avg_variance4x4_neon -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x8 vpx_sub_pixel_avg_variance4x8_neon -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x32 vpx_sub_pixel_avg_variance64x32_neon -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x64 vpx_sub_pixel_avg_variance64x64_neon -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x16 vpx_sub_pixel_avg_variance8x16_neon -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x4 vpx_sub_pixel_avg_variance8x4_neon -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x8 vpx_sub_pixel_avg_variance8x8_neon -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x16 vpx_sub_pixel_variance16x16_neon -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x32 vpx_sub_pixel_variance16x32_neon -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x8 vpx_sub_pixel_variance16x8_neon -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x16 vpx_sub_pixel_variance32x16_neon -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x32 vpx_sub_pixel_variance32x32_neon -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x64 vpx_sub_pixel_variance32x64_neon -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance4x4 vpx_sub_pixel_variance4x4_neon -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance4x8 vpx_sub_pixel_variance4x8_neon -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x32 vpx_sub_pixel_variance64x32_neon -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x64 vpx_sub_pixel_variance64x64_neon -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance8x16 vpx_sub_pixel_variance8x16_neon -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_neon -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_neon -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -void vpx_subtract_block_neon(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_neon(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); #define vpx_subtract_block vpx_subtract_block_neon -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_neon -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_neon -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_neon -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_neon -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_16x16 vpx_v_predictor_16x16_neon -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_32x32 vpx_v_predictor_32x32_neon -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_4x4 vpx_v_predictor_4x4_neon -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_neon -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x16 vpx_variance16x16_neon -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x32 vpx_variance16x32_neon -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x8 vpx_variance16x8_neon -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x16 vpx_variance32x16_neon -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x32 vpx_variance32x32_neon -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x64 vpx_variance32x64_neon -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x4_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x4 vpx_variance4x4_neon -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x8 vpx_variance4x8_neon -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x32 vpx_variance64x32_neon -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x64 vpx_variance64x64_neon -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x16 vpx_variance8x16_neon -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x4_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x4 vpx_variance8x4_neon -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x8 vpx_variance8x8_neon -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); -int vpx_vector_var_neon(const int16_t* ref, const int16_t* src, const int bwl); +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); +int vpx_vector_var_neon(const int16_t *ref, const int16_t *src, const int bwl); #define vpx_vector_var vpx_vector_var_neon void vpx_dsp_rtcd(void);
diff --git a/third_party/libvpx/source/config/ios/arm64/vpx_scale_rtcd.h b/third_party/libvpx/source/config/ios/arm64/vpx_scale_rtcd.h index 555013e..62b2537 100644 --- a/third_party/libvpx/source/config/ios/arm64/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/ios/arm64/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vp8_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vp8_rtcd.h index ca242d0..9b7135c 100644 --- a/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vp8_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vp8_rtcd.h
@@ -27,567 +27,326 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict16x16_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict16x16_neon(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict4x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict4x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict4x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict8x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict8x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); #define vp8_block_error vp8_block_error_c -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem16x16_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_copy_mem16x16)(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +void vp8_copy_mem16x16_neon(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_copy_mem16x16)(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_copy_mem8x8)(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_copy_mem8x8)(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -void vp8_dc_only_idct_add_neon(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +void vp8_dc_only_idct_add_neon(short input, unsigned char *pred, + int pred_stride, unsigned char *dst, int dst_stride); -RTCD_EXTERN void (*vp8_dc_only_idct_add)(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, +RTCD_EXTERN void (*vp8_dc_only_idct_add)(short input, unsigned char *pred, + int pred_stride, unsigned char *dst, int dst_stride); -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_neon(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_neon(unsigned char *mc_running_avg_y, + int mc_avg_y_stride, unsigned char *running_avg_y, + int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -RTCD_EXTERN int (*vp8_denoiser_filter)(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, - int increase_denoising); +RTCD_EXTERN int (*vp8_denoiser_filter)( + unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_neon(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_uv_neon(unsigned char *mc_running_avg, + int mc_avg_stride, unsigned char *running_avg, + int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -RTCD_EXTERN int (*vp8_denoiser_filter_uv)(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, - int increase_denoising); +RTCD_EXTERN int (*vp8_denoiser_filter_uv)( + unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); -void vp8_dequant_idct_add_neon(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_neon(short *input, short *dq, unsigned char *output, int stride); -RTCD_EXTERN void (*vp8_dequant_idct_add)(short* input, - short* dq, - unsigned char* output, - int stride); +RTCD_EXTERN void (*vp8_dequant_idct_add)(short *input, short *dq, + unsigned char *output, int stride); -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -void vp8_dequant_idct_add_uv_block_neon(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -RTCD_EXTERN void (*vp8_dequant_idct_add_uv_block)(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +void vp8_dequant_idct_add_uv_block_neon(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +RTCD_EXTERN void (*vp8_dequant_idct_add_uv_block)(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, + int stride, char *eobs); -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -void vp8_dequant_idct_add_y_block_neon(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -RTCD_EXTERN void (*vp8_dequant_idct_add_y_block)(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +void vp8_dequant_idct_add_y_block_neon(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +RTCD_EXTERN void (*vp8_dequant_idct_add_y_block)(short *q, short *dq, + unsigned char *dst, int stride, + char *eobs); -void vp8_dequantize_b_c(struct blockd*, short* dqc); -void vp8_dequantize_b_neon(struct blockd*, short* dqc); -RTCD_EXTERN void (*vp8_dequantize_b)(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); +void vp8_dequantize_b_neon(struct blockd *, short *dqc); +RTCD_EXTERN void (*vp8_dequantize_b)(struct blockd *, short *dqc); -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_diamond_search_sad vp8_diamond_search_sad_c -void vp8_fast_quantize_b_c(struct block*, struct blockd*); -void vp8_fast_quantize_b_neon(struct block*, struct blockd*); -RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); +void vp8_fast_quantize_b_neon(struct block *, struct blockd *); +RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block *, struct blockd *); -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_c -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_c -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_full_search_sad vp8_full_search_sad_c -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bh_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_bh)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bh_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_bh)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bv_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_bv)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bv_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_bv)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbh_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_mbh)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbh_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_mbh)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbv_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_mbv)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbv_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_mbv)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bhs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_bh)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bhs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_bh)(unsigned char *y, int ystride, + const unsigned char *blimit); -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bvs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_bv)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bvs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_bv)(unsigned char *y, int ystride, + const unsigned char *blimit); -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_mbhs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_mbh)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_mbhs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_mbh)(unsigned char *y, int ystride, + const unsigned char *blimit); -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_mbvs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_mbv)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_mbvs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_mbv)(unsigned char *y, int ystride, + const unsigned char *blimit); -int vp8_mbblock_error_c(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); #define vp8_mbblock_error vp8_mbblock_error_c -int vp8_mbuverror_c(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); #define vp8_mbuverror vp8_mbuverror_c -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_refining_search_sad vp8_refining_search_sad_c -void vp8_regular_quantize_b_c(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); #define vp8_regular_quantize_b vp8_regular_quantize_b_c -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); -void vp8_short_fdct4x4_neon(short* input, short* output, int pitch); -RTCD_EXTERN void (*vp8_short_fdct4x4)(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); +void vp8_short_fdct4x4_neon(short *input, short *output, int pitch); +RTCD_EXTERN void (*vp8_short_fdct4x4)(short *input, short *output, int pitch); -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); -void vp8_short_fdct8x4_neon(short* input, short* output, int pitch); -RTCD_EXTERN void (*vp8_short_fdct8x4)(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); +void vp8_short_fdct8x4_neon(short *input, short *output, int pitch); +RTCD_EXTERN void (*vp8_short_fdct8x4)(short *input, short *output, int pitch); -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -void vp8_short_idct4x4llm_neon(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -RTCD_EXTERN void (*vp8_short_idct4x4llm)(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +void vp8_short_idct4x4llm_neon(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +RTCD_EXTERN void (*vp8_short_idct4x4llm)(short *input, unsigned char *pred, + int pitch, unsigned char *dst, int dst_stride); -void vp8_short_inv_walsh4x4_c(short* input, short* output); -void vp8_short_inv_walsh4x4_neon(short* input, short* output); -RTCD_EXTERN void (*vp8_short_inv_walsh4x4)(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); +void vp8_short_inv_walsh4x4_neon(short *input, short *output); +RTCD_EXTERN void (*vp8_short_inv_walsh4x4)(short *input, short *output); -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); -void vp8_short_walsh4x4_neon(short* input, short* output, int pitch); -RTCD_EXTERN void (*vp8_short_walsh4x4)(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); +void vp8_short_walsh4x4_neon(short *input, short *output, int pitch); +RTCD_EXTERN void (*vp8_short_walsh4x4)(short *input, short *output, int pitch); -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); void vp8_rtcd(void); @@ -604,35 +363,25 @@ if (flags & HAS_NEON) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_neon; vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_c; - if (flags & HAS_NEON) - vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_neon; + if (flags & HAS_NEON) vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_neon; vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_c; - if (flags & HAS_NEON) - vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_neon; + if (flags & HAS_NEON) vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_neon; vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_c; - if (flags & HAS_NEON) - vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_neon; + if (flags & HAS_NEON) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_neon; vp8_copy_mem16x16 = vp8_copy_mem16x16_c; - if (flags & HAS_NEON) - vp8_copy_mem16x16 = vp8_copy_mem16x16_neon; + if (flags & HAS_NEON) vp8_copy_mem16x16 = vp8_copy_mem16x16_neon; vp8_copy_mem8x4 = vp8_copy_mem8x4_c; - if (flags & HAS_NEON) - vp8_copy_mem8x4 = vp8_copy_mem8x4_neon; + if (flags & HAS_NEON) vp8_copy_mem8x4 = vp8_copy_mem8x4_neon; vp8_copy_mem8x8 = vp8_copy_mem8x8_c; - if (flags & HAS_NEON) - vp8_copy_mem8x8 = vp8_copy_mem8x8_neon; + if (flags & HAS_NEON) vp8_copy_mem8x8 = vp8_copy_mem8x8_neon; vp8_dc_only_idct_add = vp8_dc_only_idct_add_c; - if (flags & HAS_NEON) - vp8_dc_only_idct_add = vp8_dc_only_idct_add_neon; + if (flags & HAS_NEON) vp8_dc_only_idct_add = vp8_dc_only_idct_add_neon; vp8_denoiser_filter = vp8_denoiser_filter_c; - if (flags & HAS_NEON) - vp8_denoiser_filter = vp8_denoiser_filter_neon; + if (flags & HAS_NEON) vp8_denoiser_filter = vp8_denoiser_filter_neon; vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_c; - if (flags & HAS_NEON) - vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_neon; + if (flags & HAS_NEON) vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_neon; vp8_dequant_idct_add = vp8_dequant_idct_add_c; - if (flags & HAS_NEON) - vp8_dequant_idct_add = vp8_dequant_idct_add_neon; + if (flags & HAS_NEON) vp8_dequant_idct_add = vp8_dequant_idct_add_neon; vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_c; if (flags & HAS_NEON) vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_neon; @@ -640,62 +389,43 @@ if (flags & HAS_NEON) vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_neon; vp8_dequantize_b = vp8_dequantize_b_c; - if (flags & HAS_NEON) - vp8_dequantize_b = vp8_dequantize_b_neon; + if (flags & HAS_NEON) vp8_dequantize_b = vp8_dequantize_b_neon; vp8_fast_quantize_b = vp8_fast_quantize_b_c; - if (flags & HAS_NEON) - vp8_fast_quantize_b = vp8_fast_quantize_b_neon; + if (flags & HAS_NEON) vp8_fast_quantize_b = vp8_fast_quantize_b_neon; vp8_loop_filter_bh = vp8_loop_filter_bh_c; - if (flags & HAS_NEON) - vp8_loop_filter_bh = vp8_loop_filter_bh_neon; + if (flags & HAS_NEON) vp8_loop_filter_bh = vp8_loop_filter_bh_neon; vp8_loop_filter_bv = vp8_loop_filter_bv_c; - if (flags & HAS_NEON) - vp8_loop_filter_bv = vp8_loop_filter_bv_neon; + if (flags & HAS_NEON) vp8_loop_filter_bv = vp8_loop_filter_bv_neon; vp8_loop_filter_mbh = vp8_loop_filter_mbh_c; - if (flags & HAS_NEON) - vp8_loop_filter_mbh = vp8_loop_filter_mbh_neon; + if (flags & HAS_NEON) vp8_loop_filter_mbh = vp8_loop_filter_mbh_neon; vp8_loop_filter_mbv = vp8_loop_filter_mbv_c; - if (flags & HAS_NEON) - vp8_loop_filter_mbv = vp8_loop_filter_mbv_neon; + if (flags & HAS_NEON) vp8_loop_filter_mbv = vp8_loop_filter_mbv_neon; vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_c; - if (flags & HAS_NEON) - vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_neon; + if (flags & HAS_NEON) vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_neon; vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_c; - if (flags & HAS_NEON) - vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_neon; + if (flags & HAS_NEON) vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_neon; vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_c; - if (flags & HAS_NEON) - vp8_loop_filter_simple_mbh = vp8_loop_filter_mbhs_neon; + if (flags & HAS_NEON) vp8_loop_filter_simple_mbh = vp8_loop_filter_mbhs_neon; vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_c; - if (flags & HAS_NEON) - vp8_loop_filter_simple_mbv = vp8_loop_filter_mbvs_neon; + if (flags & HAS_NEON) vp8_loop_filter_simple_mbv = vp8_loop_filter_mbvs_neon; vp8_short_fdct4x4 = vp8_short_fdct4x4_c; - if (flags & HAS_NEON) - vp8_short_fdct4x4 = vp8_short_fdct4x4_neon; + if (flags & HAS_NEON) vp8_short_fdct4x4 = vp8_short_fdct4x4_neon; vp8_short_fdct8x4 = vp8_short_fdct8x4_c; - if (flags & HAS_NEON) - vp8_short_fdct8x4 = vp8_short_fdct8x4_neon; + if (flags & HAS_NEON) vp8_short_fdct8x4 = vp8_short_fdct8x4_neon; vp8_short_idct4x4llm = vp8_short_idct4x4llm_c; - if (flags & HAS_NEON) - vp8_short_idct4x4llm = vp8_short_idct4x4llm_neon; + if (flags & HAS_NEON) vp8_short_idct4x4llm = vp8_short_idct4x4llm_neon; vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_c; - if (flags & HAS_NEON) - vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_neon; + if (flags & HAS_NEON) vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_neon; vp8_short_walsh4x4 = vp8_short_walsh4x4_c; - if (flags & HAS_NEON) - vp8_short_walsh4x4 = vp8_short_walsh4x4_neon; + if (flags & HAS_NEON) vp8_short_walsh4x4 = vp8_short_walsh4x4_neon; vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_c; - if (flags & HAS_NEON) - vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_neon; + if (flags & HAS_NEON) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_neon; vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_c; - if (flags & HAS_NEON) - vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_neon; + if (flags & HAS_NEON) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_neon; vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_c; - if (flags & HAS_NEON) - vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_neon; + if (flags & HAS_NEON) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_neon; vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_c; - if (flags & HAS_NEON) - vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_neon; + if (flags & HAS_NEON) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_neon; } #endif
diff --git a/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h index 28fa6b5..7b9b866 100644 --- a/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h
@@ -31,256 +31,152 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); #define vp9_block_error vp9_block_error_c -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); -int64_t vp9_block_error_fp_neon(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); -RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_neon(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); +RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); -int vp9_denoiser_filter_neon(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); +int vp9_denoiser_filter_neon(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); -RTCD_EXTERN int (*vp9_denoiser_filter)(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +RTCD_EXTERN int (*vp9_denoiser_filter)(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); #define vp9_diamond_search_sad vp9_diamond_search_sad_c -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_fdct8x8_quant_neon(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_fdct8x8_quant)(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_fdct8x8_quant_neon(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vp9_fdct8x8_quant)( + const int16_t *input, int stride, tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_c -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht4x4 vp9_fht4x4_c -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_c -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); -void vp9_iht16x16_256_add_neon(const tran_low_t* input, - uint8_t* output, - int pitch, - int tx_type); -RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_neon(const tran_low_t *input, uint8_t *output, + int pitch, int tx_type); +RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t *input, + uint8_t *output, int pitch, int tx_type); -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht4x4_16_add_neon(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t* input, - uint8_t* dest, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t *input, uint8_t *dest, + int stride, int tx_type); -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht8x8_64_add_neon(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t* input, - uint8_t* dest, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t *input, uint8_t *dest, + int stride, int tx_type); -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_quantize_fp)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vp9_quantize_fp)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_32x32_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_quantize_fp_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vp9_quantize_fp_32x32_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vp9_quantize_fp_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); -void vp9_scale_and_extend_frame_neon(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); +void vp9_scale_and_extend_frame_neon(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler); RTCD_EXTERN void (*vp9_scale_and_extend_frame)( - const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); + const struct yv12_buffer_config *src, struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); void vp9_rtcd(void); @@ -294,29 +190,21 @@ (void)flags; vp9_block_error_fp = vp9_block_error_fp_c; - if (flags & HAS_NEON) - vp9_block_error_fp = vp9_block_error_fp_neon; + if (flags & HAS_NEON) vp9_block_error_fp = vp9_block_error_fp_neon; vp9_denoiser_filter = vp9_denoiser_filter_c; - if (flags & HAS_NEON) - vp9_denoiser_filter = vp9_denoiser_filter_neon; + if (flags & HAS_NEON) vp9_denoiser_filter = vp9_denoiser_filter_neon; vp9_fdct8x8_quant = vp9_fdct8x8_quant_c; - if (flags & HAS_NEON) - vp9_fdct8x8_quant = vp9_fdct8x8_quant_neon; + if (flags & HAS_NEON) vp9_fdct8x8_quant = vp9_fdct8x8_quant_neon; vp9_iht16x16_256_add = vp9_iht16x16_256_add_c; - if (flags & HAS_NEON) - vp9_iht16x16_256_add = vp9_iht16x16_256_add_neon; + if (flags & HAS_NEON) vp9_iht16x16_256_add = vp9_iht16x16_256_add_neon; vp9_iht4x4_16_add = vp9_iht4x4_16_add_c; - if (flags & HAS_NEON) - vp9_iht4x4_16_add = vp9_iht4x4_16_add_neon; + if (flags & HAS_NEON) vp9_iht4x4_16_add = vp9_iht4x4_16_add_neon; vp9_iht8x8_64_add = vp9_iht8x8_64_add_c; - if (flags & HAS_NEON) - vp9_iht8x8_64_add = vp9_iht8x8_64_add_neon; + if (flags & HAS_NEON) vp9_iht8x8_64_add = vp9_iht8x8_64_add_neon; vp9_quantize_fp = vp9_quantize_fp_c; - if (flags & HAS_NEON) - vp9_quantize_fp = vp9_quantize_fp_neon; + if (flags & HAS_NEON) vp9_quantize_fp = vp9_quantize_fp_neon; vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_c; - if (flags & HAS_NEON) - vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_neon; + if (flags & HAS_NEON) vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_neon; vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c; if (flags & HAS_NEON) vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_neon;
diff --git a/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_dsp_rtcd.h index c518d2b..bec1b662 100644 --- a/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_dsp_rtcd.h
@@ -20,3201 +20,1954 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); -unsigned int vpx_avg_4x4_neon(const uint8_t*, int p); -RTCD_EXTERN unsigned int (*vpx_avg_4x4)(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); +unsigned int vpx_avg_4x4_neon(const uint8_t *, int p); +RTCD_EXTERN unsigned int (*vpx_avg_4x4)(const uint8_t *, int p); -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); -unsigned int vpx_avg_8x8_neon(const uint8_t*, int p); -RTCD_EXTERN unsigned int (*vpx_avg_8x8)(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); +unsigned int vpx_avg_8x8_neon(const uint8_t *, int p); +RTCD_EXTERN unsigned int (*vpx_avg_8x8)(const uint8_t *, int p); -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -void vpx_comp_avg_pred_neon(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -RTCD_EXTERN void (*vpx_comp_avg_pred)(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +void vpx_comp_avg_pred_neon(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +RTCD_EXTERN void (*vpx_comp_avg_pred)(uint8_t *comp_pred, const uint8_t *pred, + int width, int height, const uint8_t *ref, int ref_stride); -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_neon(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_horiz_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +void vpx_convolve8_avg_horiz_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_horiz_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_horiz_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_vert_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_vert_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_avg_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve_avg)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_avg_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +RTCD_EXTERN void (*vpx_convolve_avg)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_copy_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_copy_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve_copy)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve_copy)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d135_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d135_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d135_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d135_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d135_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d135_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d135_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d135_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_16x16 vpx_d153_predictor_16x16_c -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_32x32 vpx_d153_predictor_32x32_c -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_4x4 vpx_d153_predictor_4x4_c -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_8x8 vpx_d153_predictor_8x8_c -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_16x16 vpx_d207_predictor_16x16_c -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_32x32 vpx_d207_predictor_32x32_c -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_c -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_8x8 vpx_d207_predictor_8x8_c -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_16x16 vpx_d63_predictor_16x16_c -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_32x32 vpx_d63_predictor_32x32_c -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_4x4 vpx_d63_predictor_4x4_c -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_8x8 vpx_d63_predictor_8x8_c -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_16x16)(uint8_t* dst, +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_32x32)(uint8_t* dst, +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_neon(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct16x16)(const int16_t* input, - tran_low_t* output, +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_neon(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct16x16)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_1_neon(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct16x16_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_1_neon(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct16x16_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_neon(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct32x32)(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_neon(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct32x32)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_1_neon(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct32x32_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_1_neon(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct32x32_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_rd_neon(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_rd_neon(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_fdct32x32_rd)(const int16_t* input, - tran_low_t* output, +RTCD_EXTERN void (*vpx_fdct32x32_rd)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_neon(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct4x4)(const int16_t* input, - tran_low_t* output, +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_neon(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct4x4)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_1_neon(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct4x4_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_1_neon(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct4x4_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_neon(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct8x8)(const int16_t* input, - tran_low_t* output, +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_neon(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct8x8)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_1_neon(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct8x8_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_1_neon(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct8x8_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); -unsigned int vpx_get4x4sse_cs_neon(const unsigned char* src_ptr, +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); +unsigned int vpx_get4x4sse_cs_neon(const unsigned char *src_ptr, int source_stride, - const unsigned char* ref_ptr, + const unsigned char *ref_ptr, int ref_stride); -RTCD_EXTERN unsigned int (*vpx_get4x4sse_cs)(const unsigned char* src_ptr, +RTCD_EXTERN unsigned int (*vpx_get4x4sse_cs)(const unsigned char *src_ptr, int source_stride, - const unsigned char* ref_ptr, + const unsigned char *ref_ptr, int ref_stride); -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get8x8var_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -RTCD_EXTERN void (*vpx_get8x8var)(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); +void vpx_get8x8var_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +RTCD_EXTERN void (*vpx_get8x8var)(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); -unsigned int vpx_get_mb_ss_c(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); #define vpx_get_mb_ss vpx_get_mb_ss_c -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); -void vpx_hadamard_16x16_neon(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); +void vpx_hadamard_16x16_neon(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t *src_diff, + ptrdiff_t src_stride, int16_t *coeff); -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); -void vpx_hadamard_8x8_neon(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); +void vpx_hadamard_8x8_neon(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t *src_diff, + ptrdiff_t src_stride, int16_t *coeff); -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_10_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_10_add_neon(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_10_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct16x16_10_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_1_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_1_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct16x16_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_neon(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_256_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct16x16_256_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_38_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_38_add_neon(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_38_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct16x16_38_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_neon(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_1024_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct32x32_1024_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_neon(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_1_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_1_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct32x32_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_34_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_34_add_neon(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_16_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct4x4_16_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct4x4_16_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_1_add_neon(const tran_low_t* input, uint8_t* dest, int stride); -RTCD_EXTERN void (*vpx_idct4x4_1_add)(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); +RTCD_EXTERN void (*vpx_idct4x4_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_12_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_12_add_neon(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_1_add_neon(const tran_low_t* input, uint8_t* dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_1_add)(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); +RTCD_EXTERN void (*vpx_idct8x8_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_64_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_64_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct8x8_64_add)(const tran_low_t *input, uint8_t *dest, int stride); -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); -int16_t vpx_int_pro_col_neon(const uint8_t* ref, const int width); -RTCD_EXTERN int16_t (*vpx_int_pro_col)(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); +int16_t vpx_int_pro_col_neon(const uint8_t *ref, const int width); +RTCD_EXTERN int16_t (*vpx_int_pro_col)(const uint8_t *ref, const int width); -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); -void vpx_int_pro_row_neon(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); -RTCD_EXTERN void (*vpx_int_pro_row)(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); +void vpx_int_pro_row_neon(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); +RTCD_EXTERN void (*vpx_int_pro_row)(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_c -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_neon(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_4_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_4)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_4_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_4)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_4_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_horizontal_4_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_4_dual_neon( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_horizontal_4_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_8_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_8)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_8)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_8_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_horizontal_8_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_8_dual_neon( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_horizontal_8_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_16)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_16)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_16_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_16_dual)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_4_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_4)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_4_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_4)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_4_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_vertical_4_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_4_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_vertical_4_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_8_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_8)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_8)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_8_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_vertical_8_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_8_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_vertical_8_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -void vpx_mbpost_proc_across_ip_neon(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -RTCD_EXTERN void (*vpx_mbpost_proc_across_ip)(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +void vpx_mbpost_proc_across_ip_neon(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +RTCD_EXTERN void (*vpx_mbpost_proc_across_ip)(unsigned char *dst, int pitch, + int rows, int cols, int flimit); -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); -void vpx_mbpost_proc_down_neon(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -RTCD_EXTERN void (*vpx_mbpost_proc_down)(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_down_neon(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +RTCD_EXTERN void (*vpx_mbpost_proc_down)(unsigned char *dst, int pitch, + int rows, int cols, int flimit); -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -void vpx_minmax_8x8_neon(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -RTCD_EXTERN void (*vpx_minmax_8x8)(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +void vpx_minmax_8x8_neon(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +RTCD_EXTERN void (*vpx_minmax_8x8)(const uint8_t *s, int p, const uint8_t *d, + int dp, int *min, int *max); -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t* src_ptr, +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x8 vpx_mse16x8_c -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x16 vpx_mse8x16_c -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x8 vpx_mse8x8_c -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); #define vpx_plane_add_noise vpx_plane_add_noise_c -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); -void vpx_post_proc_down_and_across_mb_row_neon(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); +void vpx_post_proc_down_and_across_mb_row_neon(unsigned char *src, + unsigned char *dst, + int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); -RTCD_EXTERN void (*vpx_post_proc_down_and_across_mb_row)(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); +RTCD_EXTERN void (*vpx_post_proc_down_and_across_mb_row)( + unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad16x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad16x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad16x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad16x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x3 vpx_sad16x16x3_c -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x8 vpx_sad16x16x8_c -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad16x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad16x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad16x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad16x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad16x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad16x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x3 vpx_sad16x8x3_c -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x8 vpx_sad16x8x8_c -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x16x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x16x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x64x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x64x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x64x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x64x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x4_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad4x4)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x4_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad4x4)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x4_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad4x4_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x4_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad4x4_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x3 vpx_sad4x4x3_c -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x8 vpx_sad4x4x8_c -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad4x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad4x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad4x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad4x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad64x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad64x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad8x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad8x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad8x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad8x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x3 vpx_sad8x16x3_c -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x8 vpx_sad8x16x8_c -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x4_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad8x4)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x4_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad8x4)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x4_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad8x4_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x4_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad8x4_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x4x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x4x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad8x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad8x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x3 vpx_sad8x8x3_c -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x8 vpx_sad8x8x8_c -int vpx_satd_c(const int16_t* coeff, int length); -int vpx_satd_neon(const int16_t* coeff, int length); -RTCD_EXTERN int (*vpx_satd)(const int16_t* coeff, int length); +int vpx_satd_c(const int16_t *coeff, int length); +int vpx_satd_neon(const int16_t *coeff, int length); +RTCD_EXTERN int (*vpx_satd)(const int16_t *coeff, int length); -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_scaled_2d_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_2d_neon(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -void vpx_subtract_block_neon(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_neon(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -RTCD_EXTERN void (*vpx_subtract_block)(int rows, - int cols, - int16_t* diff_ptr, +RTCD_EXTERN void (*vpx_subtract_block)(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, - const uint8_t* src_ptr, + const uint8_t *src_ptr, ptrdiff_t src_stride, - const uint8_t* pred_ptr, + const uint8_t *pred_ptr, ptrdiff_t pred_stride); -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t* src_ptr, +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x32)(const uint8_t* src_ptr, +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x8)(const uint8_t* src_ptr, +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t* src_ptr, +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t* src_ptr, +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x64)(const uint8_t* src_ptr, +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance4x4)(const uint8_t* src_ptr, +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x4_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance4x4)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance4x8)(const uint8_t* src_ptr, +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance4x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t* src_ptr, +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t* src_ptr, +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance8x16)(const uint8_t* src_ptr, +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance8x4)(const uint8_t* src_ptr, +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x4_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance8x4)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance8x8)(const uint8_t* src_ptr, +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); -int vpx_vector_var_neon(const int16_t* ref, const int16_t* src, const int bwl); -RTCD_EXTERN int (*vpx_vector_var)(const int16_t* ref, - const int16_t* src, +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); +int vpx_vector_var_neon(const int16_t *ref, const int16_t *src, const int bwl); +RTCD_EXTERN int (*vpx_vector_var)(const int16_t *ref, const int16_t *src, const int bwl); void vpx_dsp_rtcd(void); @@ -3229,38 +1982,27 @@ (void)flags; vpx_avg_4x4 = vpx_avg_4x4_c; - if (flags & HAS_NEON) - vpx_avg_4x4 = vpx_avg_4x4_neon; + if (flags & HAS_NEON) vpx_avg_4x4 = vpx_avg_4x4_neon; vpx_avg_8x8 = vpx_avg_8x8_c; - if (flags & HAS_NEON) - vpx_avg_8x8 = vpx_avg_8x8_neon; + if (flags & HAS_NEON) vpx_avg_8x8 = vpx_avg_8x8_neon; vpx_comp_avg_pred = vpx_comp_avg_pred_c; - if (flags & HAS_NEON) - vpx_comp_avg_pred = vpx_comp_avg_pred_neon; + if (flags & HAS_NEON) vpx_comp_avg_pred = vpx_comp_avg_pred_neon; vpx_convolve8 = vpx_convolve8_c; - if (flags & HAS_NEON) - vpx_convolve8 = vpx_convolve8_neon; + if (flags & HAS_NEON) vpx_convolve8 = vpx_convolve8_neon; vpx_convolve8_avg = vpx_convolve8_avg_c; - if (flags & HAS_NEON) - vpx_convolve8_avg = vpx_convolve8_avg_neon; + if (flags & HAS_NEON) vpx_convolve8_avg = vpx_convolve8_avg_neon; vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_c; - if (flags & HAS_NEON) - vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_neon; + if (flags & HAS_NEON) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_neon; vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_c; - if (flags & HAS_NEON) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_neon; + if (flags & HAS_NEON) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_neon; vpx_convolve8_horiz = vpx_convolve8_horiz_c; - if (flags & HAS_NEON) - vpx_convolve8_horiz = vpx_convolve8_horiz_neon; + if (flags & HAS_NEON) vpx_convolve8_horiz = vpx_convolve8_horiz_neon; vpx_convolve8_vert = vpx_convolve8_vert_c; - if (flags & HAS_NEON) - vpx_convolve8_vert = vpx_convolve8_vert_neon; + if (flags & HAS_NEON) vpx_convolve8_vert = vpx_convolve8_vert_neon; vpx_convolve_avg = vpx_convolve_avg_c; - if (flags & HAS_NEON) - vpx_convolve_avg = vpx_convolve_avg_neon; + if (flags & HAS_NEON) vpx_convolve_avg = vpx_convolve_avg_neon; vpx_convolve_copy = vpx_convolve_copy_c; - if (flags & HAS_NEON) - vpx_convolve_copy = vpx_convolve_copy_neon; + if (flags & HAS_NEON) vpx_convolve_copy = vpx_convolve_copy_neon; vpx_d135_predictor_16x16 = vpx_d135_predictor_16x16_c; if (flags & HAS_NEON) vpx_d135_predictor_16x16 = vpx_d135_predictor_16x16_neon; @@ -3268,23 +2010,17 @@ if (flags & HAS_NEON) vpx_d135_predictor_32x32 = vpx_d135_predictor_32x32_neon; vpx_d135_predictor_4x4 = vpx_d135_predictor_4x4_c; - if (flags & HAS_NEON) - vpx_d135_predictor_4x4 = vpx_d135_predictor_4x4_neon; + if (flags & HAS_NEON) vpx_d135_predictor_4x4 = vpx_d135_predictor_4x4_neon; vpx_d135_predictor_8x8 = vpx_d135_predictor_8x8_c; - if (flags & HAS_NEON) - vpx_d135_predictor_8x8 = vpx_d135_predictor_8x8_neon; + if (flags & HAS_NEON) vpx_d135_predictor_8x8 = vpx_d135_predictor_8x8_neon; vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_c; - if (flags & HAS_NEON) - vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_neon; + if (flags & HAS_NEON) vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_neon; vpx_d45_predictor_32x32 = vpx_d45_predictor_32x32_c; - if (flags & HAS_NEON) - vpx_d45_predictor_32x32 = vpx_d45_predictor_32x32_neon; + if (flags & HAS_NEON) vpx_d45_predictor_32x32 = vpx_d45_predictor_32x32_neon; vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_c; - if (flags & HAS_NEON) - vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_neon; + if (flags & HAS_NEON) vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_neon; vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_c; - if (flags & HAS_NEON) - vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_neon; + if (flags & HAS_NEON) vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_neon; vpx_dc_128_predictor_16x16 = vpx_dc_128_predictor_16x16_c; if (flags & HAS_NEON) vpx_dc_128_predictor_16x16 = vpx_dc_128_predictor_16x16_neon; @@ -3310,17 +2046,13 @@ if (flags & HAS_NEON) vpx_dc_left_predictor_8x8 = vpx_dc_left_predictor_8x8_neon; vpx_dc_predictor_16x16 = vpx_dc_predictor_16x16_c; - if (flags & HAS_NEON) - vpx_dc_predictor_16x16 = vpx_dc_predictor_16x16_neon; + if (flags & HAS_NEON) vpx_dc_predictor_16x16 = vpx_dc_predictor_16x16_neon; vpx_dc_predictor_32x32 = vpx_dc_predictor_32x32_c; - if (flags & HAS_NEON) - vpx_dc_predictor_32x32 = vpx_dc_predictor_32x32_neon; + if (flags & HAS_NEON) vpx_dc_predictor_32x32 = vpx_dc_predictor_32x32_neon; vpx_dc_predictor_4x4 = vpx_dc_predictor_4x4_c; - if (flags & HAS_NEON) - vpx_dc_predictor_4x4 = vpx_dc_predictor_4x4_neon; + if (flags & HAS_NEON) vpx_dc_predictor_4x4 = vpx_dc_predictor_4x4_neon; vpx_dc_predictor_8x8 = vpx_dc_predictor_8x8_c; - if (flags & HAS_NEON) - vpx_dc_predictor_8x8 = vpx_dc_predictor_8x8_neon; + if (flags & HAS_NEON) vpx_dc_predictor_8x8 = vpx_dc_predictor_8x8_neon; vpx_dc_top_predictor_16x16 = vpx_dc_top_predictor_16x16_c; if (flags & HAS_NEON) vpx_dc_top_predictor_16x16 = vpx_dc_top_predictor_16x16_neon; @@ -3334,285 +2066,198 @@ if (flags & HAS_NEON) vpx_dc_top_predictor_8x8 = vpx_dc_top_predictor_8x8_neon; vpx_fdct16x16 = vpx_fdct16x16_c; - if (flags & HAS_NEON) - vpx_fdct16x16 = vpx_fdct16x16_neon; + if (flags & HAS_NEON) vpx_fdct16x16 = vpx_fdct16x16_neon; vpx_fdct16x16_1 = vpx_fdct16x16_1_c; - if (flags & HAS_NEON) - vpx_fdct16x16_1 = vpx_fdct16x16_1_neon; + if (flags & HAS_NEON) vpx_fdct16x16_1 = vpx_fdct16x16_1_neon; vpx_fdct32x32 = vpx_fdct32x32_c; - if (flags & HAS_NEON) - vpx_fdct32x32 = vpx_fdct32x32_neon; + if (flags & HAS_NEON) vpx_fdct32x32 = vpx_fdct32x32_neon; vpx_fdct32x32_1 = vpx_fdct32x32_1_c; - if (flags & HAS_NEON) - vpx_fdct32x32_1 = vpx_fdct32x32_1_neon; + if (flags & HAS_NEON) vpx_fdct32x32_1 = vpx_fdct32x32_1_neon; vpx_fdct32x32_rd = vpx_fdct32x32_rd_c; - if (flags & HAS_NEON) - vpx_fdct32x32_rd = vpx_fdct32x32_rd_neon; + if (flags & HAS_NEON) vpx_fdct32x32_rd = vpx_fdct32x32_rd_neon; vpx_fdct4x4 = vpx_fdct4x4_c; - if (flags & HAS_NEON) - vpx_fdct4x4 = vpx_fdct4x4_neon; + if (flags & HAS_NEON) vpx_fdct4x4 = vpx_fdct4x4_neon; vpx_fdct4x4_1 = vpx_fdct4x4_1_c; - if (flags & HAS_NEON) - vpx_fdct4x4_1 = vpx_fdct4x4_1_neon; + if (flags & HAS_NEON) vpx_fdct4x4_1 = vpx_fdct4x4_1_neon; vpx_fdct8x8 = vpx_fdct8x8_c; - if (flags & HAS_NEON) - vpx_fdct8x8 = vpx_fdct8x8_neon; + if (flags & HAS_NEON) vpx_fdct8x8 = vpx_fdct8x8_neon; vpx_fdct8x8_1 = vpx_fdct8x8_1_c; - if (flags & HAS_NEON) - vpx_fdct8x8_1 = vpx_fdct8x8_1_neon; + if (flags & HAS_NEON) vpx_fdct8x8_1 = vpx_fdct8x8_1_neon; vpx_get16x16var = vpx_get16x16var_c; - if (flags & HAS_NEON) - vpx_get16x16var = vpx_get16x16var_neon; + if (flags & HAS_NEON) vpx_get16x16var = vpx_get16x16var_neon; vpx_get4x4sse_cs = vpx_get4x4sse_cs_c; - if (flags & HAS_NEON) - vpx_get4x4sse_cs = vpx_get4x4sse_cs_neon; + if (flags & HAS_NEON) vpx_get4x4sse_cs = vpx_get4x4sse_cs_neon; vpx_get8x8var = vpx_get8x8var_c; - if (flags & HAS_NEON) - vpx_get8x8var = vpx_get8x8var_neon; + if (flags & HAS_NEON) vpx_get8x8var = vpx_get8x8var_neon; vpx_h_predictor_16x16 = vpx_h_predictor_16x16_c; - if (flags & HAS_NEON) - vpx_h_predictor_16x16 = vpx_h_predictor_16x16_neon; + if (flags & HAS_NEON) vpx_h_predictor_16x16 = vpx_h_predictor_16x16_neon; vpx_h_predictor_32x32 = vpx_h_predictor_32x32_c; - if (flags & HAS_NEON) - vpx_h_predictor_32x32 = vpx_h_predictor_32x32_neon; + if (flags & HAS_NEON) vpx_h_predictor_32x32 = vpx_h_predictor_32x32_neon; vpx_h_predictor_4x4 = vpx_h_predictor_4x4_c; - if (flags & HAS_NEON) - vpx_h_predictor_4x4 = vpx_h_predictor_4x4_neon; + if (flags & HAS_NEON) vpx_h_predictor_4x4 = vpx_h_predictor_4x4_neon; vpx_h_predictor_8x8 = vpx_h_predictor_8x8_c; - if (flags & HAS_NEON) - vpx_h_predictor_8x8 = vpx_h_predictor_8x8_neon; + if (flags & HAS_NEON) vpx_h_predictor_8x8 = vpx_h_predictor_8x8_neon; vpx_hadamard_16x16 = vpx_hadamard_16x16_c; - if (flags & HAS_NEON) - vpx_hadamard_16x16 = vpx_hadamard_16x16_neon; + if (flags & HAS_NEON) vpx_hadamard_16x16 = vpx_hadamard_16x16_neon; vpx_hadamard_8x8 = vpx_hadamard_8x8_c; - if (flags & HAS_NEON) - vpx_hadamard_8x8 = vpx_hadamard_8x8_neon; + if (flags & HAS_NEON) vpx_hadamard_8x8 = vpx_hadamard_8x8_neon; vpx_idct16x16_10_add = vpx_idct16x16_10_add_c; - if (flags & HAS_NEON) - vpx_idct16x16_10_add = vpx_idct16x16_10_add_neon; + if (flags & HAS_NEON) vpx_idct16x16_10_add = vpx_idct16x16_10_add_neon; vpx_idct16x16_1_add = vpx_idct16x16_1_add_c; - if (flags & HAS_NEON) - vpx_idct16x16_1_add = vpx_idct16x16_1_add_neon; + if (flags & HAS_NEON) vpx_idct16x16_1_add = vpx_idct16x16_1_add_neon; vpx_idct16x16_256_add = vpx_idct16x16_256_add_c; - if (flags & HAS_NEON) - vpx_idct16x16_256_add = vpx_idct16x16_256_add_neon; + if (flags & HAS_NEON) vpx_idct16x16_256_add = vpx_idct16x16_256_add_neon; vpx_idct16x16_38_add = vpx_idct16x16_38_add_c; - if (flags & HAS_NEON) - vpx_idct16x16_38_add = vpx_idct16x16_38_add_neon; + if (flags & HAS_NEON) vpx_idct16x16_38_add = vpx_idct16x16_38_add_neon; vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_c; - if (flags & HAS_NEON) - vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_neon; + if (flags & HAS_NEON) vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_neon; vpx_idct32x32_135_add = vpx_idct32x32_135_add_c; - if (flags & HAS_NEON) - vpx_idct32x32_135_add = vpx_idct32x32_135_add_neon; + if (flags & HAS_NEON) vpx_idct32x32_135_add = vpx_idct32x32_135_add_neon; vpx_idct32x32_1_add = vpx_idct32x32_1_add_c; - if (flags & HAS_NEON) - vpx_idct32x32_1_add = vpx_idct32x32_1_add_neon; + if (flags & HAS_NEON) vpx_idct32x32_1_add = vpx_idct32x32_1_add_neon; vpx_idct32x32_34_add = vpx_idct32x32_34_add_c; - if (flags & HAS_NEON) - vpx_idct32x32_34_add = vpx_idct32x32_34_add_neon; + if (flags & HAS_NEON) vpx_idct32x32_34_add = vpx_idct32x32_34_add_neon; vpx_idct4x4_16_add = vpx_idct4x4_16_add_c; - if (flags & HAS_NEON) - vpx_idct4x4_16_add = vpx_idct4x4_16_add_neon; + if (flags & HAS_NEON) vpx_idct4x4_16_add = vpx_idct4x4_16_add_neon; vpx_idct4x4_1_add = vpx_idct4x4_1_add_c; - if (flags & HAS_NEON) - vpx_idct4x4_1_add = vpx_idct4x4_1_add_neon; + if (flags & HAS_NEON) vpx_idct4x4_1_add = vpx_idct4x4_1_add_neon; vpx_idct8x8_12_add = vpx_idct8x8_12_add_c; - if (flags & HAS_NEON) - vpx_idct8x8_12_add = vpx_idct8x8_12_add_neon; + if (flags & HAS_NEON) vpx_idct8x8_12_add = vpx_idct8x8_12_add_neon; vpx_idct8x8_1_add = vpx_idct8x8_1_add_c; - if (flags & HAS_NEON) - vpx_idct8x8_1_add = vpx_idct8x8_1_add_neon; + if (flags & HAS_NEON) vpx_idct8x8_1_add = vpx_idct8x8_1_add_neon; vpx_idct8x8_64_add = vpx_idct8x8_64_add_c; - if (flags & HAS_NEON) - vpx_idct8x8_64_add = vpx_idct8x8_64_add_neon; + if (flags & HAS_NEON) vpx_idct8x8_64_add = vpx_idct8x8_64_add_neon; vpx_int_pro_col = vpx_int_pro_col_c; - if (flags & HAS_NEON) - vpx_int_pro_col = vpx_int_pro_col_neon; + if (flags & HAS_NEON) vpx_int_pro_col = vpx_int_pro_col_neon; vpx_int_pro_row = vpx_int_pro_row_c; - if (flags & HAS_NEON) - vpx_int_pro_row = vpx_int_pro_row_neon; + if (flags & HAS_NEON) vpx_int_pro_row = vpx_int_pro_row_neon; vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_c; - if (flags & HAS_NEON) - vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_neon; + if (flags & HAS_NEON) vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_neon; vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_c; if (flags & HAS_NEON) vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_neon; vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_c; - if (flags & HAS_NEON) - vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_neon; + if (flags & HAS_NEON) vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_neon; vpx_lpf_horizontal_4_dual = vpx_lpf_horizontal_4_dual_c; if (flags & HAS_NEON) vpx_lpf_horizontal_4_dual = vpx_lpf_horizontal_4_dual_neon; vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_c; - if (flags & HAS_NEON) - vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_neon; + if (flags & HAS_NEON) vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_neon; vpx_lpf_horizontal_8_dual = vpx_lpf_horizontal_8_dual_c; if (flags & HAS_NEON) vpx_lpf_horizontal_8_dual = vpx_lpf_horizontal_8_dual_neon; vpx_lpf_vertical_16 = vpx_lpf_vertical_16_c; - if (flags & HAS_NEON) - vpx_lpf_vertical_16 = vpx_lpf_vertical_16_neon; + if (flags & HAS_NEON) vpx_lpf_vertical_16 = vpx_lpf_vertical_16_neon; vpx_lpf_vertical_16_dual = vpx_lpf_vertical_16_dual_c; if (flags & HAS_NEON) vpx_lpf_vertical_16_dual = vpx_lpf_vertical_16_dual_neon; vpx_lpf_vertical_4 = vpx_lpf_vertical_4_c; - if (flags & HAS_NEON) - vpx_lpf_vertical_4 = vpx_lpf_vertical_4_neon; + if (flags & HAS_NEON) vpx_lpf_vertical_4 = vpx_lpf_vertical_4_neon; vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_c; - if (flags & HAS_NEON) - vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_neon; + if (flags & HAS_NEON) vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_neon; vpx_lpf_vertical_8 = vpx_lpf_vertical_8_c; - if (flags & HAS_NEON) - vpx_lpf_vertical_8 = vpx_lpf_vertical_8_neon; + if (flags & HAS_NEON) vpx_lpf_vertical_8 = vpx_lpf_vertical_8_neon; vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_c; - if (flags & HAS_NEON) - vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_neon; + if (flags & HAS_NEON) vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_neon; vpx_mbpost_proc_across_ip = vpx_mbpost_proc_across_ip_c; if (flags & HAS_NEON) vpx_mbpost_proc_across_ip = vpx_mbpost_proc_across_ip_neon; vpx_mbpost_proc_down = vpx_mbpost_proc_down_c; - if (flags & HAS_NEON) - vpx_mbpost_proc_down = vpx_mbpost_proc_down_neon; + if (flags & HAS_NEON) vpx_mbpost_proc_down = vpx_mbpost_proc_down_neon; vpx_minmax_8x8 = vpx_minmax_8x8_c; - if (flags & HAS_NEON) - vpx_minmax_8x8 = vpx_minmax_8x8_neon; + if (flags & HAS_NEON) vpx_minmax_8x8 = vpx_minmax_8x8_neon; vpx_mse16x16 = vpx_mse16x16_c; - if (flags & HAS_NEON) - vpx_mse16x16 = vpx_mse16x16_neon; + if (flags & HAS_NEON) vpx_mse16x16 = vpx_mse16x16_neon; vpx_post_proc_down_and_across_mb_row = vpx_post_proc_down_and_across_mb_row_c; if (flags & HAS_NEON) vpx_post_proc_down_and_across_mb_row = vpx_post_proc_down_and_across_mb_row_neon; vpx_quantize_b = vpx_quantize_b_c; - if (flags & HAS_NEON) - vpx_quantize_b = vpx_quantize_b_neon; + if (flags & HAS_NEON) vpx_quantize_b = vpx_quantize_b_neon; vpx_quantize_b_32x32 = vpx_quantize_b_32x32_c; - if (flags & HAS_NEON) - vpx_quantize_b_32x32 = vpx_quantize_b_32x32_neon; + if (flags & HAS_NEON) vpx_quantize_b_32x32 = vpx_quantize_b_32x32_neon; vpx_sad16x16 = vpx_sad16x16_c; - if (flags & HAS_NEON) - vpx_sad16x16 = vpx_sad16x16_neon; + if (flags & HAS_NEON) vpx_sad16x16 = vpx_sad16x16_neon; vpx_sad16x16_avg = vpx_sad16x16_avg_c; - if (flags & HAS_NEON) - vpx_sad16x16_avg = vpx_sad16x16_avg_neon; + if (flags & HAS_NEON) vpx_sad16x16_avg = vpx_sad16x16_avg_neon; vpx_sad16x16x4d = vpx_sad16x16x4d_c; - if (flags & HAS_NEON) - vpx_sad16x16x4d = vpx_sad16x16x4d_neon; + if (flags & HAS_NEON) vpx_sad16x16x4d = vpx_sad16x16x4d_neon; vpx_sad16x32 = vpx_sad16x32_c; - if (flags & HAS_NEON) - vpx_sad16x32 = vpx_sad16x32_neon; + if (flags & HAS_NEON) vpx_sad16x32 = vpx_sad16x32_neon; vpx_sad16x32_avg = vpx_sad16x32_avg_c; - if (flags & HAS_NEON) - vpx_sad16x32_avg = vpx_sad16x32_avg_neon; + if (flags & HAS_NEON) vpx_sad16x32_avg = vpx_sad16x32_avg_neon; vpx_sad16x32x4d = vpx_sad16x32x4d_c; - if (flags & HAS_NEON) - vpx_sad16x32x4d = vpx_sad16x32x4d_neon; + if (flags & HAS_NEON) vpx_sad16x32x4d = vpx_sad16x32x4d_neon; vpx_sad16x8 = vpx_sad16x8_c; - if (flags & HAS_NEON) - vpx_sad16x8 = vpx_sad16x8_neon; + if (flags & HAS_NEON) vpx_sad16x8 = vpx_sad16x8_neon; vpx_sad16x8_avg = vpx_sad16x8_avg_c; - if (flags & HAS_NEON) - vpx_sad16x8_avg = vpx_sad16x8_avg_neon; + if (flags & HAS_NEON) vpx_sad16x8_avg = vpx_sad16x8_avg_neon; vpx_sad16x8x4d = vpx_sad16x8x4d_c; - if (flags & HAS_NEON) - vpx_sad16x8x4d = vpx_sad16x8x4d_neon; + if (flags & HAS_NEON) vpx_sad16x8x4d = vpx_sad16x8x4d_neon; vpx_sad32x16 = vpx_sad32x16_c; - if (flags & HAS_NEON) - vpx_sad32x16 = vpx_sad32x16_neon; + if (flags & HAS_NEON) vpx_sad32x16 = vpx_sad32x16_neon; vpx_sad32x16_avg = vpx_sad32x16_avg_c; - if (flags & HAS_NEON) - vpx_sad32x16_avg = vpx_sad32x16_avg_neon; + if (flags & HAS_NEON) vpx_sad32x16_avg = vpx_sad32x16_avg_neon; vpx_sad32x16x4d = vpx_sad32x16x4d_c; - if (flags & HAS_NEON) - vpx_sad32x16x4d = vpx_sad32x16x4d_neon; + if (flags & HAS_NEON) vpx_sad32x16x4d = vpx_sad32x16x4d_neon; vpx_sad32x32 = vpx_sad32x32_c; - if (flags & HAS_NEON) - vpx_sad32x32 = vpx_sad32x32_neon; + if (flags & HAS_NEON) vpx_sad32x32 = vpx_sad32x32_neon; vpx_sad32x32_avg = vpx_sad32x32_avg_c; - if (flags & HAS_NEON) - vpx_sad32x32_avg = vpx_sad32x32_avg_neon; + if (flags & HAS_NEON) vpx_sad32x32_avg = vpx_sad32x32_avg_neon; vpx_sad32x32x4d = vpx_sad32x32x4d_c; - if (flags & HAS_NEON) - vpx_sad32x32x4d = vpx_sad32x32x4d_neon; + if (flags & HAS_NEON) vpx_sad32x32x4d = vpx_sad32x32x4d_neon; vpx_sad32x64 = vpx_sad32x64_c; - if (flags & HAS_NEON) - vpx_sad32x64 = vpx_sad32x64_neon; + if (flags & HAS_NEON) vpx_sad32x64 = vpx_sad32x64_neon; vpx_sad32x64_avg = vpx_sad32x64_avg_c; - if (flags & HAS_NEON) - vpx_sad32x64_avg = vpx_sad32x64_avg_neon; + if (flags & HAS_NEON) vpx_sad32x64_avg = vpx_sad32x64_avg_neon; vpx_sad32x64x4d = vpx_sad32x64x4d_c; - if (flags & HAS_NEON) - vpx_sad32x64x4d = vpx_sad32x64x4d_neon; + if (flags & HAS_NEON) vpx_sad32x64x4d = vpx_sad32x64x4d_neon; vpx_sad4x4 = vpx_sad4x4_c; - if (flags & HAS_NEON) - vpx_sad4x4 = vpx_sad4x4_neon; + if (flags & HAS_NEON) vpx_sad4x4 = vpx_sad4x4_neon; vpx_sad4x4_avg = vpx_sad4x4_avg_c; - if (flags & HAS_NEON) - vpx_sad4x4_avg = vpx_sad4x4_avg_neon; + if (flags & HAS_NEON) vpx_sad4x4_avg = vpx_sad4x4_avg_neon; vpx_sad4x4x4d = vpx_sad4x4x4d_c; - if (flags & HAS_NEON) - vpx_sad4x4x4d = vpx_sad4x4x4d_neon; + if (flags & HAS_NEON) vpx_sad4x4x4d = vpx_sad4x4x4d_neon; vpx_sad4x8 = vpx_sad4x8_c; - if (flags & HAS_NEON) - vpx_sad4x8 = vpx_sad4x8_neon; + if (flags & HAS_NEON) vpx_sad4x8 = vpx_sad4x8_neon; vpx_sad4x8_avg = vpx_sad4x8_avg_c; - if (flags & HAS_NEON) - vpx_sad4x8_avg = vpx_sad4x8_avg_neon; + if (flags & HAS_NEON) vpx_sad4x8_avg = vpx_sad4x8_avg_neon; vpx_sad4x8x4d = vpx_sad4x8x4d_c; - if (flags & HAS_NEON) - vpx_sad4x8x4d = vpx_sad4x8x4d_neon; + if (flags & HAS_NEON) vpx_sad4x8x4d = vpx_sad4x8x4d_neon; vpx_sad64x32 = vpx_sad64x32_c; - if (flags & HAS_NEON) - vpx_sad64x32 = vpx_sad64x32_neon; + if (flags & HAS_NEON) vpx_sad64x32 = vpx_sad64x32_neon; vpx_sad64x32_avg = vpx_sad64x32_avg_c; - if (flags & HAS_NEON) - vpx_sad64x32_avg = vpx_sad64x32_avg_neon; + if (flags & HAS_NEON) vpx_sad64x32_avg = vpx_sad64x32_avg_neon; vpx_sad64x32x4d = vpx_sad64x32x4d_c; - if (flags & HAS_NEON) - vpx_sad64x32x4d = vpx_sad64x32x4d_neon; + if (flags & HAS_NEON) vpx_sad64x32x4d = vpx_sad64x32x4d_neon; vpx_sad64x64 = vpx_sad64x64_c; - if (flags & HAS_NEON) - vpx_sad64x64 = vpx_sad64x64_neon; + if (flags & HAS_NEON) vpx_sad64x64 = vpx_sad64x64_neon; vpx_sad64x64_avg = vpx_sad64x64_avg_c; - if (flags & HAS_NEON) - vpx_sad64x64_avg = vpx_sad64x64_avg_neon; + if (flags & HAS_NEON) vpx_sad64x64_avg = vpx_sad64x64_avg_neon; vpx_sad64x64x4d = vpx_sad64x64x4d_c; - if (flags & HAS_NEON) - vpx_sad64x64x4d = vpx_sad64x64x4d_neon; + if (flags & HAS_NEON) vpx_sad64x64x4d = vpx_sad64x64x4d_neon; vpx_sad8x16 = vpx_sad8x16_c; - if (flags & HAS_NEON) - vpx_sad8x16 = vpx_sad8x16_neon; + if (flags & HAS_NEON) vpx_sad8x16 = vpx_sad8x16_neon; vpx_sad8x16_avg = vpx_sad8x16_avg_c; - if (flags & HAS_NEON) - vpx_sad8x16_avg = vpx_sad8x16_avg_neon; + if (flags & HAS_NEON) vpx_sad8x16_avg = vpx_sad8x16_avg_neon; vpx_sad8x16x4d = vpx_sad8x16x4d_c; - if (flags & HAS_NEON) - vpx_sad8x16x4d = vpx_sad8x16x4d_neon; + if (flags & HAS_NEON) vpx_sad8x16x4d = vpx_sad8x16x4d_neon; vpx_sad8x4 = vpx_sad8x4_c; - if (flags & HAS_NEON) - vpx_sad8x4 = vpx_sad8x4_neon; + if (flags & HAS_NEON) vpx_sad8x4 = vpx_sad8x4_neon; vpx_sad8x4_avg = vpx_sad8x4_avg_c; - if (flags & HAS_NEON) - vpx_sad8x4_avg = vpx_sad8x4_avg_neon; + if (flags & HAS_NEON) vpx_sad8x4_avg = vpx_sad8x4_avg_neon; vpx_sad8x4x4d = vpx_sad8x4x4d_c; - if (flags & HAS_NEON) - vpx_sad8x4x4d = vpx_sad8x4x4d_neon; + if (flags & HAS_NEON) vpx_sad8x4x4d = vpx_sad8x4x4d_neon; vpx_sad8x8 = vpx_sad8x8_c; - if (flags & HAS_NEON) - vpx_sad8x8 = vpx_sad8x8_neon; + if (flags & HAS_NEON) vpx_sad8x8 = vpx_sad8x8_neon; vpx_sad8x8_avg = vpx_sad8x8_avg_c; - if (flags & HAS_NEON) - vpx_sad8x8_avg = vpx_sad8x8_avg_neon; + if (flags & HAS_NEON) vpx_sad8x8_avg = vpx_sad8x8_avg_neon; vpx_sad8x8x4d = vpx_sad8x8x4d_c; - if (flags & HAS_NEON) - vpx_sad8x8x4d = vpx_sad8x8x4d_neon; + if (flags & HAS_NEON) vpx_sad8x8x4d = vpx_sad8x8x4d_neon; vpx_satd = vpx_satd_c; - if (flags & HAS_NEON) - vpx_satd = vpx_satd_neon; + if (flags & HAS_NEON) vpx_satd = vpx_satd_neon; vpx_scaled_2d = vpx_scaled_2d_c; - if (flags & HAS_NEON) - vpx_scaled_2d = vpx_scaled_2d_neon; + if (flags & HAS_NEON) vpx_scaled_2d = vpx_scaled_2d_neon; vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_c; if (flags & HAS_NEON) vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_neon; @@ -3692,74 +2337,51 @@ if (flags & HAS_NEON) vpx_sub_pixel_variance8x8 = vpx_sub_pixel_variance8x8_neon; vpx_subtract_block = vpx_subtract_block_c; - if (flags & HAS_NEON) - vpx_subtract_block = vpx_subtract_block_neon; + if (flags & HAS_NEON) vpx_subtract_block = vpx_subtract_block_neon; vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_c; - if (flags & HAS_NEON) - vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_neon; + if (flags & HAS_NEON) vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_neon; vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_c; - if (flags & HAS_NEON) - vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_neon; + if (flags & HAS_NEON) vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_neon; vpx_tm_predictor_4x4 = vpx_tm_predictor_4x4_c; - if (flags & HAS_NEON) - vpx_tm_predictor_4x4 = vpx_tm_predictor_4x4_neon; + if (flags & HAS_NEON) vpx_tm_predictor_4x4 = vpx_tm_predictor_4x4_neon; vpx_tm_predictor_8x8 = vpx_tm_predictor_8x8_c; - if (flags & HAS_NEON) - vpx_tm_predictor_8x8 = vpx_tm_predictor_8x8_neon; + if (flags & HAS_NEON) vpx_tm_predictor_8x8 = vpx_tm_predictor_8x8_neon; vpx_v_predictor_16x16 = vpx_v_predictor_16x16_c; - if (flags & HAS_NEON) - vpx_v_predictor_16x16 = vpx_v_predictor_16x16_neon; + if (flags & HAS_NEON) vpx_v_predictor_16x16 = vpx_v_predictor_16x16_neon; vpx_v_predictor_32x32 = vpx_v_predictor_32x32_c; - if (flags & HAS_NEON) - vpx_v_predictor_32x32 = vpx_v_predictor_32x32_neon; + if (flags & HAS_NEON) vpx_v_predictor_32x32 = vpx_v_predictor_32x32_neon; vpx_v_predictor_4x4 = vpx_v_predictor_4x4_c; - if (flags & HAS_NEON) - vpx_v_predictor_4x4 = vpx_v_predictor_4x4_neon; + if (flags & HAS_NEON) vpx_v_predictor_4x4 = vpx_v_predictor_4x4_neon; vpx_v_predictor_8x8 = vpx_v_predictor_8x8_c; - if (flags & HAS_NEON) - vpx_v_predictor_8x8 = vpx_v_predictor_8x8_neon; + if (flags & HAS_NEON) vpx_v_predictor_8x8 = vpx_v_predictor_8x8_neon; vpx_variance16x16 = vpx_variance16x16_c; - if (flags & HAS_NEON) - vpx_variance16x16 = vpx_variance16x16_neon; + if (flags & HAS_NEON) vpx_variance16x16 = vpx_variance16x16_neon; vpx_variance16x32 = vpx_variance16x32_c; - if (flags & HAS_NEON) - vpx_variance16x32 = vpx_variance16x32_neon; + if (flags & HAS_NEON) vpx_variance16x32 = vpx_variance16x32_neon; vpx_variance16x8 = vpx_variance16x8_c; - if (flags & HAS_NEON) - vpx_variance16x8 = vpx_variance16x8_neon; + if (flags & HAS_NEON) vpx_variance16x8 = vpx_variance16x8_neon; vpx_variance32x16 = vpx_variance32x16_c; - if (flags & HAS_NEON) - vpx_variance32x16 = vpx_variance32x16_neon; + if (flags & HAS_NEON) vpx_variance32x16 = vpx_variance32x16_neon; vpx_variance32x32 = vpx_variance32x32_c; - if (flags & HAS_NEON) - vpx_variance32x32 = vpx_variance32x32_neon; + if (flags & HAS_NEON) vpx_variance32x32 = vpx_variance32x32_neon; vpx_variance32x64 = vpx_variance32x64_c; - if (flags & HAS_NEON) - vpx_variance32x64 = vpx_variance32x64_neon; + if (flags & HAS_NEON) vpx_variance32x64 = vpx_variance32x64_neon; vpx_variance4x4 = vpx_variance4x4_c; - if (flags & HAS_NEON) - vpx_variance4x4 = vpx_variance4x4_neon; + if (flags & HAS_NEON) vpx_variance4x4 = vpx_variance4x4_neon; vpx_variance4x8 = vpx_variance4x8_c; - if (flags & HAS_NEON) - vpx_variance4x8 = vpx_variance4x8_neon; + if (flags & HAS_NEON) vpx_variance4x8 = vpx_variance4x8_neon; vpx_variance64x32 = vpx_variance64x32_c; - if (flags & HAS_NEON) - vpx_variance64x32 = vpx_variance64x32_neon; + if (flags & HAS_NEON) vpx_variance64x32 = vpx_variance64x32_neon; vpx_variance64x64 = vpx_variance64x64_c; - if (flags & HAS_NEON) - vpx_variance64x64 = vpx_variance64x64_neon; + if (flags & HAS_NEON) vpx_variance64x64 = vpx_variance64x64_neon; vpx_variance8x16 = vpx_variance8x16_c; - if (flags & HAS_NEON) - vpx_variance8x16 = vpx_variance8x16_neon; + if (flags & HAS_NEON) vpx_variance8x16 = vpx_variance8x16_neon; vpx_variance8x4 = vpx_variance8x4_c; - if (flags & HAS_NEON) - vpx_variance8x4 = vpx_variance8x4_neon; + if (flags & HAS_NEON) vpx_variance8x4 = vpx_variance8x4_neon; vpx_variance8x8 = vpx_variance8x8_c; - if (flags & HAS_NEON) - vpx_variance8x8 = vpx_variance8x8_neon; + if (flags & HAS_NEON) vpx_variance8x8 = vpx_variance8x8_neon; vpx_vector_var = vpx_vector_var_c; - if (flags & HAS_NEON) - vpx_vector_var = vpx_vector_var_neon; + if (flags & HAS_NEON) vpx_vector_var = vpx_vector_var_neon; } #endif
diff --git a/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h index 555013e..62b2537 100644 --- a/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vp8_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon/vp8_rtcd.h index 737afd5..3bd769d5 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vp8_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm-neon/vp8_rtcd.h
@@ -27,455 +27,273 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict16x16_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict16x16_neon(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict16x16 vp8_bilinear_predict16x16_neon -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict4x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_neon -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_neon -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x8 vp8_bilinear_predict8x8_neon -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); #define vp8_block_error vp8_block_error_c -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem16x16_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +void vp8_copy_mem16x16_neon(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); #define vp8_copy_mem16x16 vp8_copy_mem16x16_neon -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_neon -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x8 vp8_copy_mem8x8_neon -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -void vp8_dc_only_idct_add_neon(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +void vp8_dc_only_idct_add_neon(short input, unsigned char *pred, + int pred_stride, unsigned char *dst, int dst_stride); #define vp8_dc_only_idct_add vp8_dc_only_idct_add_neon -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_neon(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_neon(unsigned char *mc_running_avg_y, + int mc_avg_y_stride, unsigned char *running_avg_y, + int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter vp8_denoiser_filter_neon -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_neon(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_uv_neon(unsigned char *mc_running_avg, + int mc_avg_stride, unsigned char *running_avg, + int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_neon -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); -void vp8_dequant_idct_add_neon(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_neon(short *input, short *dq, unsigned char *output, int stride); #define vp8_dequant_idct_add vp8_dequant_idct_add_neon -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -void vp8_dequant_idct_add_uv_block_neon(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +void vp8_dequant_idct_add_uv_block_neon(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_neon -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -void vp8_dequant_idct_add_y_block_neon(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +void vp8_dequant_idct_add_y_block_neon(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_neon -void vp8_dequantize_b_c(struct blockd*, short* dqc); -void vp8_dequantize_b_neon(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); +void vp8_dequantize_b_neon(struct blockd *, short *dqc); #define vp8_dequantize_b vp8_dequantize_b_neon -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_diamond_search_sad vp8_diamond_search_sad_c -void vp8_fast_quantize_b_c(struct block*, struct blockd*); -void vp8_fast_quantize_b_neon(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); +void vp8_fast_quantize_b_neon(struct block *, struct blockd *); #define vp8_fast_quantize_b vp8_fast_quantize_b_neon -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_c -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_c -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_full_search_sad vp8_full_search_sad_c -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bh_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bh_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bh vp8_loop_filter_bh_neon -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bv_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bv_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bv vp8_loop_filter_bv_neon -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbh_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbh_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbh vp8_loop_filter_mbh_neon -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbv_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbv_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbv vp8_loop_filter_mbv_neon -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bhs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bhs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_neon -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bvs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bvs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_neon -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_mbhs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_mbhs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbh vp8_loop_filter_mbhs_neon -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_mbvs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_mbvs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbv vp8_loop_filter_mbvs_neon -int vp8_mbblock_error_c(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); #define vp8_mbblock_error vp8_mbblock_error_c -int vp8_mbuverror_c(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); #define vp8_mbuverror vp8_mbuverror_c -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_refining_search_sad vp8_refining_search_sad_c -void vp8_regular_quantize_b_c(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); #define vp8_regular_quantize_b vp8_regular_quantize_b_c -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); -void vp8_short_fdct4x4_neon(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); +void vp8_short_fdct4x4_neon(short *input, short *output, int pitch); #define vp8_short_fdct4x4 vp8_short_fdct4x4_neon -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); -void vp8_short_fdct8x4_neon(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); +void vp8_short_fdct8x4_neon(short *input, short *output, int pitch); #define vp8_short_fdct8x4 vp8_short_fdct8x4_neon -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -void vp8_short_idct4x4llm_neon(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +void vp8_short_idct4x4llm_neon(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); #define vp8_short_idct4x4llm vp8_short_idct4x4llm_neon -void vp8_short_inv_walsh4x4_c(short* input, short* output); -void vp8_short_inv_walsh4x4_neon(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); +void vp8_short_inv_walsh4x4_neon(short *input, short *output); #define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_neon -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); -void vp8_short_walsh4x4_neon(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); +void vp8_short_walsh4x4_neon(short *input, short *output, int pitch); #define vp8_short_walsh4x4 vp8_short_walsh4x4_neon -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict16x16 vp8_sixtap_predict16x16_neon -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_neon -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x4 vp8_sixtap_predict8x4_neon -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x8 vp8_sixtap_predict8x8_neon void vp8_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vp9_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon/vp9_rtcd.h index 309c7808..8fe8182 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vp9_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm-neon/vp9_rtcd.h
@@ -31,198 +31,125 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); #define vp9_block_error vp9_block_error_c -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); -int64_t vp9_block_error_fp_neon(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); +int64_t vp9_block_error_fp_neon(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); #define vp9_block_error_fp vp9_block_error_fp_neon -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); -int vp9_denoiser_filter_neon(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); +int vp9_denoiser_filter_neon(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); #define vp9_denoiser_filter vp9_denoiser_filter_neon -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); #define vp9_diamond_search_sad vp9_diamond_search_sad_c -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_fdct8x8_quant_neon(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_fdct8x8_quant_neon(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_fdct8x8_quant vp9_fdct8x8_quant_neon -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_c -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht4x4 vp9_fht4x4_c -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_c -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); -void vp9_iht16x16_256_add_neon(const tran_low_t* input, - uint8_t* output, - int pitch, - int tx_type); +void vp9_iht16x16_256_add_neon(const tran_low_t *input, uint8_t *output, + int pitch, int tx_type); #define vp9_iht16x16_256_add vp9_iht16x16_256_add_neon -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht4x4_16_add_neon(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht4x4_16_add vp9_iht4x4_16_add_neon -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht8x8_64_add_neon(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht8x8_64_add vp9_iht8x8_64_add_neon -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_quantize_fp vp9_quantize_fp_neon -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_32x32_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vp9_quantize_fp_32x32_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_neon -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); -void vp9_scale_and_extend_frame_neon(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); +void vp9_scale_and_extend_frame_neon(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler); #define vp9_scale_and_extend_frame vp9_scale_and_extend_frame_neon
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon/vpx_dsp_rtcd.h index cc0b382..cd34634 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_dsp_rtcd.h
@@ -20,2442 +20,1539 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); -unsigned int vpx_avg_4x4_neon(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); +unsigned int vpx_avg_4x4_neon(const uint8_t *, int p); #define vpx_avg_4x4 vpx_avg_4x4_neon -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); -unsigned int vpx_avg_8x8_neon(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); +unsigned int vpx_avg_8x8_neon(const uint8_t *, int p); #define vpx_avg_8x8 vpx_avg_8x8_neon -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -void vpx_comp_avg_pred_neon(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +void vpx_comp_avg_pred_neon(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); #define vpx_comp_avg_pred vpx_comp_avg_pred_neon -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_neon(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve8 vpx_convolve8_neon -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg vpx_convolve8_avg_neon -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_horiz_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_avg_horiz_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve8_avg_horiz vpx_convolve8_avg_horiz_neon -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_vert vpx_convolve8_avg_vert_neon -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_horiz_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_horiz_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_horiz vpx_convolve8_horiz_neon -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_vert_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_vert_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_vert vpx_convolve8_vert_neon -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_avg_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_avg_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_avg vpx_convolve_avg_neon -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_copy_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_copy_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_copy vpx_convolve_copy_neon -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_neon -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_neon -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_neon -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_neon -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_16x16 vpx_d153_predictor_16x16_c -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_32x32 vpx_d153_predictor_32x32_c -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_4x4 vpx_d153_predictor_4x4_c -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_8x8 vpx_d153_predictor_8x8_c -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_16x16 vpx_d207_predictor_16x16_c -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_32x32 vpx_d207_predictor_32x32_c -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_c -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_8x8 vpx_d207_predictor_8x8_c -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_16x16 vpx_d45_predictor_16x16_neon -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_32x32 vpx_d45_predictor_32x32_neon -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_neon -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_neon -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_16x16 vpx_d63_predictor_16x16_c -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_32x32 vpx_d63_predictor_32x32_c -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_4x4 vpx_d63_predictor_4x4_c -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_8x8 vpx_d63_predictor_8x8_c -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_neon -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_neon -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_neon -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_neon -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_neon -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_neon -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_neon -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_neon -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_neon -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_neon -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_neon -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_neon -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_neon -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_neon -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_neon -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_neon -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16 vpx_fdct16x16_neon -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16_1 vpx_fdct16x16_1_neon -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32 vpx_fdct32x32_neon -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_1 vpx_fdct32x32_1_neon -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_rd_neon(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_rd_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_rd vpx_fdct32x32_rd_neon -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4 vpx_fdct4x4_neon -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4_1 vpx_fdct4x4_1_neon -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8 vpx_fdct8x8_neon -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8_1 vpx_fdct8x8_1_neon -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get16x16var vpx_get16x16var_neon -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); -unsigned int vpx_get4x4sse_cs_neon(const unsigned char* src_ptr, +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); +unsigned int vpx_get4x4sse_cs_neon(const unsigned char *src_ptr, int source_stride, - const unsigned char* ref_ptr, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_neon -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get8x8var_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); +void vpx_get8x8var_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get8x8var vpx_get8x8var_neon -unsigned int vpx_get_mb_ss_c(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); #define vpx_get_mb_ss vpx_get_mb_ss_c -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_16x16 vpx_h_predictor_16x16_neon -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_32x32 vpx_h_predictor_32x32_neon -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_4x4 vpx_h_predictor_4x4_neon -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_8x8 vpx_h_predictor_8x8_neon -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); -void vpx_hadamard_16x16_neon(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); +void vpx_hadamard_16x16_neon(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_16x16 vpx_hadamard_16x16_neon -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); -void vpx_hadamard_8x8_neon(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); +void vpx_hadamard_8x8_neon(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_8x8 vpx_hadamard_8x8_neon -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_10_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_10_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_10_add vpx_idct16x16_10_add_neon -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_1_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_1_add vpx_idct16x16_1_add_neon -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_256_add vpx_idct16x16_256_add_neon -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_38_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_38_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_38_add vpx_idct16x16_38_add_neon -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_neon -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_135_add vpx_idct32x32_135_add_neon -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_1_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1_add vpx_idct32x32_1_add_neon -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_34_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_34_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_34_add vpx_idct32x32_34_add_neon -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_16_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_16_add vpx_idct4x4_16_add_neon -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_1_add_neon(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_1_add vpx_idct4x4_1_add_neon -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_12_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_12_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_12_add vpx_idct8x8_12_add_neon -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_1_add_neon(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_1_add vpx_idct8x8_1_add_neon -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_64_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_64_add vpx_idct8x8_64_add_neon -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); -int16_t vpx_int_pro_col_neon(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); +int16_t vpx_int_pro_col_neon(const uint8_t *ref, const int width); #define vpx_int_pro_col vpx_int_pro_col_neon -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); -void vpx_int_pro_row_neon(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); +void vpx_int_pro_row_neon(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); #define vpx_int_pro_row vpx_int_pro_row_neon -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_c -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16 vpx_lpf_horizontal_16_neon -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_neon(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); #define vpx_lpf_horizontal_16_dual vpx_lpf_horizontal_16_dual_neon -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_4_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_4_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_neon -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_4_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_4_dual_neon( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_neon -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_8_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_neon -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_8_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_8_dual_neon( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_neon -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16 vpx_lpf_vertical_16_neon -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_neon -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_4_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_4_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_4 vpx_lpf_vertical_4_neon -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_4_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_4_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_4_dual vpx_lpf_vertical_4_dual_neon -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_8_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_8 vpx_lpf_vertical_8_neon -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_8_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_8_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_neon -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -void vpx_mbpost_proc_across_ip_neon(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +void vpx_mbpost_proc_across_ip_neon(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_across_ip vpx_mbpost_proc_across_ip_neon -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); -void vpx_mbpost_proc_down_neon(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_down_neon(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_down vpx_mbpost_proc_down_neon -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -void vpx_minmax_8x8_neon(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +void vpx_minmax_8x8_neon(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_minmax_8x8 vpx_minmax_8x8_neon -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x16 vpx_mse16x16_neon -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x8 vpx_mse16x8_c -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x16 vpx_mse8x16_c -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x8 vpx_mse8x8_c -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); #define vpx_plane_add_noise vpx_plane_add_noise_c -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); -void vpx_post_proc_down_and_across_mb_row_neon(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); +void vpx_post_proc_down_and_across_mb_row_neon(unsigned char *src, + unsigned char *dst, + int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); #define vpx_post_proc_down_and_across_mb_row \ vpx_post_proc_down_and_across_mb_row_neon -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vpx_quantize_b vpx_quantize_b_neon -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_quantize_b_32x32 vpx_quantize_b_32x32_neon -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x16 vpx_sad16x16_neon -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x16_avg vpx_sad16x16_avg_neon -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x3 vpx_sad16x16x3_c -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x4d vpx_sad16x16x4d_neon -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x8 vpx_sad16x16x8_c -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x32 vpx_sad16x32_neon -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x32_avg vpx_sad16x32_avg_neon -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x32x4d vpx_sad16x32x4d_neon -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x8 vpx_sad16x8_neon -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x8_avg vpx_sad16x8_avg_neon -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x3 vpx_sad16x8x3_c -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x4d vpx_sad16x8x4d_neon -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x8 vpx_sad16x8x8_c -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x16 vpx_sad32x16_neon -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x16_avg vpx_sad32x16_avg_neon -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x16x4d vpx_sad32x16x4d_neon -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x32 vpx_sad32x32_neon -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x32_avg vpx_sad32x32_avg_neon -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x32x4d vpx_sad32x32x4d_neon -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x64 vpx_sad32x64_neon -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x64_avg vpx_sad32x64_avg_neon -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x64x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x64x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x64x4d vpx_sad32x64x4d_neon -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x4_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x4_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x4 vpx_sad4x4_neon -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x4_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x4_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x4_avg vpx_sad4x4_avg_neon -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x3 vpx_sad4x4x3_c -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x4d vpx_sad4x4x4d_neon -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x8 vpx_sad4x4x8_c -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x8 vpx_sad4x8_neon -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x8_avg vpx_sad4x8_avg_neon -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x8x4d vpx_sad4x8x4d_neon -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x32 vpx_sad64x32_neon -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x32_avg vpx_sad64x32_avg_neon -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x32x4d vpx_sad64x32x4d_neon -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x64 vpx_sad64x64_neon -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x64_avg vpx_sad64x64_avg_neon -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x64x4d vpx_sad64x64x4d_neon -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x16 vpx_sad8x16_neon -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x16_avg vpx_sad8x16_avg_neon -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x3 vpx_sad8x16x3_c -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x4d vpx_sad8x16x4d_neon -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x8 vpx_sad8x16x8_c -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x4_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x4_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x4 vpx_sad8x4_neon -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x4_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x4_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x4_avg vpx_sad8x4_avg_neon -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x4x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x4x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x4x4d vpx_sad8x4x4d_neon -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x8 vpx_sad8x8_neon -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x8_avg vpx_sad8x8_avg_neon -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x3 vpx_sad8x8x3_c -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x4d vpx_sad8x8x4d_neon -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x8 vpx_sad8x8x8_c -int vpx_satd_c(const int16_t* coeff, int length); -int vpx_satd_neon(const int16_t* coeff, int length); +int vpx_satd_c(const int16_t *coeff, int length); +int vpx_satd_neon(const int16_t *coeff, int length); #define vpx_satd vpx_satd_neon -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_scaled_2d_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_2d_neon(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_2d vpx_scaled_2d_neon -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x16 vpx_sub_pixel_avg_variance16x16_neon -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x32 vpx_sub_pixel_avg_variance16x32_neon -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x8 vpx_sub_pixel_avg_variance16x8_neon -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x16 vpx_sub_pixel_avg_variance32x16_neon -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x32 vpx_sub_pixel_avg_variance32x32_neon -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x64 vpx_sub_pixel_avg_variance32x64_neon -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x4 vpx_sub_pixel_avg_variance4x4_neon -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x8 vpx_sub_pixel_avg_variance4x8_neon -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x32 vpx_sub_pixel_avg_variance64x32_neon -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x64 vpx_sub_pixel_avg_variance64x64_neon -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x16 vpx_sub_pixel_avg_variance8x16_neon -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x4 vpx_sub_pixel_avg_variance8x4_neon -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x8 vpx_sub_pixel_avg_variance8x8_neon -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x16 vpx_sub_pixel_variance16x16_neon -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x32 vpx_sub_pixel_variance16x32_neon -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x8 vpx_sub_pixel_variance16x8_neon -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x16 vpx_sub_pixel_variance32x16_neon -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x32 vpx_sub_pixel_variance32x32_neon -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x64 vpx_sub_pixel_variance32x64_neon -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance4x4 vpx_sub_pixel_variance4x4_neon -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance4x8 vpx_sub_pixel_variance4x8_neon -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x32 vpx_sub_pixel_variance64x32_neon -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x64 vpx_sub_pixel_variance64x64_neon -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance8x16 vpx_sub_pixel_variance8x16_neon -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_neon -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_neon -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -void vpx_subtract_block_neon(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_neon(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); #define vpx_subtract_block vpx_subtract_block_neon -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_neon -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_neon -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_neon -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_neon -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_16x16 vpx_v_predictor_16x16_neon -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_32x32 vpx_v_predictor_32x32_neon -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_4x4 vpx_v_predictor_4x4_neon -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_neon -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x16 vpx_variance16x16_neon -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x32 vpx_variance16x32_neon -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x8 vpx_variance16x8_neon -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x16 vpx_variance32x16_neon -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x32 vpx_variance32x32_neon -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x64 vpx_variance32x64_neon -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x4_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x4 vpx_variance4x4_neon -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x8 vpx_variance4x8_neon -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x32 vpx_variance64x32_neon -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x64 vpx_variance64x64_neon -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x16 vpx_variance8x16_neon -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x4_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x4 vpx_variance8x4_neon -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x8 vpx_variance8x8_neon -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); -int vpx_vector_var_neon(const int16_t* ref, const int16_t* src, const int bwl); +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); +int vpx_vector_var_neon(const int16_t *ref, const int16_t *src, const int bwl); #define vpx_vector_var vpx_vector_var_neon void vpx_dsp_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_scale_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon/vpx_scale_rtcd.h index 555013e..62b2537 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/arm/vp8_rtcd.h b/third_party/libvpx/source/config/linux/arm/vp8_rtcd.h index a84e3b3..0083535 100644 --- a/third_party/libvpx/source/config/linux/arm/vp8_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm/vp8_rtcd.h
@@ -27,312 +27,201 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict16x16 vp8_bilinear_predict16x16_c -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_c -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_c -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x8 vp8_bilinear_predict8x8_c -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); #define vp8_block_error vp8_block_error_c -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem16x16 vp8_copy_mem16x16_c -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_c -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x8 vp8_copy_mem8x8_c -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); #define vp8_dc_only_idct_add vp8_dc_only_idct_add_c -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter vp8_denoiser_filter_c -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_c -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); #define vp8_dequant_idct_add vp8_dequant_idct_add_c -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_c -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_c -void vp8_dequantize_b_c(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); #define vp8_dequantize_b vp8_dequantize_b_c -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_diamond_search_sad vp8_diamond_search_sad_c -void vp8_fast_quantize_b_c(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); #define vp8_fast_quantize_b vp8_fast_quantize_b_c -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_c -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_c -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_full_search_sad vp8_full_search_sad_c -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bh vp8_loop_filter_bh_c -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bv vp8_loop_filter_bv_c -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbh vp8_loop_filter_mbh_c -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbv vp8_loop_filter_mbv_c -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_c -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_c -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbh vp8_loop_filter_simple_horizontal_edge_c -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbv vp8_loop_filter_simple_vertical_edge_c -int vp8_mbblock_error_c(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); #define vp8_mbblock_error vp8_mbblock_error_c -int vp8_mbuverror_c(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); #define vp8_mbuverror vp8_mbuverror_c -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_refining_search_sad vp8_refining_search_sad_c -void vp8_regular_quantize_b_c(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); #define vp8_regular_quantize_b vp8_regular_quantize_b_c -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); #define vp8_short_fdct4x4 vp8_short_fdct4x4_c -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); #define vp8_short_fdct8x4 vp8_short_fdct8x4_c -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); #define vp8_short_idct4x4llm vp8_short_idct4x4llm_c -void vp8_short_inv_walsh4x4_c(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); #define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_c -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); #define vp8_short_walsh4x4 vp8_short_walsh4x4_c -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict16x16 vp8_sixtap_predict16x16_c -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_c -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x4 vp8_sixtap_predict8x4_c -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x8 vp8_sixtap_predict8x8_c void vp8_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/arm/vp9_rtcd.h b/third_party/libvpx/source/config/linux/arm/vp9_rtcd.h index 478101ff..2df0d5c 100644 --- a/third_party/libvpx/source/config/linux/arm/vp9_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm/vp9_rtcd.h
@@ -31,137 +31,91 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); #define vp9_block_error vp9_block_error_c -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); #define vp9_block_error_fp vp9_block_error_fp_c -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); #define vp9_denoiser_filter vp9_denoiser_filter_c -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); #define vp9_diamond_search_sad vp9_diamond_search_sad_c -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_fdct8x8_quant vp9_fdct8x8_quant_c -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_c -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht4x4 vp9_fht4x4_c -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_c -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); #define vp9_iht16x16_256_add vp9_iht16x16_256_add_c -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht4x4_16_add vp9_iht4x4_16_add_c -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht8x8_64_add vp9_iht8x8_64_add_c -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_quantize_fp vp9_quantize_fp_c -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); #define vp9_scale_and_extend_frame vp9_scale_and_extend_frame_c void vp9_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/arm/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/arm/vpx_dsp_rtcd.h index 9cbc77b..3375f186 100644 --- a/third_party/libvpx/source/config/linux/arm/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm/vpx_dsp_rtcd.h
@@ -20,1540 +20,1030 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); #define vpx_avg_4x4 vpx_avg_4x4_c -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); #define vpx_avg_8x8 vpx_avg_8x8_c -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); #define vpx_comp_avg_pred vpx_comp_avg_pred_c -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8 vpx_convolve8_c -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve8_avg vpx_convolve8_avg_c -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_horiz vpx_convolve8_avg_horiz_c -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_vert vpx_convolve8_avg_vert_c -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_horiz vpx_convolve8_horiz_c -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_vert vpx_convolve8_vert_c -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve_avg vpx_convolve_avg_c -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve_copy vpx_convolve_copy_c -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_c -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_16x16 vpx_d153_predictor_16x16_c -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_32x32 vpx_d153_predictor_32x32_c -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_4x4 vpx_d153_predictor_4x4_c -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_8x8 vpx_d153_predictor_8x8_c -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_16x16 vpx_d207_predictor_16x16_c -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_32x32 vpx_d207_predictor_32x32_c -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_c -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_8x8 vpx_d207_predictor_8x8_c -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_16x16 vpx_d45_predictor_16x16_c -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_32x32 vpx_d45_predictor_32x32_c -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_c -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_c -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_16x16 vpx_d63_predictor_16x16_c -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_32x32 vpx_d63_predictor_32x32_c -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_4x4 vpx_d63_predictor_4x4_c -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_8x8 vpx_d63_predictor_8x8_c -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_c -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_c -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_c -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_c -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_c -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_c -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_c -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_c -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_c -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_c -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_c -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_c -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_c -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_c -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_c -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_c -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16 vpx_fdct16x16_c -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16_1 vpx_fdct16x16_1_c -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32 vpx_fdct32x32_c -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_1 vpx_fdct32x32_1_c -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_rd vpx_fdct32x32_rd_c -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4 vpx_fdct4x4_c -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4_1 vpx_fdct4x4_1_c -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8 vpx_fdct8x8_c -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8_1 vpx_fdct8x8_1_c -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get16x16var vpx_get16x16var_c -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_c -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); #define vpx_get8x8var vpx_get8x8var_c -unsigned int vpx_get_mb_ss_c(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); #define vpx_get_mb_ss vpx_get_mb_ss_c -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_16x16 vpx_h_predictor_16x16_c -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_32x32 vpx_h_predictor_32x32_c -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_4x4 vpx_h_predictor_4x4_c -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_8x8 vpx_h_predictor_8x8_c -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_16x16 vpx_hadamard_16x16_c -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_8x8 vpx_hadamard_8x8_c -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_10_add vpx_idct16x16_10_add_c -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_1_add vpx_idct16x16_1_add_c -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_256_add vpx_idct16x16_256_add_c -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_38_add vpx_idct16x16_38_add_c -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_c -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_135_add vpx_idct32x32_135_add_c -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1_add vpx_idct32x32_1_add_c -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_34_add vpx_idct32x32_34_add_c -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_16_add vpx_idct4x4_16_add_c -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_1_add vpx_idct4x4_1_add_c -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_12_add vpx_idct8x8_12_add_c -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_1_add vpx_idct8x8_1_add_c -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_64_add vpx_idct8x8_64_add_c -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); #define vpx_int_pro_col vpx_int_pro_col_c -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); #define vpx_int_pro_row vpx_int_pro_row_c -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_c -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16 vpx_lpf_horizontal_16_c -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16_dual vpx_lpf_horizontal_16_dual_c -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_c -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_c -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_c -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_c -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16 vpx_lpf_vertical_16_c -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_c -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_4 vpx_lpf_vertical_4_c -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_4_dual vpx_lpf_vertical_4_dual_c -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_8 vpx_lpf_vertical_8_c -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_c -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_across_ip vpx_mbpost_proc_across_ip_c -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); #define vpx_mbpost_proc_down vpx_mbpost_proc_down_c -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_minmax_8x8 vpx_minmax_8x8_c -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x16 vpx_mse16x16_c -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x8 vpx_mse16x8_c -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x16 vpx_mse8x16_c -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x8 vpx_mse8x8_c -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); #define vpx_plane_add_noise vpx_plane_add_noise_c -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); #define vpx_post_proc_down_and_across_mb_row \ vpx_post_proc_down_and_across_mb_row_c -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vpx_quantize_b vpx_quantize_b_c -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_quantize_b_32x32 vpx_quantize_b_32x32_c -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x16 vpx_sad16x16_c -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x16_avg vpx_sad16x16_avg_c -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x3 vpx_sad16x16x3_c -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x4d vpx_sad16x16x4d_c -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x8 vpx_sad16x16x8_c -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x32 vpx_sad16x32_c -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x32_avg vpx_sad16x32_avg_c -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x32x4d vpx_sad16x32x4d_c -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x8 vpx_sad16x8_c -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x8_avg vpx_sad16x8_avg_c -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x3 vpx_sad16x8x3_c -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x4d vpx_sad16x8x4d_c -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x8 vpx_sad16x8x8_c -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x16 vpx_sad32x16_c -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x16_avg vpx_sad32x16_avg_c -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x16x4d vpx_sad32x16x4d_c -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x32 vpx_sad32x32_c -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x32_avg vpx_sad32x32_avg_c -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x32x4d vpx_sad32x32x4d_c -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x64 vpx_sad32x64_c -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x64_avg vpx_sad32x64_avg_c -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x64x4d vpx_sad32x64x4d_c -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x4 vpx_sad4x4_c -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x4_avg vpx_sad4x4_avg_c -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x3 vpx_sad4x4x3_c -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x4d vpx_sad4x4x4d_c -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x8 vpx_sad4x4x8_c -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x8 vpx_sad4x8_c -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x8_avg vpx_sad4x8_avg_c -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x8x4d vpx_sad4x8x4d_c -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x32 vpx_sad64x32_c -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x32_avg vpx_sad64x32_avg_c -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x32x4d vpx_sad64x32x4d_c -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x64 vpx_sad64x64_c -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x64_avg vpx_sad64x64_avg_c -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x64x4d vpx_sad64x64x4d_c -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x16 vpx_sad8x16_c -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x16_avg vpx_sad8x16_avg_c -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x3 vpx_sad8x16x3_c -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x4d vpx_sad8x16x4d_c -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x8 vpx_sad8x16x8_c -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x4 vpx_sad8x4_c -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x4_avg vpx_sad8x4_avg_c -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x4x4d vpx_sad8x4x4d_c -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x8 vpx_sad8x8_c -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x8_avg vpx_sad8x8_avg_c -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x3 vpx_sad8x8x3_c -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x4d vpx_sad8x8x4d_c -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x8 vpx_sad8x8x8_c -int vpx_satd_c(const int16_t* coeff, int length); +int vpx_satd_c(const int16_t *coeff, int length); #define vpx_satd vpx_satd_c -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_2d vpx_scaled_2d_c -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x16 vpx_sub_pixel_avg_variance16x16_c -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x32 vpx_sub_pixel_avg_variance16x32_c -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x8 vpx_sub_pixel_avg_variance16x8_c -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x16 vpx_sub_pixel_avg_variance32x16_c -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x32 vpx_sub_pixel_avg_variance32x32_c -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x64 vpx_sub_pixel_avg_variance32x64_c -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x4 vpx_sub_pixel_avg_variance4x4_c -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x8 vpx_sub_pixel_avg_variance4x8_c -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x32 vpx_sub_pixel_avg_variance64x32_c -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x64 vpx_sub_pixel_avg_variance64x64_c -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x16 vpx_sub_pixel_avg_variance8x16_c -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x4 vpx_sub_pixel_avg_variance8x4_c -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x8 vpx_sub_pixel_avg_variance8x8_c -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x16 vpx_sub_pixel_variance16x16_c -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x32 vpx_sub_pixel_variance16x32_c -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance16x8 vpx_sub_pixel_variance16x8_c -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x16 vpx_sub_pixel_variance32x16_c -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x32 vpx_sub_pixel_variance32x32_c -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x64 vpx_sub_pixel_variance32x64_c -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance4x4 vpx_sub_pixel_variance4x4_c -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance4x8 vpx_sub_pixel_variance4x8_c -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x32 vpx_sub_pixel_variance64x32_c -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x64 vpx_sub_pixel_variance64x64_c -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x16 vpx_sub_pixel_variance8x16_c -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_c -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_c -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); #define vpx_subtract_block vpx_subtract_block_c -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_c -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_c -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_c -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_c -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_16x16 vpx_v_predictor_16x16_c -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_32x32 vpx_v_predictor_32x32_c -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_4x4 vpx_v_predictor_4x4_c -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_c -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x16 vpx_variance16x16_c -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x32 vpx_variance16x32_c -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x8 vpx_variance16x8_c -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x16 vpx_variance32x16_c -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x32 vpx_variance32x32_c -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x64 vpx_variance32x64_c -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x4 vpx_variance4x4_c -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x8 vpx_variance4x8_c -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x32 vpx_variance64x32_c -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x64 vpx_variance64x64_c -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x16 vpx_variance8x16_c -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x4 vpx_variance8x4_c -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x8 vpx_variance8x8_c -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); #define vpx_vector_var vpx_vector_var_c void vpx_dsp_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/arm/vpx_scale_rtcd.h b/third_party/libvpx/source/config/linux/arm/vpx_scale_rtcd.h index 555013e..62b2537 100644 --- a/third_party/libvpx/source/config/linux/arm/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/arm64/vp8_rtcd.h b/third_party/libvpx/source/config/linux/arm64/vp8_rtcd.h index 737afd5..3bd769d5 100644 --- a/third_party/libvpx/source/config/linux/arm64/vp8_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm64/vp8_rtcd.h
@@ -27,455 +27,273 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict16x16_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict16x16_neon(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict16x16 vp8_bilinear_predict16x16_neon -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict4x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_neon -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_neon -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x8 vp8_bilinear_predict8x8_neon -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); #define vp8_block_error vp8_block_error_c -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem16x16_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +void vp8_copy_mem16x16_neon(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); #define vp8_copy_mem16x16 vp8_copy_mem16x16_neon -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_neon -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_neon(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x8 vp8_copy_mem8x8_neon -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -void vp8_dc_only_idct_add_neon(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +void vp8_dc_only_idct_add_neon(short input, unsigned char *pred, + int pred_stride, unsigned char *dst, int dst_stride); #define vp8_dc_only_idct_add vp8_dc_only_idct_add_neon -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_neon(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_neon(unsigned char *mc_running_avg_y, + int mc_avg_y_stride, unsigned char *running_avg_y, + int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter vp8_denoiser_filter_neon -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_neon(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_uv_neon(unsigned char *mc_running_avg, + int mc_avg_stride, unsigned char *running_avg, + int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_neon -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); -void vp8_dequant_idct_add_neon(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_neon(short *input, short *dq, unsigned char *output, int stride); #define vp8_dequant_idct_add vp8_dequant_idct_add_neon -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -void vp8_dequant_idct_add_uv_block_neon(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +void vp8_dequant_idct_add_uv_block_neon(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_neon -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -void vp8_dequant_idct_add_y_block_neon(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +void vp8_dequant_idct_add_y_block_neon(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_neon -void vp8_dequantize_b_c(struct blockd*, short* dqc); -void vp8_dequantize_b_neon(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); +void vp8_dequantize_b_neon(struct blockd *, short *dqc); #define vp8_dequantize_b vp8_dequantize_b_neon -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_diamond_search_sad vp8_diamond_search_sad_c -void vp8_fast_quantize_b_c(struct block*, struct blockd*); -void vp8_fast_quantize_b_neon(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); +void vp8_fast_quantize_b_neon(struct block *, struct blockd *); #define vp8_fast_quantize_b vp8_fast_quantize_b_neon -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_c -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_c -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_full_search_sad vp8_full_search_sad_c -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bh_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bh_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bh vp8_loop_filter_bh_neon -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bv_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bv_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bv vp8_loop_filter_bv_neon -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbh_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbh_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbh vp8_loop_filter_mbh_neon -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbv_neon(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbv_neon(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbv vp8_loop_filter_mbv_neon -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bhs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bhs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_neon -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bvs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bvs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_neon -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_mbhs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_mbhs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbh vp8_loop_filter_mbhs_neon -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_mbvs_neon(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_mbvs_neon(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbv vp8_loop_filter_mbvs_neon -int vp8_mbblock_error_c(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); #define vp8_mbblock_error vp8_mbblock_error_c -int vp8_mbuverror_c(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); #define vp8_mbuverror vp8_mbuverror_c -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_refining_search_sad vp8_refining_search_sad_c -void vp8_regular_quantize_b_c(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); #define vp8_regular_quantize_b vp8_regular_quantize_b_c -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); -void vp8_short_fdct4x4_neon(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); +void vp8_short_fdct4x4_neon(short *input, short *output, int pitch); #define vp8_short_fdct4x4 vp8_short_fdct4x4_neon -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); -void vp8_short_fdct8x4_neon(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); +void vp8_short_fdct8x4_neon(short *input, short *output, int pitch); #define vp8_short_fdct8x4 vp8_short_fdct8x4_neon -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -void vp8_short_idct4x4llm_neon(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +void vp8_short_idct4x4llm_neon(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); #define vp8_short_idct4x4llm vp8_short_idct4x4llm_neon -void vp8_short_inv_walsh4x4_c(short* input, short* output); -void vp8_short_inv_walsh4x4_neon(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); +void vp8_short_inv_walsh4x4_neon(short *input, short *output); #define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_neon -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); -void vp8_short_walsh4x4_neon(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); +void vp8_short_walsh4x4_neon(short *input, short *output, int pitch); #define vp8_short_walsh4x4 vp8_short_walsh4x4_neon -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict16x16 vp8_sixtap_predict16x16_neon -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_neon -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x4 vp8_sixtap_predict8x4_neon -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_neon(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_neon(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x8 vp8_sixtap_predict8x8_neon void vp8_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/arm64/vp9_rtcd.h b/third_party/libvpx/source/config/linux/arm64/vp9_rtcd.h index 309c7808..8fe8182 100644 --- a/third_party/libvpx/source/config/linux/arm64/vp9_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm64/vp9_rtcd.h
@@ -31,198 +31,125 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); #define vp9_block_error vp9_block_error_c -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); -int64_t vp9_block_error_fp_neon(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); +int64_t vp9_block_error_fp_neon(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); #define vp9_block_error_fp vp9_block_error_fp_neon -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); -int vp9_denoiser_filter_neon(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); +int vp9_denoiser_filter_neon(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); #define vp9_denoiser_filter vp9_denoiser_filter_neon -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); #define vp9_diamond_search_sad vp9_diamond_search_sad_c -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_fdct8x8_quant_neon(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_fdct8x8_quant_neon(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_fdct8x8_quant vp9_fdct8x8_quant_neon -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_c -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht4x4 vp9_fht4x4_c -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_c -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); -void vp9_iht16x16_256_add_neon(const tran_low_t* input, - uint8_t* output, - int pitch, - int tx_type); +void vp9_iht16x16_256_add_neon(const tran_low_t *input, uint8_t *output, + int pitch, int tx_type); #define vp9_iht16x16_256_add vp9_iht16x16_256_add_neon -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht4x4_16_add_neon(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht4x4_16_add vp9_iht4x4_16_add_neon -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht8x8_64_add_neon(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht8x8_64_add vp9_iht8x8_64_add_neon -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_quantize_fp vp9_quantize_fp_neon -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_32x32_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vp9_quantize_fp_32x32_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_neon -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); -void vp9_scale_and_extend_frame_neon(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); +void vp9_scale_and_extend_frame_neon(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler); #define vp9_scale_and_extend_frame vp9_scale_and_extend_frame_neon
diff --git a/third_party/libvpx/source/config/linux/arm64/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/arm64/vpx_dsp_rtcd.h index cc0b382..cd34634 100644 --- a/third_party/libvpx/source/config/linux/arm64/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm64/vpx_dsp_rtcd.h
@@ -20,2442 +20,1539 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); -unsigned int vpx_avg_4x4_neon(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); +unsigned int vpx_avg_4x4_neon(const uint8_t *, int p); #define vpx_avg_4x4 vpx_avg_4x4_neon -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); -unsigned int vpx_avg_8x8_neon(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); +unsigned int vpx_avg_8x8_neon(const uint8_t *, int p); #define vpx_avg_8x8 vpx_avg_8x8_neon -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -void vpx_comp_avg_pred_neon(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +void vpx_comp_avg_pred_neon(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); #define vpx_comp_avg_pred vpx_comp_avg_pred_neon -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_neon(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve8 vpx_convolve8_neon -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg vpx_convolve8_avg_neon -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_horiz_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_avg_horiz_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve8_avg_horiz vpx_convolve8_avg_horiz_neon -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_vert vpx_convolve8_avg_vert_neon -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_horiz_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_horiz_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_horiz vpx_convolve8_horiz_neon -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_vert_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_vert_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_vert vpx_convolve8_vert_neon -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_avg_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_avg_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_avg vpx_convolve_avg_neon -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_copy_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_copy_neon(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_copy vpx_convolve_copy_neon -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_neon -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_neon -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_neon -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d135_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d135_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_neon -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_16x16 vpx_d153_predictor_16x16_c -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_32x32 vpx_d153_predictor_32x32_c -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_4x4 vpx_d153_predictor_4x4_c -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_8x8 vpx_d153_predictor_8x8_c -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_16x16 vpx_d207_predictor_16x16_c -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_32x32 vpx_d207_predictor_32x32_c -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_c -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_8x8 vpx_d207_predictor_8x8_c -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_16x16 vpx_d45_predictor_16x16_neon -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_32x32 vpx_d45_predictor_32x32_neon -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_neon -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_neon -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_16x16 vpx_d63_predictor_16x16_c -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_32x32 vpx_d63_predictor_32x32_c -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_4x4 vpx_d63_predictor_4x4_c -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_8x8 vpx_d63_predictor_8x8_c -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_neon -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_neon -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_neon -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_neon -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_neon -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_neon -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_neon -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_neon -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_neon -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_neon -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_neon -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_neon -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_neon -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_neon -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_neon -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_neon -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16 vpx_fdct16x16_neon -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16_1 vpx_fdct16x16_1_neon -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32 vpx_fdct32x32_neon -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_1 vpx_fdct32x32_1_neon -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_rd_neon(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_rd_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_rd vpx_fdct32x32_rd_neon -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4 vpx_fdct4x4_neon -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4_1 vpx_fdct4x4_1_neon -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8 vpx_fdct8x8_neon -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_1_neon(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_1_neon(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8_1 vpx_fdct8x8_1_neon -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get16x16var vpx_get16x16var_neon -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); -unsigned int vpx_get4x4sse_cs_neon(const unsigned char* src_ptr, +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); +unsigned int vpx_get4x4sse_cs_neon(const unsigned char *src_ptr, int source_stride, - const unsigned char* ref_ptr, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_neon -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get8x8var_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); +void vpx_get8x8var_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get8x8var vpx_get8x8var_neon -unsigned int vpx_get_mb_ss_c(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); #define vpx_get_mb_ss vpx_get_mb_ss_c -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_16x16 vpx_h_predictor_16x16_neon -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_32x32 vpx_h_predictor_32x32_neon -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_4x4 vpx_h_predictor_4x4_neon -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_8x8 vpx_h_predictor_8x8_neon -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); -void vpx_hadamard_16x16_neon(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); +void vpx_hadamard_16x16_neon(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_16x16 vpx_hadamard_16x16_neon -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); -void vpx_hadamard_8x8_neon(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); +void vpx_hadamard_8x8_neon(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_8x8 vpx_hadamard_8x8_neon -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_10_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_10_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_10_add vpx_idct16x16_10_add_neon -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_1_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_1_add vpx_idct16x16_1_add_neon -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_256_add vpx_idct16x16_256_add_neon -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_38_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_38_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_38_add vpx_idct16x16_38_add_neon -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_neon -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_135_add vpx_idct32x32_135_add_neon -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_1_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1_add vpx_idct32x32_1_add_neon -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_34_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_34_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_34_add vpx_idct32x32_34_add_neon -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_16_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_16_add vpx_idct4x4_16_add_neon -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_1_add_neon(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_1_add vpx_idct4x4_1_add_neon -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_12_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_12_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_12_add vpx_idct8x8_12_add_neon -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_1_add_neon(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_1_add vpx_idct8x8_1_add_neon -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_64_add_neon(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_64_add vpx_idct8x8_64_add_neon -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); -int16_t vpx_int_pro_col_neon(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); +int16_t vpx_int_pro_col_neon(const uint8_t *ref, const int width); #define vpx_int_pro_col vpx_int_pro_col_neon -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); -void vpx_int_pro_row_neon(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); +void vpx_int_pro_row_neon(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); #define vpx_int_pro_row vpx_int_pro_row_neon -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_c -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16 vpx_lpf_horizontal_16_neon -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_neon(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); #define vpx_lpf_horizontal_16_dual vpx_lpf_horizontal_16_dual_neon -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_4_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_4_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_neon -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_4_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_4_dual_neon( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_neon -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_8_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_neon -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_8_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_8_dual_neon( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_neon -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16 vpx_lpf_vertical_16_neon -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_neon -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_4_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_4_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_4 vpx_lpf_vertical_4_neon -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_4_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_4_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_4_dual vpx_lpf_vertical_4_dual_neon -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_8_neon(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_8 vpx_lpf_vertical_8_neon -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_8_dual_neon(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_8_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_neon -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -void vpx_mbpost_proc_across_ip_neon(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +void vpx_mbpost_proc_across_ip_neon(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_across_ip vpx_mbpost_proc_across_ip_neon -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); -void vpx_mbpost_proc_down_neon(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_down_neon(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_down vpx_mbpost_proc_down_neon -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -void vpx_minmax_8x8_neon(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +void vpx_minmax_8x8_neon(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_minmax_8x8 vpx_minmax_8x8_neon -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x16 vpx_mse16x16_neon -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x8 vpx_mse16x8_c -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x16 vpx_mse8x16_c -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x8 vpx_mse8x8_c -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); #define vpx_plane_add_noise vpx_plane_add_noise_c -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); -void vpx_post_proc_down_and_across_mb_row_neon(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); +void vpx_post_proc_down_and_across_mb_row_neon(unsigned char *src, + unsigned char *dst, + int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); #define vpx_post_proc_down_and_across_mb_row \ vpx_post_proc_down_and_across_mb_row_neon -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vpx_quantize_b vpx_quantize_b_neon -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_neon(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_quantize_b_32x32 vpx_quantize_b_32x32_neon -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x16 vpx_sad16x16_neon -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x16_avg vpx_sad16x16_avg_neon -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x3 vpx_sad16x16x3_c -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x4d vpx_sad16x16x4d_neon -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x8 vpx_sad16x16x8_c -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x32 vpx_sad16x32_neon -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x32_avg vpx_sad16x32_avg_neon -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x32x4d vpx_sad16x32x4d_neon -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x8 vpx_sad16x8_neon -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x8_avg vpx_sad16x8_avg_neon -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x3 vpx_sad16x8x3_c -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x4d vpx_sad16x8x4d_neon -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x8 vpx_sad16x8x8_c -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x16 vpx_sad32x16_neon -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x16_avg vpx_sad32x16_avg_neon -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x16x4d vpx_sad32x16x4d_neon -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x32 vpx_sad32x32_neon -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x32_avg vpx_sad32x32_avg_neon -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x32x4d vpx_sad32x32x4d_neon -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x64 vpx_sad32x64_neon -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x64_avg vpx_sad32x64_avg_neon -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x64x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x64x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x64x4d vpx_sad32x64x4d_neon -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x4_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x4_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x4 vpx_sad4x4_neon -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x4_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x4_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x4_avg vpx_sad4x4_avg_neon -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x3 vpx_sad4x4x3_c -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x4d vpx_sad4x4x4d_neon -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x8 vpx_sad4x4x8_c -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x8 vpx_sad4x8_neon -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x8_avg vpx_sad4x8_avg_neon -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x8x4d vpx_sad4x8x4d_neon -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x32 vpx_sad64x32_neon -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x32_avg vpx_sad64x32_avg_neon -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x32x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x32x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x32x4d vpx_sad64x32x4d_neon -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x64 vpx_sad64x64_neon -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x64_avg vpx_sad64x64_avg_neon -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x64x4d vpx_sad64x64x4d_neon -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x16_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x16_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x16 vpx_sad8x16_neon -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x16_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x16_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x16_avg vpx_sad8x16_avg_neon -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x3 vpx_sad8x16x3_c -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x4d vpx_sad8x16x4d_neon -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x8 vpx_sad8x16x8_c -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x4_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x4_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x4 vpx_sad8x4_neon -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x4_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x4_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x4_avg vpx_sad8x4_avg_neon -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x4x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x4x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x4x4d vpx_sad8x4x4d_neon -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x8_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x8_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x8 vpx_sad8x8_neon -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x8_avg_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x8_avg_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x8_avg vpx_sad8x8_avg_neon -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x3 vpx_sad8x8x3_c -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x4d_neon(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x4d_neon(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x4d vpx_sad8x8x4d_neon -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x8 vpx_sad8x8x8_c -int vpx_satd_c(const int16_t* coeff, int length); -int vpx_satd_neon(const int16_t* coeff, int length); +int vpx_satd_c(const int16_t *coeff, int length); +int vpx_satd_neon(const int16_t *coeff, int length); #define vpx_satd vpx_satd_neon -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_scaled_2d_neon(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_2d_neon(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_2d vpx_scaled_2d_neon -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x16 vpx_sub_pixel_avg_variance16x16_neon -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x32 vpx_sub_pixel_avg_variance16x32_neon -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x8 vpx_sub_pixel_avg_variance16x8_neon -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x16 vpx_sub_pixel_avg_variance32x16_neon -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x32 vpx_sub_pixel_avg_variance32x32_neon -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x64 vpx_sub_pixel_avg_variance32x64_neon -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x4 vpx_sub_pixel_avg_variance4x4_neon -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x8 vpx_sub_pixel_avg_variance4x8_neon -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x32 vpx_sub_pixel_avg_variance64x32_neon -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x64 vpx_sub_pixel_avg_variance64x64_neon -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x16 vpx_sub_pixel_avg_variance8x16_neon -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x4 vpx_sub_pixel_avg_variance8x4_neon -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x8 vpx_sub_pixel_avg_variance8x8_neon -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x16 vpx_sub_pixel_variance16x16_neon -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x32 vpx_sub_pixel_variance16x32_neon -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x8 vpx_sub_pixel_variance16x8_neon -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x16 vpx_sub_pixel_variance32x16_neon -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x32 vpx_sub_pixel_variance32x32_neon -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x64 vpx_sub_pixel_variance32x64_neon -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance4x4 vpx_sub_pixel_variance4x4_neon -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance4x8 vpx_sub_pixel_variance4x8_neon -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x32 vpx_sub_pixel_variance64x32_neon -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x64 vpx_sub_pixel_variance64x64_neon -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance8x16 vpx_sub_pixel_variance8x16_neon -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_neon -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_neon(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_neon -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -void vpx_subtract_block_neon(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_neon(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); #define vpx_subtract_block vpx_subtract_block_neon -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_neon -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_neon -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_neon -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_neon -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_16x16_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_16x16 vpx_v_predictor_16x16_neon -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_32x32_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_32x32 vpx_v_predictor_32x32_neon -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_4x4_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_4x4 vpx_v_predictor_4x4_neon -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_8x8_neon(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_neon -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x16 vpx_variance16x16_neon -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x32 vpx_variance16x32_neon -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x8 vpx_variance16x8_neon -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x16 vpx_variance32x16_neon -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x32 vpx_variance32x32_neon -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x64_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x64 vpx_variance32x64_neon -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x4_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x4_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x4 vpx_variance4x4_neon -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x8 vpx_variance4x8_neon -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x32 vpx_variance64x32_neon -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x64 vpx_variance64x64_neon -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x16_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x16_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x16 vpx_variance8x16_neon -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x4_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x4_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x4 vpx_variance8x4_neon -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x8_neon(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x8_neon(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x8 vpx_variance8x8_neon -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); -int vpx_vector_var_neon(const int16_t* ref, const int16_t* src, const int bwl); +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); +int vpx_vector_var_neon(const int16_t *ref, const int16_t *src, const int bwl); #define vpx_vector_var vpx_vector_var_neon void vpx_dsp_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/arm64/vpx_scale_rtcd.h b/third_party/libvpx/source/config/linux/arm64/vpx_scale_rtcd.h index 555013e..62b2537 100644 --- a/third_party/libvpx/source/config/linux/arm64/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm64/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/generic/vp8_rtcd.h b/third_party/libvpx/source/config/linux/generic/vp8_rtcd.h index dc054d6..c5cded6 100644 --- a/third_party/libvpx/source/config/linux/generic/vp8_rtcd.h +++ b/third_party/libvpx/source/config/linux/generic/vp8_rtcd.h
@@ -27,312 +27,201 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict16x16 vp8_bilinear_predict16x16_c -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_c -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_c -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x8 vp8_bilinear_predict8x8_c -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); #define vp8_block_error vp8_block_error_c -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem16x16 vp8_copy_mem16x16_c -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_c -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x8 vp8_copy_mem8x8_c -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); #define vp8_dc_only_idct_add vp8_dc_only_idct_add_c -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter vp8_denoiser_filter_c -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_c -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); #define vp8_dequant_idct_add vp8_dequant_idct_add_c -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_c -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_c -void vp8_dequantize_b_c(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); #define vp8_dequantize_b vp8_dequantize_b_c -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_diamond_search_sad vp8_diamond_search_sad_c -void vp8_fast_quantize_b_c(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); #define vp8_fast_quantize_b vp8_fast_quantize_b_c -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_c -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_c -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_full_search_sad vp8_full_search_sad_c -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bh vp8_loop_filter_bh_c -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bv vp8_loop_filter_bv_c -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbh vp8_loop_filter_mbh_c -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbv vp8_loop_filter_mbv_c -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_c -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_c -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbh vp8_loop_filter_simple_horizontal_edge_c -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbv vp8_loop_filter_simple_vertical_edge_c -int vp8_mbblock_error_c(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); #define vp8_mbblock_error vp8_mbblock_error_c -int vp8_mbuverror_c(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); #define vp8_mbuverror vp8_mbuverror_c -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_refining_search_sad vp8_refining_search_sad_c -void vp8_regular_quantize_b_c(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); #define vp8_regular_quantize_b vp8_regular_quantize_b_c -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); #define vp8_short_fdct4x4 vp8_short_fdct4x4_c -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); #define vp8_short_fdct8x4 vp8_short_fdct8x4_c -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); #define vp8_short_idct4x4llm vp8_short_idct4x4llm_c -void vp8_short_inv_walsh4x4_c(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); #define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_c -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); #define vp8_short_walsh4x4 vp8_short_walsh4x4_c -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict16x16 vp8_sixtap_predict16x16_c -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_c -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x4 vp8_sixtap_predict8x4_c -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x8 vp8_sixtap_predict8x8_c void vp8_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/generic/vp9_rtcd.h b/third_party/libvpx/source/config/linux/generic/vp9_rtcd.h index 289a739..8c1bbc4 100644 --- a/third_party/libvpx/source/config/linux/generic/vp9_rtcd.h +++ b/third_party/libvpx/source/config/linux/generic/vp9_rtcd.h
@@ -31,247 +31,160 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); #define vp9_block_error vp9_block_error_c -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); #define vp9_block_error_fp vp9_block_error_fp_c -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); #define vp9_denoiser_filter vp9_denoiser_filter_c -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); #define vp9_diamond_search_sad vp9_diamond_search_sad_c -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_fdct8x8_quant vp9_fdct8x8_quant_c -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_c -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht4x4 vp9_fht4x4_c -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_c -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_c -int64_t vp9_highbd_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); +int64_t vp9_highbd_block_error_c(const tran_low_t *coeff, + const tran_low_t *dqcoeff, intptr_t block_size, + int64_t *ssz, int bd); #define vp9_highbd_block_error vp9_highbd_block_error_c -void vp9_highbd_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht16x16 vp9_highbd_fht16x16_c -void vp9_highbd_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht4x4 vp9_highbd_fht4x4_c -void vp9_highbd_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht8x8 vp9_highbd_fht8x8_c -void vp9_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_highbd_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_highbd_fwht4x4 vp9_highbd_fwht4x4_c -void vp9_highbd_iht16x16_256_add_c(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); +void vp9_highbd_iht16x16_256_add_c(const tran_low_t *input, uint16_t *output, + int pitch, int tx_type, int bd); #define vp9_highbd_iht16x16_256_add vp9_highbd_iht16x16_256_add_c -void vp9_highbd_iht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); #define vp9_highbd_iht4x4_16_add vp9_highbd_iht4x4_16_add_c -void vp9_highbd_iht8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); #define vp9_highbd_iht8x8_64_add vp9_highbd_iht8x8_64_add_c -void vp9_highbd_mbpost_proc_across_ip_c(uint16_t* src, - int pitch, - int rows, - int cols, - int flimit); +void vp9_highbd_mbpost_proc_across_ip_c(uint16_t *src, int pitch, int rows, + int cols, int flimit); #define vp9_highbd_mbpost_proc_across_ip vp9_highbd_mbpost_proc_across_ip_c -void vp9_highbd_mbpost_proc_down_c(uint16_t* dst, - int pitch, - int rows, - int cols, +void vp9_highbd_mbpost_proc_down_c(uint16_t *dst, int pitch, int rows, int cols, int flimit); #define vp9_highbd_mbpost_proc_down vp9_highbd_mbpost_proc_down_c -void vp9_highbd_post_proc_down_and_across_c(const uint16_t* src_ptr, - uint16_t* dst_ptr, +void vp9_highbd_post_proc_down_and_across_c(const uint16_t *src_ptr, + uint16_t *dst_ptr, int src_pixels_per_line, - int dst_pixels_per_line, - int rows, - int cols, - int flimit); + int dst_pixels_per_line, int rows, + int cols, int flimit); #define vp9_highbd_post_proc_down_and_across \ vp9_highbd_post_proc_down_and_across_c -void vp9_highbd_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp vp9_highbd_quantize_fp_c -void vp9_highbd_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp_32x32 vp9_highbd_quantize_fp_32x32_c -void vp9_highbd_temporal_filter_apply_c(const uint8_t* frame1, - unsigned int stride, - const uint8_t* frame2, - unsigned int block_width, - unsigned int block_height, - int strength, - int filter_weight, - uint32_t* accumulator, - uint16_t* count); +void vp9_highbd_temporal_filter_apply_c( + const uint8_t *frame1, unsigned int stride, const uint8_t *frame2, + unsigned int block_width, unsigned int block_height, int strength, + int filter_weight, uint32_t *accumulator, uint16_t *count); #define vp9_highbd_temporal_filter_apply vp9_highbd_temporal_filter_apply_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); #define vp9_iht16x16_256_add vp9_iht16x16_256_add_c -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht4x4_16_add vp9_iht4x4_16_add_c -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht8x8_64_add vp9_iht8x8_64_add_c -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_quantize_fp vp9_quantize_fp_c -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); #define vp9_scale_and_extend_frame vp9_scale_and_extend_frame_c void vp9_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/generic/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/generic/vpx_dsp_rtcd.h index 9770717..8f4462c 100644 --- a/third_party/libvpx/source/config/linux/generic/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/linux/generic/vpx_dsp_rtcd.h
@@ -20,3807 +20,2635 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); #define vpx_avg_4x4 vpx_avg_4x4_c -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); #define vpx_avg_8x8 vpx_avg_8x8_c -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); #define vpx_comp_avg_pred vpx_comp_avg_pred_c -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8 vpx_convolve8_c -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve8_avg vpx_convolve8_avg_c -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_horiz vpx_convolve8_avg_horiz_c -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_vert vpx_convolve8_avg_vert_c -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_horiz vpx_convolve8_horiz_c -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_vert vpx_convolve8_vert_c -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve_avg vpx_convolve_avg_c -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve_copy vpx_convolve_copy_c -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_c -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_16x16 vpx_d153_predictor_16x16_c -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_32x32 vpx_d153_predictor_32x32_c -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_4x4 vpx_d153_predictor_4x4_c -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_8x8 vpx_d153_predictor_8x8_c -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_16x16 vpx_d207_predictor_16x16_c -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_32x32 vpx_d207_predictor_32x32_c -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_c -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_8x8 vpx_d207_predictor_8x8_c -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_16x16 vpx_d45_predictor_16x16_c -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_32x32 vpx_d45_predictor_32x32_c -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_c -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_c -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_16x16 vpx_d63_predictor_16x16_c -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_32x32 vpx_d63_predictor_32x32_c -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_4x4 vpx_d63_predictor_4x4_c -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_8x8 vpx_d63_predictor_8x8_c -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_c -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_c -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_c -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_c -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_c -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_c -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_c -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_c -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_c -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_c -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_c -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_c -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_c -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_c -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_c -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_c -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16 vpx_fdct16x16_c -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16_1 vpx_fdct16x16_1_c -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32 vpx_fdct32x32_c -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_1 vpx_fdct32x32_1_c -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_rd vpx_fdct32x32_rd_c -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4 vpx_fdct4x4_c -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4_1 vpx_fdct4x4_1_c -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8 vpx_fdct8x8_c -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8_1 vpx_fdct8x8_1_c -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get16x16var vpx_get16x16var_c -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_c -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); #define vpx_get8x8var vpx_get8x8var_c -unsigned int vpx_get_mb_ss_c(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); #define vpx_get_mb_ss vpx_get_mb_ss_c -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_16x16 vpx_h_predictor_16x16_c -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_32x32 vpx_h_predictor_32x32_c -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_4x4 vpx_h_predictor_4x4_c -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_8x8 vpx_h_predictor_8x8_c -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); #define vpx_hadamard_16x16 vpx_hadamard_16x16_c -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); #define vpx_hadamard_8x8 vpx_hadamard_8x8_c -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_highbd_10_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get16x16var vpx_highbd_10_get16x16var_c -void vpx_highbd_10_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get8x8var vpx_highbd_10_get8x8var_c -unsigned int vpx_highbd_10_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse16x16 vpx_highbd_10_mse16x16_c -unsigned int vpx_highbd_10_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse16x8 vpx_highbd_10_mse16x8_c -unsigned int vpx_highbd_10_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse8x16 vpx_highbd_10_mse8x16_c -unsigned int vpx_highbd_10_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse8x8 vpx_highbd_10_mse8x8_c uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x16 \ vpx_highbd_10_sub_pixel_avg_variance16x16_c uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x32 \ vpx_highbd_10_sub_pixel_avg_variance16x32_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x8 \ vpx_highbd_10_sub_pixel_avg_variance16x8_c uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x16 \ vpx_highbd_10_sub_pixel_avg_variance32x16_c uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x32 \ vpx_highbd_10_sub_pixel_avg_variance32x32_c uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x64 \ vpx_highbd_10_sub_pixel_avg_variance32x64_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x4 \ vpx_highbd_10_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x8 \ vpx_highbd_10_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance64x32 \ vpx_highbd_10_sub_pixel_avg_variance64x32_c uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance64x64 \ vpx_highbd_10_sub_pixel_avg_variance64x64_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x16 \ vpx_highbd_10_sub_pixel_avg_variance8x16_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x4 \ vpx_highbd_10_sub_pixel_avg_variance8x4_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x8 \ vpx_highbd_10_sub_pixel_avg_variance8x8_c -uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x16 \ vpx_highbd_10_sub_pixel_variance16x16_c -uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x32 \ vpx_highbd_10_sub_pixel_variance16x32_c -uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x8 \ vpx_highbd_10_sub_pixel_variance16x8_c -uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x16 \ vpx_highbd_10_sub_pixel_variance32x16_c -uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x32 \ vpx_highbd_10_sub_pixel_variance32x32_c -uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x64 \ vpx_highbd_10_sub_pixel_variance32x64_c -uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x4 \ vpx_highbd_10_sub_pixel_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x8 \ vpx_highbd_10_sub_pixel_variance4x8_c -uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance64x32 \ vpx_highbd_10_sub_pixel_variance64x32_c -uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance64x64 \ vpx_highbd_10_sub_pixel_variance64x64_c -uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x16 \ vpx_highbd_10_sub_pixel_variance8x16_c -uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x4 \ vpx_highbd_10_sub_pixel_variance8x4_c -uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x8 \ vpx_highbd_10_sub_pixel_variance8x8_c -unsigned int vpx_highbd_10_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance16x16 vpx_highbd_10_variance16x16_c -unsigned int vpx_highbd_10_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance16x32 vpx_highbd_10_variance16x32_c -unsigned int vpx_highbd_10_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance16x8 vpx_highbd_10_variance16x8_c -unsigned int vpx_highbd_10_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance32x16 vpx_highbd_10_variance32x16_c -unsigned int vpx_highbd_10_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance32x32 vpx_highbd_10_variance32x32_c -unsigned int vpx_highbd_10_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance32x64 vpx_highbd_10_variance32x64_c -unsigned int vpx_highbd_10_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x4 vpx_highbd_10_variance4x4_c -unsigned int vpx_highbd_10_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x8 vpx_highbd_10_variance4x8_c -unsigned int vpx_highbd_10_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance64x32 vpx_highbd_10_variance64x32_c -unsigned int vpx_highbd_10_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance64x64 vpx_highbd_10_variance64x64_c -unsigned int vpx_highbd_10_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance8x16 vpx_highbd_10_variance8x16_c -unsigned int vpx_highbd_10_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance8x4 vpx_highbd_10_variance8x4_c -unsigned int vpx_highbd_10_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance8x8 vpx_highbd_10_variance8x8_c -void vpx_highbd_12_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get16x16var vpx_highbd_12_get16x16var_c -void vpx_highbd_12_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get8x8var vpx_highbd_12_get8x8var_c -unsigned int vpx_highbd_12_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse16x16 vpx_highbd_12_mse16x16_c -unsigned int vpx_highbd_12_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse16x8 vpx_highbd_12_mse16x8_c -unsigned int vpx_highbd_12_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse8x16 vpx_highbd_12_mse8x16_c -unsigned int vpx_highbd_12_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse8x8 vpx_highbd_12_mse8x8_c uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x16 \ vpx_highbd_12_sub_pixel_avg_variance16x16_c uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x32 \ vpx_highbd_12_sub_pixel_avg_variance16x32_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x8 \ vpx_highbd_12_sub_pixel_avg_variance16x8_c uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x16 \ vpx_highbd_12_sub_pixel_avg_variance32x16_c uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x32 \ vpx_highbd_12_sub_pixel_avg_variance32x32_c uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x64 \ vpx_highbd_12_sub_pixel_avg_variance32x64_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x4 \ vpx_highbd_12_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x8 \ vpx_highbd_12_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance64x32 \ vpx_highbd_12_sub_pixel_avg_variance64x32_c uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance64x64 \ vpx_highbd_12_sub_pixel_avg_variance64x64_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x16 \ vpx_highbd_12_sub_pixel_avg_variance8x16_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x4 \ vpx_highbd_12_sub_pixel_avg_variance8x4_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x8 \ vpx_highbd_12_sub_pixel_avg_variance8x8_c -uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x16 \ vpx_highbd_12_sub_pixel_variance16x16_c -uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x32 \ vpx_highbd_12_sub_pixel_variance16x32_c -uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x8 \ vpx_highbd_12_sub_pixel_variance16x8_c -uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x16 \ vpx_highbd_12_sub_pixel_variance32x16_c -uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x32 \ vpx_highbd_12_sub_pixel_variance32x32_c -uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x64 \ vpx_highbd_12_sub_pixel_variance32x64_c -uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x4 \ vpx_highbd_12_sub_pixel_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x8 \ vpx_highbd_12_sub_pixel_variance4x8_c -uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance64x32 \ vpx_highbd_12_sub_pixel_variance64x32_c -uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance64x64 \ vpx_highbd_12_sub_pixel_variance64x64_c -uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x16 \ vpx_highbd_12_sub_pixel_variance8x16_c -uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x4 \ vpx_highbd_12_sub_pixel_variance8x4_c -uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x8 \ vpx_highbd_12_sub_pixel_variance8x8_c -unsigned int vpx_highbd_12_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance16x16 vpx_highbd_12_variance16x16_c -unsigned int vpx_highbd_12_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance16x32 vpx_highbd_12_variance16x32_c -unsigned int vpx_highbd_12_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance16x8 vpx_highbd_12_variance16x8_c -unsigned int vpx_highbd_12_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance32x16 vpx_highbd_12_variance32x16_c -unsigned int vpx_highbd_12_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance32x32 vpx_highbd_12_variance32x32_c -unsigned int vpx_highbd_12_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance32x64 vpx_highbd_12_variance32x64_c -unsigned int vpx_highbd_12_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x4 vpx_highbd_12_variance4x4_c -unsigned int vpx_highbd_12_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x8 vpx_highbd_12_variance4x8_c -unsigned int vpx_highbd_12_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance64x32 vpx_highbd_12_variance64x32_c -unsigned int vpx_highbd_12_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance64x64 vpx_highbd_12_variance64x64_c -unsigned int vpx_highbd_12_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance8x16 vpx_highbd_12_variance8x16_c -unsigned int vpx_highbd_12_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance8x4 vpx_highbd_12_variance8x4_c -unsigned int vpx_highbd_12_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance8x8 vpx_highbd_12_variance8x8_c -void vpx_highbd_8_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get16x16var vpx_highbd_8_get16x16var_c -void vpx_highbd_8_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get8x8var vpx_highbd_8_get8x8var_c -unsigned int vpx_highbd_8_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse16x16 vpx_highbd_8_mse16x16_c -unsigned int vpx_highbd_8_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse16x8 vpx_highbd_8_mse16x8_c -unsigned int vpx_highbd_8_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse8x16 vpx_highbd_8_mse8x16_c -unsigned int vpx_highbd_8_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse8x8 vpx_highbd_8_mse8x8_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x16 \ vpx_highbd_8_sub_pixel_avg_variance16x16_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x32 \ vpx_highbd_8_sub_pixel_avg_variance16x32_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x8 \ vpx_highbd_8_sub_pixel_avg_variance16x8_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x16 \ vpx_highbd_8_sub_pixel_avg_variance32x16_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x32 \ vpx_highbd_8_sub_pixel_avg_variance32x32_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x64 \ vpx_highbd_8_sub_pixel_avg_variance32x64_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x4 \ vpx_highbd_8_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x8 \ vpx_highbd_8_sub_pixel_avg_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance64x32 \ vpx_highbd_8_sub_pixel_avg_variance64x32_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance64x64 \ vpx_highbd_8_sub_pixel_avg_variance64x64_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x16 \ vpx_highbd_8_sub_pixel_avg_variance8x16_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x4 \ vpx_highbd_8_sub_pixel_avg_variance8x4_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x8 \ vpx_highbd_8_sub_pixel_avg_variance8x8_c -uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x16 \ vpx_highbd_8_sub_pixel_variance16x16_c -uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x32 \ vpx_highbd_8_sub_pixel_variance16x32_c -uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x8 \ vpx_highbd_8_sub_pixel_variance16x8_c -uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x16 \ vpx_highbd_8_sub_pixel_variance32x16_c -uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x32 \ vpx_highbd_8_sub_pixel_variance32x32_c -uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x64 \ vpx_highbd_8_sub_pixel_variance32x64_c -uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x4 vpx_highbd_8_sub_pixel_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x8 vpx_highbd_8_sub_pixel_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance64x32 \ vpx_highbd_8_sub_pixel_variance64x32_c -uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance64x64 \ vpx_highbd_8_sub_pixel_variance64x64_c -uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x16 \ vpx_highbd_8_sub_pixel_variance8x16_c -uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x4 vpx_highbd_8_sub_pixel_variance8x4_c -uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x8 vpx_highbd_8_sub_pixel_variance8x8_c -unsigned int vpx_highbd_8_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance16x16 vpx_highbd_8_variance16x16_c -unsigned int vpx_highbd_8_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance16x32 vpx_highbd_8_variance16x32_c -unsigned int vpx_highbd_8_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance16x8 vpx_highbd_8_variance16x8_c -unsigned int vpx_highbd_8_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x16 vpx_highbd_8_variance32x16_c -unsigned int vpx_highbd_8_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x32 vpx_highbd_8_variance32x32_c -unsigned int vpx_highbd_8_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x64 vpx_highbd_8_variance32x64_c -unsigned int vpx_highbd_8_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x4 vpx_highbd_8_variance4x4_c -unsigned int vpx_highbd_8_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x8 vpx_highbd_8_variance4x8_c -unsigned int vpx_highbd_8_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance64x32 vpx_highbd_8_variance64x32_c -unsigned int vpx_highbd_8_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance64x64 vpx_highbd_8_variance64x64_c -unsigned int vpx_highbd_8_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance8x16 vpx_highbd_8_variance8x16_c -unsigned int vpx_highbd_8_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance8x4 vpx_highbd_8_variance8x4_c -unsigned int vpx_highbd_8_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance8x8 vpx_highbd_8_variance8x8_c -unsigned int vpx_highbd_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_4x4_c(const uint8_t *, int p); #define vpx_highbd_avg_4x4 vpx_highbd_avg_4x4_c -unsigned int vpx_highbd_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_8x8_c(const uint8_t *, int p); #define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c -void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred, - const uint16_t* pred, - int width, - int height, - const uint16_t* ref, +void vpx_highbd_comp_avg_pred_c(uint16_t *comp_pred, const uint16_t *pred, + int width, int height, const uint16_t *ref, int ref_stride); #define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c -void vpx_highbd_convolve8_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); #define vpx_highbd_convolve8 vpx_highbd_convolve8_c -void vpx_highbd_convolve8_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); #define vpx_highbd_convolve8_avg vpx_highbd_convolve8_avg_c -void vpx_highbd_convolve8_avg_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_avg_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); #define vpx_highbd_convolve8_avg_horiz vpx_highbd_convolve8_avg_horiz_c -void vpx_highbd_convolve8_avg_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_avg_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); #define vpx_highbd_convolve8_avg_vert vpx_highbd_convolve8_avg_vert_c -void vpx_highbd_convolve8_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); #define vpx_highbd_convolve8_horiz vpx_highbd_convolve8_horiz_c -void vpx_highbd_convolve8_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); #define vpx_highbd_convolve8_vert vpx_highbd_convolve8_vert_c -void vpx_highbd_convolve_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); #define vpx_highbd_convolve_avg vpx_highbd_convolve_avg_c -void vpx_highbd_convolve_copy_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_copy_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); #define vpx_highbd_convolve_copy vpx_highbd_convolve_copy_c -void vpx_highbd_d117_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d117_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d117_predictor_16x16 vpx_highbd_d117_predictor_16x16_c -void vpx_highbd_d117_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d117_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d117_predictor_32x32 vpx_highbd_d117_predictor_32x32_c -void vpx_highbd_d117_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d117_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d117_predictor_4x4 vpx_highbd_d117_predictor_4x4_c -void vpx_highbd_d117_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d117_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d117_predictor_8x8 vpx_highbd_d117_predictor_8x8_c -void vpx_highbd_d135_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d135_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d135_predictor_16x16 vpx_highbd_d135_predictor_16x16_c -void vpx_highbd_d135_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d135_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d135_predictor_32x32 vpx_highbd_d135_predictor_32x32_c -void vpx_highbd_d135_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d135_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d135_predictor_4x4 vpx_highbd_d135_predictor_4x4_c -void vpx_highbd_d135_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d135_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d135_predictor_8x8 vpx_highbd_d135_predictor_8x8_c -void vpx_highbd_d153_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d153_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d153_predictor_16x16 vpx_highbd_d153_predictor_16x16_c -void vpx_highbd_d153_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d153_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d153_predictor_32x32 vpx_highbd_d153_predictor_32x32_c -void vpx_highbd_d153_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d153_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d153_predictor_4x4 vpx_highbd_d153_predictor_4x4_c -void vpx_highbd_d153_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d153_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d153_predictor_8x8 vpx_highbd_d153_predictor_8x8_c -void vpx_highbd_d207_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d207_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d207_predictor_16x16 vpx_highbd_d207_predictor_16x16_c -void vpx_highbd_d207_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d207_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d207_predictor_32x32 vpx_highbd_d207_predictor_32x32_c -void vpx_highbd_d207_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d207_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d207_predictor_4x4 vpx_highbd_d207_predictor_4x4_c -void vpx_highbd_d207_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d207_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d207_predictor_8x8 vpx_highbd_d207_predictor_8x8_c -void vpx_highbd_d45_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d45_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d45_predictor_16x16 vpx_highbd_d45_predictor_16x16_c -void vpx_highbd_d45_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d45_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d45_predictor_32x32 vpx_highbd_d45_predictor_32x32_c -void vpx_highbd_d45_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_d45_predictor_4x4 vpx_highbd_d45_predictor_4x4_c -void vpx_highbd_d45_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_d45_predictor_8x8 vpx_highbd_d45_predictor_8x8_c -void vpx_highbd_d63_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d63_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d63_predictor_16x16 vpx_highbd_d63_predictor_16x16_c -void vpx_highbd_d63_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d63_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d63_predictor_32x32 vpx_highbd_d63_predictor_32x32_c -void vpx_highbd_d63_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_d63_predictor_4x4 vpx_highbd_d63_predictor_4x4_c -void vpx_highbd_d63_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_d63_predictor_8x8 vpx_highbd_d63_predictor_8x8_c -void vpx_highbd_dc_128_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_16x16 vpx_highbd_dc_128_predictor_16x16_c -void vpx_highbd_dc_128_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_32x32 vpx_highbd_dc_128_predictor_32x32_c -void vpx_highbd_dc_128_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_4x4 vpx_highbd_dc_128_predictor_4x4_c -void vpx_highbd_dc_128_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_8x8 vpx_highbd_dc_128_predictor_8x8_c -void vpx_highbd_dc_left_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_16x16 vpx_highbd_dc_left_predictor_16x16_c -void vpx_highbd_dc_left_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_32x32 vpx_highbd_dc_left_predictor_32x32_c -void vpx_highbd_dc_left_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_4x4 vpx_highbd_dc_left_predictor_4x4_c -void vpx_highbd_dc_left_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_8x8 vpx_highbd_dc_left_predictor_8x8_c -void vpx_highbd_dc_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_16x16 vpx_highbd_dc_predictor_16x16_c -void vpx_highbd_dc_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_32x32 vpx_highbd_dc_predictor_32x32_c -void vpx_highbd_dc_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_4x4 vpx_highbd_dc_predictor_4x4_c -void vpx_highbd_dc_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_8x8 vpx_highbd_dc_predictor_8x8_c -void vpx_highbd_dc_top_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_16x16 vpx_highbd_dc_top_predictor_16x16_c -void vpx_highbd_dc_top_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_32x32 vpx_highbd_dc_top_predictor_32x32_c -void vpx_highbd_dc_top_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_4x4 vpx_highbd_dc_top_predictor_4x4_c -void vpx_highbd_dc_top_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_8x8 vpx_highbd_dc_top_predictor_8x8_c -void vpx_highbd_fdct16x16_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct16x16 vpx_highbd_fdct16x16_c -void vpx_highbd_fdct16x16_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct16x16_1 vpx_highbd_fdct16x16_1_c -void vpx_highbd_fdct32x32_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32 vpx_highbd_fdct32x32_c -void vpx_highbd_fdct32x32_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32_1 vpx_highbd_fdct32x32_1_c -void vpx_highbd_fdct32x32_rd_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32_rd vpx_highbd_fdct32x32_rd_c -void vpx_highbd_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct4x4 vpx_highbd_fdct4x4_c -void vpx_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_highbd_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct8x8 vpx_highbd_fdct8x8_c -void vpx_highbd_fdct8x8_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct8x8_1 vpx_highbd_fdct8x8_1_c -void vpx_highbd_h_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_h_predictor_16x16 vpx_highbd_h_predictor_16x16_c -void vpx_highbd_h_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_h_predictor_32x32 vpx_highbd_h_predictor_32x32_c -void vpx_highbd_h_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_h_predictor_4x4 vpx_highbd_h_predictor_4x4_c -void vpx_highbd_h_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_h_predictor_8x8 vpx_highbd_h_predictor_8x8_c -void vpx_highbd_idct16x16_10_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct16x16_10_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct16x16_10_add vpx_highbd_idct16x16_10_add_c -void vpx_highbd_idct16x16_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct16x16_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct16x16_1_add vpx_highbd_idct16x16_1_add_c -void vpx_highbd_idct16x16_256_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct16x16_256_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct16x16_256_add vpx_highbd_idct16x16_256_add_c -void vpx_highbd_idct16x16_38_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct16x16_38_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct16x16_38_add vpx_highbd_idct16x16_38_add_c -void vpx_highbd_idct32x32_1024_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct32x32_1024_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct32x32_1024_add vpx_highbd_idct32x32_1024_add_c -void vpx_highbd_idct32x32_135_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct32x32_135_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct32x32_135_add vpx_highbd_idct32x32_135_add_c -void vpx_highbd_idct32x32_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct32x32_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct32x32_1_add vpx_highbd_idct32x32_1_add_c -void vpx_highbd_idct32x32_34_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct32x32_34_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct32x32_34_add vpx_highbd_idct32x32_34_add_c -void vpx_highbd_idct4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct4x4_16_add vpx_highbd_idct4x4_16_add_c -void vpx_highbd_idct4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct4x4_1_add vpx_highbd_idct4x4_1_add_c -void vpx_highbd_idct8x8_12_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct8x8_12_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct8x8_12_add vpx_highbd_idct8x8_12_add_c -void vpx_highbd_idct8x8_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct8x8_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct8x8_1_add vpx_highbd_idct8x8_1_add_c -void vpx_highbd_idct8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct8x8_64_add vpx_highbd_idct8x8_64_add_c -void vpx_highbd_iwht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_16_add vpx_highbd_iwht4x4_16_add_c -void vpx_highbd_iwht4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_1_add vpx_highbd_iwht4x4_1_add_c -void vpx_highbd_lpf_horizontal_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_16_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_16 vpx_highbd_lpf_horizontal_16_c -void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_16_dual vpx_highbd_lpf_horizontal_16_dual_c -void vpx_highbd_lpf_horizontal_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_4_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_4 vpx_highbd_lpf_horizontal_4_c -void vpx_highbd_lpf_horizontal_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_horizontal_4_dual vpx_highbd_lpf_horizontal_4_dual_c -void vpx_highbd_lpf_horizontal_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_8_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_8 vpx_highbd_lpf_horizontal_8_c -void vpx_highbd_lpf_horizontal_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_horizontal_8_dual vpx_highbd_lpf_horizontal_8_dual_c -void vpx_highbd_lpf_vertical_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_16_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_16 vpx_highbd_lpf_vertical_16_c -void vpx_highbd_lpf_vertical_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_16_dual vpx_highbd_lpf_vertical_16_dual_c -void vpx_highbd_lpf_vertical_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_4_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_4 vpx_highbd_lpf_vertical_4_c -void vpx_highbd_lpf_vertical_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_vertical_4_dual vpx_highbd_lpf_vertical_4_dual_c -void vpx_highbd_lpf_vertical_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_8_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_8 vpx_highbd_lpf_vertical_8_c -void vpx_highbd_lpf_vertical_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_vertical_8_dual vpx_highbd_lpf_vertical_8_dual_c -void vpx_highbd_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_highbd_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_highbd_minmax_8x8 vpx_highbd_minmax_8x8_c -void vpx_highbd_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_highbd_quantize_b vpx_highbd_quantize_b_c -void vpx_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_highbd_quantize_b_32x32 vpx_highbd_quantize_b_32x32_c -unsigned int vpx_highbd_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x16 vpx_highbd_sad16x16_c -unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad16x16_avg vpx_highbd_sad16x16_avg_c -void vpx_highbd_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x16x4d vpx_highbd_sad16x16x4d_c -unsigned int vpx_highbd_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x32 vpx_highbd_sad16x32_c -unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad16x32_avg vpx_highbd_sad16x32_avg_c -void vpx_highbd_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x32x4d vpx_highbd_sad16x32x4d_c -unsigned int vpx_highbd_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x8 vpx_highbd_sad16x8_c -unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad16x8_avg vpx_highbd_sad16x8_avg_c -void vpx_highbd_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x8x4d vpx_highbd_sad16x8x4d_c -unsigned int vpx_highbd_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x16 vpx_highbd_sad32x16_c -unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad32x16_avg vpx_highbd_sad32x16_avg_c -void vpx_highbd_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x16x4d vpx_highbd_sad32x16x4d_c -unsigned int vpx_highbd_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x32 vpx_highbd_sad32x32_c -unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad32x32_avg vpx_highbd_sad32x32_avg_c -void vpx_highbd_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x32x4d vpx_highbd_sad32x32x4d_c -unsigned int vpx_highbd_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x64 vpx_highbd_sad32x64_c -unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad32x64_avg vpx_highbd_sad32x64_avg_c -void vpx_highbd_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x64x4d vpx_highbd_sad32x64x4d_c -unsigned int vpx_highbd_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x4 vpx_highbd_sad4x4_c -unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x4_avg vpx_highbd_sad4x4_avg_c -void vpx_highbd_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad4x4x4d vpx_highbd_sad4x4x4d_c -unsigned int vpx_highbd_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x8 vpx_highbd_sad4x8_c -unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x8_avg vpx_highbd_sad4x8_avg_c -void vpx_highbd_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad4x8x4d vpx_highbd_sad4x8x4d_c -unsigned int vpx_highbd_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad64x32 vpx_highbd_sad64x32_c -unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad64x32_avg vpx_highbd_sad64x32_avg_c -void vpx_highbd_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad64x32x4d vpx_highbd_sad64x32x4d_c -unsigned int vpx_highbd_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad64x64 vpx_highbd_sad64x64_c -unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad64x64_avg vpx_highbd_sad64x64_avg_c -void vpx_highbd_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad64x64x4d vpx_highbd_sad64x64x4d_c -unsigned int vpx_highbd_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x16 vpx_highbd_sad8x16_c -unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x16_avg vpx_highbd_sad8x16_avg_c -void vpx_highbd_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x16x4d vpx_highbd_sad8x16x4d_c -unsigned int vpx_highbd_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x4 vpx_highbd_sad8x4_c -unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x4_avg vpx_highbd_sad8x4_avg_c -void vpx_highbd_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x4x4d vpx_highbd_sad8x4x4d_c -unsigned int vpx_highbd_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x8 vpx_highbd_sad8x8_c -unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x8_avg vpx_highbd_sad8x8_avg_c -void vpx_highbd_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x8x4d vpx_highbd_sad8x8x4d_c -void vpx_highbd_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, - ptrdiff_t pred_stride, - int bd); +void vpx_highbd_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, + ptrdiff_t pred_stride, int bd); #define vpx_highbd_subtract_block vpx_highbd_subtract_block_c -void vpx_highbd_tm_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_16x16 vpx_highbd_tm_predictor_16x16_c -void vpx_highbd_tm_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_32x32 vpx_highbd_tm_predictor_32x32_c -void vpx_highbd_tm_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_4x4 vpx_highbd_tm_predictor_4x4_c -void vpx_highbd_tm_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_8x8 vpx_highbd_tm_predictor_8x8_c -void vpx_highbd_v_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_v_predictor_16x16 vpx_highbd_v_predictor_16x16_c -void vpx_highbd_v_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_v_predictor_32x32 vpx_highbd_v_predictor_32x32_c -void vpx_highbd_v_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_v_predictor_4x4 vpx_highbd_v_predictor_4x4_c -void vpx_highbd_v_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_v_predictor_8x8 vpx_highbd_v_predictor_8x8_c -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_10_add vpx_idct16x16_10_add_c -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_1_add vpx_idct16x16_1_add_c -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_256_add vpx_idct16x16_256_add_c -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_38_add vpx_idct16x16_38_add_c -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_c -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_135_add vpx_idct32x32_135_add_c -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1_add vpx_idct32x32_1_add_c -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_34_add vpx_idct32x32_34_add_c -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_16_add vpx_idct4x4_16_add_c -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_1_add vpx_idct4x4_1_add_c -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_12_add vpx_idct8x8_12_add_c -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_1_add vpx_idct8x8_1_add_c -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_64_add vpx_idct8x8_64_add_c -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); #define vpx_int_pro_col vpx_int_pro_col_c -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); #define vpx_int_pro_row vpx_int_pro_row_c -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_c -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16 vpx_lpf_horizontal_16_c -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16_dual vpx_lpf_horizontal_16_dual_c -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_c -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_c -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_c -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_c -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16 vpx_lpf_vertical_16_c -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_c -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_4 vpx_lpf_vertical_4_c -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_4_dual vpx_lpf_vertical_4_dual_c -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_8 vpx_lpf_vertical_8_c -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_c -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_across_ip vpx_mbpost_proc_across_ip_c -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); #define vpx_mbpost_proc_down vpx_mbpost_proc_down_c -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_minmax_8x8 vpx_minmax_8x8_c -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x16 vpx_mse16x16_c -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x8 vpx_mse16x8_c -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x16 vpx_mse8x16_c -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x8 vpx_mse8x8_c -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); #define vpx_plane_add_noise vpx_plane_add_noise_c -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); #define vpx_post_proc_down_and_across_mb_row \ vpx_post_proc_down_and_across_mb_row_c -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vpx_quantize_b vpx_quantize_b_c -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_quantize_b_32x32 vpx_quantize_b_32x32_c -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x16 vpx_sad16x16_c -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x16_avg vpx_sad16x16_avg_c -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x3 vpx_sad16x16x3_c -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x4d vpx_sad16x16x4d_c -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x8 vpx_sad16x16x8_c -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x32 vpx_sad16x32_c -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x32_avg vpx_sad16x32_avg_c -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x32x4d vpx_sad16x32x4d_c -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x8 vpx_sad16x8_c -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x8_avg vpx_sad16x8_avg_c -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x3 vpx_sad16x8x3_c -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x4d vpx_sad16x8x4d_c -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x8 vpx_sad16x8x8_c -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x16 vpx_sad32x16_c -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x16_avg vpx_sad32x16_avg_c -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x16x4d vpx_sad32x16x4d_c -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x32 vpx_sad32x32_c -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x32_avg vpx_sad32x32_avg_c -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x32x4d vpx_sad32x32x4d_c -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x64 vpx_sad32x64_c -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x64_avg vpx_sad32x64_avg_c -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x64x4d vpx_sad32x64x4d_c -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x4 vpx_sad4x4_c -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x4_avg vpx_sad4x4_avg_c -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x3 vpx_sad4x4x3_c -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x4d vpx_sad4x4x4d_c -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x8 vpx_sad4x4x8_c -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x8 vpx_sad4x8_c -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x8_avg vpx_sad4x8_avg_c -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x8x4d vpx_sad4x8x4d_c -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x32 vpx_sad64x32_c -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x32_avg vpx_sad64x32_avg_c -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x32x4d vpx_sad64x32x4d_c -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x64 vpx_sad64x64_c -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x64_avg vpx_sad64x64_avg_c -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x64x4d vpx_sad64x64x4d_c -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x16 vpx_sad8x16_c -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x16_avg vpx_sad8x16_avg_c -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x3 vpx_sad8x16x3_c -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x4d vpx_sad8x16x4d_c -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x8 vpx_sad8x16x8_c -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x4 vpx_sad8x4_c -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x4_avg vpx_sad8x4_avg_c -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x4x4d vpx_sad8x4x4d_c -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x8 vpx_sad8x8_c -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x8_avg vpx_sad8x8_avg_c -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x3 vpx_sad8x8x3_c -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x4d vpx_sad8x8x4d_c -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x8 vpx_sad8x8x8_c -int vpx_satd_c(const tran_low_t* coeff, int length); +int vpx_satd_c(const tran_low_t *coeff, int length); #define vpx_satd vpx_satd_c -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_2d vpx_scaled_2d_c -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x16 vpx_sub_pixel_avg_variance16x16_c -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x32 vpx_sub_pixel_avg_variance16x32_c -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x8 vpx_sub_pixel_avg_variance16x8_c -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x16 vpx_sub_pixel_avg_variance32x16_c -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x32 vpx_sub_pixel_avg_variance32x32_c -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x64 vpx_sub_pixel_avg_variance32x64_c -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x4 vpx_sub_pixel_avg_variance4x4_c -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x8 vpx_sub_pixel_avg_variance4x8_c -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x32 vpx_sub_pixel_avg_variance64x32_c -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x64 vpx_sub_pixel_avg_variance64x64_c -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x16 vpx_sub_pixel_avg_variance8x16_c -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x4 vpx_sub_pixel_avg_variance8x4_c -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x8 vpx_sub_pixel_avg_variance8x8_c -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x16 vpx_sub_pixel_variance16x16_c -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x32 vpx_sub_pixel_variance16x32_c -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance16x8 vpx_sub_pixel_variance16x8_c -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x16 vpx_sub_pixel_variance32x16_c -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x32 vpx_sub_pixel_variance32x32_c -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x64 vpx_sub_pixel_variance32x64_c -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance4x4 vpx_sub_pixel_variance4x4_c -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance4x8 vpx_sub_pixel_variance4x8_c -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x32 vpx_sub_pixel_variance64x32_c -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x64 vpx_sub_pixel_variance64x64_c -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x16 vpx_sub_pixel_variance8x16_c -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_c -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_c -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); #define vpx_subtract_block vpx_subtract_block_c -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_c -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_c -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_c -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_c -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_16x16 vpx_v_predictor_16x16_c -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_32x32 vpx_v_predictor_32x32_c -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_4x4 vpx_v_predictor_4x4_c -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_c -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x16 vpx_variance16x16_c -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x32 vpx_variance16x32_c -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x8 vpx_variance16x8_c -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x16 vpx_variance32x16_c -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x32 vpx_variance32x32_c -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x64 vpx_variance32x64_c -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x4 vpx_variance4x4_c -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x8 vpx_variance4x8_c -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x32 vpx_variance64x32_c -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x64 vpx_variance64x64_c -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x16 vpx_variance8x16_c -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x4 vpx_variance8x4_c -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x8 vpx_variance8x8_c -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); #define vpx_vector_var vpx_vector_var_c void vpx_dsp_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/generic/vpx_scale_rtcd.h b/third_party/libvpx/source/config/linux/generic/vpx_scale_rtcd.h index c5196db4d..aa7e4b1 100644 --- a/third_party/libvpx/source/config/linux/generic/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/linux/generic/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/ia32/vp8_rtcd.h b/third_party/libvpx/source/config/linux/ia32/vp8_rtcd.h index 9472db1..834d00c0 100644 --- a/third_party/libvpx/source/config/linux/ia32/vp8_rtcd.h +++ b/third_party/libvpx/source/config/linux/ia32/vp8_rtcd.h
@@ -27,712 +27,399 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict16x16_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict16x16_sse2(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict16x16_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_ssse3(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict4x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict4x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict4x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict8x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict8x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); -int vp8_block_error_sse2(short* coeff, short* dqcoeff); -RTCD_EXTERN int (*vp8_block_error)(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); +int vp8_block_error_sse2(short *coeff, short *dqcoeff); +RTCD_EXTERN int (*vp8_block_error)(short *coeff, short *dqcoeff); -void vp8_copy32xn_c(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -void vp8_copy32xn_sse2(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -void vp8_copy32xn_sse3(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); +void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char *src_ptr, + int source_stride, unsigned char *dst_ptr, + int dst_stride, int n); -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem16x16_sse2(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_copy_mem16x16)(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +void vp8_copy_mem16x16_sse2(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_copy_mem16x16)(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_mmx(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_mmx(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_copy_mem8x8)(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_copy_mem8x8)(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -void vp8_dc_only_idct_add_mmx(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -RTCD_EXTERN void (*vp8_dc_only_idct_add)(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +void vp8_dc_only_idct_add_mmx(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +RTCD_EXTERN void (*vp8_dc_only_idct_add)(short input, unsigned char *pred, + int pred_stride, unsigned char *dst, int dst_stride); -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_sse2(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_sse2(unsigned char *mc_running_avg_y, + int mc_avg_y_stride, unsigned char *running_avg_y, + int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -RTCD_EXTERN int (*vp8_denoiser_filter)(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, - int increase_denoising); +RTCD_EXTERN int (*vp8_denoiser_filter)( + unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_sse2(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_uv_sse2(unsigned char *mc_running_avg, + int mc_avg_stride, unsigned char *running_avg, + int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -RTCD_EXTERN int (*vp8_denoiser_filter_uv)(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, - int increase_denoising); +RTCD_EXTERN int (*vp8_denoiser_filter_uv)( + unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); -void vp8_dequant_idct_add_mmx(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_mmx(short *input, short *dq, unsigned char *output, int stride); -RTCD_EXTERN void (*vp8_dequant_idct_add)(short* input, - short* dq, - unsigned char* output, - int stride); +RTCD_EXTERN void (*vp8_dequant_idct_add)(short *input, short *dq, + unsigned char *output, int stride); -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -void vp8_dequant_idct_add_uv_block_sse2(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -RTCD_EXTERN void (*vp8_dequant_idct_add_uv_block)(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +void vp8_dequant_idct_add_uv_block_sse2(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +RTCD_EXTERN void (*vp8_dequant_idct_add_uv_block)(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, + int stride, char *eobs); -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -void vp8_dequant_idct_add_y_block_sse2(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -RTCD_EXTERN void (*vp8_dequant_idct_add_y_block)(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +void vp8_dequant_idct_add_y_block_sse2(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +RTCD_EXTERN void (*vp8_dequant_idct_add_y_block)(short *q, short *dq, + unsigned char *dst, int stride, + char *eobs); -void vp8_dequantize_b_c(struct blockd*, short* dqc); -void vp8_dequantize_b_mmx(struct blockd*, short* dqc); -RTCD_EXTERN void (*vp8_dequantize_b)(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); +void vp8_dequantize_b_mmx(struct blockd *, short *dqc); +RTCD_EXTERN void (*vp8_dequantize_b)(struct blockd *, short *dqc); -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_diamond_search_sadx4(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -RTCD_EXTERN int (*vp8_diamond_search_sad)(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_diamond_search_sadx4(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +RTCD_EXTERN int (*vp8_diamond_search_sad)( + struct macroblock *x, struct block *b, struct blockd *d, + union int_mv *ref_mv, union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); -void vp8_fast_quantize_b_c(struct block*, struct blockd*); -void vp8_fast_quantize_b_sse2(struct block*, struct blockd*); -void vp8_fast_quantize_b_ssse3(struct block*, struct blockd*); -RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); +void vp8_fast_quantize_b_sse2(struct block *, struct blockd *); +void vp8_fast_quantize_b_ssse3(struct block *, struct blockd *); +RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block *, struct blockd *); -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -void vp8_filter_by_weight16x16_sse2(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -RTCD_EXTERN void (*vp8_filter_by_weight16x16)(unsigned char* src, +RTCD_EXTERN void (*vp8_filter_by_weight16x16)(unsigned char *src, int src_stride, - unsigned char* dst, - int dst_stride, - int src_weight); + unsigned char *dst, + int dst_stride, int src_weight); -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -void vp8_filter_by_weight8x8_sse2(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -RTCD_EXTERN void (*vp8_filter_by_weight8x8)(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +RTCD_EXTERN void (*vp8_filter_by_weight8x8)(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_full_search_sadx3(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_full_search_sadx8(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_full_search_sadx3(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_full_search_sadx8(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, + int *mvcost[2], union int_mv *center_mv); -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bh_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_bh)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bh_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_bh)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bv_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_bv)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bv_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_bv)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbh_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_mbh)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbh_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_mbh)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbv_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_mbv)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbv_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_mbv)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bhs_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_bh)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bhs_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_bh)(unsigned char *y, int ystride, + const unsigned char *blimit); -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bvs_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_bv)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bvs_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_bv)(unsigned char *y, int ystride, + const unsigned char *blimit); -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_mbh)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_mbh)(unsigned char *y, int ystride, + const unsigned char *blimit); -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_mbv)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_mbv)(unsigned char *y, int ystride, + const unsigned char *blimit); -int vp8_mbblock_error_c(struct macroblock* mb, int dc); -int vp8_mbblock_error_sse2(struct macroblock* mb, int dc); -RTCD_EXTERN int (*vp8_mbblock_error)(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); +int vp8_mbblock_error_sse2(struct macroblock *mb, int dc); +RTCD_EXTERN int (*vp8_mbblock_error)(struct macroblock *mb, int dc); -int vp8_mbuverror_c(struct macroblock* mb); -int vp8_mbuverror_sse2(struct macroblock* mb); -RTCD_EXTERN int (*vp8_mbuverror)(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); +int vp8_mbuverror_sse2(struct macroblock *mb); +RTCD_EXTERN int (*vp8_mbuverror)(struct macroblock *mb); -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_refining_search_sadx4(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -RTCD_EXTERN int (*vp8_refining_search_sad)(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_refining_search_sadx4(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +RTCD_EXTERN int (*vp8_refining_search_sad)( + struct macroblock *x, struct block *b, struct blockd *d, + union int_mv *ref_mv, int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv); -void vp8_regular_quantize_b_c(struct block*, struct blockd*); -void vp8_regular_quantize_b_sse2(struct block*, struct blockd*); -void vp8_regular_quantize_b_sse4_1(struct block*, struct blockd*); -RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); +void vp8_regular_quantize_b_sse2(struct block *, struct blockd *); +void vp8_regular_quantize_b_sse4_1(struct block *, struct blockd *); +RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block *, struct blockd *); -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); -void vp8_short_fdct4x4_sse2(short* input, short* output, int pitch); -RTCD_EXTERN void (*vp8_short_fdct4x4)(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); +void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch); +RTCD_EXTERN void (*vp8_short_fdct4x4)(short *input, short *output, int pitch); -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); -void vp8_short_fdct8x4_sse2(short* input, short* output, int pitch); -RTCD_EXTERN void (*vp8_short_fdct8x4)(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); +void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch); +RTCD_EXTERN void (*vp8_short_fdct8x4)(short *input, short *output, int pitch); -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -void vp8_short_idct4x4llm_mmx(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -RTCD_EXTERN void (*vp8_short_idct4x4llm)(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +RTCD_EXTERN void (*vp8_short_idct4x4llm)(short *input, unsigned char *pred, + int pitch, unsigned char *dst, int dst_stride); -void vp8_short_inv_walsh4x4_c(short* input, short* output); -void vp8_short_inv_walsh4x4_sse2(short* input, short* output); -RTCD_EXTERN void (*vp8_short_inv_walsh4x4)(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); +void vp8_short_inv_walsh4x4_sse2(short *input, short *output); +RTCD_EXTERN void (*vp8_short_inv_walsh4x4)(short *input, short *output); -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); -void vp8_short_walsh4x4_sse2(short* input, short* output, int pitch); -RTCD_EXTERN void (*vp8_short_walsh4x4)(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); +void vp8_short_walsh4x4_sse2(short *input, short *output, int pitch); +RTCD_EXTERN void (*vp8_short_walsh4x4)(short *input, short *output, int pitch); -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); void vp8_rtcd(void); @@ -749,45 +436,32 @@ if (flags & HAS_SSSE3) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_ssse3; vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_c; - if (flags & HAS_MMX) - vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_mmx; + if (flags & HAS_MMX) vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_mmx; vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_c; - if (flags & HAS_MMX) - vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_mmx; + if (flags & HAS_MMX) vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_mmx; vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_c; - if (flags & HAS_SSE2) - vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_sse2; + if (flags & HAS_SSE2) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_sse2; if (flags & HAS_SSSE3) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_ssse3; vp8_block_error = vp8_block_error_c; - if (flags & HAS_SSE2) - vp8_block_error = vp8_block_error_sse2; + if (flags & HAS_SSE2) vp8_block_error = vp8_block_error_sse2; vp8_copy32xn = vp8_copy32xn_c; - if (flags & HAS_SSE2) - vp8_copy32xn = vp8_copy32xn_sse2; - if (flags & HAS_SSE3) - vp8_copy32xn = vp8_copy32xn_sse3; + if (flags & HAS_SSE2) vp8_copy32xn = vp8_copy32xn_sse2; + if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3; vp8_copy_mem16x16 = vp8_copy_mem16x16_c; - if (flags & HAS_SSE2) - vp8_copy_mem16x16 = vp8_copy_mem16x16_sse2; + if (flags & HAS_SSE2) vp8_copy_mem16x16 = vp8_copy_mem16x16_sse2; vp8_copy_mem8x4 = vp8_copy_mem8x4_c; - if (flags & HAS_MMX) - vp8_copy_mem8x4 = vp8_copy_mem8x4_mmx; + if (flags & HAS_MMX) vp8_copy_mem8x4 = vp8_copy_mem8x4_mmx; vp8_copy_mem8x8 = vp8_copy_mem8x8_c; - if (flags & HAS_MMX) - vp8_copy_mem8x8 = vp8_copy_mem8x8_mmx; + if (flags & HAS_MMX) vp8_copy_mem8x8 = vp8_copy_mem8x8_mmx; vp8_dc_only_idct_add = vp8_dc_only_idct_add_c; - if (flags & HAS_MMX) - vp8_dc_only_idct_add = vp8_dc_only_idct_add_mmx; + if (flags & HAS_MMX) vp8_dc_only_idct_add = vp8_dc_only_idct_add_mmx; vp8_denoiser_filter = vp8_denoiser_filter_c; - if (flags & HAS_SSE2) - vp8_denoiser_filter = vp8_denoiser_filter_sse2; + if (flags & HAS_SSE2) vp8_denoiser_filter = vp8_denoiser_filter_sse2; vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_c; - if (flags & HAS_SSE2) - vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_sse2; + if (flags & HAS_SSE2) vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_sse2; vp8_dequant_idct_add = vp8_dequant_idct_add_c; - if (flags & HAS_MMX) - vp8_dequant_idct_add = vp8_dequant_idct_add_mmx; + if (flags & HAS_MMX) vp8_dequant_idct_add = vp8_dequant_idct_add_mmx; vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_c; if (flags & HAS_SSE2) vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_sse2; @@ -795,45 +469,32 @@ if (flags & HAS_SSE2) vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_sse2; vp8_dequantize_b = vp8_dequantize_b_c; - if (flags & HAS_MMX) - vp8_dequantize_b = vp8_dequantize_b_mmx; + if (flags & HAS_MMX) vp8_dequantize_b = vp8_dequantize_b_mmx; vp8_diamond_search_sad = vp8_diamond_search_sad_c; - if (flags & HAS_SSE2) - vp8_diamond_search_sad = vp8_diamond_search_sadx4; + if (flags & HAS_SSE2) vp8_diamond_search_sad = vp8_diamond_search_sadx4; vp8_fast_quantize_b = vp8_fast_quantize_b_c; - if (flags & HAS_SSE2) - vp8_fast_quantize_b = vp8_fast_quantize_b_sse2; - if (flags & HAS_SSSE3) - vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3; + if (flags & HAS_SSE2) vp8_fast_quantize_b = vp8_fast_quantize_b_sse2; + if (flags & HAS_SSSE3) vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3; vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_c; if (flags & HAS_SSE2) vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_sse2; vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_c; - if (flags & HAS_SSE2) - vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_sse2; + if (flags & HAS_SSE2) vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_sse2; vp8_full_search_sad = vp8_full_search_sad_c; - if (flags & HAS_SSE3) - vp8_full_search_sad = vp8_full_search_sadx3; - if (flags & HAS_SSE4_1) - vp8_full_search_sad = vp8_full_search_sadx8; + if (flags & HAS_SSE3) vp8_full_search_sad = vp8_full_search_sadx3; + if (flags & HAS_SSE4_1) vp8_full_search_sad = vp8_full_search_sadx8; vp8_loop_filter_bh = vp8_loop_filter_bh_c; - if (flags & HAS_SSE2) - vp8_loop_filter_bh = vp8_loop_filter_bh_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_bh = vp8_loop_filter_bh_sse2; vp8_loop_filter_bv = vp8_loop_filter_bv_c; - if (flags & HAS_SSE2) - vp8_loop_filter_bv = vp8_loop_filter_bv_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_bv = vp8_loop_filter_bv_sse2; vp8_loop_filter_mbh = vp8_loop_filter_mbh_c; - if (flags & HAS_SSE2) - vp8_loop_filter_mbh = vp8_loop_filter_mbh_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_mbh = vp8_loop_filter_mbh_sse2; vp8_loop_filter_mbv = vp8_loop_filter_mbv_c; - if (flags & HAS_SSE2) - vp8_loop_filter_mbv = vp8_loop_filter_mbv_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_mbv = vp8_loop_filter_mbv_sse2; vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_c; - if (flags & HAS_SSE2) - vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_sse2; vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_c; - if (flags & HAS_SSE2) - vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_sse2; vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_c; if (flags & HAS_SSE2) vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_sse2; @@ -841,54 +502,38 @@ if (flags & HAS_SSE2) vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_sse2; vp8_mbblock_error = vp8_mbblock_error_c; - if (flags & HAS_SSE2) - vp8_mbblock_error = vp8_mbblock_error_sse2; + if (flags & HAS_SSE2) vp8_mbblock_error = vp8_mbblock_error_sse2; vp8_mbuverror = vp8_mbuverror_c; - if (flags & HAS_SSE2) - vp8_mbuverror = vp8_mbuverror_sse2; + if (flags & HAS_SSE2) vp8_mbuverror = vp8_mbuverror_sse2; vp8_refining_search_sad = vp8_refining_search_sad_c; - if (flags & HAS_SSE2) - vp8_refining_search_sad = vp8_refining_search_sadx4; + if (flags & HAS_SSE2) vp8_refining_search_sad = vp8_refining_search_sadx4; vp8_regular_quantize_b = vp8_regular_quantize_b_c; - if (flags & HAS_SSE2) - vp8_regular_quantize_b = vp8_regular_quantize_b_sse2; + if (flags & HAS_SSE2) vp8_regular_quantize_b = vp8_regular_quantize_b_sse2; if (flags & HAS_SSE4_1) vp8_regular_quantize_b = vp8_regular_quantize_b_sse4_1; vp8_short_fdct4x4 = vp8_short_fdct4x4_c; - if (flags & HAS_SSE2) - vp8_short_fdct4x4 = vp8_short_fdct4x4_sse2; + if (flags & HAS_SSE2) vp8_short_fdct4x4 = vp8_short_fdct4x4_sse2; vp8_short_fdct8x4 = vp8_short_fdct8x4_c; - if (flags & HAS_SSE2) - vp8_short_fdct8x4 = vp8_short_fdct8x4_sse2; + if (flags & HAS_SSE2) vp8_short_fdct8x4 = vp8_short_fdct8x4_sse2; vp8_short_idct4x4llm = vp8_short_idct4x4llm_c; - if (flags & HAS_MMX) - vp8_short_idct4x4llm = vp8_short_idct4x4llm_mmx; + if (flags & HAS_MMX) vp8_short_idct4x4llm = vp8_short_idct4x4llm_mmx; vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_c; - if (flags & HAS_SSE2) - vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_sse2; + if (flags & HAS_SSE2) vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_sse2; vp8_short_walsh4x4 = vp8_short_walsh4x4_c; - if (flags & HAS_SSE2) - vp8_short_walsh4x4 = vp8_short_walsh4x4_sse2; + if (flags & HAS_SSE2) vp8_short_walsh4x4 = vp8_short_walsh4x4_sse2; vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_c; - if (flags & HAS_SSE2) - vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2; + if (flags & HAS_SSE2) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2; if (flags & HAS_SSSE3) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3; vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_c; - if (flags & HAS_MMX) - vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_mmx; - if (flags & HAS_SSSE3) - vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3; + if (flags & HAS_MMX) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_mmx; + if (flags & HAS_SSSE3) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3; vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_c; - if (flags & HAS_SSE2) - vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_sse2; - if (flags & HAS_SSSE3) - vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3; + if (flags & HAS_SSE2) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_sse2; + if (flags & HAS_SSSE3) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3; vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_c; - if (flags & HAS_SSE2) - vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_sse2; - if (flags & HAS_SSSE3) - vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3; + if (flags & HAS_SSE2) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_sse2; + if (flags & HAS_SSSE3) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3; } #endif
diff --git a/third_party/libvpx/source/config/linux/ia32/vp9_rtcd.h b/third_party/libvpx/source/config/linux/ia32/vp9_rtcd.h index c8f69b95..1038d05 100644 --- a/third_party/libvpx/source/config/linux/ia32/vp9_rtcd.h +++ b/third_party/libvpx/source/config/linux/ia32/vp9_rtcd.h
@@ -31,466 +31,274 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -int64_t vp9_block_error_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -int64_t vp9_block_error_avx2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +int64_t vp9_block_error_sse2(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +int64_t vp9_block_error_avx2(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); -int64_t vp9_block_error_fp_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); -int64_t vp9_block_error_fp_avx2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); -RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_sse2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); +int64_t vp9_block_error_fp_avx2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); +RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); -int vp9_denoiser_filter_sse2(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); +int vp9_denoiser_filter_sse2(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); -RTCD_EXTERN int (*vp9_denoiser_filter)(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +RTCD_EXTERN int (*vp9_denoiser_filter)(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); -int vp9_diamond_search_sad_avx(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); +int vp9_diamond_search_sad_avx(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); RTCD_EXTERN int (*vp9_diamond_search_sad)( - const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); + const struct macroblock *x, const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, + int *num00, const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_fdct8x8_quant_ssse3(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_fdct8x8_quant)(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_fdct8x8_quant_ssse3(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vp9_fdct8x8_quant)( + const int16_t *input, int stride, tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht16x16_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); -RTCD_EXTERN void (*vp9_fht16x16)(const int16_t* input, - tran_low_t* output, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_fht16x16)(const int16_t *input, tran_low_t *output, + int stride, int tx_type); -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht4x4_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); -RTCD_EXTERN void (*vp9_fht4x4)(const int16_t* input, - tran_low_t* output, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_fht4x4)(const int16_t *input, tran_low_t *output, + int stride, int tx_type); -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht8x8_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); -RTCD_EXTERN void (*vp9_fht8x8)(const int16_t* input, - tran_low_t* output, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_fht8x8)(const int16_t *input, tran_low_t *output, + int stride, int tx_type); -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -void vp9_filter_by_weight16x16_sse2(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); +void vp9_filter_by_weight16x16_sse2(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); -RTCD_EXTERN void (*vp9_filter_by_weight16x16)(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +RTCD_EXTERN void (*vp9_filter_by_weight16x16)(const uint8_t *src, + int src_stride, uint8_t *dst, + int dst_stride, int src_weight); -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -void vp9_filter_by_weight8x8_sse2(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -RTCD_EXTERN void (*vp9_filter_by_weight8x8)(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); +void vp9_filter_by_weight8x8_sse2(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); +RTCD_EXTERN void (*vp9_filter_by_weight8x8)(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vp9_fwht4x4_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vp9_fwht4x4)(const int16_t* input, - tran_low_t* output, +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vp9_fwht4x4_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vp9_fwht4x4)(const int16_t *input, tran_low_t *output, int stride); -int64_t vp9_highbd_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); -int64_t vp9_highbd_block_error_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); -RTCD_EXTERN int64_t (*vp9_highbd_block_error)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, +int64_t vp9_highbd_block_error_c(const tran_low_t *coeff, + const tran_low_t *dqcoeff, intptr_t block_size, + int64_t *ssz, int bd); +int64_t vp9_highbd_block_error_sse2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz, int bd); +RTCD_EXTERN int64_t (*vp9_highbd_block_error)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz, int bd); -void vp9_highbd_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht16x16 vp9_highbd_fht16x16_c -void vp9_highbd_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht4x4 vp9_highbd_fht4x4_c -void vp9_highbd_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht8x8 vp9_highbd_fht8x8_c -void vp9_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_highbd_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_highbd_fwht4x4 vp9_highbd_fwht4x4_c -void vp9_highbd_iht16x16_256_add_c(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); -void vp9_highbd_iht16x16_256_add_sse4_1(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht16x16_256_add)(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); +void vp9_highbd_iht16x16_256_add_c(const tran_low_t *input, uint16_t *output, + int pitch, int tx_type, int bd); +void vp9_highbd_iht16x16_256_add_sse4_1(const tran_low_t *input, + uint16_t *output, int pitch, + int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht16x16_256_add)(const tran_low_t *input, + uint16_t *output, int pitch, + int tx_type, int bd); -void vp9_highbd_iht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -void vp9_highbd_iht4x4_16_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht4x4_16_add)(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +void vp9_highbd_iht4x4_16_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht4x4_16_add)(const tran_low_t *input, + uint16_t *dest, int stride, + int tx_type, int bd); -void vp9_highbd_iht8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht8x8_64_add)(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht8x8_64_add)(const tran_low_t *input, + uint16_t *dest, int stride, + int tx_type, int bd); -void vp9_highbd_mbpost_proc_across_ip_c(uint16_t* src, - int pitch, - int rows, - int cols, - int flimit); +void vp9_highbd_mbpost_proc_across_ip_c(uint16_t *src, int pitch, int rows, + int cols, int flimit); #define vp9_highbd_mbpost_proc_across_ip vp9_highbd_mbpost_proc_across_ip_c -void vp9_highbd_mbpost_proc_down_c(uint16_t* dst, - int pitch, - int rows, - int cols, +void vp9_highbd_mbpost_proc_down_c(uint16_t *dst, int pitch, int rows, int cols, int flimit); #define vp9_highbd_mbpost_proc_down vp9_highbd_mbpost_proc_down_c -void vp9_highbd_post_proc_down_and_across_c(const uint16_t* src_ptr, - uint16_t* dst_ptr, +void vp9_highbd_post_proc_down_and_across_c(const uint16_t *src_ptr, + uint16_t *dst_ptr, int src_pixels_per_line, - int dst_pixels_per_line, - int rows, - int cols, - int flimit); + int dst_pixels_per_line, int rows, + int cols, int flimit); #define vp9_highbd_post_proc_down_and_across \ vp9_highbd_post_proc_down_and_across_c -void vp9_highbd_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp vp9_highbd_quantize_fp_c -void vp9_highbd_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp_32x32 vp9_highbd_quantize_fp_32x32_c -void vp9_highbd_temporal_filter_apply_c(const uint8_t* frame1, - unsigned int stride, - const uint8_t* frame2, - unsigned int block_width, - unsigned int block_height, - int strength, - int filter_weight, - uint32_t* accumulator, - uint16_t* count); +void vp9_highbd_temporal_filter_apply_c( + const uint8_t *frame1, unsigned int stride, const uint8_t *frame2, + unsigned int block_width, unsigned int block_height, int strength, + int filter_weight, uint32_t *accumulator, uint16_t *count); #define vp9_highbd_temporal_filter_apply vp9_highbd_temporal_filter_apply_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); -void vp9_iht16x16_256_add_sse2(const tran_low_t* input, - uint8_t* output, - int pitch, - int tx_type); -RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_sse2(const tran_low_t *input, uint8_t *output, + int pitch, int tx_type); +RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t *input, + uint8_t *output, int pitch, int tx_type); -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t* input, - uint8_t* dest, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t *input, uint8_t *dest, + int stride, int tx_type); -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht8x8_64_add_sse2(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t* input, - uint8_t* dest, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t *input, uint8_t *dest, + int stride, int tx_type); -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_avx2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_quantize_fp)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_avx2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vp9_quantize_fp)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); -void vp9_scale_and_extend_frame_ssse3(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); +void vp9_scale_and_extend_frame_ssse3(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler); RTCD_EXTERN void (*vp9_scale_and_extend_frame)( - const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); + const struct yv12_buffer_config *src, struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); void vp9_rtcd(void); @@ -502,45 +310,32 @@ (void)flags; vp9_block_error = vp9_block_error_c; - if (flags & HAS_SSE2) - vp9_block_error = vp9_block_error_sse2; - if (flags & HAS_AVX2) - vp9_block_error = vp9_block_error_avx2; + if (flags & HAS_SSE2) vp9_block_error = vp9_block_error_sse2; + if (flags & HAS_AVX2) vp9_block_error = vp9_block_error_avx2; vp9_block_error_fp = vp9_block_error_fp_c; - if (flags & HAS_SSE2) - vp9_block_error_fp = vp9_block_error_fp_sse2; - if (flags & HAS_AVX2) - vp9_block_error_fp = vp9_block_error_fp_avx2; + if (flags & HAS_SSE2) vp9_block_error_fp = vp9_block_error_fp_sse2; + if (flags & HAS_AVX2) vp9_block_error_fp = vp9_block_error_fp_avx2; vp9_denoiser_filter = vp9_denoiser_filter_c; - if (flags & HAS_SSE2) - vp9_denoiser_filter = vp9_denoiser_filter_sse2; + if (flags & HAS_SSE2) vp9_denoiser_filter = vp9_denoiser_filter_sse2; vp9_diamond_search_sad = vp9_diamond_search_sad_c; - if (flags & HAS_AVX) - vp9_diamond_search_sad = vp9_diamond_search_sad_avx; + if (flags & HAS_AVX) vp9_diamond_search_sad = vp9_diamond_search_sad_avx; vp9_fdct8x8_quant = vp9_fdct8x8_quant_c; - if (flags & HAS_SSSE3) - vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; + if (flags & HAS_SSSE3) vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; vp9_fht16x16 = vp9_fht16x16_c; - if (flags & HAS_SSE2) - vp9_fht16x16 = vp9_fht16x16_sse2; + if (flags & HAS_SSE2) vp9_fht16x16 = vp9_fht16x16_sse2; vp9_fht4x4 = vp9_fht4x4_c; - if (flags & HAS_SSE2) - vp9_fht4x4 = vp9_fht4x4_sse2; + if (flags & HAS_SSE2) vp9_fht4x4 = vp9_fht4x4_sse2; vp9_fht8x8 = vp9_fht8x8_c; - if (flags & HAS_SSE2) - vp9_fht8x8 = vp9_fht8x8_sse2; + if (flags & HAS_SSE2) vp9_fht8x8 = vp9_fht8x8_sse2; vp9_filter_by_weight16x16 = vp9_filter_by_weight16x16_c; if (flags & HAS_SSE2) vp9_filter_by_weight16x16 = vp9_filter_by_weight16x16_sse2; vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_c; - if (flags & HAS_SSE2) - vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_sse2; + if (flags & HAS_SSE2) vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_sse2; vp9_fwht4x4 = vp9_fwht4x4_c; - if (flags & HAS_SSE2) - vp9_fwht4x4 = vp9_fwht4x4_sse2; + if (flags & HAS_SSE2) vp9_fwht4x4 = vp9_fwht4x4_sse2; vp9_highbd_block_error = vp9_highbd_block_error_c; - if (flags & HAS_SSE2) - vp9_highbd_block_error = vp9_highbd_block_error_sse2; + if (flags & HAS_SSE2) vp9_highbd_block_error = vp9_highbd_block_error_sse2; vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_c; if (flags & HAS_SSE4_1) vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_sse4_1; @@ -551,19 +346,14 @@ if (flags & HAS_SSE4_1) vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1; vp9_iht16x16_256_add = vp9_iht16x16_256_add_c; - if (flags & HAS_SSE2) - vp9_iht16x16_256_add = vp9_iht16x16_256_add_sse2; + if (flags & HAS_SSE2) vp9_iht16x16_256_add = vp9_iht16x16_256_add_sse2; vp9_iht4x4_16_add = vp9_iht4x4_16_add_c; - if (flags & HAS_SSE2) - vp9_iht4x4_16_add = vp9_iht4x4_16_add_sse2; + if (flags & HAS_SSE2) vp9_iht4x4_16_add = vp9_iht4x4_16_add_sse2; vp9_iht8x8_64_add = vp9_iht8x8_64_add_c; - if (flags & HAS_SSE2) - vp9_iht8x8_64_add = vp9_iht8x8_64_add_sse2; + if (flags & HAS_SSE2) vp9_iht8x8_64_add = vp9_iht8x8_64_add_sse2; vp9_quantize_fp = vp9_quantize_fp_c; - if (flags & HAS_SSE2) - vp9_quantize_fp = vp9_quantize_fp_sse2; - if (flags & HAS_AVX2) - vp9_quantize_fp = vp9_quantize_fp_avx2; + if (flags & HAS_SSE2) vp9_quantize_fp = vp9_quantize_fp_sse2; + if (flags & HAS_AVX2) vp9_quantize_fp = vp9_quantize_fp_avx2; vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c; if (flags & HAS_SSSE3) vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_ssse3;
diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/ia32/vpx_dsp_rtcd.h index 4e665cc..f6db41e 100644 --- a/third_party/libvpx/source/config/linux/ia32/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/linux/ia32/vpx_dsp_rtcd.h
@@ -20,8786 +20,5442 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); -unsigned int vpx_avg_4x4_sse2(const uint8_t*, int p); -RTCD_EXTERN unsigned int (*vpx_avg_4x4)(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); +unsigned int vpx_avg_4x4_sse2(const uint8_t *, int p); +RTCD_EXTERN unsigned int (*vpx_avg_4x4)(const uint8_t *, int p); -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); -unsigned int vpx_avg_8x8_sse2(const uint8_t*, int p); -RTCD_EXTERN unsigned int (*vpx_avg_8x8)(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); +unsigned int vpx_avg_8x8_sse2(const uint8_t *, int p); +RTCD_EXTERN unsigned int (*vpx_avg_8x8)(const uint8_t *, int p); -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -void vpx_comp_avg_pred_sse2(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -RTCD_EXTERN void (*vpx_comp_avg_pred)(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +void vpx_comp_avg_pred_sse2(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +RTCD_EXTERN void (*vpx_comp_avg_pred)(uint8_t *comp_pred, const uint8_t *pred, + int width, int height, const uint8_t *ref, int ref_stride); -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avx2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_horiz_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_horiz_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_horiz_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +void vpx_convolve8_avg_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_vert_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_horiz_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_horiz_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_horiz_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_vert_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_vert_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_vert_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_avg_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve_avg)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +RTCD_EXTERN void (*vpx_convolve_avg)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_copy_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_copy_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve_copy)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve_copy)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_c -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_4x4_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_4x4_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_16x16)(uint8_t* dst, +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_32x32)(uint8_t* dst, +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct16x16)(const int16_t* input, - tran_low_t* output, +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct16x16)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_1_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct16x16_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_1_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct16x16_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct32x32)(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct32x32)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_1_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct32x32_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_1_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct32x32_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_rd_sse2(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_fdct32x32_rd)(const int16_t* input, - tran_low_t* output, +RTCD_EXTERN void (*vpx_fdct32x32_rd)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct4x4)(const int16_t* input, - tran_low_t* output, +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct4x4)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_1_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct4x4_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_1_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct4x4_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct8x8)(const int16_t* input, - tran_low_t* output, +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct8x8)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_1_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct8x8_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_1_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct8x8_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_c -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get8x8var_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -RTCD_EXTERN void (*vpx_get8x8var)(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); +void vpx_get8x8var_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +RTCD_EXTERN void (*vpx_get8x8var)(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); -unsigned int vpx_get_mb_ss_c(const int16_t*); -unsigned int vpx_get_mb_ss_sse2(const int16_t*); -RTCD_EXTERN unsigned int (*vpx_get_mb_ss)(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); +unsigned int vpx_get_mb_ss_sse2(const int16_t *); +RTCD_EXTERN unsigned int (*vpx_get_mb_ss)(const int16_t *); -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_16x16_sse2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_16x16_avx2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_16x16_sse2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_16x16_avx2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t *src_diff, + ptrdiff_t src_stride, tran_low_t *coeff); -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_8x8_sse2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_8x8_sse2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t *src_diff, + ptrdiff_t src_stride, tran_low_t *coeff); -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_highbd_10_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get16x16var vpx_highbd_10_get16x16var_c -void vpx_highbd_10_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get8x8var vpx_highbd_10_get8x8var_c -unsigned int vpx_highbd_10_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_mse16x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse16x8 vpx_highbd_10_mse16x8_c -unsigned int vpx_highbd_10_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse8x16 vpx_highbd_10_mse8x16_c -unsigned int vpx_highbd_10_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_mse8x8_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_mse8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_mse8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x4 \ vpx_highbd_10_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x8 \ vpx_highbd_10_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x4 \ vpx_highbd_10_sub_pixel_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x8 \ vpx_highbd_10_sub_pixel_variance4x8_c -uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x4_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -unsigned int vpx_highbd_10_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x16)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x16)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x64)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x4 vpx_highbd_10_variance4x4_c -unsigned int vpx_highbd_10_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x8 vpx_highbd_10_variance4x8_c -unsigned int vpx_highbd_10_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance64x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance64x64)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance8x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance8x4 vpx_highbd_10_variance8x4_c -unsigned int vpx_highbd_10_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -void vpx_highbd_12_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get16x16var vpx_highbd_12_get16x16var_c -void vpx_highbd_12_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get8x8var vpx_highbd_12_get8x8var_c -unsigned int vpx_highbd_12_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_mse16x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse16x8 vpx_highbd_12_mse16x8_c -unsigned int vpx_highbd_12_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse8x16 vpx_highbd_12_mse8x16_c -unsigned int vpx_highbd_12_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_mse8x8_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_mse8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_mse8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x4 \ vpx_highbd_12_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x8 \ vpx_highbd_12_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x4 \ vpx_highbd_12_sub_pixel_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x8 \ vpx_highbd_12_sub_pixel_variance4x8_c -uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x4_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -unsigned int vpx_highbd_12_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x16)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x16)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x64)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x4 vpx_highbd_12_variance4x4_c -unsigned int vpx_highbd_12_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x8 vpx_highbd_12_variance4x8_c -unsigned int vpx_highbd_12_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance64x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance64x64)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance8x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance8x4 vpx_highbd_12_variance8x4_c -unsigned int vpx_highbd_12_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -void vpx_highbd_8_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get16x16var vpx_highbd_8_get16x16var_c -void vpx_highbd_8_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get8x8var vpx_highbd_8_get8x8var_c -unsigned int vpx_highbd_8_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_mse16x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse16x8 vpx_highbd_8_mse16x8_c -unsigned int vpx_highbd_8_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse8x16 vpx_highbd_8_mse8x16_c -unsigned int vpx_highbd_8_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_mse8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_mse8x8)(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_mse8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x4 \ vpx_highbd_8_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x8 \ vpx_highbd_8_sub_pixel_avg_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x4 vpx_highbd_8_sub_pixel_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x8 vpx_highbd_8_sub_pixel_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -unsigned int vpx_highbd_8_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x32)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x32)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x64)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x4 vpx_highbd_8_variance4x4_c -unsigned int vpx_highbd_8_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x8 vpx_highbd_8_variance4x8_c -unsigned int vpx_highbd_8_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance64x32)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance64x64)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance8x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance8x4 vpx_highbd_8_variance8x4_c -unsigned int vpx_highbd_8_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_4x4_c(const uint8_t *, int p); #define vpx_highbd_avg_4x4 vpx_highbd_avg_4x4_c -unsigned int vpx_highbd_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_8x8_c(const uint8_t *, int p); #define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c -void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred, - const uint16_t* pred, - int width, - int height, - const uint16_t* ref, +void vpx_highbd_comp_avg_pred_c(uint16_t *comp_pred, const uint16_t *pred, + int width, int height, const uint16_t *ref, int ref_stride); #define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c -void vpx_highbd_convolve8_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8)(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_avg_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_horiz_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_avg_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_horiz_avx2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg_horiz)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg_horiz)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_vert_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_avg_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_vert_avx2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg_vert)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg_vert)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_horiz_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_horiz)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_horiz_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_horiz)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_vert_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_vert)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_vert_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_vert)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_avg_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_avg_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve_avg)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve_avg_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve_avg_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve_avg)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve_copy_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_copy_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_copy_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve_copy)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_copy_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve_copy_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve_copy_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve_copy)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_d117_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d117_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d117_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d117_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d117_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d135_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d135_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d135_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d135_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d153_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d153_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d153_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d153_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d207_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d207_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d207_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d207_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d45_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d45_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d45_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d45_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d45_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d45_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_4x4_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d45_predictor_4x4_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d45_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d63_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d63_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d63_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d63_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d63_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d63_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d63_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d63_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_16x16)(uint16_t* dst, +void vpx_highbd_dc_128_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_32x32)(uint16_t* dst, +void vpx_highbd_dc_128_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_4x4)(uint16_t* dst, +void vpx_highbd_dc_128_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_8x8)(uint16_t* dst, +void vpx_highbd_dc_128_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_left_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_16x16)(uint16_t* dst, +void vpx_highbd_dc_left_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_left_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_32x32)(uint16_t* dst, +void vpx_highbd_dc_left_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_left_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_4x4)(uint16_t* dst, +void vpx_highbd_dc_left_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_left_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_8x8)(uint16_t* dst, +void vpx_highbd_dc_left_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_predictor_16x16)(uint16_t* dst, +void vpx_highbd_dc_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_predictor_32x32)(uint16_t* dst, +void vpx_highbd_dc_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_predictor_4x4)(uint16_t* dst, +void vpx_highbd_dc_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_predictor_8x8)(uint16_t* dst, +void vpx_highbd_dc_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_top_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_16x16)(uint16_t* dst, +void vpx_highbd_dc_top_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_top_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_32x32)(uint16_t* dst, +void vpx_highbd_dc_top_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_top_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_4x4)(uint16_t* dst, +void vpx_highbd_dc_top_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_top_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_8x8)(uint16_t* dst, +void vpx_highbd_dc_top_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_fdct16x16_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct16x16_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct16x16)(const int16_t* input, - tran_low_t* output, - int stride); +RTCD_EXTERN void (*vpx_highbd_fdct16x16)(const int16_t *input, + tran_low_t *output, int stride); -void vpx_highbd_fdct16x16_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct16x16_1 vpx_highbd_fdct16x16_1_c -void vpx_highbd_fdct32x32_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct32x32)(const int16_t* input, - tran_low_t* output, - int stride); +RTCD_EXTERN void (*vpx_highbd_fdct32x32)(const int16_t *input, + tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32_1 vpx_highbd_fdct32x32_1_c -void vpx_highbd_fdct32x32_rd_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_rd_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct32x32_rd)(const int16_t* input, - tran_low_t* output, - int stride); +RTCD_EXTERN void (*vpx_highbd_fdct32x32_rd)(const int16_t *input, + tran_low_t *output, int stride); -void vpx_highbd_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_highbd_fdct4x4_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_highbd_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct4x4)(const int16_t* input, - tran_low_t* output, +RTCD_EXTERN void (*vpx_highbd_fdct4x4)(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_highbd_fdct8x8_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_highbd_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct8x8)(const int16_t* input, - tran_low_t* output, +RTCD_EXTERN void (*vpx_highbd_fdct8x8)(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct8x8_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct8x8_1 vpx_highbd_fdct8x8_1_c -void vpx_highbd_h_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_h_predictor_16x16)(uint16_t* dst, +void vpx_highbd_h_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_h_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_h_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_h_predictor_32x32)(uint16_t* dst, +void vpx_highbd_h_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_h_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_h_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_h_predictor_4x4)(uint16_t* dst, +void vpx_highbd_h_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_h_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_h_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_h_predictor_8x8)(uint16_t* dst, +void vpx_highbd_h_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_h_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_idct16x16_10_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_10_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_10_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_10_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_10_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_10_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_10_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_10_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_1_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_1_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_256_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_256_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_256_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_256_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_256_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_256_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_256_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_256_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_38_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_38_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_38_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_38_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_38_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_38_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_38_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_38_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_1024_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1024_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1024_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_1024_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_1024_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1024_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1024_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_1024_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_135_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_135_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_135_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_135_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_135_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_135_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_135_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_135_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_1_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_1_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_34_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_34_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_34_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_34_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_34_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_34_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_34_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_34_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_16_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_16_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct4x4_16_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_16_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_16_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct4x4_16_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct4x4_1_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct4x4_1_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct8x8_12_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_12_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_12_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_12_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_12_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_12_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_12_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_12_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct8x8_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_1_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_1_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_64_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_64_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_64_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_64_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_64_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_iwht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_16_add vpx_highbd_iwht4x4_16_add_c -void vpx_highbd_iwht4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_1_add vpx_highbd_iwht4x4_1_add_c -void vpx_highbd_lpf_horizontal_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_16_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_16)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_16_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_16_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_16)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_16_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_16_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_16_dual_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_16_dual)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_horizontal_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_4_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_4)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_4_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_4_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_4)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_horizontal_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_horizontal_4_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_4_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_horizontal_4_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_4_dual)( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); -void vpx_highbd_lpf_horizontal_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_8_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_8)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_8_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_8_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_8)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_horizontal_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_horizontal_8_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_8_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_horizontal_8_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_8_dual)( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); -void vpx_highbd_lpf_vertical_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_16_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_16_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_16)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_16_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_16)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_vertical_16_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_16_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_vertical_16_dual_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_16_dual)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_4_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_4_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_4)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_4_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_4)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_vertical_4_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_4_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_vertical_4_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_4_dual)( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); -void vpx_highbd_lpf_vertical_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_8_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_8_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_8)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_8_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_8)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_vertical_8_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_8_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_vertical_8_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_8_dual)( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); -void vpx_highbd_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_highbd_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_highbd_minmax_8x8 vpx_highbd_minmax_8x8_c -void vpx_highbd_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_highbd_quantize_b_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_highbd_quantize_b)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_highbd_quantize_b_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vpx_highbd_quantize_b)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vpx_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_highbd_quantize_b_32x32_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_highbd_quantize_b_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_highbd_quantize_b_32x32_sse2( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vpx_highbd_quantize_b_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -unsigned int vpx_highbd_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x16)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x16)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x16_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x16_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x16_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad16x16x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad16x16x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x32)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x32)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x32_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad16x32x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad16x32x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x8)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x8)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad16x8x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad16x8x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x16)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x16)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x16_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x16_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x16_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad32x16x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad32x16x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x32)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x32)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x32_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad32x32x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad32x32x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x64)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x64)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x64_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x64_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x64_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad32x64x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad32x64x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x4 vpx_highbd_sad4x4_c -unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x4_avg vpx_highbd_sad4x4_avg_c -void vpx_highbd_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad4x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad4x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad4x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad4x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x8 vpx_highbd_sad4x8_c -unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x8_avg vpx_highbd_sad4x8_avg_c -void vpx_highbd_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad4x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad4x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad4x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad4x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad64x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad64x32)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad64x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad64x32)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad64x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad64x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad64x32_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad64x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad64x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad64x32x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad64x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad64x32x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad64x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad64x64)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad64x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad64x64)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad64x64_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad64x64_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad64x64_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad64x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad64x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad64x64x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad64x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad64x64x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x16)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x16)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad8x16x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad8x16x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x4)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x4)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x4_avg)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x4_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad8x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad8x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x8)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x8)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad8x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad8x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_highbd_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, - ptrdiff_t pred_stride, - int bd); +void vpx_highbd_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, + ptrdiff_t pred_stride, int bd); #define vpx_highbd_subtract_block vpx_highbd_subtract_block_c -void vpx_highbd_tm_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_tm_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_tm_predictor_16x16)(uint16_t* dst, +void vpx_highbd_tm_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_tm_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_tm_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_tm_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_tm_predictor_32x32)(uint16_t* dst, +void vpx_highbd_tm_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_tm_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_tm_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_tm_predictor_4x4)(uint16_t* dst, +void vpx_highbd_tm_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_tm_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_tm_predictor_8x8)(uint16_t* dst, +void vpx_highbd_tm_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_tm_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_v_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_v_predictor_16x16)(uint16_t* dst, +void vpx_highbd_v_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_v_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_v_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_v_predictor_32x32)(uint16_t* dst, +void vpx_highbd_v_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_v_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_v_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_v_predictor_4x4)(uint16_t* dst, +void vpx_highbd_v_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_v_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_v_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_v_predictor_8x8)(uint16_t* dst, +void vpx_highbd_v_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_v_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_10_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_10_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_10_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct16x16_10_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_1_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_1_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct16x16_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_256_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct16x16_256_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_38_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_38_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_38_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct16x16_38_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_1024_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct32x32_1024_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_1_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_1_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct32x32_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_34_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_34_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_34_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct4x4_16_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct4x4_16_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_1_add_sse2(const tran_low_t* input, uint8_t* dest, int stride); -RTCD_EXTERN void (*vpx_idct4x4_1_add)(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); +RTCD_EXTERN void (*vpx_idct4x4_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_12_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_12_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_12_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_1_add_sse2(const tran_low_t* input, uint8_t* dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_1_add)(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); +RTCD_EXTERN void (*vpx_idct8x8_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_64_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_64_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct8x8_64_add)(const tran_low_t *input, uint8_t *dest, int stride); -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); -int16_t vpx_int_pro_col_sse2(const uint8_t* ref, const int width); -RTCD_EXTERN int16_t (*vpx_int_pro_col)(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); +int16_t vpx_int_pro_col_sse2(const uint8_t *ref, const int width); +RTCD_EXTERN int16_t (*vpx_int_pro_col)(const uint8_t *ref, const int width); -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); -void vpx_int_pro_row_sse2(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); -RTCD_EXTERN void (*vpx_int_pro_row)(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); +void vpx_int_pro_row_sse2(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); +RTCD_EXTERN void (*vpx_int_pro_row)(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_iwht4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_iwht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_iwht4x4_16_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_iwht4x4_16_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_avx2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_avx2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_avx2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_sse2(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_avx2(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_4_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_4)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_4)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_4_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_horizontal_4_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_4_dual_sse2( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_horizontal_4_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_8_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_8)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_8)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_8_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_horizontal_8_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_8_dual_sse2( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_horizontal_8_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_16)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_16)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_16_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_16_dual)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_4_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_4)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_4)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_4_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_vertical_4_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_vertical_4_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_8_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_8)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_8)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_8_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_vertical_8_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_vertical_8_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -void vpx_mbpost_proc_across_ip_sse2(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -RTCD_EXTERN void (*vpx_mbpost_proc_across_ip)(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +void vpx_mbpost_proc_across_ip_sse2(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +RTCD_EXTERN void (*vpx_mbpost_proc_across_ip)(unsigned char *dst, int pitch, + int rows, int cols, int flimit); -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); -void vpx_mbpost_proc_down_sse2(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -RTCD_EXTERN void (*vpx_mbpost_proc_down)(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_down_sse2(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +RTCD_EXTERN void (*vpx_mbpost_proc_down)(unsigned char *dst, int pitch, + int rows, int cols, int flimit); -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -void vpx_minmax_8x8_sse2(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -RTCD_EXTERN void (*vpx_minmax_8x8)(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +void vpx_minmax_8x8_sse2(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +RTCD_EXTERN void (*vpx_minmax_8x8)(const uint8_t *s, int p, const uint8_t *d, + int dp, int *min, int *max); -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t* src_ptr, +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse16x8)(const uint8_t* src_ptr, +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x8_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse8x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse8x16)(const uint8_t* src_ptr, +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse8x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse8x8)(const uint8_t* src_ptr, +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); -void vpx_plane_add_noise_sse2(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); -RTCD_EXTERN void (*vpx_plane_add_noise)(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); +void vpx_plane_add_noise_sse2(uint8_t *start, const int8_t *noise, + int blackclamp, int whiteclamp, int width, + int height, int pitch); +RTCD_EXTERN void (*vpx_plane_add_noise)(uint8_t *start, const int8_t *noise, + int blackclamp, int whiteclamp, + int width, int height, int pitch); -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); -void vpx_post_proc_down_and_across_mb_row_sse2(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); +void vpx_post_proc_down_and_across_mb_row_sse2(unsigned char *src, + unsigned char *dst, + int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); -RTCD_EXTERN void (*vpx_post_proc_down_and_across_mb_row)(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); +RTCD_EXTERN void (*vpx_post_proc_down_and_across_mb_row)( + unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_avx(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_avx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_avx(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_avx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad16x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad16x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad16x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad16x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x3_ssse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x3_ssse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad16x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad16x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad16x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad16x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad16x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad16x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x3_ssse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x3_ssse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x16x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x16x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x64x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x64x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad4x4)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad4x4)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad4x4_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad4x4_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad4x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad4x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad4x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad4x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad64x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad64x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad8x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad8x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad8x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad8x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad8x4)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad8x4)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad8x4_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad8x4_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad8x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad8x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -int vpx_satd_c(const tran_low_t* coeff, int length); -int vpx_satd_sse2(const tran_low_t* coeff, int length); -int vpx_satd_avx2(const tran_low_t* coeff, int length); -RTCD_EXTERN int (*vpx_satd)(const tran_low_t* coeff, int length); +int vpx_satd_c(const tran_low_t *coeff, int length); +int vpx_satd_sse2(const tran_low_t *coeff, int length); +int vpx_satd_avx2(const tran_low_t *coeff, int length); +RTCD_EXTERN int (*vpx_satd)(const tran_low_t *coeff, int length); -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_scaled_2d_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_2d_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -void vpx_subtract_block_sse2(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_sse2(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -RTCD_EXTERN void (*vpx_subtract_block)(int rows, - int cols, - int16_t* diff_ptr, +RTCD_EXTERN void (*vpx_subtract_block)(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, - const uint8_t* src_ptr, + const uint8_t *src_ptr, ptrdiff_t src_stride, - const uint8_t* pred_ptr, + const uint8_t *pred_ptr, ptrdiff_t pred_stride); -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); -uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t* src, int stride, int size); -RTCD_EXTERN uint64_t (*vpx_sum_squares_2d_i16)(const int16_t* src, - int stride, +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t *src, int stride, int size); +RTCD_EXTERN uint64_t (*vpx_sum_squares_2d_i16)(const int16_t *src, int stride, int size); -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t* src_ptr, +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x32)(const uint8_t* src_ptr, +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x8)(const uint8_t* src_ptr, +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t* src_ptr, +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t* src_ptr, +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x64)(const uint8_t* src_ptr, +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance4x4)(const uint8_t* src_ptr, +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x4_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance4x4)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance4x8)(const uint8_t* src_ptr, +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance4x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t* src_ptr, +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t* src_ptr, +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance8x16)(const uint8_t* src_ptr, +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance8x4)(const uint8_t* src_ptr, +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance8x4)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance8x8)(const uint8_t* src_ptr, +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); -int vpx_vector_var_sse2(const int16_t* ref, const int16_t* src, const int bwl); -RTCD_EXTERN int (*vpx_vector_var)(const int16_t* ref, - const int16_t* src, +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); +int vpx_vector_var_sse2(const int16_t *ref, const int16_t *src, const int bwl); +RTCD_EXTERN int (*vpx_vector_var)(const int16_t *ref, const int16_t *src, const int bwl); void vpx_dsp_rtcd(void); @@ -8812,62 +5468,40 @@ (void)flags; vpx_avg_4x4 = vpx_avg_4x4_c; - if (flags & HAS_SSE2) - vpx_avg_4x4 = vpx_avg_4x4_sse2; + if (flags & HAS_SSE2) vpx_avg_4x4 = vpx_avg_4x4_sse2; vpx_avg_8x8 = vpx_avg_8x8_c; - if (flags & HAS_SSE2) - vpx_avg_8x8 = vpx_avg_8x8_sse2; + if (flags & HAS_SSE2) vpx_avg_8x8 = vpx_avg_8x8_sse2; vpx_comp_avg_pred = vpx_comp_avg_pred_c; - if (flags & HAS_SSE2) - vpx_comp_avg_pred = vpx_comp_avg_pred_sse2; + if (flags & HAS_SSE2) vpx_comp_avg_pred = vpx_comp_avg_pred_sse2; vpx_convolve8 = vpx_convolve8_c; - if (flags & HAS_SSE2) - vpx_convolve8 = vpx_convolve8_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8 = vpx_convolve8_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8 = vpx_convolve8_avx2; + if (flags & HAS_SSE2) vpx_convolve8 = vpx_convolve8_sse2; + if (flags & HAS_SSSE3) vpx_convolve8 = vpx_convolve8_ssse3; + if (flags & HAS_AVX2) vpx_convolve8 = vpx_convolve8_avx2; vpx_convolve8_avg = vpx_convolve8_avg_c; - if (flags & HAS_SSE2) - vpx_convolve8_avg = vpx_convolve8_avg_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_avg = vpx_convolve8_avg_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg = vpx_convolve8_avg_avx2; + if (flags & HAS_SSE2) vpx_convolve8_avg = vpx_convolve8_avg_sse2; + if (flags & HAS_SSSE3) vpx_convolve8_avg = vpx_convolve8_avg_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_avg = vpx_convolve8_avg_avx2; vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_c; - if (flags & HAS_SSE2) - vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_sse2; + if (flags & HAS_SSE2) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_sse2; if (flags & HAS_SSSE3) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_avx2; + if (flags & HAS_AVX2) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_avx2; vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_c; - if (flags & HAS_SSE2) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_avx2; + if (flags & HAS_SSE2) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_sse2; + if (flags & HAS_SSSE3) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_avx2; vpx_convolve8_horiz = vpx_convolve8_horiz_c; - if (flags & HAS_SSE2) - vpx_convolve8_horiz = vpx_convolve8_horiz_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_horiz = vpx_convolve8_horiz_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_horiz = vpx_convolve8_horiz_avx2; + if (flags & HAS_SSE2) vpx_convolve8_horiz = vpx_convolve8_horiz_sse2; + if (flags & HAS_SSSE3) vpx_convolve8_horiz = vpx_convolve8_horiz_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_horiz = vpx_convolve8_horiz_avx2; vpx_convolve8_vert = vpx_convolve8_vert_c; - if (flags & HAS_SSE2) - vpx_convolve8_vert = vpx_convolve8_vert_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_vert = vpx_convolve8_vert_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_vert = vpx_convolve8_vert_avx2; + if (flags & HAS_SSE2) vpx_convolve8_vert = vpx_convolve8_vert_sse2; + if (flags & HAS_SSSE3) vpx_convolve8_vert = vpx_convolve8_vert_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_vert = vpx_convolve8_vert_avx2; vpx_convolve_avg = vpx_convolve_avg_c; - if (flags & HAS_SSE2) - vpx_convolve_avg = vpx_convolve_avg_sse2; + if (flags & HAS_SSE2) vpx_convolve_avg = vpx_convolve_avg_sse2; vpx_convolve_copy = vpx_convolve_copy_c; - if (flags & HAS_SSE2) - vpx_convolve_copy = vpx_convolve_copy_sse2; + if (flags & HAS_SSE2) vpx_convolve_copy = vpx_convolve_copy_sse2; vpx_d153_predictor_16x16 = vpx_d153_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d153_predictor_16x16 = vpx_d153_predictor_16x16_ssse3; @@ -8875,11 +5509,9 @@ if (flags & HAS_SSSE3) vpx_d153_predictor_32x32 = vpx_d153_predictor_32x32_ssse3; vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_c; - if (flags & HAS_SSSE3) - vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_ssse3; + if (flags & HAS_SSSE3) vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_ssse3; vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_ssse3; vpx_d207_predictor_16x16 = vpx_d207_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d207_predictor_16x16 = vpx_d207_predictor_16x16_ssse3; @@ -8887,11 +5519,9 @@ if (flags & HAS_SSSE3) vpx_d207_predictor_32x32 = vpx_d207_predictor_32x32_ssse3; vpx_d207_predictor_4x4 = vpx_d207_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_d207_predictor_4x4 = vpx_d207_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_d207_predictor_4x4 = vpx_d207_predictor_4x4_sse2; vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_ssse3; vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_ssse3; @@ -8899,11 +5529,9 @@ if (flags & HAS_SSSE3) vpx_d45_predictor_32x32 = vpx_d45_predictor_32x32_ssse3; vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_sse2; vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_sse2; vpx_d63_predictor_16x16 = vpx_d63_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d63_predictor_16x16 = vpx_d63_predictor_16x16_ssse3; @@ -8911,11 +5539,9 @@ if (flags & HAS_SSSE3) vpx_d63_predictor_32x32 = vpx_d63_predictor_32x32_ssse3; vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_c; - if (flags & HAS_SSSE3) - vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_ssse3; + if (flags & HAS_SSSE3) vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_ssse3; vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_ssse3; vpx_dc_128_predictor_16x16 = vpx_dc_128_predictor_16x16_c; if (flags & HAS_SSE2) vpx_dc_128_predictor_16x16 = vpx_dc_128_predictor_16x16_sse2; @@ -8941,17 +5567,13 @@ if (flags & HAS_SSE2) vpx_dc_left_predictor_8x8 = vpx_dc_left_predictor_8x8_sse2; vpx_dc_predictor_16x16 = vpx_dc_predictor_16x16_c; - if (flags & HAS_SSE2) - vpx_dc_predictor_16x16 = vpx_dc_predictor_16x16_sse2; + if (flags & HAS_SSE2) vpx_dc_predictor_16x16 = vpx_dc_predictor_16x16_sse2; vpx_dc_predictor_32x32 = vpx_dc_predictor_32x32_c; - if (flags & HAS_SSE2) - vpx_dc_predictor_32x32 = vpx_dc_predictor_32x32_sse2; + if (flags & HAS_SSE2) vpx_dc_predictor_32x32 = vpx_dc_predictor_32x32_sse2; vpx_dc_predictor_4x4 = vpx_dc_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_dc_predictor_4x4 = vpx_dc_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_dc_predictor_4x4 = vpx_dc_predictor_4x4_sse2; vpx_dc_predictor_8x8 = vpx_dc_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_dc_predictor_8x8 = vpx_dc_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_dc_predictor_8x8 = vpx_dc_predictor_8x8_sse2; vpx_dc_top_predictor_16x16 = vpx_dc_top_predictor_16x16_c; if (flags & HAS_SSE2) vpx_dc_top_predictor_16x16 = vpx_dc_top_predictor_16x16_sse2; @@ -8965,69 +5587,47 @@ if (flags & HAS_SSE2) vpx_dc_top_predictor_8x8 = vpx_dc_top_predictor_8x8_sse2; vpx_fdct16x16 = vpx_fdct16x16_c; - if (flags & HAS_SSE2) - vpx_fdct16x16 = vpx_fdct16x16_sse2; + if (flags & HAS_SSE2) vpx_fdct16x16 = vpx_fdct16x16_sse2; vpx_fdct16x16_1 = vpx_fdct16x16_1_c; - if (flags & HAS_SSE2) - vpx_fdct16x16_1 = vpx_fdct16x16_1_sse2; + if (flags & HAS_SSE2) vpx_fdct16x16_1 = vpx_fdct16x16_1_sse2; vpx_fdct32x32 = vpx_fdct32x32_c; - if (flags & HAS_SSE2) - vpx_fdct32x32 = vpx_fdct32x32_sse2; + if (flags & HAS_SSE2) vpx_fdct32x32 = vpx_fdct32x32_sse2; vpx_fdct32x32_1 = vpx_fdct32x32_1_c; - if (flags & HAS_SSE2) - vpx_fdct32x32_1 = vpx_fdct32x32_1_sse2; + if (flags & HAS_SSE2) vpx_fdct32x32_1 = vpx_fdct32x32_1_sse2; vpx_fdct32x32_rd = vpx_fdct32x32_rd_c; - if (flags & HAS_SSE2) - vpx_fdct32x32_rd = vpx_fdct32x32_rd_sse2; + if (flags & HAS_SSE2) vpx_fdct32x32_rd = vpx_fdct32x32_rd_sse2; vpx_fdct4x4 = vpx_fdct4x4_c; - if (flags & HAS_SSE2) - vpx_fdct4x4 = vpx_fdct4x4_sse2; + if (flags & HAS_SSE2) vpx_fdct4x4 = vpx_fdct4x4_sse2; vpx_fdct4x4_1 = vpx_fdct4x4_1_c; - if (flags & HAS_SSE2) - vpx_fdct4x4_1 = vpx_fdct4x4_1_sse2; + if (flags & HAS_SSE2) vpx_fdct4x4_1 = vpx_fdct4x4_1_sse2; vpx_fdct8x8 = vpx_fdct8x8_c; - if (flags & HAS_SSE2) - vpx_fdct8x8 = vpx_fdct8x8_sse2; + if (flags & HAS_SSE2) vpx_fdct8x8 = vpx_fdct8x8_sse2; vpx_fdct8x8_1 = vpx_fdct8x8_1_c; - if (flags & HAS_SSE2) - vpx_fdct8x8_1 = vpx_fdct8x8_1_sse2; + if (flags & HAS_SSE2) vpx_fdct8x8_1 = vpx_fdct8x8_1_sse2; vpx_get16x16var = vpx_get16x16var_c; - if (flags & HAS_SSE2) - vpx_get16x16var = vpx_get16x16var_sse2; - if (flags & HAS_AVX2) - vpx_get16x16var = vpx_get16x16var_avx2; + if (flags & HAS_SSE2) vpx_get16x16var = vpx_get16x16var_sse2; + if (flags & HAS_AVX2) vpx_get16x16var = vpx_get16x16var_avx2; vpx_get8x8var = vpx_get8x8var_c; - if (flags & HAS_SSE2) - vpx_get8x8var = vpx_get8x8var_sse2; + if (flags & HAS_SSE2) vpx_get8x8var = vpx_get8x8var_sse2; vpx_get_mb_ss = vpx_get_mb_ss_c; - if (flags & HAS_SSE2) - vpx_get_mb_ss = vpx_get_mb_ss_sse2; + if (flags & HAS_SSE2) vpx_get_mb_ss = vpx_get_mb_ss_sse2; vpx_h_predictor_16x16 = vpx_h_predictor_16x16_c; - if (flags & HAS_SSE2) - vpx_h_predictor_16x16 = vpx_h_predictor_16x16_sse2; + if (flags & HAS_SSE2) vpx_h_predictor_16x16 = vpx_h_predictor_16x16_sse2; vpx_h_predictor_32x32 = vpx_h_predictor_32x32_c; - if (flags & HAS_SSE2) - vpx_h_predictor_32x32 = vpx_h_predictor_32x32_sse2; + if (flags & HAS_SSE2) vpx_h_predictor_32x32 = vpx_h_predictor_32x32_sse2; vpx_h_predictor_4x4 = vpx_h_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_h_predictor_4x4 = vpx_h_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_h_predictor_4x4 = vpx_h_predictor_4x4_sse2; vpx_h_predictor_8x8 = vpx_h_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_h_predictor_8x8 = vpx_h_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_h_predictor_8x8 = vpx_h_predictor_8x8_sse2; vpx_hadamard_16x16 = vpx_hadamard_16x16_c; - if (flags & HAS_SSE2) - vpx_hadamard_16x16 = vpx_hadamard_16x16_sse2; - if (flags & HAS_AVX2) - vpx_hadamard_16x16 = vpx_hadamard_16x16_avx2; + if (flags & HAS_SSE2) vpx_hadamard_16x16 = vpx_hadamard_16x16_sse2; + if (flags & HAS_AVX2) vpx_hadamard_16x16 = vpx_hadamard_16x16_avx2; vpx_hadamard_8x8 = vpx_hadamard_8x8_c; - if (flags & HAS_SSE2) - vpx_hadamard_8x8 = vpx_hadamard_8x8_sse2; + if (flags & HAS_SSE2) vpx_hadamard_8x8 = vpx_hadamard_8x8_sse2; vpx_highbd_10_mse16x16 = vpx_highbd_10_mse16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_10_mse16x16 = vpx_highbd_10_mse16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_10_mse16x16 = vpx_highbd_10_mse16x16_sse2; vpx_highbd_10_mse8x8 = vpx_highbd_10_mse8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_10_mse8x8 = vpx_highbd_10_mse8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_10_mse8x8 = vpx_highbd_10_mse8x8_sse2; vpx_highbd_10_sub_pixel_avg_variance16x16 = vpx_highbd_10_sub_pixel_avg_variance16x16_c; if (flags & HAS_SSE2) @@ -9165,11 +5765,9 @@ if (flags & HAS_SSE2) vpx_highbd_10_variance8x8 = vpx_highbd_10_variance8x8_sse2; vpx_highbd_12_mse16x16 = vpx_highbd_12_mse16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_12_mse16x16 = vpx_highbd_12_mse16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_12_mse16x16 = vpx_highbd_12_mse16x16_sse2; vpx_highbd_12_mse8x8 = vpx_highbd_12_mse8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_12_mse8x8 = vpx_highbd_12_mse8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_12_mse8x8 = vpx_highbd_12_mse8x8_sse2; vpx_highbd_12_sub_pixel_avg_variance16x16 = vpx_highbd_12_sub_pixel_avg_variance16x16_c; if (flags & HAS_SSE2) @@ -9307,11 +5905,9 @@ if (flags & HAS_SSE2) vpx_highbd_12_variance8x8 = vpx_highbd_12_variance8x8_sse2; vpx_highbd_8_mse16x16 = vpx_highbd_8_mse16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_8_mse16x16 = vpx_highbd_8_mse16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_8_mse16x16 = vpx_highbd_8_mse16x16_sse2; vpx_highbd_8_mse8x8 = vpx_highbd_8_mse8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_8_mse8x8 = vpx_highbd_8_mse8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_8_mse8x8 = vpx_highbd_8_mse8x8_sse2; vpx_highbd_8_sub_pixel_avg_variance16x16 = vpx_highbd_8_sub_pixel_avg_variance16x16_c; if (flags & HAS_SSE2) @@ -9442,8 +6038,7 @@ if (flags & HAS_SSE2) vpx_highbd_8_variance8x8 = vpx_highbd_8_variance8x8_sse2; vpx_highbd_convolve8 = vpx_highbd_convolve8_c; - if (flags & HAS_AVX2) - vpx_highbd_convolve8 = vpx_highbd_convolve8_avx2; + if (flags & HAS_AVX2) vpx_highbd_convolve8 = vpx_highbd_convolve8_avx2; vpx_highbd_convolve8_avg = vpx_highbd_convolve8_avg_c; if (flags & HAS_AVX2) vpx_highbd_convolve8_avg = vpx_highbd_convolve8_avg_avx2; @@ -9460,10 +6055,8 @@ if (flags & HAS_AVX2) vpx_highbd_convolve8_vert = vpx_highbd_convolve8_vert_avx2; vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_sse2; - if (flags & HAS_AVX2) - vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_avx2; + if (flags & HAS_SSE2) vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_sse2; + if (flags & HAS_AVX2) vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_avx2; vpx_highbd_convolve_copy = vpx_highbd_convolve_copy_c; if (flags & HAS_SSE2) vpx_highbd_convolve_copy = vpx_highbd_convolve_copy_sse2; @@ -9592,20 +6185,15 @@ if (flags & HAS_SSE2) vpx_highbd_dc_top_predictor_8x8 = vpx_highbd_dc_top_predictor_8x8_sse2; vpx_highbd_fdct16x16 = vpx_highbd_fdct16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct16x16 = vpx_highbd_fdct16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct16x16 = vpx_highbd_fdct16x16_sse2; vpx_highbd_fdct32x32 = vpx_highbd_fdct32x32_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct32x32 = vpx_highbd_fdct32x32_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct32x32 = vpx_highbd_fdct32x32_sse2; vpx_highbd_fdct32x32_rd = vpx_highbd_fdct32x32_rd_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct32x32_rd = vpx_highbd_fdct32x32_rd_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct32x32_rd = vpx_highbd_fdct32x32_rd_sse2; vpx_highbd_fdct4x4 = vpx_highbd_fdct4x4_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct4x4 = vpx_highbd_fdct4x4_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct4x4 = vpx_highbd_fdct4x4_sse2; vpx_highbd_fdct8x8 = vpx_highbd_fdct8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct8x8 = vpx_highbd_fdct8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct8x8 = vpx_highbd_fdct8x8_sse2; vpx_highbd_h_predictor_16x16 = vpx_highbd_h_predictor_16x16_c; if (flags & HAS_SSE2) vpx_highbd_h_predictor_16x16 = vpx_highbd_h_predictor_16x16_sse2; @@ -9712,116 +6300,80 @@ if (flags & HAS_SSE2) vpx_highbd_lpf_vertical_8_dual = vpx_highbd_lpf_vertical_8_dual_sse2; vpx_highbd_quantize_b = vpx_highbd_quantize_b_c; - if (flags & HAS_SSE2) - vpx_highbd_quantize_b = vpx_highbd_quantize_b_sse2; + if (flags & HAS_SSE2) vpx_highbd_quantize_b = vpx_highbd_quantize_b_sse2; vpx_highbd_quantize_b_32x32 = vpx_highbd_quantize_b_32x32_c; if (flags & HAS_SSE2) vpx_highbd_quantize_b_32x32 = vpx_highbd_quantize_b_32x32_sse2; vpx_highbd_sad16x16 = vpx_highbd_sad16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x16 = vpx_highbd_sad16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x16 = vpx_highbd_sad16x16_sse2; vpx_highbd_sad16x16_avg = vpx_highbd_sad16x16_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x16_avg = vpx_highbd_sad16x16_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x16_avg = vpx_highbd_sad16x16_avg_sse2; vpx_highbd_sad16x16x4d = vpx_highbd_sad16x16x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x16x4d = vpx_highbd_sad16x16x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x16x4d = vpx_highbd_sad16x16x4d_sse2; vpx_highbd_sad16x32 = vpx_highbd_sad16x32_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x32 = vpx_highbd_sad16x32_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x32 = vpx_highbd_sad16x32_sse2; vpx_highbd_sad16x32_avg = vpx_highbd_sad16x32_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x32_avg = vpx_highbd_sad16x32_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x32_avg = vpx_highbd_sad16x32_avg_sse2; vpx_highbd_sad16x32x4d = vpx_highbd_sad16x32x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x32x4d = vpx_highbd_sad16x32x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x32x4d = vpx_highbd_sad16x32x4d_sse2; vpx_highbd_sad16x8 = vpx_highbd_sad16x8_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x8 = vpx_highbd_sad16x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x8 = vpx_highbd_sad16x8_sse2; vpx_highbd_sad16x8_avg = vpx_highbd_sad16x8_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x8_avg = vpx_highbd_sad16x8_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x8_avg = vpx_highbd_sad16x8_avg_sse2; vpx_highbd_sad16x8x4d = vpx_highbd_sad16x8x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x8x4d = vpx_highbd_sad16x8x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x8x4d = vpx_highbd_sad16x8x4d_sse2; vpx_highbd_sad32x16 = vpx_highbd_sad32x16_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x16 = vpx_highbd_sad32x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x16 = vpx_highbd_sad32x16_sse2; vpx_highbd_sad32x16_avg = vpx_highbd_sad32x16_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x16_avg = vpx_highbd_sad32x16_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x16_avg = vpx_highbd_sad32x16_avg_sse2; vpx_highbd_sad32x16x4d = vpx_highbd_sad32x16x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x16x4d = vpx_highbd_sad32x16x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x16x4d = vpx_highbd_sad32x16x4d_sse2; vpx_highbd_sad32x32 = vpx_highbd_sad32x32_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x32 = vpx_highbd_sad32x32_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x32 = vpx_highbd_sad32x32_sse2; vpx_highbd_sad32x32_avg = vpx_highbd_sad32x32_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x32_avg = vpx_highbd_sad32x32_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x32_avg = vpx_highbd_sad32x32_avg_sse2; vpx_highbd_sad32x32x4d = vpx_highbd_sad32x32x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x32x4d = vpx_highbd_sad32x32x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x32x4d = vpx_highbd_sad32x32x4d_sse2; vpx_highbd_sad32x64 = vpx_highbd_sad32x64_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x64 = vpx_highbd_sad32x64_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x64 = vpx_highbd_sad32x64_sse2; vpx_highbd_sad32x64_avg = vpx_highbd_sad32x64_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x64_avg = vpx_highbd_sad32x64_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x64_avg = vpx_highbd_sad32x64_avg_sse2; vpx_highbd_sad32x64x4d = vpx_highbd_sad32x64x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x64x4d = vpx_highbd_sad32x64x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x64x4d = vpx_highbd_sad32x64x4d_sse2; vpx_highbd_sad4x4x4d = vpx_highbd_sad4x4x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad4x4x4d = vpx_highbd_sad4x4x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad4x4x4d = vpx_highbd_sad4x4x4d_sse2; vpx_highbd_sad4x8x4d = vpx_highbd_sad4x8x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad4x8x4d = vpx_highbd_sad4x8x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad4x8x4d = vpx_highbd_sad4x8x4d_sse2; vpx_highbd_sad64x32 = vpx_highbd_sad64x32_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x32 = vpx_highbd_sad64x32_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x32 = vpx_highbd_sad64x32_sse2; vpx_highbd_sad64x32_avg = vpx_highbd_sad64x32_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x32_avg = vpx_highbd_sad64x32_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x32_avg = vpx_highbd_sad64x32_avg_sse2; vpx_highbd_sad64x32x4d = vpx_highbd_sad64x32x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x32x4d = vpx_highbd_sad64x32x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x32x4d = vpx_highbd_sad64x32x4d_sse2; vpx_highbd_sad64x64 = vpx_highbd_sad64x64_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x64 = vpx_highbd_sad64x64_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x64 = vpx_highbd_sad64x64_sse2; vpx_highbd_sad64x64_avg = vpx_highbd_sad64x64_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x64_avg = vpx_highbd_sad64x64_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x64_avg = vpx_highbd_sad64x64_avg_sse2; vpx_highbd_sad64x64x4d = vpx_highbd_sad64x64x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x64x4d = vpx_highbd_sad64x64x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x64x4d = vpx_highbd_sad64x64x4d_sse2; vpx_highbd_sad8x16 = vpx_highbd_sad8x16_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x16 = vpx_highbd_sad8x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x16 = vpx_highbd_sad8x16_sse2; vpx_highbd_sad8x16_avg = vpx_highbd_sad8x16_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x16_avg = vpx_highbd_sad8x16_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x16_avg = vpx_highbd_sad8x16_avg_sse2; vpx_highbd_sad8x16x4d = vpx_highbd_sad8x16x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x16x4d = vpx_highbd_sad8x16x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x16x4d = vpx_highbd_sad8x16x4d_sse2; vpx_highbd_sad8x4 = vpx_highbd_sad8x4_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x4 = vpx_highbd_sad8x4_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x4 = vpx_highbd_sad8x4_sse2; vpx_highbd_sad8x4_avg = vpx_highbd_sad8x4_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x4_avg = vpx_highbd_sad8x4_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x4_avg = vpx_highbd_sad8x4_avg_sse2; vpx_highbd_sad8x4x4d = vpx_highbd_sad8x4x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x4x4d = vpx_highbd_sad8x4x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x4x4d = vpx_highbd_sad8x4x4d_sse2; vpx_highbd_sad8x8 = vpx_highbd_sad8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x8 = vpx_highbd_sad8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x8 = vpx_highbd_sad8x8_sse2; vpx_highbd_sad8x8_avg = vpx_highbd_sad8x8_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x8_avg = vpx_highbd_sad8x8_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x8_avg = vpx_highbd_sad8x8_avg_sse2; vpx_highbd_sad8x8x4d = vpx_highbd_sad8x8x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x8x4d = vpx_highbd_sad8x8x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x8x4d = vpx_highbd_sad8x8x4d_sse2; vpx_highbd_tm_predictor_16x16 = vpx_highbd_tm_predictor_16x16_c; if (flags & HAS_SSE2) vpx_highbd_tm_predictor_16x16 = vpx_highbd_tm_predictor_16x16_sse2; @@ -9847,324 +6399,218 @@ if (flags & HAS_SSE2) vpx_highbd_v_predictor_8x8 = vpx_highbd_v_predictor_8x8_sse2; vpx_idct16x16_10_add = vpx_idct16x16_10_add_c; - if (flags & HAS_SSE2) - vpx_idct16x16_10_add = vpx_idct16x16_10_add_sse2; + if (flags & HAS_SSE2) vpx_idct16x16_10_add = vpx_idct16x16_10_add_sse2; vpx_idct16x16_1_add = vpx_idct16x16_1_add_c; - if (flags & HAS_SSE2) - vpx_idct16x16_1_add = vpx_idct16x16_1_add_sse2; + if (flags & HAS_SSE2) vpx_idct16x16_1_add = vpx_idct16x16_1_add_sse2; vpx_idct16x16_256_add = vpx_idct16x16_256_add_c; - if (flags & HAS_SSE2) - vpx_idct16x16_256_add = vpx_idct16x16_256_add_sse2; + if (flags & HAS_SSE2) vpx_idct16x16_256_add = vpx_idct16x16_256_add_sse2; vpx_idct16x16_38_add = vpx_idct16x16_38_add_c; - if (flags & HAS_SSE2) - vpx_idct16x16_38_add = vpx_idct16x16_38_add_sse2; + if (flags & HAS_SSE2) vpx_idct16x16_38_add = vpx_idct16x16_38_add_sse2; vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_c; - if (flags & HAS_SSE2) - vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_sse2; + if (flags & HAS_SSE2) vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_sse2; vpx_idct32x32_135_add = vpx_idct32x32_135_add_c; - if (flags & HAS_SSE2) - vpx_idct32x32_135_add = vpx_idct32x32_135_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct32x32_135_add = vpx_idct32x32_135_add_ssse3; + if (flags & HAS_SSE2) vpx_idct32x32_135_add = vpx_idct32x32_135_add_sse2; + if (flags & HAS_SSSE3) vpx_idct32x32_135_add = vpx_idct32x32_135_add_ssse3; vpx_idct32x32_1_add = vpx_idct32x32_1_add_c; - if (flags & HAS_SSE2) - vpx_idct32x32_1_add = vpx_idct32x32_1_add_sse2; + if (flags & HAS_SSE2) vpx_idct32x32_1_add = vpx_idct32x32_1_add_sse2; vpx_idct32x32_34_add = vpx_idct32x32_34_add_c; - if (flags & HAS_SSE2) - vpx_idct32x32_34_add = vpx_idct32x32_34_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct32x32_34_add = vpx_idct32x32_34_add_ssse3; + if (flags & HAS_SSE2) vpx_idct32x32_34_add = vpx_idct32x32_34_add_sse2; + if (flags & HAS_SSSE3) vpx_idct32x32_34_add = vpx_idct32x32_34_add_ssse3; vpx_idct4x4_16_add = vpx_idct4x4_16_add_c; - if (flags & HAS_SSE2) - vpx_idct4x4_16_add = vpx_idct4x4_16_add_sse2; + if (flags & HAS_SSE2) vpx_idct4x4_16_add = vpx_idct4x4_16_add_sse2; vpx_idct4x4_1_add = vpx_idct4x4_1_add_c; - if (flags & HAS_SSE2) - vpx_idct4x4_1_add = vpx_idct4x4_1_add_sse2; + if (flags & HAS_SSE2) vpx_idct4x4_1_add = vpx_idct4x4_1_add_sse2; vpx_idct8x8_12_add = vpx_idct8x8_12_add_c; - if (flags & HAS_SSE2) - vpx_idct8x8_12_add = vpx_idct8x8_12_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct8x8_12_add = vpx_idct8x8_12_add_ssse3; + if (flags & HAS_SSE2) vpx_idct8x8_12_add = vpx_idct8x8_12_add_sse2; + if (flags & HAS_SSSE3) vpx_idct8x8_12_add = vpx_idct8x8_12_add_ssse3; vpx_idct8x8_1_add = vpx_idct8x8_1_add_c; - if (flags & HAS_SSE2) - vpx_idct8x8_1_add = vpx_idct8x8_1_add_sse2; + if (flags & HAS_SSE2) vpx_idct8x8_1_add = vpx_idct8x8_1_add_sse2; vpx_idct8x8_64_add = vpx_idct8x8_64_add_c; - if (flags & HAS_SSE2) - vpx_idct8x8_64_add = vpx_idct8x8_64_add_sse2; + if (flags & HAS_SSE2) vpx_idct8x8_64_add = vpx_idct8x8_64_add_sse2; vpx_int_pro_col = vpx_int_pro_col_c; - if (flags & HAS_SSE2) - vpx_int_pro_col = vpx_int_pro_col_sse2; + if (flags & HAS_SSE2) vpx_int_pro_col = vpx_int_pro_col_sse2; vpx_int_pro_row = vpx_int_pro_row_c; - if (flags & HAS_SSE2) - vpx_int_pro_row = vpx_int_pro_row_sse2; + if (flags & HAS_SSE2) vpx_int_pro_row = vpx_int_pro_row_sse2; vpx_iwht4x4_16_add = vpx_iwht4x4_16_add_c; - if (flags & HAS_SSE2) - vpx_iwht4x4_16_add = vpx_iwht4x4_16_add_sse2; + if (flags & HAS_SSE2) vpx_iwht4x4_16_add = vpx_iwht4x4_16_add_sse2; vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_c; - if (flags & HAS_SSE2) - vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_sse2; - if (flags & HAS_AVX2) - vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_avx2; + if (flags & HAS_SSE2) vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_sse2; + if (flags & HAS_AVX2) vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_avx2; vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_c; if (flags & HAS_SSE2) vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_sse2; if (flags & HAS_AVX2) vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_avx2; vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_c; - if (flags & HAS_SSE2) - vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_sse2; + if (flags & HAS_SSE2) vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_sse2; vpx_lpf_horizontal_4_dual = vpx_lpf_horizontal_4_dual_c; if (flags & HAS_SSE2) vpx_lpf_horizontal_4_dual = vpx_lpf_horizontal_4_dual_sse2; vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_c; - if (flags & HAS_SSE2) - vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_sse2; + if (flags & HAS_SSE2) vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_sse2; vpx_lpf_horizontal_8_dual = vpx_lpf_horizontal_8_dual_c; if (flags & HAS_SSE2) vpx_lpf_horizontal_8_dual = vpx_lpf_horizontal_8_dual_sse2; vpx_lpf_vertical_16 = vpx_lpf_vertical_16_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_16 = vpx_lpf_vertical_16_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_16 = vpx_lpf_vertical_16_sse2; vpx_lpf_vertical_16_dual = vpx_lpf_vertical_16_dual_c; if (flags & HAS_SSE2) vpx_lpf_vertical_16_dual = vpx_lpf_vertical_16_dual_sse2; vpx_lpf_vertical_4 = vpx_lpf_vertical_4_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_4 = vpx_lpf_vertical_4_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_4 = vpx_lpf_vertical_4_sse2; vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_sse2; vpx_lpf_vertical_8 = vpx_lpf_vertical_8_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_8 = vpx_lpf_vertical_8_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_8 = vpx_lpf_vertical_8_sse2; vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_sse2; vpx_mbpost_proc_across_ip = vpx_mbpost_proc_across_ip_c; if (flags & HAS_SSE2) vpx_mbpost_proc_across_ip = vpx_mbpost_proc_across_ip_sse2; vpx_mbpost_proc_down = vpx_mbpost_proc_down_c; - if (flags & HAS_SSE2) - vpx_mbpost_proc_down = vpx_mbpost_proc_down_sse2; + if (flags & HAS_SSE2) vpx_mbpost_proc_down = vpx_mbpost_proc_down_sse2; vpx_minmax_8x8 = vpx_minmax_8x8_c; - if (flags & HAS_SSE2) - vpx_minmax_8x8 = vpx_minmax_8x8_sse2; + if (flags & HAS_SSE2) vpx_minmax_8x8 = vpx_minmax_8x8_sse2; vpx_mse16x16 = vpx_mse16x16_c; - if (flags & HAS_SSE2) - vpx_mse16x16 = vpx_mse16x16_sse2; - if (flags & HAS_AVX2) - vpx_mse16x16 = vpx_mse16x16_avx2; + if (flags & HAS_SSE2) vpx_mse16x16 = vpx_mse16x16_sse2; + if (flags & HAS_AVX2) vpx_mse16x16 = vpx_mse16x16_avx2; vpx_mse16x8 = vpx_mse16x8_c; - if (flags & HAS_SSE2) - vpx_mse16x8 = vpx_mse16x8_sse2; + if (flags & HAS_SSE2) vpx_mse16x8 = vpx_mse16x8_sse2; + if (flags & HAS_AVX2) vpx_mse16x8 = vpx_mse16x8_avx2; vpx_mse8x16 = vpx_mse8x16_c; - if (flags & HAS_SSE2) - vpx_mse8x16 = vpx_mse8x16_sse2; + if (flags & HAS_SSE2) vpx_mse8x16 = vpx_mse8x16_sse2; vpx_mse8x8 = vpx_mse8x8_c; - if (flags & HAS_SSE2) - vpx_mse8x8 = vpx_mse8x8_sse2; + if (flags & HAS_SSE2) vpx_mse8x8 = vpx_mse8x8_sse2; vpx_plane_add_noise = vpx_plane_add_noise_c; - if (flags & HAS_SSE2) - vpx_plane_add_noise = vpx_plane_add_noise_sse2; + if (flags & HAS_SSE2) vpx_plane_add_noise = vpx_plane_add_noise_sse2; vpx_post_proc_down_and_across_mb_row = vpx_post_proc_down_and_across_mb_row_c; if (flags & HAS_SSE2) vpx_post_proc_down_and_across_mb_row = vpx_post_proc_down_and_across_mb_row_sse2; vpx_quantize_b = vpx_quantize_b_c; - if (flags & HAS_SSE2) - vpx_quantize_b = vpx_quantize_b_sse2; - if (flags & HAS_SSSE3) - vpx_quantize_b = vpx_quantize_b_ssse3; - if (flags & HAS_AVX) - vpx_quantize_b = vpx_quantize_b_avx; + if (flags & HAS_SSE2) vpx_quantize_b = vpx_quantize_b_sse2; + if (flags & HAS_SSSE3) vpx_quantize_b = vpx_quantize_b_ssse3; + if (flags & HAS_AVX) vpx_quantize_b = vpx_quantize_b_avx; vpx_quantize_b_32x32 = vpx_quantize_b_32x32_c; - if (flags & HAS_SSSE3) - vpx_quantize_b_32x32 = vpx_quantize_b_32x32_ssse3; - if (flags & HAS_AVX) - vpx_quantize_b_32x32 = vpx_quantize_b_32x32_avx; + if (flags & HAS_SSSE3) vpx_quantize_b_32x32 = vpx_quantize_b_32x32_ssse3; + if (flags & HAS_AVX) vpx_quantize_b_32x32 = vpx_quantize_b_32x32_avx; vpx_sad16x16 = vpx_sad16x16_c; - if (flags & HAS_SSE2) - vpx_sad16x16 = vpx_sad16x16_sse2; + if (flags & HAS_SSE2) vpx_sad16x16 = vpx_sad16x16_sse2; vpx_sad16x16_avg = vpx_sad16x16_avg_c; - if (flags & HAS_SSE2) - vpx_sad16x16_avg = vpx_sad16x16_avg_sse2; + if (flags & HAS_SSE2) vpx_sad16x16_avg = vpx_sad16x16_avg_sse2; vpx_sad16x16x3 = vpx_sad16x16x3_c; - if (flags & HAS_SSE3) - vpx_sad16x16x3 = vpx_sad16x16x3_sse3; - if (flags & HAS_SSSE3) - vpx_sad16x16x3 = vpx_sad16x16x3_ssse3; + if (flags & HAS_SSE3) vpx_sad16x16x3 = vpx_sad16x16x3_sse3; + if (flags & HAS_SSSE3) vpx_sad16x16x3 = vpx_sad16x16x3_ssse3; vpx_sad16x16x4d = vpx_sad16x16x4d_c; - if (flags & HAS_SSE2) - vpx_sad16x16x4d = vpx_sad16x16x4d_sse2; + if (flags & HAS_SSE2) vpx_sad16x16x4d = vpx_sad16x16x4d_sse2; vpx_sad16x16x8 = vpx_sad16x16x8_c; - if (flags & HAS_SSE4_1) - vpx_sad16x16x8 = vpx_sad16x16x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad16x16x8 = vpx_sad16x16x8_sse4_1; vpx_sad16x32 = vpx_sad16x32_c; - if (flags & HAS_SSE2) - vpx_sad16x32 = vpx_sad16x32_sse2; + if (flags & HAS_SSE2) vpx_sad16x32 = vpx_sad16x32_sse2; vpx_sad16x32_avg = vpx_sad16x32_avg_c; - if (flags & HAS_SSE2) - vpx_sad16x32_avg = vpx_sad16x32_avg_sse2; + if (flags & HAS_SSE2) vpx_sad16x32_avg = vpx_sad16x32_avg_sse2; vpx_sad16x32x4d = vpx_sad16x32x4d_c; - if (flags & HAS_SSE2) - vpx_sad16x32x4d = vpx_sad16x32x4d_sse2; + if (flags & HAS_SSE2) vpx_sad16x32x4d = vpx_sad16x32x4d_sse2; vpx_sad16x8 = vpx_sad16x8_c; - if (flags & HAS_SSE2) - vpx_sad16x8 = vpx_sad16x8_sse2; + if (flags & HAS_SSE2) vpx_sad16x8 = vpx_sad16x8_sse2; vpx_sad16x8_avg = vpx_sad16x8_avg_c; - if (flags & HAS_SSE2) - vpx_sad16x8_avg = vpx_sad16x8_avg_sse2; + if (flags & HAS_SSE2) vpx_sad16x8_avg = vpx_sad16x8_avg_sse2; vpx_sad16x8x3 = vpx_sad16x8x3_c; - if (flags & HAS_SSE3) - vpx_sad16x8x3 = vpx_sad16x8x3_sse3; - if (flags & HAS_SSSE3) - vpx_sad16x8x3 = vpx_sad16x8x3_ssse3; + if (flags & HAS_SSE3) vpx_sad16x8x3 = vpx_sad16x8x3_sse3; + if (flags & HAS_SSSE3) vpx_sad16x8x3 = vpx_sad16x8x3_ssse3; vpx_sad16x8x4d = vpx_sad16x8x4d_c; - if (flags & HAS_SSE2) - vpx_sad16x8x4d = vpx_sad16x8x4d_sse2; + if (flags & HAS_SSE2) vpx_sad16x8x4d = vpx_sad16x8x4d_sse2; vpx_sad16x8x8 = vpx_sad16x8x8_c; - if (flags & HAS_SSE4_1) - vpx_sad16x8x8 = vpx_sad16x8x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad16x8x8 = vpx_sad16x8x8_sse4_1; vpx_sad32x16 = vpx_sad32x16_c; - if (flags & HAS_SSE2) - vpx_sad32x16 = vpx_sad32x16_sse2; - if (flags & HAS_AVX2) - vpx_sad32x16 = vpx_sad32x16_avx2; + if (flags & HAS_SSE2) vpx_sad32x16 = vpx_sad32x16_sse2; + if (flags & HAS_AVX2) vpx_sad32x16 = vpx_sad32x16_avx2; vpx_sad32x16_avg = vpx_sad32x16_avg_c; - if (flags & HAS_SSE2) - vpx_sad32x16_avg = vpx_sad32x16_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x16_avg = vpx_sad32x16_avg_avx2; + if (flags & HAS_SSE2) vpx_sad32x16_avg = vpx_sad32x16_avg_sse2; + if (flags & HAS_AVX2) vpx_sad32x16_avg = vpx_sad32x16_avg_avx2; vpx_sad32x16x4d = vpx_sad32x16x4d_c; - if (flags & HAS_SSE2) - vpx_sad32x16x4d = vpx_sad32x16x4d_sse2; + if (flags & HAS_SSE2) vpx_sad32x16x4d = vpx_sad32x16x4d_sse2; vpx_sad32x32 = vpx_sad32x32_c; - if (flags & HAS_SSE2) - vpx_sad32x32 = vpx_sad32x32_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32 = vpx_sad32x32_avx2; + if (flags & HAS_SSE2) vpx_sad32x32 = vpx_sad32x32_sse2; + if (flags & HAS_AVX2) vpx_sad32x32 = vpx_sad32x32_avx2; vpx_sad32x32_avg = vpx_sad32x32_avg_c; - if (flags & HAS_SSE2) - vpx_sad32x32_avg = vpx_sad32x32_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32_avg = vpx_sad32x32_avg_avx2; + if (flags & HAS_SSE2) vpx_sad32x32_avg = vpx_sad32x32_avg_sse2; + if (flags & HAS_AVX2) vpx_sad32x32_avg = vpx_sad32x32_avg_avx2; vpx_sad32x32x4d = vpx_sad32x32x4d_c; - if (flags & HAS_SSE2) - vpx_sad32x32x4d = vpx_sad32x32x4d_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32x4d = vpx_sad32x32x4d_avx2; + if (flags & HAS_SSE2) vpx_sad32x32x4d = vpx_sad32x32x4d_sse2; + if (flags & HAS_AVX2) vpx_sad32x32x4d = vpx_sad32x32x4d_avx2; vpx_sad32x64 = vpx_sad32x64_c; - if (flags & HAS_SSE2) - vpx_sad32x64 = vpx_sad32x64_sse2; - if (flags & HAS_AVX2) - vpx_sad32x64 = vpx_sad32x64_avx2; + if (flags & HAS_SSE2) vpx_sad32x64 = vpx_sad32x64_sse2; + if (flags & HAS_AVX2) vpx_sad32x64 = vpx_sad32x64_avx2; vpx_sad32x64_avg = vpx_sad32x64_avg_c; - if (flags & HAS_SSE2) - vpx_sad32x64_avg = vpx_sad32x64_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x64_avg = vpx_sad32x64_avg_avx2; + if (flags & HAS_SSE2) vpx_sad32x64_avg = vpx_sad32x64_avg_sse2; + if (flags & HAS_AVX2) vpx_sad32x64_avg = vpx_sad32x64_avg_avx2; vpx_sad32x64x4d = vpx_sad32x64x4d_c; - if (flags & HAS_SSE2) - vpx_sad32x64x4d = vpx_sad32x64x4d_sse2; + if (flags & HAS_SSE2) vpx_sad32x64x4d = vpx_sad32x64x4d_sse2; vpx_sad4x4 = vpx_sad4x4_c; - if (flags & HAS_SSE2) - vpx_sad4x4 = vpx_sad4x4_sse2; + if (flags & HAS_SSE2) vpx_sad4x4 = vpx_sad4x4_sse2; vpx_sad4x4_avg = vpx_sad4x4_avg_c; - if (flags & HAS_SSE2) - vpx_sad4x4_avg = vpx_sad4x4_avg_sse2; + if (flags & HAS_SSE2) vpx_sad4x4_avg = vpx_sad4x4_avg_sse2; vpx_sad4x4x3 = vpx_sad4x4x3_c; - if (flags & HAS_SSE3) - vpx_sad4x4x3 = vpx_sad4x4x3_sse3; + if (flags & HAS_SSE3) vpx_sad4x4x3 = vpx_sad4x4x3_sse3; vpx_sad4x4x4d = vpx_sad4x4x4d_c; - if (flags & HAS_SSE2) - vpx_sad4x4x4d = vpx_sad4x4x4d_sse2; + if (flags & HAS_SSE2) vpx_sad4x4x4d = vpx_sad4x4x4d_sse2; vpx_sad4x4x8 = vpx_sad4x4x8_c; - if (flags & HAS_SSE4_1) - vpx_sad4x4x8 = vpx_sad4x4x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad4x4x8 = vpx_sad4x4x8_sse4_1; vpx_sad4x8 = vpx_sad4x8_c; - if (flags & HAS_SSE2) - vpx_sad4x8 = vpx_sad4x8_sse2; + if (flags & HAS_SSE2) vpx_sad4x8 = vpx_sad4x8_sse2; vpx_sad4x8_avg = vpx_sad4x8_avg_c; - if (flags & HAS_SSE2) - vpx_sad4x8_avg = vpx_sad4x8_avg_sse2; + if (flags & HAS_SSE2) vpx_sad4x8_avg = vpx_sad4x8_avg_sse2; vpx_sad4x8x4d = vpx_sad4x8x4d_c; - if (flags & HAS_SSE2) - vpx_sad4x8x4d = vpx_sad4x8x4d_sse2; + if (flags & HAS_SSE2) vpx_sad4x8x4d = vpx_sad4x8x4d_sse2; vpx_sad64x32 = vpx_sad64x32_c; - if (flags & HAS_SSE2) - vpx_sad64x32 = vpx_sad64x32_sse2; - if (flags & HAS_AVX2) - vpx_sad64x32 = vpx_sad64x32_avx2; + if (flags & HAS_SSE2) vpx_sad64x32 = vpx_sad64x32_sse2; + if (flags & HAS_AVX2) vpx_sad64x32 = vpx_sad64x32_avx2; vpx_sad64x32_avg = vpx_sad64x32_avg_c; - if (flags & HAS_SSE2) - vpx_sad64x32_avg = vpx_sad64x32_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad64x32_avg = vpx_sad64x32_avg_avx2; + if (flags & HAS_SSE2) vpx_sad64x32_avg = vpx_sad64x32_avg_sse2; + if (flags & HAS_AVX2) vpx_sad64x32_avg = vpx_sad64x32_avg_avx2; vpx_sad64x32x4d = vpx_sad64x32x4d_c; - if (flags & HAS_SSE2) - vpx_sad64x32x4d = vpx_sad64x32x4d_sse2; + if (flags & HAS_SSE2) vpx_sad64x32x4d = vpx_sad64x32x4d_sse2; vpx_sad64x64 = vpx_sad64x64_c; - if (flags & HAS_SSE2) - vpx_sad64x64 = vpx_sad64x64_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64 = vpx_sad64x64_avx2; + if (flags & HAS_SSE2) vpx_sad64x64 = vpx_sad64x64_sse2; + if (flags & HAS_AVX2) vpx_sad64x64 = vpx_sad64x64_avx2; vpx_sad64x64_avg = vpx_sad64x64_avg_c; - if (flags & HAS_SSE2) - vpx_sad64x64_avg = vpx_sad64x64_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64_avg = vpx_sad64x64_avg_avx2; + if (flags & HAS_SSE2) vpx_sad64x64_avg = vpx_sad64x64_avg_sse2; + if (flags & HAS_AVX2) vpx_sad64x64_avg = vpx_sad64x64_avg_avx2; vpx_sad64x64x4d = vpx_sad64x64x4d_c; - if (flags & HAS_SSE2) - vpx_sad64x64x4d = vpx_sad64x64x4d_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64x4d = vpx_sad64x64x4d_avx2; + if (flags & HAS_SSE2) vpx_sad64x64x4d = vpx_sad64x64x4d_sse2; + if (flags & HAS_AVX2) vpx_sad64x64x4d = vpx_sad64x64x4d_avx2; vpx_sad8x16 = vpx_sad8x16_c; - if (flags & HAS_SSE2) - vpx_sad8x16 = vpx_sad8x16_sse2; + if (flags & HAS_SSE2) vpx_sad8x16 = vpx_sad8x16_sse2; vpx_sad8x16_avg = vpx_sad8x16_avg_c; - if (flags & HAS_SSE2) - vpx_sad8x16_avg = vpx_sad8x16_avg_sse2; + if (flags & HAS_SSE2) vpx_sad8x16_avg = vpx_sad8x16_avg_sse2; vpx_sad8x16x3 = vpx_sad8x16x3_c; - if (flags & HAS_SSE3) - vpx_sad8x16x3 = vpx_sad8x16x3_sse3; + if (flags & HAS_SSE3) vpx_sad8x16x3 = vpx_sad8x16x3_sse3; vpx_sad8x16x4d = vpx_sad8x16x4d_c; - if (flags & HAS_SSE2) - vpx_sad8x16x4d = vpx_sad8x16x4d_sse2; + if (flags & HAS_SSE2) vpx_sad8x16x4d = vpx_sad8x16x4d_sse2; vpx_sad8x16x8 = vpx_sad8x16x8_c; - if (flags & HAS_SSE4_1) - vpx_sad8x16x8 = vpx_sad8x16x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad8x16x8 = vpx_sad8x16x8_sse4_1; vpx_sad8x4 = vpx_sad8x4_c; - if (flags & HAS_SSE2) - vpx_sad8x4 = vpx_sad8x4_sse2; + if (flags & HAS_SSE2) vpx_sad8x4 = vpx_sad8x4_sse2; vpx_sad8x4_avg = vpx_sad8x4_avg_c; - if (flags & HAS_SSE2) - vpx_sad8x4_avg = vpx_sad8x4_avg_sse2; + if (flags & HAS_SSE2) vpx_sad8x4_avg = vpx_sad8x4_avg_sse2; vpx_sad8x4x4d = vpx_sad8x4x4d_c; - if (flags & HAS_SSE2) - vpx_sad8x4x4d = vpx_sad8x4x4d_sse2; + if (flags & HAS_SSE2) vpx_sad8x4x4d = vpx_sad8x4x4d_sse2; vpx_sad8x8 = vpx_sad8x8_c; - if (flags & HAS_SSE2) - vpx_sad8x8 = vpx_sad8x8_sse2; + if (flags & HAS_SSE2) vpx_sad8x8 = vpx_sad8x8_sse2; vpx_sad8x8_avg = vpx_sad8x8_avg_c; - if (flags & HAS_SSE2) - vpx_sad8x8_avg = vpx_sad8x8_avg_sse2; + if (flags & HAS_SSE2) vpx_sad8x8_avg = vpx_sad8x8_avg_sse2; vpx_sad8x8x3 = vpx_sad8x8x3_c; - if (flags & HAS_SSE3) - vpx_sad8x8x3 = vpx_sad8x8x3_sse3; + if (flags & HAS_SSE3) vpx_sad8x8x3 = vpx_sad8x8x3_sse3; vpx_sad8x8x4d = vpx_sad8x8x4d_c; - if (flags & HAS_SSE2) - vpx_sad8x8x4d = vpx_sad8x8x4d_sse2; + if (flags & HAS_SSE2) vpx_sad8x8x4d = vpx_sad8x8x4d_sse2; vpx_sad8x8x8 = vpx_sad8x8x8_c; - if (flags & HAS_SSE4_1) - vpx_sad8x8x8 = vpx_sad8x8x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad8x8x8 = vpx_sad8x8x8_sse4_1; vpx_satd = vpx_satd_c; - if (flags & HAS_SSE2) - vpx_satd = vpx_satd_sse2; - if (flags & HAS_AVX2) - vpx_satd = vpx_satd_avx2; + if (flags & HAS_SSE2) vpx_satd = vpx_satd_sse2; + if (flags & HAS_AVX2) vpx_satd = vpx_satd_avx2; vpx_scaled_2d = vpx_scaled_2d_c; - if (flags & HAS_SSSE3) - vpx_scaled_2d = vpx_scaled_2d_ssse3; + if (flags & HAS_SSSE3) vpx_scaled_2d = vpx_scaled_2d_ssse3; vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_c; if (flags & HAS_SSE2) vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_sse2; @@ -10304,87 +6750,61 @@ if (flags & HAS_SSSE3) vpx_sub_pixel_variance8x8 = vpx_sub_pixel_variance8x8_ssse3; vpx_subtract_block = vpx_subtract_block_c; - if (flags & HAS_SSE2) - vpx_subtract_block = vpx_subtract_block_sse2; + if (flags & HAS_SSE2) vpx_subtract_block = vpx_subtract_block_sse2; vpx_sum_squares_2d_i16 = vpx_sum_squares_2d_i16_c; - if (flags & HAS_SSE2) - vpx_sum_squares_2d_i16 = vpx_sum_squares_2d_i16_sse2; + if (flags & HAS_SSE2) vpx_sum_squares_2d_i16 = vpx_sum_squares_2d_i16_sse2; vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_c; - if (flags & HAS_SSE2) - vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_sse2; + if (flags & HAS_SSE2) vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_sse2; vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_c; - if (flags & HAS_SSE2) - vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_sse2; + if (flags & HAS_SSE2) vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_sse2; vpx_tm_predictor_4x4 = vpx_tm_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_tm_predictor_4x4 = vpx_tm_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_tm_predictor_4x4 = vpx_tm_predictor_4x4_sse2; vpx_tm_predictor_8x8 = vpx_tm_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_tm_predictor_8x8 = vpx_tm_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_tm_predictor_8x8 = vpx_tm_predictor_8x8_sse2; vpx_v_predictor_16x16 = vpx_v_predictor_16x16_c; - if (flags & HAS_SSE2) - vpx_v_predictor_16x16 = vpx_v_predictor_16x16_sse2; + if (flags & HAS_SSE2) vpx_v_predictor_16x16 = vpx_v_predictor_16x16_sse2; vpx_v_predictor_32x32 = vpx_v_predictor_32x32_c; - if (flags & HAS_SSE2) - vpx_v_predictor_32x32 = vpx_v_predictor_32x32_sse2; + if (flags & HAS_SSE2) vpx_v_predictor_32x32 = vpx_v_predictor_32x32_sse2; vpx_v_predictor_4x4 = vpx_v_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_v_predictor_4x4 = vpx_v_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_v_predictor_4x4 = vpx_v_predictor_4x4_sse2; vpx_v_predictor_8x8 = vpx_v_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_v_predictor_8x8 = vpx_v_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_v_predictor_8x8 = vpx_v_predictor_8x8_sse2; vpx_variance16x16 = vpx_variance16x16_c; - if (flags & HAS_SSE2) - vpx_variance16x16 = vpx_variance16x16_sse2; - if (flags & HAS_AVX2) - vpx_variance16x16 = vpx_variance16x16_avx2; + if (flags & HAS_SSE2) vpx_variance16x16 = vpx_variance16x16_sse2; + if (flags & HAS_AVX2) vpx_variance16x16 = vpx_variance16x16_avx2; vpx_variance16x32 = vpx_variance16x32_c; - if (flags & HAS_SSE2) - vpx_variance16x32 = vpx_variance16x32_sse2; + if (flags & HAS_SSE2) vpx_variance16x32 = vpx_variance16x32_sse2; + if (flags & HAS_AVX2) vpx_variance16x32 = vpx_variance16x32_avx2; vpx_variance16x8 = vpx_variance16x8_c; - if (flags & HAS_SSE2) - vpx_variance16x8 = vpx_variance16x8_sse2; + if (flags & HAS_SSE2) vpx_variance16x8 = vpx_variance16x8_sse2; + if (flags & HAS_AVX2) vpx_variance16x8 = vpx_variance16x8_avx2; vpx_variance32x16 = vpx_variance32x16_c; - if (flags & HAS_SSE2) - vpx_variance32x16 = vpx_variance32x16_sse2; - if (flags & HAS_AVX2) - vpx_variance32x16 = vpx_variance32x16_avx2; + if (flags & HAS_SSE2) vpx_variance32x16 = vpx_variance32x16_sse2; + if (flags & HAS_AVX2) vpx_variance32x16 = vpx_variance32x16_avx2; vpx_variance32x32 = vpx_variance32x32_c; - if (flags & HAS_SSE2) - vpx_variance32x32 = vpx_variance32x32_sse2; - if (flags & HAS_AVX2) - vpx_variance32x32 = vpx_variance32x32_avx2; + if (flags & HAS_SSE2) vpx_variance32x32 = vpx_variance32x32_sse2; + if (flags & HAS_AVX2) vpx_variance32x32 = vpx_variance32x32_avx2; vpx_variance32x64 = vpx_variance32x64_c; - if (flags & HAS_SSE2) - vpx_variance32x64 = vpx_variance32x64_sse2; + if (flags & HAS_SSE2) vpx_variance32x64 = vpx_variance32x64_sse2; + if (flags & HAS_AVX2) vpx_variance32x64 = vpx_variance32x64_avx2; vpx_variance4x4 = vpx_variance4x4_c; - if (flags & HAS_SSE2) - vpx_variance4x4 = vpx_variance4x4_sse2; + if (flags & HAS_SSE2) vpx_variance4x4 = vpx_variance4x4_sse2; vpx_variance4x8 = vpx_variance4x8_c; - if (flags & HAS_SSE2) - vpx_variance4x8 = vpx_variance4x8_sse2; + if (flags & HAS_SSE2) vpx_variance4x8 = vpx_variance4x8_sse2; vpx_variance64x32 = vpx_variance64x32_c; - if (flags & HAS_SSE2) - vpx_variance64x32 = vpx_variance64x32_sse2; - if (flags & HAS_AVX2) - vpx_variance64x32 = vpx_variance64x32_avx2; + if (flags & HAS_SSE2) vpx_variance64x32 = vpx_variance64x32_sse2; + if (flags & HAS_AVX2) vpx_variance64x32 = vpx_variance64x32_avx2; vpx_variance64x64 = vpx_variance64x64_c; - if (flags & HAS_SSE2) - vpx_variance64x64 = vpx_variance64x64_sse2; - if (flags & HAS_AVX2) - vpx_variance64x64 = vpx_variance64x64_avx2; + if (flags & HAS_SSE2) vpx_variance64x64 = vpx_variance64x64_sse2; + if (flags & HAS_AVX2) vpx_variance64x64 = vpx_variance64x64_avx2; vpx_variance8x16 = vpx_variance8x16_c; - if (flags & HAS_SSE2) - vpx_variance8x16 = vpx_variance8x16_sse2; + if (flags & HAS_SSE2) vpx_variance8x16 = vpx_variance8x16_sse2; vpx_variance8x4 = vpx_variance8x4_c; - if (flags & HAS_SSE2) - vpx_variance8x4 = vpx_variance8x4_sse2; + if (flags & HAS_SSE2) vpx_variance8x4 = vpx_variance8x4_sse2; vpx_variance8x8 = vpx_variance8x8_c; - if (flags & HAS_SSE2) - vpx_variance8x8 = vpx_variance8x8_sse2; + if (flags & HAS_SSE2) vpx_variance8x8 = vpx_variance8x8_sse2; vpx_vector_var = vpx_vector_var_c; - if (flags & HAS_SSE2) - vpx_vector_var = vpx_vector_var_sse2; + if (flags & HAS_SSE2) vpx_vector_var = vpx_vector_var_sse2; } #endif
diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_scale_rtcd.h b/third_party/libvpx/source/config/linux/ia32/vpx_scale_rtcd.h index 19da7a7..f30cdee1 100644 --- a/third_party/libvpx/source/config/linux/ia32/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/linux/ia32/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/mips64el/vp8_rtcd.h b/third_party/libvpx/source/config/linux/mips64el/vp8_rtcd.h index dc054d6..c5cded6 100644 --- a/third_party/libvpx/source/config/linux/mips64el/vp8_rtcd.h +++ b/third_party/libvpx/source/config/linux/mips64el/vp8_rtcd.h
@@ -27,312 +27,201 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict16x16 vp8_bilinear_predict16x16_c -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_c -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_c -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x8 vp8_bilinear_predict8x8_c -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); #define vp8_block_error vp8_block_error_c -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem16x16 vp8_copy_mem16x16_c -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_c -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x8 vp8_copy_mem8x8_c -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); #define vp8_dc_only_idct_add vp8_dc_only_idct_add_c -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter vp8_denoiser_filter_c -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_c -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); #define vp8_dequant_idct_add vp8_dequant_idct_add_c -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_c -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_c -void vp8_dequantize_b_c(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); #define vp8_dequantize_b vp8_dequantize_b_c -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_diamond_search_sad vp8_diamond_search_sad_c -void vp8_fast_quantize_b_c(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); #define vp8_fast_quantize_b vp8_fast_quantize_b_c -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_c -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_c -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_full_search_sad vp8_full_search_sad_c -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bh vp8_loop_filter_bh_c -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bv vp8_loop_filter_bv_c -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbh vp8_loop_filter_mbh_c -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbv vp8_loop_filter_mbv_c -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_c -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_c -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbh vp8_loop_filter_simple_horizontal_edge_c -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbv vp8_loop_filter_simple_vertical_edge_c -int vp8_mbblock_error_c(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); #define vp8_mbblock_error vp8_mbblock_error_c -int vp8_mbuverror_c(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); #define vp8_mbuverror vp8_mbuverror_c -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_refining_search_sad vp8_refining_search_sad_c -void vp8_regular_quantize_b_c(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); #define vp8_regular_quantize_b vp8_regular_quantize_b_c -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); #define vp8_short_fdct4x4 vp8_short_fdct4x4_c -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); #define vp8_short_fdct8x4 vp8_short_fdct8x4_c -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); #define vp8_short_idct4x4llm vp8_short_idct4x4llm_c -void vp8_short_inv_walsh4x4_c(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); #define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_c -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); #define vp8_short_walsh4x4 vp8_short_walsh4x4_c -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict16x16 vp8_sixtap_predict16x16_c -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_c -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x4 vp8_sixtap_predict8x4_c -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x8 vp8_sixtap_predict8x8_c void vp8_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/mips64el/vp9_rtcd.h b/third_party/libvpx/source/config/linux/mips64el/vp9_rtcd.h index 1eb9db5..3780b52 100644 --- a/third_party/libvpx/source/config/linux/mips64el/vp9_rtcd.h +++ b/third_party/libvpx/source/config/linux/mips64el/vp9_rtcd.h
@@ -31,137 +31,91 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); #define vp9_block_error vp9_block_error_c -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); #define vp9_block_error_fp vp9_block_error_fp_c -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); #define vp9_denoiser_filter vp9_denoiser_filter_c -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); #define vp9_diamond_search_sad vp9_diamond_search_sad_c -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_fdct8x8_quant vp9_fdct8x8_quant_c -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_c -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht4x4 vp9_fht4x4_c -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_c -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); #define vp9_iht16x16_256_add vp9_iht16x16_256_add_c -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht4x4_16_add vp9_iht4x4_16_add_c -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht8x8_64_add vp9_iht8x8_64_add_c -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_quantize_fp vp9_quantize_fp_c -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); #define vp9_scale_and_extend_frame vp9_scale_and_extend_frame_c void vp9_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/mips64el/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/mips64el/vpx_dsp_rtcd.h index ddac3c1..09d32aa 100644 --- a/third_party/libvpx/source/config/linux/mips64el/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/linux/mips64el/vpx_dsp_rtcd.h
@@ -20,1540 +20,1030 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); #define vpx_avg_4x4 vpx_avg_4x4_c -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); #define vpx_avg_8x8 vpx_avg_8x8_c -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); #define vpx_comp_avg_pred vpx_comp_avg_pred_c -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8 vpx_convolve8_c -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve8_avg vpx_convolve8_avg_c -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_horiz vpx_convolve8_avg_horiz_c -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_vert vpx_convolve8_avg_vert_c -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_horiz vpx_convolve8_horiz_c -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_vert vpx_convolve8_vert_c -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve_avg vpx_convolve_avg_c -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve_copy vpx_convolve_copy_c -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_c -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_16x16 vpx_d153_predictor_16x16_c -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_32x32 vpx_d153_predictor_32x32_c -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_4x4 vpx_d153_predictor_4x4_c -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_8x8 vpx_d153_predictor_8x8_c -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_16x16 vpx_d207_predictor_16x16_c -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_32x32 vpx_d207_predictor_32x32_c -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_c -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_8x8 vpx_d207_predictor_8x8_c -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_16x16 vpx_d45_predictor_16x16_c -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_32x32 vpx_d45_predictor_32x32_c -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_c -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_c -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_16x16 vpx_d63_predictor_16x16_c -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_32x32 vpx_d63_predictor_32x32_c -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_4x4 vpx_d63_predictor_4x4_c -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_8x8 vpx_d63_predictor_8x8_c -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_c -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_c -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_c -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_c -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_c -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_c -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_c -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_c -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_c -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_c -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_c -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_c -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_c -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_c -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_c -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_c -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16 vpx_fdct16x16_c -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16_1 vpx_fdct16x16_1_c -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32 vpx_fdct32x32_c -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_1 vpx_fdct32x32_1_c -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_rd vpx_fdct32x32_rd_c -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4 vpx_fdct4x4_c -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4_1 vpx_fdct4x4_1_c -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8 vpx_fdct8x8_c -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8_1 vpx_fdct8x8_1_c -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get16x16var vpx_get16x16var_c -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_c -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); #define vpx_get8x8var vpx_get8x8var_c -unsigned int vpx_get_mb_ss_c(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); #define vpx_get_mb_ss vpx_get_mb_ss_c -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_16x16 vpx_h_predictor_16x16_c -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_32x32 vpx_h_predictor_32x32_c -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_4x4 vpx_h_predictor_4x4_c -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_8x8 vpx_h_predictor_8x8_c -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_16x16 vpx_hadamard_16x16_c -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_8x8 vpx_hadamard_8x8_c -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_10_add vpx_idct16x16_10_add_c -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_1_add vpx_idct16x16_1_add_c -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_256_add vpx_idct16x16_256_add_c -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_38_add vpx_idct16x16_38_add_c -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_c -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_135_add vpx_idct32x32_135_add_c -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1_add vpx_idct32x32_1_add_c -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_34_add vpx_idct32x32_34_add_c -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_16_add vpx_idct4x4_16_add_c -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_1_add vpx_idct4x4_1_add_c -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_12_add vpx_idct8x8_12_add_c -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_1_add vpx_idct8x8_1_add_c -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_64_add vpx_idct8x8_64_add_c -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); #define vpx_int_pro_col vpx_int_pro_col_c -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); #define vpx_int_pro_row vpx_int_pro_row_c -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_c -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16 vpx_lpf_horizontal_16_c -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16_dual vpx_lpf_horizontal_16_dual_c -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_c -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_c -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_c -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_c -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16 vpx_lpf_vertical_16_c -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_c -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_4 vpx_lpf_vertical_4_c -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_4_dual vpx_lpf_vertical_4_dual_c -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_8 vpx_lpf_vertical_8_c -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_c -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_across_ip vpx_mbpost_proc_across_ip_c -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); #define vpx_mbpost_proc_down vpx_mbpost_proc_down_c -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_minmax_8x8 vpx_minmax_8x8_c -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x16 vpx_mse16x16_c -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x8 vpx_mse16x8_c -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x16 vpx_mse8x16_c -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x8 vpx_mse8x8_c -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); #define vpx_plane_add_noise vpx_plane_add_noise_c -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); #define vpx_post_proc_down_and_across_mb_row \ vpx_post_proc_down_and_across_mb_row_c -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vpx_quantize_b vpx_quantize_b_c -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_quantize_b_32x32 vpx_quantize_b_32x32_c -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x16 vpx_sad16x16_c -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x16_avg vpx_sad16x16_avg_c -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x3 vpx_sad16x16x3_c -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x4d vpx_sad16x16x4d_c -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x8 vpx_sad16x16x8_c -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x32 vpx_sad16x32_c -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x32_avg vpx_sad16x32_avg_c -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x32x4d vpx_sad16x32x4d_c -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x8 vpx_sad16x8_c -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x8_avg vpx_sad16x8_avg_c -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x3 vpx_sad16x8x3_c -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x4d vpx_sad16x8x4d_c -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x8 vpx_sad16x8x8_c -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x16 vpx_sad32x16_c -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x16_avg vpx_sad32x16_avg_c -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x16x4d vpx_sad32x16x4d_c -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x32 vpx_sad32x32_c -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x32_avg vpx_sad32x32_avg_c -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x32x4d vpx_sad32x32x4d_c -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x64 vpx_sad32x64_c -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x64_avg vpx_sad32x64_avg_c -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x64x4d vpx_sad32x64x4d_c -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x4 vpx_sad4x4_c -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x4_avg vpx_sad4x4_avg_c -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x3 vpx_sad4x4x3_c -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x4d vpx_sad4x4x4d_c -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x8 vpx_sad4x4x8_c -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x8 vpx_sad4x8_c -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x8_avg vpx_sad4x8_avg_c -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x8x4d vpx_sad4x8x4d_c -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x32 vpx_sad64x32_c -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x32_avg vpx_sad64x32_avg_c -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x32x4d vpx_sad64x32x4d_c -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x64 vpx_sad64x64_c -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x64_avg vpx_sad64x64_avg_c -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x64x4d vpx_sad64x64x4d_c -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x16 vpx_sad8x16_c -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x16_avg vpx_sad8x16_avg_c -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x3 vpx_sad8x16x3_c -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x4d vpx_sad8x16x4d_c -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x8 vpx_sad8x16x8_c -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x4 vpx_sad8x4_c -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x4_avg vpx_sad8x4_avg_c -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x4x4d vpx_sad8x4x4d_c -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x8 vpx_sad8x8_c -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x8_avg vpx_sad8x8_avg_c -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x3 vpx_sad8x8x3_c -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x4d vpx_sad8x8x4d_c -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x8 vpx_sad8x8x8_c -int vpx_satd_c(const int16_t* coeff, int length); +int vpx_satd_c(const int16_t *coeff, int length); #define vpx_satd vpx_satd_c -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_2d vpx_scaled_2d_c -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x16 vpx_sub_pixel_avg_variance16x16_c -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x32 vpx_sub_pixel_avg_variance16x32_c -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x8 vpx_sub_pixel_avg_variance16x8_c -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x16 vpx_sub_pixel_avg_variance32x16_c -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x32 vpx_sub_pixel_avg_variance32x32_c -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x64 vpx_sub_pixel_avg_variance32x64_c -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x4 vpx_sub_pixel_avg_variance4x4_c -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x8 vpx_sub_pixel_avg_variance4x8_c -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x32 vpx_sub_pixel_avg_variance64x32_c -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x64 vpx_sub_pixel_avg_variance64x64_c -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x16 vpx_sub_pixel_avg_variance8x16_c -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x4 vpx_sub_pixel_avg_variance8x4_c -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x8 vpx_sub_pixel_avg_variance8x8_c -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x16 vpx_sub_pixel_variance16x16_c -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x32 vpx_sub_pixel_variance16x32_c -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance16x8 vpx_sub_pixel_variance16x8_c -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x16 vpx_sub_pixel_variance32x16_c -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x32 vpx_sub_pixel_variance32x32_c -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x64 vpx_sub_pixel_variance32x64_c -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance4x4 vpx_sub_pixel_variance4x4_c -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance4x8 vpx_sub_pixel_variance4x8_c -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x32 vpx_sub_pixel_variance64x32_c -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x64 vpx_sub_pixel_variance64x64_c -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x16 vpx_sub_pixel_variance8x16_c -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_c -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_c -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); #define vpx_subtract_block vpx_subtract_block_c -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_c -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_c -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_c -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_c -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_16x16 vpx_v_predictor_16x16_c -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_32x32 vpx_v_predictor_32x32_c -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_4x4 vpx_v_predictor_4x4_c -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_c -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x16 vpx_variance16x16_c -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x32 vpx_variance16x32_c -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x8 vpx_variance16x8_c -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x16 vpx_variance32x16_c -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x32 vpx_variance32x32_c -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x64 vpx_variance32x64_c -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x4 vpx_variance4x4_c -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x8 vpx_variance4x8_c -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x32 vpx_variance64x32_c -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x64 vpx_variance64x64_c -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x16 vpx_variance8x16_c -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x4 vpx_variance8x4_c -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x8 vpx_variance8x8_c -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); #define vpx_vector_var vpx_vector_var_c void vpx_dsp_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/mips64el/vpx_scale_rtcd.h b/third_party/libvpx/source/config/linux/mips64el/vpx_scale_rtcd.h index c5196db4d..aa7e4b1 100644 --- a/third_party/libvpx/source/config/linux/mips64el/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/linux/mips64el/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/mipsel/vp8_rtcd.h b/third_party/libvpx/source/config/linux/mipsel/vp8_rtcd.h index dc054d6..c5cded6 100644 --- a/third_party/libvpx/source/config/linux/mipsel/vp8_rtcd.h +++ b/third_party/libvpx/source/config/linux/mipsel/vp8_rtcd.h
@@ -27,312 +27,201 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict16x16 vp8_bilinear_predict16x16_c -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_c -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_c -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x8 vp8_bilinear_predict8x8_c -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); #define vp8_block_error vp8_block_error_c -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem16x16 vp8_copy_mem16x16_c -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_c -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x8 vp8_copy_mem8x8_c -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); #define vp8_dc_only_idct_add vp8_dc_only_idct_add_c -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter vp8_denoiser_filter_c -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_c -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); #define vp8_dequant_idct_add vp8_dequant_idct_add_c -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_c -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_c -void vp8_dequantize_b_c(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); #define vp8_dequantize_b vp8_dequantize_b_c -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_diamond_search_sad vp8_diamond_search_sad_c -void vp8_fast_quantize_b_c(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); #define vp8_fast_quantize_b vp8_fast_quantize_b_c -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_c -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_c -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_full_search_sad vp8_full_search_sad_c -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bh vp8_loop_filter_bh_c -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bv vp8_loop_filter_bv_c -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbh vp8_loop_filter_mbh_c -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbv vp8_loop_filter_mbv_c -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_c -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_c -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbh vp8_loop_filter_simple_horizontal_edge_c -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbv vp8_loop_filter_simple_vertical_edge_c -int vp8_mbblock_error_c(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); #define vp8_mbblock_error vp8_mbblock_error_c -int vp8_mbuverror_c(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); #define vp8_mbuverror vp8_mbuverror_c -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_refining_search_sad vp8_refining_search_sad_c -void vp8_regular_quantize_b_c(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); #define vp8_regular_quantize_b vp8_regular_quantize_b_c -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); #define vp8_short_fdct4x4 vp8_short_fdct4x4_c -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); #define vp8_short_fdct8x4 vp8_short_fdct8x4_c -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); #define vp8_short_idct4x4llm vp8_short_idct4x4llm_c -void vp8_short_inv_walsh4x4_c(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); #define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_c -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); #define vp8_short_walsh4x4 vp8_short_walsh4x4_c -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict16x16 vp8_sixtap_predict16x16_c -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_c -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x4 vp8_sixtap_predict8x4_c -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x8 vp8_sixtap_predict8x8_c void vp8_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/mipsel/vp9_rtcd.h b/third_party/libvpx/source/config/linux/mipsel/vp9_rtcd.h index 1eb9db5..3780b52 100644 --- a/third_party/libvpx/source/config/linux/mipsel/vp9_rtcd.h +++ b/third_party/libvpx/source/config/linux/mipsel/vp9_rtcd.h
@@ -31,137 +31,91 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); #define vp9_block_error vp9_block_error_c -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); #define vp9_block_error_fp vp9_block_error_fp_c -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); #define vp9_denoiser_filter vp9_denoiser_filter_c -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); #define vp9_diamond_search_sad vp9_diamond_search_sad_c -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_fdct8x8_quant vp9_fdct8x8_quant_c -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_c -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht4x4 vp9_fht4x4_c -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_c -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); #define vp9_iht16x16_256_add vp9_iht16x16_256_add_c -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht4x4_16_add vp9_iht4x4_16_add_c -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht8x8_64_add vp9_iht8x8_64_add_c -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_quantize_fp vp9_quantize_fp_c -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); #define vp9_scale_and_extend_frame vp9_scale_and_extend_frame_c void vp9_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/mipsel/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/mipsel/vpx_dsp_rtcd.h index ddac3c1..09d32aa 100644 --- a/third_party/libvpx/source/config/linux/mipsel/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/linux/mipsel/vpx_dsp_rtcd.h
@@ -20,1540 +20,1030 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); #define vpx_avg_4x4 vpx_avg_4x4_c -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); #define vpx_avg_8x8 vpx_avg_8x8_c -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); #define vpx_comp_avg_pred vpx_comp_avg_pred_c -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8 vpx_convolve8_c -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve8_avg vpx_convolve8_avg_c -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_horiz vpx_convolve8_avg_horiz_c -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_vert vpx_convolve8_avg_vert_c -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_horiz vpx_convolve8_horiz_c -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_vert vpx_convolve8_vert_c -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve_avg vpx_convolve_avg_c -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve_copy vpx_convolve_copy_c -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_c -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_16x16 vpx_d153_predictor_16x16_c -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_32x32 vpx_d153_predictor_32x32_c -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_4x4 vpx_d153_predictor_4x4_c -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_8x8 vpx_d153_predictor_8x8_c -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_16x16 vpx_d207_predictor_16x16_c -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_32x32 vpx_d207_predictor_32x32_c -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_c -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_8x8 vpx_d207_predictor_8x8_c -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_16x16 vpx_d45_predictor_16x16_c -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_32x32 vpx_d45_predictor_32x32_c -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_c -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_c -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_16x16 vpx_d63_predictor_16x16_c -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_32x32 vpx_d63_predictor_32x32_c -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_4x4 vpx_d63_predictor_4x4_c -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_8x8 vpx_d63_predictor_8x8_c -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_c -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_c -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_c -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_c -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_c -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_c -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_c -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_c -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_c -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_c -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_c -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_c -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_c -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_c -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_c -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_c -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16 vpx_fdct16x16_c -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16_1 vpx_fdct16x16_1_c -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32 vpx_fdct32x32_c -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_1 vpx_fdct32x32_1_c -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_rd vpx_fdct32x32_rd_c -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4 vpx_fdct4x4_c -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4_1 vpx_fdct4x4_1_c -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8 vpx_fdct8x8_c -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8_1 vpx_fdct8x8_1_c -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get16x16var vpx_get16x16var_c -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_c -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); #define vpx_get8x8var vpx_get8x8var_c -unsigned int vpx_get_mb_ss_c(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); #define vpx_get_mb_ss vpx_get_mb_ss_c -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_16x16 vpx_h_predictor_16x16_c -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_32x32 vpx_h_predictor_32x32_c -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_4x4 vpx_h_predictor_4x4_c -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_8x8 vpx_h_predictor_8x8_c -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_16x16 vpx_hadamard_16x16_c -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - int16_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + int16_t *coeff); #define vpx_hadamard_8x8 vpx_hadamard_8x8_c -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_10_add vpx_idct16x16_10_add_c -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_1_add vpx_idct16x16_1_add_c -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_256_add vpx_idct16x16_256_add_c -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_38_add vpx_idct16x16_38_add_c -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_c -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_135_add vpx_idct32x32_135_add_c -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1_add vpx_idct32x32_1_add_c -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_34_add vpx_idct32x32_34_add_c -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_16_add vpx_idct4x4_16_add_c -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_1_add vpx_idct4x4_1_add_c -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_12_add vpx_idct8x8_12_add_c -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_1_add vpx_idct8x8_1_add_c -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_64_add vpx_idct8x8_64_add_c -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); #define vpx_int_pro_col vpx_int_pro_col_c -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); #define vpx_int_pro_row vpx_int_pro_row_c -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_c -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16 vpx_lpf_horizontal_16_c -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16_dual vpx_lpf_horizontal_16_dual_c -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_c -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_c -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_c -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_c -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16 vpx_lpf_vertical_16_c -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_c -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_4 vpx_lpf_vertical_4_c -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_4_dual vpx_lpf_vertical_4_dual_c -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_8 vpx_lpf_vertical_8_c -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_c -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_across_ip vpx_mbpost_proc_across_ip_c -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); #define vpx_mbpost_proc_down vpx_mbpost_proc_down_c -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_minmax_8x8 vpx_minmax_8x8_c -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x16 vpx_mse16x16_c -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x8 vpx_mse16x8_c -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x16 vpx_mse8x16_c -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x8 vpx_mse8x8_c -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); #define vpx_plane_add_noise vpx_plane_add_noise_c -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); #define vpx_post_proc_down_and_across_mb_row \ vpx_post_proc_down_and_across_mb_row_c -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vpx_quantize_b vpx_quantize_b_c -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_quantize_b_32x32 vpx_quantize_b_32x32_c -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x16 vpx_sad16x16_c -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x16_avg vpx_sad16x16_avg_c -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x3 vpx_sad16x16x3_c -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x4d vpx_sad16x16x4d_c -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x8 vpx_sad16x16x8_c -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x32 vpx_sad16x32_c -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x32_avg vpx_sad16x32_avg_c -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x32x4d vpx_sad16x32x4d_c -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x8 vpx_sad16x8_c -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x8_avg vpx_sad16x8_avg_c -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x3 vpx_sad16x8x3_c -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x4d vpx_sad16x8x4d_c -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x8 vpx_sad16x8x8_c -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x16 vpx_sad32x16_c -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x16_avg vpx_sad32x16_avg_c -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x16x4d vpx_sad32x16x4d_c -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x32 vpx_sad32x32_c -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x32_avg vpx_sad32x32_avg_c -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x32x4d vpx_sad32x32x4d_c -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x64 vpx_sad32x64_c -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x64_avg vpx_sad32x64_avg_c -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x64x4d vpx_sad32x64x4d_c -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x4 vpx_sad4x4_c -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x4_avg vpx_sad4x4_avg_c -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x3 vpx_sad4x4x3_c -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x4d vpx_sad4x4x4d_c -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x8 vpx_sad4x4x8_c -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x8 vpx_sad4x8_c -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x8_avg vpx_sad4x8_avg_c -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x8x4d vpx_sad4x8x4d_c -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x32 vpx_sad64x32_c -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x32_avg vpx_sad64x32_avg_c -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x32x4d vpx_sad64x32x4d_c -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x64 vpx_sad64x64_c -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x64_avg vpx_sad64x64_avg_c -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x64x4d vpx_sad64x64x4d_c -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x16 vpx_sad8x16_c -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x16_avg vpx_sad8x16_avg_c -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x3 vpx_sad8x16x3_c -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x4d vpx_sad8x16x4d_c -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x8 vpx_sad8x16x8_c -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x4 vpx_sad8x4_c -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x4_avg vpx_sad8x4_avg_c -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x4x4d vpx_sad8x4x4d_c -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x8 vpx_sad8x8_c -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x8_avg vpx_sad8x8_avg_c -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x3 vpx_sad8x8x3_c -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x4d vpx_sad8x8x4d_c -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x8 vpx_sad8x8x8_c -int vpx_satd_c(const int16_t* coeff, int length); +int vpx_satd_c(const int16_t *coeff, int length); #define vpx_satd vpx_satd_c -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_2d vpx_scaled_2d_c -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x16 vpx_sub_pixel_avg_variance16x16_c -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x32 vpx_sub_pixel_avg_variance16x32_c -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x8 vpx_sub_pixel_avg_variance16x8_c -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x16 vpx_sub_pixel_avg_variance32x16_c -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x32 vpx_sub_pixel_avg_variance32x32_c -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x64 vpx_sub_pixel_avg_variance32x64_c -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x4 vpx_sub_pixel_avg_variance4x4_c -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x8 vpx_sub_pixel_avg_variance4x8_c -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x32 vpx_sub_pixel_avg_variance64x32_c -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x64 vpx_sub_pixel_avg_variance64x64_c -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x16 vpx_sub_pixel_avg_variance8x16_c -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x4 vpx_sub_pixel_avg_variance8x4_c -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x8 vpx_sub_pixel_avg_variance8x8_c -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x16 vpx_sub_pixel_variance16x16_c -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x32 vpx_sub_pixel_variance16x32_c -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance16x8 vpx_sub_pixel_variance16x8_c -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x16 vpx_sub_pixel_variance32x16_c -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x32 vpx_sub_pixel_variance32x32_c -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x64 vpx_sub_pixel_variance32x64_c -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance4x4 vpx_sub_pixel_variance4x4_c -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance4x8 vpx_sub_pixel_variance4x8_c -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x32 vpx_sub_pixel_variance64x32_c -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x64 vpx_sub_pixel_variance64x64_c -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x16 vpx_sub_pixel_variance8x16_c -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_c -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_c -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); #define vpx_subtract_block vpx_subtract_block_c -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_c -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_c -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_c -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_c -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_16x16 vpx_v_predictor_16x16_c -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_32x32 vpx_v_predictor_32x32_c -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_4x4 vpx_v_predictor_4x4_c -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_c -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x16 vpx_variance16x16_c -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x32 vpx_variance16x32_c -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x8 vpx_variance16x8_c -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x16 vpx_variance32x16_c -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x32 vpx_variance32x32_c -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x64 vpx_variance32x64_c -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x4 vpx_variance4x4_c -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x8 vpx_variance4x8_c -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x32 vpx_variance64x32_c -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x64 vpx_variance64x64_c -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x16 vpx_variance8x16_c -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x4 vpx_variance8x4_c -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x8 vpx_variance8x8_c -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); #define vpx_vector_var vpx_vector_var_c void vpx_dsp_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/mipsel/vpx_scale_rtcd.h b/third_party/libvpx/source/config/linux/mipsel/vpx_scale_rtcd.h index c5196db4d..aa7e4b1 100644 --- a/third_party/libvpx/source/config/linux/mipsel/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/linux/mipsel/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/linux/x64/vp8_rtcd.h b/third_party/libvpx/source/config/linux/x64/vp8_rtcd.h index 4e9d062..c876b08 100644 --- a/third_party/libvpx/source/config/linux/x64/vp8_rtcd.h +++ b/third_party/libvpx/source/config/linux/x64/vp8_rtcd.h
@@ -27,605 +27,348 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict16x16_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict16x16_sse2(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict16x16_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_ssse3(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict4x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_mmx -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_mmx -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); -int vp8_block_error_sse2(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); +int vp8_block_error_sse2(short *coeff, short *dqcoeff); #define vp8_block_error vp8_block_error_sse2 -void vp8_copy32xn_c(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -void vp8_copy32xn_sse2(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -void vp8_copy32xn_sse3(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); +void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char *src_ptr, + int source_stride, unsigned char *dst_ptr, + int dst_stride, int n); -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem16x16_sse2(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +void vp8_copy_mem16x16_sse2(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); #define vp8_copy_mem16x16 vp8_copy_mem16x16_sse2 -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_mmx(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_mmx -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_mmx(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x8 vp8_copy_mem8x8_mmx -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -void vp8_dc_only_idct_add_mmx(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +void vp8_dc_only_idct_add_mmx(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); #define vp8_dc_only_idct_add vp8_dc_only_idct_add_mmx -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_sse2(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_sse2(unsigned char *mc_running_avg_y, + int mc_avg_y_stride, unsigned char *running_avg_y, + int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter vp8_denoiser_filter_sse2 -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_sse2(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_uv_sse2(unsigned char *mc_running_avg, + int mc_avg_stride, unsigned char *running_avg, + int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_sse2 -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); -void vp8_dequant_idct_add_mmx(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_mmx(short *input, short *dq, unsigned char *output, int stride); #define vp8_dequant_idct_add vp8_dequant_idct_add_mmx -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -void vp8_dequant_idct_add_uv_block_sse2(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +void vp8_dequant_idct_add_uv_block_sse2(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_sse2 -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -void vp8_dequant_idct_add_y_block_sse2(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +void vp8_dequant_idct_add_y_block_sse2(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_sse2 -void vp8_dequantize_b_c(struct blockd*, short* dqc); -void vp8_dequantize_b_mmx(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); +void vp8_dequantize_b_mmx(struct blockd *, short *dqc); #define vp8_dequantize_b vp8_dequantize_b_mmx -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_diamond_search_sadx4(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_diamond_search_sadx4(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_diamond_search_sad vp8_diamond_search_sadx4 -void vp8_fast_quantize_b_c(struct block*, struct blockd*); -void vp8_fast_quantize_b_sse2(struct block*, struct blockd*); -void vp8_fast_quantize_b_ssse3(struct block*, struct blockd*); -RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); +void vp8_fast_quantize_b_sse2(struct block *, struct blockd *); +void vp8_fast_quantize_b_ssse3(struct block *, struct blockd *); +RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block *, struct blockd *); -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -void vp8_filter_by_weight16x16_sse2(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_sse2 -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -void vp8_filter_by_weight8x8_sse2(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_sse2 -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_full_search_sadx3(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_full_search_sadx8(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_full_search_sadx3(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_full_search_sadx8(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, + int *mvcost[2], union int_mv *center_mv); -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bh_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bh_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bh vp8_loop_filter_bh_sse2 -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bv_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bv_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bv vp8_loop_filter_bv_sse2 -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbh_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbh_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbh vp8_loop_filter_mbh_sse2 -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbv_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbv_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbv vp8_loop_filter_mbv_sse2 -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bhs_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bhs_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_sse2 -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bvs_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bvs_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_sse2 -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbh vp8_loop_filter_simple_horizontal_edge_sse2 -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbv vp8_loop_filter_simple_vertical_edge_sse2 -int vp8_mbblock_error_c(struct macroblock* mb, int dc); -int vp8_mbblock_error_sse2(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); +int vp8_mbblock_error_sse2(struct macroblock *mb, int dc); #define vp8_mbblock_error vp8_mbblock_error_sse2 -int vp8_mbuverror_c(struct macroblock* mb); -int vp8_mbuverror_sse2(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); +int vp8_mbuverror_sse2(struct macroblock *mb); #define vp8_mbuverror vp8_mbuverror_sse2 -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_refining_search_sadx4(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_refining_search_sadx4(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_refining_search_sad vp8_refining_search_sadx4 -void vp8_regular_quantize_b_c(struct block*, struct blockd*); -void vp8_regular_quantize_b_sse2(struct block*, struct blockd*); -void vp8_regular_quantize_b_sse4_1(struct block*, struct blockd*); -RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); +void vp8_regular_quantize_b_sse2(struct block *, struct blockd *); +void vp8_regular_quantize_b_sse4_1(struct block *, struct blockd *); +RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block *, struct blockd *); -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); -void vp8_short_fdct4x4_sse2(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); +void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch); #define vp8_short_fdct4x4 vp8_short_fdct4x4_sse2 -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); -void vp8_short_fdct8x4_sse2(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); +void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch); #define vp8_short_fdct8x4 vp8_short_fdct8x4_sse2 -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -void vp8_short_idct4x4llm_mmx(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); #define vp8_short_idct4x4llm vp8_short_idct4x4llm_mmx -void vp8_short_inv_walsh4x4_c(short* input, short* output); -void vp8_short_inv_walsh4x4_sse2(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); +void vp8_short_inv_walsh4x4_sse2(short *input, short *output); #define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_sse2 -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); -void vp8_short_walsh4x4_sse2(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); +void vp8_short_walsh4x4_sse2(short *input, short *output, int pitch); #define vp8_short_walsh4x4 vp8_short_walsh4x4_sse2 -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); void vp8_rtcd(void); @@ -643,16 +386,12 @@ if (flags & HAS_SSSE3) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_ssse3; vp8_copy32xn = vp8_copy32xn_sse2; - if (flags & HAS_SSE3) - vp8_copy32xn = vp8_copy32xn_sse3; + if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3; vp8_fast_quantize_b = vp8_fast_quantize_b_sse2; - if (flags & HAS_SSSE3) - vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3; + if (flags & HAS_SSSE3) vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3; vp8_full_search_sad = vp8_full_search_sad_c; - if (flags & HAS_SSE3) - vp8_full_search_sad = vp8_full_search_sadx3; - if (flags & HAS_SSE4_1) - vp8_full_search_sad = vp8_full_search_sadx8; + if (flags & HAS_SSE3) vp8_full_search_sad = vp8_full_search_sadx3; + if (flags & HAS_SSE4_1) vp8_full_search_sad = vp8_full_search_sadx8; vp8_regular_quantize_b = vp8_regular_quantize_b_sse2; if (flags & HAS_SSE4_1) vp8_regular_quantize_b = vp8_regular_quantize_b_sse4_1; @@ -660,14 +399,11 @@ if (flags & HAS_SSSE3) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3; vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_mmx; - if (flags & HAS_SSSE3) - vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3; + if (flags & HAS_SSSE3) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3; vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_sse2; - if (flags & HAS_SSSE3) - vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3; + if (flags & HAS_SSSE3) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3; vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_sse2; - if (flags & HAS_SSSE3) - vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3; + if (flags & HAS_SSSE3) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3; } #endif
diff --git a/third_party/libvpx/source/config/linux/x64/vp9_rtcd.h b/third_party/libvpx/source/config/linux/x64/vp9_rtcd.h index 6f00c78..7de827c 100644 --- a/third_party/libvpx/source/config/linux/x64/vp9_rtcd.h +++ b/third_party/libvpx/source/config/linux/x64/vp9_rtcd.h
@@ -31,458 +31,272 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -int64_t vp9_block_error_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -int64_t vp9_block_error_avx2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +int64_t vp9_block_error_sse2(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +int64_t vp9_block_error_avx2(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); -int64_t vp9_block_error_fp_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); -int64_t vp9_block_error_fp_avx2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); -RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_sse2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); +int64_t vp9_block_error_fp_avx2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); +RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); -int vp9_denoiser_filter_sse2(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); +int vp9_denoiser_filter_sse2(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); #define vp9_denoiser_filter vp9_denoiser_filter_sse2 -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); -int vp9_diamond_search_sad_avx(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); +int vp9_diamond_search_sad_avx(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); RTCD_EXTERN int (*vp9_diamond_search_sad)( - const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); + const struct macroblock *x, const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, + int *num00, const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_fdct8x8_quant_ssse3(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_fdct8x8_quant)(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_fdct8x8_quant_ssse3(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vp9_fdct8x8_quant)( + const int16_t *input, int stride, tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht16x16_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_sse2 -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht4x4_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht4x4 vp9_fht4x4_sse2 -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht8x8_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_sse2 -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -void vp9_filter_by_weight16x16_sse2(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); +void vp9_filter_by_weight16x16_sse2(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_sse2 -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -void vp9_filter_by_weight8x8_sse2(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); +void vp9_filter_by_weight8x8_sse2(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_sse2 -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vp9_fwht4x4_sse2(const int16_t* input, tran_low_t* output, int stride); +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vp9_fwht4x4_sse2(const int16_t *input, tran_low_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_sse2 -int64_t vp9_highbd_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); -int64_t vp9_highbd_block_error_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); +int64_t vp9_highbd_block_error_c(const tran_low_t *coeff, + const tran_low_t *dqcoeff, intptr_t block_size, + int64_t *ssz, int bd); +int64_t vp9_highbd_block_error_sse2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz, int bd); #define vp9_highbd_block_error vp9_highbd_block_error_sse2 -void vp9_highbd_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht16x16 vp9_highbd_fht16x16_c -void vp9_highbd_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht4x4 vp9_highbd_fht4x4_c -void vp9_highbd_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht8x8 vp9_highbd_fht8x8_c -void vp9_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_highbd_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_highbd_fwht4x4 vp9_highbd_fwht4x4_c -void vp9_highbd_iht16x16_256_add_c(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); -void vp9_highbd_iht16x16_256_add_sse4_1(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht16x16_256_add)(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); +void vp9_highbd_iht16x16_256_add_c(const tran_low_t *input, uint16_t *output, + int pitch, int tx_type, int bd); +void vp9_highbd_iht16x16_256_add_sse4_1(const tran_low_t *input, + uint16_t *output, int pitch, + int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht16x16_256_add)(const tran_low_t *input, + uint16_t *output, int pitch, + int tx_type, int bd); -void vp9_highbd_iht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -void vp9_highbd_iht4x4_16_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht4x4_16_add)(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +void vp9_highbd_iht4x4_16_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht4x4_16_add)(const tran_low_t *input, + uint16_t *dest, int stride, + int tx_type, int bd); -void vp9_highbd_iht8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht8x8_64_add)(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht8x8_64_add)(const tran_low_t *input, + uint16_t *dest, int stride, + int tx_type, int bd); -void vp9_highbd_mbpost_proc_across_ip_c(uint16_t* src, - int pitch, - int rows, - int cols, - int flimit); +void vp9_highbd_mbpost_proc_across_ip_c(uint16_t *src, int pitch, int rows, + int cols, int flimit); #define vp9_highbd_mbpost_proc_across_ip vp9_highbd_mbpost_proc_across_ip_c -void vp9_highbd_mbpost_proc_down_c(uint16_t* dst, - int pitch, - int rows, - int cols, +void vp9_highbd_mbpost_proc_down_c(uint16_t *dst, int pitch, int rows, int cols, int flimit); #define vp9_highbd_mbpost_proc_down vp9_highbd_mbpost_proc_down_c -void vp9_highbd_post_proc_down_and_across_c(const uint16_t* src_ptr, - uint16_t* dst_ptr, +void vp9_highbd_post_proc_down_and_across_c(const uint16_t *src_ptr, + uint16_t *dst_ptr, int src_pixels_per_line, - int dst_pixels_per_line, - int rows, - int cols, - int flimit); + int dst_pixels_per_line, int rows, + int cols, int flimit); #define vp9_highbd_post_proc_down_and_across \ vp9_highbd_post_proc_down_and_across_c -void vp9_highbd_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp vp9_highbd_quantize_fp_c -void vp9_highbd_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp_32x32 vp9_highbd_quantize_fp_32x32_c -void vp9_highbd_temporal_filter_apply_c(const uint8_t* frame1, - unsigned int stride, - const uint8_t* frame2, - unsigned int block_width, - unsigned int block_height, - int strength, - int filter_weight, - uint32_t* accumulator, - uint16_t* count); +void vp9_highbd_temporal_filter_apply_c( + const uint8_t *frame1, unsigned int stride, const uint8_t *frame2, + unsigned int block_width, unsigned int block_height, int strength, + int filter_weight, uint32_t *accumulator, uint16_t *count); #define vp9_highbd_temporal_filter_apply vp9_highbd_temporal_filter_apply_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); -void vp9_iht16x16_256_add_sse2(const tran_low_t* input, - uint8_t* output, - int pitch, - int tx_type); +void vp9_iht16x16_256_add_sse2(const tran_low_t *input, uint8_t *output, + int pitch, int tx_type); #define vp9_iht16x16_256_add vp9_iht16x16_256_add_sse2 -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht4x4_16_add vp9_iht4x4_16_add_sse2 -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht8x8_64_add_sse2(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht8x8_64_add vp9_iht8x8_64_add_sse2 -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_avx2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_quantize_fp)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_avx2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vp9_quantize_fp)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_32x32_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_quantize_fp_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vp9_quantize_fp_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vp9_quantize_fp_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); -void vp9_scale_and_extend_frame_ssse3(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); +void vp9_scale_and_extend_frame_ssse3(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler); RTCD_EXTERN void (*vp9_scale_and_extend_frame)( - const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); + const struct yv12_buffer_config *src, struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); void vp9_rtcd(void); @@ -494,17 +308,13 @@ (void)flags; vp9_block_error = vp9_block_error_sse2; - if (flags & HAS_AVX2) - vp9_block_error = vp9_block_error_avx2; + if (flags & HAS_AVX2) vp9_block_error = vp9_block_error_avx2; vp9_block_error_fp = vp9_block_error_fp_sse2; - if (flags & HAS_AVX2) - vp9_block_error_fp = vp9_block_error_fp_avx2; + if (flags & HAS_AVX2) vp9_block_error_fp = vp9_block_error_fp_avx2; vp9_diamond_search_sad = vp9_diamond_search_sad_c; - if (flags & HAS_AVX) - vp9_diamond_search_sad = vp9_diamond_search_sad_avx; + if (flags & HAS_AVX) vp9_diamond_search_sad = vp9_diamond_search_sad_avx; vp9_fdct8x8_quant = vp9_fdct8x8_quant_c; - if (flags & HAS_SSSE3) - vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; + if (flags & HAS_SSSE3) vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_c; if (flags & HAS_SSE4_1) vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_sse4_1; @@ -515,13 +325,10 @@ if (flags & HAS_SSE4_1) vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1; vp9_quantize_fp = vp9_quantize_fp_sse2; - if (flags & HAS_SSSE3) - vp9_quantize_fp = vp9_quantize_fp_ssse3; - if (flags & HAS_AVX2) - vp9_quantize_fp = vp9_quantize_fp_avx2; + if (flags & HAS_SSSE3) vp9_quantize_fp = vp9_quantize_fp_ssse3; + if (flags & HAS_AVX2) vp9_quantize_fp = vp9_quantize_fp_avx2; vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_c; - if (flags & HAS_SSSE3) - vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_ssse3; + if (flags & HAS_SSSE3) vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_ssse3; vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c; if (flags & HAS_SSSE3) vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_ssse3;
diff --git a/third_party/libvpx/source/config/linux/x64/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/x64/vpx_dsp_rtcd.h index 49a73711..08c40c9 100644 --- a/third_party/libvpx/source/config/linux/x64/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/linux/x64/vpx_dsp_rtcd.h
@@ -20,7514 +20,4726 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); -unsigned int vpx_avg_4x4_sse2(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); +unsigned int vpx_avg_4x4_sse2(const uint8_t *, int p); #define vpx_avg_4x4 vpx_avg_4x4_sse2 -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); -unsigned int vpx_avg_8x8_sse2(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); +unsigned int vpx_avg_8x8_sse2(const uint8_t *, int p); #define vpx_avg_8x8 vpx_avg_8x8_sse2 -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -void vpx_comp_avg_pred_sse2(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +void vpx_comp_avg_pred_sse2(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); #define vpx_comp_avg_pred vpx_comp_avg_pred_sse2 -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avx2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_horiz_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_horiz_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_horiz_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +void vpx_convolve8_avg_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_vert_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_horiz_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_horiz_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_horiz_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_vert_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_vert_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_vert_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_avg_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_avg vpx_convolve_avg_sse2 -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_copy_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_copy_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_copy vpx_convolve_copy_sse2 -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_c -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_4x4_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_sse2 -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_sse2 -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_sse2 -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_4x4_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_sse2 -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_sse2 -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_sse2 -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_sse2 -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_sse2 -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_sse2 -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_sse2 -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_sse2 -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_sse2 -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_sse2 -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_sse2 -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_sse2 -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_sse2 -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_sse2 -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_sse2 -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_sse2 -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16 vpx_fdct16x16_sse2 -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_1_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_1_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16_1 vpx_fdct16x16_1_sse2 -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32 vpx_fdct32x32_sse2 -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_1_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_1_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_1 vpx_fdct32x32_1_sse2 -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_rd_sse2(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_rd vpx_fdct32x32_rd_sse2 -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4 vpx_fdct4x4_sse2 -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_1_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_1_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4_1 vpx_fdct4x4_1_sse2 -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8 vpx_fdct8x8_sse2 -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_1_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_1_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8_1 vpx_fdct8x8_1_sse2 -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_c -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get8x8var_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); +void vpx_get8x8var_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get8x8var vpx_get8x8var_sse2 -unsigned int vpx_get_mb_ss_c(const int16_t*); -unsigned int vpx_get_mb_ss_sse2(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); +unsigned int vpx_get_mb_ss_sse2(const int16_t *); #define vpx_get_mb_ss vpx_get_mb_ss_sse2 -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_16x16 vpx_h_predictor_16x16_sse2 -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_32x32 vpx_h_predictor_32x32_sse2 -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_4x4 vpx_h_predictor_4x4_sse2 -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_8x8 vpx_h_predictor_8x8_sse2 -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_16x16_sse2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_16x16_avx2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_16x16_sse2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_16x16_avx2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t *src_diff, + ptrdiff_t src_stride, tran_low_t *coeff); -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_8x8_sse2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_8x8_ssse3(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_8x8_sse2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_8x8_ssse3(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t *src_diff, + ptrdiff_t src_stride, tran_low_t *coeff); -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_highbd_10_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get16x16var vpx_highbd_10_get16x16var_c -void vpx_highbd_10_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get8x8var vpx_highbd_10_get8x8var_c -unsigned int vpx_highbd_10_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); #define vpx_highbd_10_mse16x16 vpx_highbd_10_mse16x16_sse2 -unsigned int vpx_highbd_10_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse16x8 vpx_highbd_10_mse16x8_c -unsigned int vpx_highbd_10_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse8x16 vpx_highbd_10_mse8x16_c -unsigned int vpx_highbd_10_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_mse8x8_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse8x8 vpx_highbd_10_mse8x8_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x16 \ vpx_highbd_10_sub_pixel_avg_variance16x16_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x32 \ vpx_highbd_10_sub_pixel_avg_variance16x32_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x8 \ vpx_highbd_10_sub_pixel_avg_variance16x8_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x16 \ vpx_highbd_10_sub_pixel_avg_variance32x16_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x32 \ vpx_highbd_10_sub_pixel_avg_variance32x32_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x64 \ vpx_highbd_10_sub_pixel_avg_variance32x64_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x4 \ vpx_highbd_10_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x8 \ vpx_highbd_10_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance64x32 \ vpx_highbd_10_sub_pixel_avg_variance64x32_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance64x64 \ vpx_highbd_10_sub_pixel_avg_variance64x64_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x16 \ vpx_highbd_10_sub_pixel_avg_variance8x16_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x4 \ vpx_highbd_10_sub_pixel_avg_variance8x4_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x8 \ vpx_highbd_10_sub_pixel_avg_variance8x8_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x16 \ vpx_highbd_10_sub_pixel_variance16x16_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x32 \ vpx_highbd_10_sub_pixel_variance16x32_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x8 \ vpx_highbd_10_sub_pixel_variance16x8_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x16 \ vpx_highbd_10_sub_pixel_variance32x16_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x32 \ vpx_highbd_10_sub_pixel_variance32x32_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x64 \ vpx_highbd_10_sub_pixel_variance32x64_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x4 \ vpx_highbd_10_sub_pixel_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x8 \ vpx_highbd_10_sub_pixel_variance4x8_c -uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance64x32 \ vpx_highbd_10_sub_pixel_variance64x32_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance64x64 \ vpx_highbd_10_sub_pixel_variance64x64_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x16 \ vpx_highbd_10_sub_pixel_variance8x16_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x4_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x4 \ vpx_highbd_10_sub_pixel_variance8x4_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x8 \ vpx_highbd_10_sub_pixel_variance8x8_sse2 -unsigned int vpx_highbd_10_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance16x16 vpx_highbd_10_variance16x16_sse2 -unsigned int vpx_highbd_10_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance16x32 vpx_highbd_10_variance16x32_sse2 -unsigned int vpx_highbd_10_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance16x8 vpx_highbd_10_variance16x8_sse2 -unsigned int vpx_highbd_10_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance32x16 vpx_highbd_10_variance32x16_sse2 -unsigned int vpx_highbd_10_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance32x32 vpx_highbd_10_variance32x32_sse2 -unsigned int vpx_highbd_10_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance32x64 vpx_highbd_10_variance32x64_sse2 -unsigned int vpx_highbd_10_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x4 vpx_highbd_10_variance4x4_c -unsigned int vpx_highbd_10_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x8 vpx_highbd_10_variance4x8_c -unsigned int vpx_highbd_10_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance64x32 vpx_highbd_10_variance64x32_sse2 -unsigned int vpx_highbd_10_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance64x64 vpx_highbd_10_variance64x64_sse2 -unsigned int vpx_highbd_10_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance8x16 vpx_highbd_10_variance8x16_sse2 -unsigned int vpx_highbd_10_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance8x4 vpx_highbd_10_variance8x4_c -unsigned int vpx_highbd_10_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance8x8 vpx_highbd_10_variance8x8_sse2 -void vpx_highbd_12_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get16x16var vpx_highbd_12_get16x16var_c -void vpx_highbd_12_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get8x8var vpx_highbd_12_get8x8var_c -unsigned int vpx_highbd_12_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); #define vpx_highbd_12_mse16x16 vpx_highbd_12_mse16x16_sse2 -unsigned int vpx_highbd_12_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse16x8 vpx_highbd_12_mse16x8_c -unsigned int vpx_highbd_12_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse8x16 vpx_highbd_12_mse8x16_c -unsigned int vpx_highbd_12_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_mse8x8_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse8x8 vpx_highbd_12_mse8x8_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x16 \ vpx_highbd_12_sub_pixel_avg_variance16x16_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x32 \ vpx_highbd_12_sub_pixel_avg_variance16x32_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x8 \ vpx_highbd_12_sub_pixel_avg_variance16x8_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x16 \ vpx_highbd_12_sub_pixel_avg_variance32x16_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x32 \ vpx_highbd_12_sub_pixel_avg_variance32x32_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x64 \ vpx_highbd_12_sub_pixel_avg_variance32x64_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x4 \ vpx_highbd_12_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x8 \ vpx_highbd_12_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance64x32 \ vpx_highbd_12_sub_pixel_avg_variance64x32_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance64x64 \ vpx_highbd_12_sub_pixel_avg_variance64x64_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x16 \ vpx_highbd_12_sub_pixel_avg_variance8x16_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x4 \ vpx_highbd_12_sub_pixel_avg_variance8x4_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x8 \ vpx_highbd_12_sub_pixel_avg_variance8x8_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x16 \ vpx_highbd_12_sub_pixel_variance16x16_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x32 \ vpx_highbd_12_sub_pixel_variance16x32_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x8 \ vpx_highbd_12_sub_pixel_variance16x8_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x16 \ vpx_highbd_12_sub_pixel_variance32x16_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x32 \ vpx_highbd_12_sub_pixel_variance32x32_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x64 \ vpx_highbd_12_sub_pixel_variance32x64_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x4 \ vpx_highbd_12_sub_pixel_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x8 \ vpx_highbd_12_sub_pixel_variance4x8_c -uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance64x32 \ vpx_highbd_12_sub_pixel_variance64x32_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance64x64 \ vpx_highbd_12_sub_pixel_variance64x64_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x16 \ vpx_highbd_12_sub_pixel_variance8x16_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x4_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x4 \ vpx_highbd_12_sub_pixel_variance8x4_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x8 \ vpx_highbd_12_sub_pixel_variance8x8_sse2 -unsigned int vpx_highbd_12_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance16x16 vpx_highbd_12_variance16x16_sse2 -unsigned int vpx_highbd_12_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance16x32 vpx_highbd_12_variance16x32_sse2 -unsigned int vpx_highbd_12_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance16x8 vpx_highbd_12_variance16x8_sse2 -unsigned int vpx_highbd_12_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance32x16 vpx_highbd_12_variance32x16_sse2 -unsigned int vpx_highbd_12_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance32x32 vpx_highbd_12_variance32x32_sse2 -unsigned int vpx_highbd_12_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance32x64 vpx_highbd_12_variance32x64_sse2 -unsigned int vpx_highbd_12_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x4 vpx_highbd_12_variance4x4_c -unsigned int vpx_highbd_12_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x8 vpx_highbd_12_variance4x8_c -unsigned int vpx_highbd_12_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance64x32 vpx_highbd_12_variance64x32_sse2 -unsigned int vpx_highbd_12_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance64x64 vpx_highbd_12_variance64x64_sse2 -unsigned int vpx_highbd_12_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance8x16 vpx_highbd_12_variance8x16_sse2 -unsigned int vpx_highbd_12_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance8x4 vpx_highbd_12_variance8x4_c -unsigned int vpx_highbd_12_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance8x8 vpx_highbd_12_variance8x8_sse2 -void vpx_highbd_8_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get16x16var vpx_highbd_8_get16x16var_c -void vpx_highbd_8_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get8x8var vpx_highbd_8_get8x8var_c -unsigned int vpx_highbd_8_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); #define vpx_highbd_8_mse16x16 vpx_highbd_8_mse16x16_sse2 -unsigned int vpx_highbd_8_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse16x8 vpx_highbd_8_mse16x8_c -unsigned int vpx_highbd_8_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse8x16 vpx_highbd_8_mse8x16_c -unsigned int vpx_highbd_8_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_mse8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse8x8 vpx_highbd_8_mse8x8_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x16 \ vpx_highbd_8_sub_pixel_avg_variance16x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x32 \ vpx_highbd_8_sub_pixel_avg_variance16x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x8 \ vpx_highbd_8_sub_pixel_avg_variance16x8_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x16 \ vpx_highbd_8_sub_pixel_avg_variance32x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x32 \ vpx_highbd_8_sub_pixel_avg_variance32x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x64 \ vpx_highbd_8_sub_pixel_avg_variance32x64_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x4 \ vpx_highbd_8_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x8 \ vpx_highbd_8_sub_pixel_avg_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance64x32 \ vpx_highbd_8_sub_pixel_avg_variance64x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance64x64 \ vpx_highbd_8_sub_pixel_avg_variance64x64_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x16 \ vpx_highbd_8_sub_pixel_avg_variance8x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x4 \ vpx_highbd_8_sub_pixel_avg_variance8x4_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x8 \ vpx_highbd_8_sub_pixel_avg_variance8x8_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x16 \ vpx_highbd_8_sub_pixel_variance16x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x32 \ vpx_highbd_8_sub_pixel_variance16x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x8 \ vpx_highbd_8_sub_pixel_variance16x8_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x16 \ vpx_highbd_8_sub_pixel_variance32x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x32 \ vpx_highbd_8_sub_pixel_variance32x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x64 \ vpx_highbd_8_sub_pixel_variance32x64_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x4 vpx_highbd_8_sub_pixel_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x8 vpx_highbd_8_sub_pixel_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance64x32 \ vpx_highbd_8_sub_pixel_variance64x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance64x64 \ vpx_highbd_8_sub_pixel_variance64x64_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x16 \ vpx_highbd_8_sub_pixel_variance8x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x4 \ vpx_highbd_8_sub_pixel_variance8x4_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x8 \ vpx_highbd_8_sub_pixel_variance8x8_sse2 -unsigned int vpx_highbd_8_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance16x16 vpx_highbd_8_variance16x16_sse2 -unsigned int vpx_highbd_8_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance16x32 vpx_highbd_8_variance16x32_sse2 -unsigned int vpx_highbd_8_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance16x8 vpx_highbd_8_variance16x8_sse2 -unsigned int vpx_highbd_8_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x16 vpx_highbd_8_variance32x16_sse2 -unsigned int vpx_highbd_8_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x32 vpx_highbd_8_variance32x32_sse2 -unsigned int vpx_highbd_8_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x64 vpx_highbd_8_variance32x64_sse2 -unsigned int vpx_highbd_8_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x4 vpx_highbd_8_variance4x4_c -unsigned int vpx_highbd_8_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x8 vpx_highbd_8_variance4x8_c -unsigned int vpx_highbd_8_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance64x32 vpx_highbd_8_variance64x32_sse2 -unsigned int vpx_highbd_8_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance64x64 vpx_highbd_8_variance64x64_sse2 -unsigned int vpx_highbd_8_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance8x16 vpx_highbd_8_variance8x16_sse2 -unsigned int vpx_highbd_8_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance8x4 vpx_highbd_8_variance8x4_c -unsigned int vpx_highbd_8_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance8x8 vpx_highbd_8_variance8x8_sse2 -unsigned int vpx_highbd_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_4x4_c(const uint8_t *, int p); #define vpx_highbd_avg_4x4 vpx_highbd_avg_4x4_c -unsigned int vpx_highbd_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_8x8_c(const uint8_t *, int p); #define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c -void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred, - const uint16_t* pred, - int width, - int height, - const uint16_t* ref, +void vpx_highbd_comp_avg_pred_c(uint16_t *comp_pred, const uint16_t *pred, + int width, int height, const uint16_t *ref, int ref_stride); #define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c -void vpx_highbd_convolve8_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8)(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_avg_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_horiz_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_avg_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_horiz_sse2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_horiz_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); +void vpx_highbd_convolve8_avg_horiz_avx2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg_horiz)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg_horiz)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_vert_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_avg_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_vert_sse2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_vert_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_vert_avx2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg_vert)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg_vert)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_horiz_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_horiz_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_horiz)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_horiz_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_horiz_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_horiz)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_vert_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_vert_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_vert)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_vert_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_vert_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_vert)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_avg_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_avg_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve_avg)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve_avg_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve_avg_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve_avg)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve_copy_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_copy_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_copy_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve_copy)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_copy_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve_copy_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve_copy_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve_copy)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_d117_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d117_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d117_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d117_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d117_predictor_4x4 vpx_highbd_d117_predictor_4x4_sse2 -void vpx_highbd_d117_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d117_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d135_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d135_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d135_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d135_predictor_4x4 vpx_highbd_d135_predictor_4x4_sse2 -void vpx_highbd_d135_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d135_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d153_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d153_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d153_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d153_predictor_4x4 vpx_highbd_d153_predictor_4x4_sse2 -void vpx_highbd_d153_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d153_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d207_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d207_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d207_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d207_predictor_4x4 vpx_highbd_d207_predictor_4x4_sse2 -void vpx_highbd_d207_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d207_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d45_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d45_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d45_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d45_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d45_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d45_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_4x4_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d45_predictor_4x4_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d45_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d63_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d63_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d63_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d63_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d63_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d63_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d63_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d63_predictor_4x4 vpx_highbd_d63_predictor_4x4_sse2 -void vpx_highbd_d63_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d63_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_16x16 vpx_highbd_dc_128_predictor_16x16_sse2 -void vpx_highbd_dc_128_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_32x32 vpx_highbd_dc_128_predictor_32x32_sse2 -void vpx_highbd_dc_128_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_4x4 vpx_highbd_dc_128_predictor_4x4_sse2 -void vpx_highbd_dc_128_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_8x8 vpx_highbd_dc_128_predictor_8x8_sse2 -void vpx_highbd_dc_left_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_16x16 \ vpx_highbd_dc_left_predictor_16x16_sse2 -void vpx_highbd_dc_left_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_32x32 \ vpx_highbd_dc_left_predictor_32x32_sse2 -void vpx_highbd_dc_left_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_4x4 vpx_highbd_dc_left_predictor_4x4_sse2 -void vpx_highbd_dc_left_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_8x8 vpx_highbd_dc_left_predictor_8x8_sse2 -void vpx_highbd_dc_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_16x16 vpx_highbd_dc_predictor_16x16_sse2 -void vpx_highbd_dc_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_32x32 vpx_highbd_dc_predictor_32x32_sse2 -void vpx_highbd_dc_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_4x4 vpx_highbd_dc_predictor_4x4_sse2 -void vpx_highbd_dc_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_8x8 vpx_highbd_dc_predictor_8x8_sse2 -void vpx_highbd_dc_top_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_16x16 vpx_highbd_dc_top_predictor_16x16_sse2 -void vpx_highbd_dc_top_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_32x32 vpx_highbd_dc_top_predictor_32x32_sse2 -void vpx_highbd_dc_top_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_4x4 vpx_highbd_dc_top_predictor_4x4_sse2 -void vpx_highbd_dc_top_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_8x8 vpx_highbd_dc_top_predictor_8x8_sse2 -void vpx_highbd_fdct16x16_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct16x16_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct16x16 vpx_highbd_fdct16x16_sse2 -void vpx_highbd_fdct16x16_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct16x16_1 vpx_highbd_fdct16x16_1_c -void vpx_highbd_fdct32x32_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32 vpx_highbd_fdct32x32_sse2 -void vpx_highbd_fdct32x32_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32_1 vpx_highbd_fdct32x32_1_c -void vpx_highbd_fdct32x32_rd_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_rd_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32_rd vpx_highbd_fdct32x32_rd_sse2 -void vpx_highbd_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_highbd_fdct4x4_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_highbd_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct4x4 vpx_highbd_fdct4x4_sse2 -void vpx_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_highbd_fdct8x8_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_highbd_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct8x8 vpx_highbd_fdct8x8_sse2 -void vpx_highbd_fdct8x8_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct8x8_1 vpx_highbd_fdct8x8_1_c -void vpx_highbd_h_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_h_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_h_predictor_16x16 vpx_highbd_h_predictor_16x16_sse2 -void vpx_highbd_h_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_h_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_h_predictor_32x32 vpx_highbd_h_predictor_32x32_sse2 -void vpx_highbd_h_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_h_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_h_predictor_4x4 vpx_highbd_h_predictor_4x4_sse2 -void vpx_highbd_h_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_h_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_h_predictor_8x8 vpx_highbd_h_predictor_8x8_sse2 -void vpx_highbd_idct16x16_10_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_10_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_10_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_10_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_10_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_10_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_10_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_10_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct16x16_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct16x16_1_add vpx_highbd_idct16x16_1_add_sse2 -void vpx_highbd_idct16x16_256_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_256_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_256_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_256_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_256_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_256_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_256_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_256_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_38_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_38_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_38_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_38_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_38_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_38_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_38_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_38_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_1024_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1024_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1024_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_1024_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_1024_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1024_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1024_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_1024_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_135_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_135_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_135_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_135_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_135_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_135_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_135_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_135_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct32x32_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct32x32_1_add vpx_highbd_idct32x32_1_add_sse2 -void vpx_highbd_idct32x32_34_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_34_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_34_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_34_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_34_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_34_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_34_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_34_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_16_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_16_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct4x4_16_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_16_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_16_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct4x4_16_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct4x4_1_add vpx_highbd_idct4x4_1_add_sse2 -void vpx_highbd_idct8x8_12_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_12_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_12_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_12_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_12_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_12_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_12_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_12_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct8x8_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct8x8_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct8x8_1_add vpx_highbd_idct8x8_1_add_sse2 -void vpx_highbd_idct8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_64_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_64_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_64_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_64_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_64_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_iwht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_16_add vpx_highbd_iwht4x4_16_add_c -void vpx_highbd_iwht4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_1_add vpx_highbd_iwht4x4_1_add_c -void vpx_highbd_lpf_horizontal_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_16_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_16_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_16_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_16 vpx_highbd_lpf_horizontal_16_sse2 -void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_16_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_16_dual_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_16_dual vpx_highbd_lpf_horizontal_16_dual_sse2 -void vpx_highbd_lpf_horizontal_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_4_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_4_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_4_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_4 vpx_highbd_lpf_horizontal_4_sse2 -void vpx_highbd_lpf_horizontal_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_horizontal_4_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_horizontal_4_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_horizontal_4_dual vpx_highbd_lpf_horizontal_4_dual_sse2 -void vpx_highbd_lpf_horizontal_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_8_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_8_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_8_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_8 vpx_highbd_lpf_horizontal_8_sse2 -void vpx_highbd_lpf_horizontal_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_horizontal_8_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_horizontal_8_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_horizontal_8_dual vpx_highbd_lpf_horizontal_8_dual_sse2 -void vpx_highbd_lpf_vertical_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_16_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_16_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_16_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_16 vpx_highbd_lpf_vertical_16_sse2 -void vpx_highbd_lpf_vertical_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_vertical_16_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_vertical_16_dual_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_16_dual vpx_highbd_lpf_vertical_16_dual_sse2 -void vpx_highbd_lpf_vertical_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_4_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_4_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_4_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_4 vpx_highbd_lpf_vertical_4_sse2 -void vpx_highbd_lpf_vertical_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_vertical_4_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_vertical_4_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_vertical_4_dual vpx_highbd_lpf_vertical_4_dual_sse2 -void vpx_highbd_lpf_vertical_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_8_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_8_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_8_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_8 vpx_highbd_lpf_vertical_8_sse2 -void vpx_highbd_lpf_vertical_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_vertical_8_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_vertical_8_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_vertical_8_dual vpx_highbd_lpf_vertical_8_dual_sse2 -void vpx_highbd_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_highbd_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_highbd_minmax_8x8 vpx_highbd_minmax_8x8_c -void vpx_highbd_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_highbd_quantize_b_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_highbd_quantize_b_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_highbd_quantize_b vpx_highbd_quantize_b_sse2 -void vpx_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_highbd_quantize_b_32x32_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_highbd_quantize_b_32x32_sse2( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_highbd_quantize_b_32x32 vpx_highbd_quantize_b_32x32_sse2 -unsigned int vpx_highbd_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x16 vpx_highbd_sad16x16_sse2 -unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x16_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x16_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad16x16_avg vpx_highbd_sad16x16_avg_sse2 -void vpx_highbd_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x16x4d vpx_highbd_sad16x16x4d_sse2 -unsigned int vpx_highbd_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x32 vpx_highbd_sad16x32_sse2 -unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad16x32_avg vpx_highbd_sad16x32_avg_sse2 -void vpx_highbd_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x32x4d vpx_highbd_sad16x32x4d_sse2 -unsigned int vpx_highbd_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x8 vpx_highbd_sad16x8_sse2 -unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad16x8_avg vpx_highbd_sad16x8_avg_sse2 -void vpx_highbd_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x8x4d vpx_highbd_sad16x8x4d_sse2 -unsigned int vpx_highbd_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x16 vpx_highbd_sad32x16_sse2 -unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x16_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x16_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad32x16_avg vpx_highbd_sad32x16_avg_sse2 -void vpx_highbd_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x16x4d vpx_highbd_sad32x16x4d_sse2 -unsigned int vpx_highbd_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x32 vpx_highbd_sad32x32_sse2 -unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad32x32_avg vpx_highbd_sad32x32_avg_sse2 -void vpx_highbd_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x32x4d vpx_highbd_sad32x32x4d_sse2 -unsigned int vpx_highbd_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x64 vpx_highbd_sad32x64_sse2 -unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x64_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x64_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad32x64_avg vpx_highbd_sad32x64_avg_sse2 -void vpx_highbd_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x64x4d vpx_highbd_sad32x64x4d_sse2 -unsigned int vpx_highbd_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x4 vpx_highbd_sad4x4_c -unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x4_avg vpx_highbd_sad4x4_avg_c -void vpx_highbd_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad4x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad4x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad4x4x4d vpx_highbd_sad4x4x4d_sse2 -unsigned int vpx_highbd_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x8 vpx_highbd_sad4x8_c -unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x8_avg vpx_highbd_sad4x8_avg_c -void vpx_highbd_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad4x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad4x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad4x8x4d vpx_highbd_sad4x8x4d_sse2 -unsigned int vpx_highbd_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad64x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad64x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad64x32 vpx_highbd_sad64x32_sse2 -unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad64x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad64x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad64x32_avg vpx_highbd_sad64x32_avg_sse2 -void vpx_highbd_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad64x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad64x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad64x32x4d vpx_highbd_sad64x32x4d_sse2 -unsigned int vpx_highbd_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad64x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad64x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad64x64 vpx_highbd_sad64x64_sse2 -unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad64x64_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad64x64_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad64x64_avg vpx_highbd_sad64x64_avg_sse2 -void vpx_highbd_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad64x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad64x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad64x64x4d vpx_highbd_sad64x64x4d_sse2 -unsigned int vpx_highbd_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x16 vpx_highbd_sad8x16_sse2 -unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x16_avg vpx_highbd_sad8x16_avg_sse2 -void vpx_highbd_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x16x4d vpx_highbd_sad8x16x4d_sse2 -unsigned int vpx_highbd_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x4 vpx_highbd_sad8x4_sse2 -unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x4_avg vpx_highbd_sad8x4_avg_sse2 -void vpx_highbd_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x4x4d vpx_highbd_sad8x4x4d_sse2 -unsigned int vpx_highbd_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x8 vpx_highbd_sad8x8_sse2 -unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x8_avg vpx_highbd_sad8x8_avg_sse2 -void vpx_highbd_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x8x4d vpx_highbd_sad8x8x4d_sse2 -void vpx_highbd_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, - ptrdiff_t pred_stride, - int bd); +void vpx_highbd_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, + ptrdiff_t pred_stride, int bd); #define vpx_highbd_subtract_block vpx_highbd_subtract_block_c -void vpx_highbd_tm_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_tm_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_tm_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_16x16 vpx_highbd_tm_predictor_16x16_sse2 -void vpx_highbd_tm_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_tm_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_tm_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_32x32 vpx_highbd_tm_predictor_32x32_sse2 -void vpx_highbd_tm_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_4x4 vpx_highbd_tm_predictor_4x4_sse2 -void vpx_highbd_tm_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_8x8 vpx_highbd_tm_predictor_8x8_sse2 -void vpx_highbd_v_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_v_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_v_predictor_16x16 vpx_highbd_v_predictor_16x16_sse2 -void vpx_highbd_v_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_v_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_v_predictor_32x32 vpx_highbd_v_predictor_32x32_sse2 -void vpx_highbd_v_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_v_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_v_predictor_4x4 vpx_highbd_v_predictor_4x4_sse2 -void vpx_highbd_v_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_v_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_v_predictor_8x8 vpx_highbd_v_predictor_8x8_sse2 -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_10_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_10_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_10_add vpx_idct16x16_10_add_sse2 -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_1_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_1_add vpx_idct16x16_1_add_sse2 -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_256_add vpx_idct16x16_256_add_sse2 -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_38_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_38_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_38_add vpx_idct16x16_38_add_sse2 -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_sse2 -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_1_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1_add vpx_idct32x32_1_add_sse2 -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_34_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_34_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_34_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_16_add vpx_idct4x4_16_add_sse2 -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_1_add_sse2(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_1_add vpx_idct4x4_1_add_sse2 -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_12_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_12_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_12_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_1_add_sse2(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_1_add vpx_idct8x8_1_add_sse2 -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_64_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_64_add vpx_idct8x8_64_add_sse2 -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); -int16_t vpx_int_pro_col_sse2(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); +int16_t vpx_int_pro_col_sse2(const uint8_t *ref, const int width); #define vpx_int_pro_col vpx_int_pro_col_sse2 -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); -void vpx_int_pro_row_sse2(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); +void vpx_int_pro_row_sse2(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); #define vpx_int_pro_row vpx_int_pro_row_sse2 -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_iwht4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_iwht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_sse2 -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_avx2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_avx2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_avx2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_sse2(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_avx2(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_4_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_sse2 -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_4_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_4_dual_sse2( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_sse2 -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_8_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_sse2 -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_8_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_8_dual_sse2( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_sse2 -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16 vpx_lpf_vertical_16_sse2 -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_sse2 -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_4_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_4 vpx_lpf_vertical_4_sse2 -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_4_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_4_dual vpx_lpf_vertical_4_dual_sse2 -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_8_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_8 vpx_lpf_vertical_8_sse2 -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_8_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_sse2 -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -void vpx_mbpost_proc_across_ip_sse2(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +void vpx_mbpost_proc_across_ip_sse2(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_across_ip vpx_mbpost_proc_across_ip_sse2 -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); -void vpx_mbpost_proc_down_sse2(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_down_sse2(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_down vpx_mbpost_proc_down_sse2 -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -void vpx_minmax_8x8_sse2(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +void vpx_minmax_8x8_sse2(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_minmax_8x8 vpx_minmax_8x8_sse2 -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t* src_ptr, +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -#define vpx_mse16x8 vpx_mse16x8_sse2 +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x8_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse16x8)(const uint8_t *src_ptr, + int source_stride, + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse8x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse8x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x16 vpx_mse8x16_sse2 -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x8 vpx_mse8x8_sse2 -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); -void vpx_plane_add_noise_sse2(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); +void vpx_plane_add_noise_sse2(uint8_t *start, const int8_t *noise, + int blackclamp, int whiteclamp, int width, + int height, int pitch); #define vpx_plane_add_noise vpx_plane_add_noise_sse2 -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); -void vpx_post_proc_down_and_across_mb_row_sse2(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); +void vpx_post_proc_down_and_across_mb_row_sse2(unsigned char *src, + unsigned char *dst, + int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); #define vpx_post_proc_down_and_across_mb_row \ vpx_post_proc_down_and_across_mb_row_sse2 -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_avx(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_avx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_avx(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_avx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x16 vpx_sad16x16_sse2 -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x16_avg vpx_sad16x16_avg_sse2 -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x3_ssse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x3_ssse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x4d vpx_sad16x16x4d_sse2 -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x32 vpx_sad16x32_sse2 -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x32_avg vpx_sad16x32_avg_sse2 -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x32x4d vpx_sad16x32x4d_sse2 -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x8 vpx_sad16x8_sse2 -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x8_avg vpx_sad16x8_avg_sse2 -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x3_ssse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x3_ssse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x4d vpx_sad16x8x4d_sse2 -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x16x4d vpx_sad32x16x4d_sse2 -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x64x4d vpx_sad32x64x4d_sse2 -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x4 vpx_sad4x4_sse2 -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x4_avg vpx_sad4x4_avg_sse2 -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x4d vpx_sad4x4x4d_sse2 -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x8 vpx_sad4x8_sse2 -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x8_avg vpx_sad4x8_avg_sse2 -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x8x4d vpx_sad4x8x4d_sse2 -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x32x4d vpx_sad64x32x4d_sse2 -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x16 vpx_sad8x16_sse2 -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x16_avg vpx_sad8x16_avg_sse2 -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x4d vpx_sad8x16x4d_sse2 -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x4 vpx_sad8x4_sse2 -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x4_avg vpx_sad8x4_avg_sse2 -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x4x4d vpx_sad8x4x4d_sse2 -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x8 vpx_sad8x8_sse2 -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x8_avg vpx_sad8x8_avg_sse2 -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x4d vpx_sad8x8x4d_sse2 -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -int vpx_satd_c(const tran_low_t* coeff, int length); -int vpx_satd_sse2(const tran_low_t* coeff, int length); -int vpx_satd_avx2(const tran_low_t* coeff, int length); -RTCD_EXTERN int (*vpx_satd)(const tran_low_t* coeff, int length); +int vpx_satd_c(const tran_low_t *coeff, int length); +int vpx_satd_sse2(const tran_low_t *coeff, int length); +int vpx_satd_avx2(const tran_low_t *coeff, int length); +RTCD_EXTERN int (*vpx_satd)(const tran_low_t *coeff, int length); -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_scaled_2d_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_2d_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -void vpx_subtract_block_sse2(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_sse2(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); #define vpx_subtract_block vpx_subtract_block_sse2 -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); -uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t* src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t *src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_sse2 -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_sse2 -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_sse2 -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_sse2 -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_sse2 -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_16x16 vpx_v_predictor_16x16_sse2 -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_32x32 vpx_v_predictor_32x32_sse2 -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_4x4 vpx_v_predictor_4x4_sse2 -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_sse2 -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t* src_ptr, +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -#define vpx_variance16x32 vpx_variance16x32_sse2 - -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -#define vpx_variance16x8 vpx_variance16x8_sse2 - -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t* src_ptr, +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t* src_ptr, +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x8)(const uint8_t *src_ptr, + int source_stride, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); + +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -#define vpx_variance32x64 vpx_variance32x64_sse2 +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t *src_ptr, + int source_stride, + const uint8_t *ref_ptr, + int ref_stride, + unsigned int *sse); -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x64)(const uint8_t *src_ptr, + int source_stride, + const uint8_t *ref_ptr, + int ref_stride, + unsigned int *sse); + +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x4_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x4 vpx_variance4x4_sse2 -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x8 vpx_variance4x8_sse2 -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t* src_ptr, +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t* src_ptr, +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x16 vpx_variance8x16_sse2 -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x4 vpx_variance8x4_sse2 -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x8 vpx_variance8x8_sse2 -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); -int vpx_vector_var_sse2(const int16_t* ref, const int16_t* src, const int bwl); +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); +int vpx_vector_var_sse2(const int16_t *ref, const int16_t *src, const int bwl); #define vpx_vector_var vpx_vector_var_sse2 void vpx_dsp_rtcd(void); @@ -7540,35 +4752,24 @@ (void)flags; vpx_convolve8 = vpx_convolve8_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8 = vpx_convolve8_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8 = vpx_convolve8_avx2; + if (flags & HAS_SSSE3) vpx_convolve8 = vpx_convolve8_ssse3; + if (flags & HAS_AVX2) vpx_convolve8 = vpx_convolve8_avx2; vpx_convolve8_avg = vpx_convolve8_avg_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_avg = vpx_convolve8_avg_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg = vpx_convolve8_avg_avx2; + if (flags & HAS_SSSE3) vpx_convolve8_avg = vpx_convolve8_avg_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_avg = vpx_convolve8_avg_avx2; vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_sse2; if (flags & HAS_SSSE3) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_avx2; + if (flags & HAS_AVX2) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_avx2; vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_avx2; + if (flags & HAS_SSSE3) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_avx2; vpx_convolve8_horiz = vpx_convolve8_horiz_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_horiz = vpx_convolve8_horiz_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_horiz = vpx_convolve8_horiz_avx2; + if (flags & HAS_SSSE3) vpx_convolve8_horiz = vpx_convolve8_horiz_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_horiz = vpx_convolve8_horiz_avx2; vpx_convolve8_vert = vpx_convolve8_vert_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_vert = vpx_convolve8_vert_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_vert = vpx_convolve8_vert_avx2; + if (flags & HAS_SSSE3) vpx_convolve8_vert = vpx_convolve8_vert_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_vert = vpx_convolve8_vert_avx2; vpx_d153_predictor_16x16 = vpx_d153_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d153_predictor_16x16 = vpx_d153_predictor_16x16_ssse3; @@ -7576,11 +4777,9 @@ if (flags & HAS_SSSE3) vpx_d153_predictor_32x32 = vpx_d153_predictor_32x32_ssse3; vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_c; - if (flags & HAS_SSSE3) - vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_ssse3; + if (flags & HAS_SSSE3) vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_ssse3; vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_ssse3; vpx_d207_predictor_16x16 = vpx_d207_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d207_predictor_16x16 = vpx_d207_predictor_16x16_ssse3; @@ -7588,8 +4787,7 @@ if (flags & HAS_SSSE3) vpx_d207_predictor_32x32 = vpx_d207_predictor_32x32_ssse3; vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_ssse3; vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_ssse3; @@ -7603,23 +4801,17 @@ if (flags & HAS_SSSE3) vpx_d63_predictor_32x32 = vpx_d63_predictor_32x32_ssse3; vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_c; - if (flags & HAS_SSSE3) - vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_ssse3; + if (flags & HAS_SSSE3) vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_ssse3; vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_ssse3; vpx_get16x16var = vpx_get16x16var_sse2; - if (flags & HAS_AVX2) - vpx_get16x16var = vpx_get16x16var_avx2; + if (flags & HAS_AVX2) vpx_get16x16var = vpx_get16x16var_avx2; vpx_hadamard_16x16 = vpx_hadamard_16x16_sse2; - if (flags & HAS_AVX2) - vpx_hadamard_16x16 = vpx_hadamard_16x16_avx2; + if (flags & HAS_AVX2) vpx_hadamard_16x16 = vpx_hadamard_16x16_avx2; vpx_hadamard_8x8 = vpx_hadamard_8x8_sse2; - if (flags & HAS_SSSE3) - vpx_hadamard_8x8 = vpx_hadamard_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_hadamard_8x8 = vpx_hadamard_8x8_ssse3; vpx_highbd_convolve8 = vpx_highbd_convolve8_sse2; - if (flags & HAS_AVX2) - vpx_highbd_convolve8 = vpx_highbd_convolve8_avx2; + if (flags & HAS_AVX2) vpx_highbd_convolve8 = vpx_highbd_convolve8_avx2; vpx_highbd_convolve8_avg = vpx_highbd_convolve8_avg_sse2; if (flags & HAS_AVX2) vpx_highbd_convolve8_avg = vpx_highbd_convolve8_avg_avx2; @@ -7636,8 +4828,7 @@ if (flags & HAS_AVX2) vpx_highbd_convolve8_vert = vpx_highbd_convolve8_vert_avx2; vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_sse2; - if (flags & HAS_AVX2) - vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_avx2; + if (flags & HAS_AVX2) vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_avx2; vpx_highbd_convolve_copy = vpx_highbd_convolve_copy_sse2; if (flags & HAS_AVX2) vpx_highbd_convolve_copy = vpx_highbd_convolve_copy_avx2; @@ -7726,109 +4917,76 @@ if (flags & HAS_SSE4_1) vpx_highbd_idct8x8_64_add = vpx_highbd_idct8x8_64_add_sse4_1; vpx_idct32x32_135_add = vpx_idct32x32_135_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct32x32_135_add = vpx_idct32x32_135_add_ssse3; + if (flags & HAS_SSSE3) vpx_idct32x32_135_add = vpx_idct32x32_135_add_ssse3; vpx_idct32x32_34_add = vpx_idct32x32_34_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct32x32_34_add = vpx_idct32x32_34_add_ssse3; + if (flags & HAS_SSSE3) vpx_idct32x32_34_add = vpx_idct32x32_34_add_ssse3; vpx_idct8x8_12_add = vpx_idct8x8_12_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct8x8_12_add = vpx_idct8x8_12_add_ssse3; + if (flags & HAS_SSSE3) vpx_idct8x8_12_add = vpx_idct8x8_12_add_ssse3; vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_sse2; - if (flags & HAS_AVX2) - vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_avx2; + if (flags & HAS_AVX2) vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_avx2; vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_sse2; if (flags & HAS_AVX2) vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_avx2; vpx_mse16x16 = vpx_mse16x16_sse2; - if (flags & HAS_AVX2) - vpx_mse16x16 = vpx_mse16x16_avx2; + if (flags & HAS_AVX2) vpx_mse16x16 = vpx_mse16x16_avx2; + vpx_mse16x8 = vpx_mse16x8_sse2; + if (flags & HAS_AVX2) vpx_mse16x8 = vpx_mse16x8_avx2; vpx_quantize_b = vpx_quantize_b_sse2; - if (flags & HAS_SSSE3) - vpx_quantize_b = vpx_quantize_b_ssse3; - if (flags & HAS_AVX) - vpx_quantize_b = vpx_quantize_b_avx; + if (flags & HAS_SSSE3) vpx_quantize_b = vpx_quantize_b_ssse3; + if (flags & HAS_AVX) vpx_quantize_b = vpx_quantize_b_avx; vpx_quantize_b_32x32 = vpx_quantize_b_32x32_c; - if (flags & HAS_SSSE3) - vpx_quantize_b_32x32 = vpx_quantize_b_32x32_ssse3; - if (flags & HAS_AVX) - vpx_quantize_b_32x32 = vpx_quantize_b_32x32_avx; + if (flags & HAS_SSSE3) vpx_quantize_b_32x32 = vpx_quantize_b_32x32_ssse3; + if (flags & HAS_AVX) vpx_quantize_b_32x32 = vpx_quantize_b_32x32_avx; vpx_sad16x16x3 = vpx_sad16x16x3_c; - if (flags & HAS_SSE3) - vpx_sad16x16x3 = vpx_sad16x16x3_sse3; - if (flags & HAS_SSSE3) - vpx_sad16x16x3 = vpx_sad16x16x3_ssse3; + if (flags & HAS_SSE3) vpx_sad16x16x3 = vpx_sad16x16x3_sse3; + if (flags & HAS_SSSE3) vpx_sad16x16x3 = vpx_sad16x16x3_ssse3; vpx_sad16x16x8 = vpx_sad16x16x8_c; - if (flags & HAS_SSE4_1) - vpx_sad16x16x8 = vpx_sad16x16x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad16x16x8 = vpx_sad16x16x8_sse4_1; vpx_sad16x8x3 = vpx_sad16x8x3_c; - if (flags & HAS_SSE3) - vpx_sad16x8x3 = vpx_sad16x8x3_sse3; - if (flags & HAS_SSSE3) - vpx_sad16x8x3 = vpx_sad16x8x3_ssse3; + if (flags & HAS_SSE3) vpx_sad16x8x3 = vpx_sad16x8x3_sse3; + if (flags & HAS_SSSE3) vpx_sad16x8x3 = vpx_sad16x8x3_ssse3; vpx_sad16x8x8 = vpx_sad16x8x8_c; - if (flags & HAS_SSE4_1) - vpx_sad16x8x8 = vpx_sad16x8x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad16x8x8 = vpx_sad16x8x8_sse4_1; vpx_sad32x16 = vpx_sad32x16_sse2; - if (flags & HAS_AVX2) - vpx_sad32x16 = vpx_sad32x16_avx2; + if (flags & HAS_AVX2) vpx_sad32x16 = vpx_sad32x16_avx2; vpx_sad32x16_avg = vpx_sad32x16_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x16_avg = vpx_sad32x16_avg_avx2; + if (flags & HAS_AVX2) vpx_sad32x16_avg = vpx_sad32x16_avg_avx2; vpx_sad32x32 = vpx_sad32x32_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32 = vpx_sad32x32_avx2; + if (flags & HAS_AVX2) vpx_sad32x32 = vpx_sad32x32_avx2; vpx_sad32x32_avg = vpx_sad32x32_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32_avg = vpx_sad32x32_avg_avx2; + if (flags & HAS_AVX2) vpx_sad32x32_avg = vpx_sad32x32_avg_avx2; vpx_sad32x32x4d = vpx_sad32x32x4d_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32x4d = vpx_sad32x32x4d_avx2; + if (flags & HAS_AVX2) vpx_sad32x32x4d = vpx_sad32x32x4d_avx2; vpx_sad32x64 = vpx_sad32x64_sse2; - if (flags & HAS_AVX2) - vpx_sad32x64 = vpx_sad32x64_avx2; + if (flags & HAS_AVX2) vpx_sad32x64 = vpx_sad32x64_avx2; vpx_sad32x64_avg = vpx_sad32x64_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x64_avg = vpx_sad32x64_avg_avx2; + if (flags & HAS_AVX2) vpx_sad32x64_avg = vpx_sad32x64_avg_avx2; vpx_sad4x4x3 = vpx_sad4x4x3_c; - if (flags & HAS_SSE3) - vpx_sad4x4x3 = vpx_sad4x4x3_sse3; + if (flags & HAS_SSE3) vpx_sad4x4x3 = vpx_sad4x4x3_sse3; vpx_sad4x4x8 = vpx_sad4x4x8_c; - if (flags & HAS_SSE4_1) - vpx_sad4x4x8 = vpx_sad4x4x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad4x4x8 = vpx_sad4x4x8_sse4_1; vpx_sad64x32 = vpx_sad64x32_sse2; - if (flags & HAS_AVX2) - vpx_sad64x32 = vpx_sad64x32_avx2; + if (flags & HAS_AVX2) vpx_sad64x32 = vpx_sad64x32_avx2; vpx_sad64x32_avg = vpx_sad64x32_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad64x32_avg = vpx_sad64x32_avg_avx2; + if (flags & HAS_AVX2) vpx_sad64x32_avg = vpx_sad64x32_avg_avx2; vpx_sad64x64 = vpx_sad64x64_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64 = vpx_sad64x64_avx2; + if (flags & HAS_AVX2) vpx_sad64x64 = vpx_sad64x64_avx2; vpx_sad64x64_avg = vpx_sad64x64_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64_avg = vpx_sad64x64_avg_avx2; + if (flags & HAS_AVX2) vpx_sad64x64_avg = vpx_sad64x64_avg_avx2; vpx_sad64x64x4d = vpx_sad64x64x4d_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64x4d = vpx_sad64x64x4d_avx2; + if (flags & HAS_AVX2) vpx_sad64x64x4d = vpx_sad64x64x4d_avx2; vpx_sad8x16x3 = vpx_sad8x16x3_c; - if (flags & HAS_SSE3) - vpx_sad8x16x3 = vpx_sad8x16x3_sse3; + if (flags & HAS_SSE3) vpx_sad8x16x3 = vpx_sad8x16x3_sse3; vpx_sad8x16x8 = vpx_sad8x16x8_c; - if (flags & HAS_SSE4_1) - vpx_sad8x16x8 = vpx_sad8x16x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad8x16x8 = vpx_sad8x16x8_sse4_1; vpx_sad8x8x3 = vpx_sad8x8x3_c; - if (flags & HAS_SSE3) - vpx_sad8x8x3 = vpx_sad8x8x3_sse3; + if (flags & HAS_SSE3) vpx_sad8x8x3 = vpx_sad8x8x3_sse3; vpx_sad8x8x8 = vpx_sad8x8x8_c; - if (flags & HAS_SSE4_1) - vpx_sad8x8x8 = vpx_sad8x8x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad8x8x8 = vpx_sad8x8x8_sse4_1; vpx_satd = vpx_satd_sse2; - if (flags & HAS_AVX2) - vpx_satd = vpx_satd_avx2; + if (flags & HAS_AVX2) vpx_satd = vpx_satd_avx2; vpx_scaled_2d = vpx_scaled_2d_c; - if (flags & HAS_SSSE3) - vpx_scaled_2d = vpx_scaled_2d_ssse3; + if (flags & HAS_SSSE3) vpx_scaled_2d = vpx_scaled_2d_ssse3; vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_sse2; if (flags & HAS_SSSE3) vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_ssse3; @@ -7916,20 +5074,21 @@ if (flags & HAS_SSSE3) vpx_sub_pixel_variance8x8 = vpx_sub_pixel_variance8x8_ssse3; vpx_variance16x16 = vpx_variance16x16_sse2; - if (flags & HAS_AVX2) - vpx_variance16x16 = vpx_variance16x16_avx2; + if (flags & HAS_AVX2) vpx_variance16x16 = vpx_variance16x16_avx2; + vpx_variance16x32 = vpx_variance16x32_sse2; + if (flags & HAS_AVX2) vpx_variance16x32 = vpx_variance16x32_avx2; + vpx_variance16x8 = vpx_variance16x8_sse2; + if (flags & HAS_AVX2) vpx_variance16x8 = vpx_variance16x8_avx2; vpx_variance32x16 = vpx_variance32x16_sse2; - if (flags & HAS_AVX2) - vpx_variance32x16 = vpx_variance32x16_avx2; + if (flags & HAS_AVX2) vpx_variance32x16 = vpx_variance32x16_avx2; vpx_variance32x32 = vpx_variance32x32_sse2; - if (flags & HAS_AVX2) - vpx_variance32x32 = vpx_variance32x32_avx2; + if (flags & HAS_AVX2) vpx_variance32x32 = vpx_variance32x32_avx2; + vpx_variance32x64 = vpx_variance32x64_sse2; + if (flags & HAS_AVX2) vpx_variance32x64 = vpx_variance32x64_avx2; vpx_variance64x32 = vpx_variance64x32_sse2; - if (flags & HAS_AVX2) - vpx_variance64x32 = vpx_variance64x32_avx2; + if (flags & HAS_AVX2) vpx_variance64x32 = vpx_variance64x32_avx2; vpx_variance64x64 = vpx_variance64x64_sse2; - if (flags & HAS_AVX2) - vpx_variance64x64 = vpx_variance64x64_avx2; + if (flags & HAS_AVX2) vpx_variance64x64 = vpx_variance64x64_avx2; } #endif
diff --git a/third_party/libvpx/source/config/linux/x64/vpx_scale_rtcd.h b/third_party/libvpx/source/config/linux/x64/vpx_scale_rtcd.h index 19da7a7..f30cdee1 100644 --- a/third_party/libvpx/source/config/linux/x64/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/linux/x64/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/mac/ia32/vp8_rtcd.h b/third_party/libvpx/source/config/mac/ia32/vp8_rtcd.h index 9472db1..834d00c0 100644 --- a/third_party/libvpx/source/config/mac/ia32/vp8_rtcd.h +++ b/third_party/libvpx/source/config/mac/ia32/vp8_rtcd.h
@@ -27,712 +27,399 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict16x16_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict16x16_sse2(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict16x16_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_ssse3(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict4x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict4x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict4x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict8x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict8x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); -int vp8_block_error_sse2(short* coeff, short* dqcoeff); -RTCD_EXTERN int (*vp8_block_error)(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); +int vp8_block_error_sse2(short *coeff, short *dqcoeff); +RTCD_EXTERN int (*vp8_block_error)(short *coeff, short *dqcoeff); -void vp8_copy32xn_c(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -void vp8_copy32xn_sse2(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -void vp8_copy32xn_sse3(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); +void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char *src_ptr, + int source_stride, unsigned char *dst_ptr, + int dst_stride, int n); -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem16x16_sse2(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_copy_mem16x16)(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +void vp8_copy_mem16x16_sse2(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_copy_mem16x16)(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_mmx(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_mmx(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_copy_mem8x8)(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_copy_mem8x8)(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -void vp8_dc_only_idct_add_mmx(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -RTCD_EXTERN void (*vp8_dc_only_idct_add)(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +void vp8_dc_only_idct_add_mmx(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +RTCD_EXTERN void (*vp8_dc_only_idct_add)(short input, unsigned char *pred, + int pred_stride, unsigned char *dst, int dst_stride); -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_sse2(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_sse2(unsigned char *mc_running_avg_y, + int mc_avg_y_stride, unsigned char *running_avg_y, + int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -RTCD_EXTERN int (*vp8_denoiser_filter)(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, - int increase_denoising); +RTCD_EXTERN int (*vp8_denoiser_filter)( + unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_sse2(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_uv_sse2(unsigned char *mc_running_avg, + int mc_avg_stride, unsigned char *running_avg, + int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -RTCD_EXTERN int (*vp8_denoiser_filter_uv)(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, - int increase_denoising); +RTCD_EXTERN int (*vp8_denoiser_filter_uv)( + unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); -void vp8_dequant_idct_add_mmx(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_mmx(short *input, short *dq, unsigned char *output, int stride); -RTCD_EXTERN void (*vp8_dequant_idct_add)(short* input, - short* dq, - unsigned char* output, - int stride); +RTCD_EXTERN void (*vp8_dequant_idct_add)(short *input, short *dq, + unsigned char *output, int stride); -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -void vp8_dequant_idct_add_uv_block_sse2(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -RTCD_EXTERN void (*vp8_dequant_idct_add_uv_block)(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +void vp8_dequant_idct_add_uv_block_sse2(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +RTCD_EXTERN void (*vp8_dequant_idct_add_uv_block)(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, + int stride, char *eobs); -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -void vp8_dequant_idct_add_y_block_sse2(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -RTCD_EXTERN void (*vp8_dequant_idct_add_y_block)(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +void vp8_dequant_idct_add_y_block_sse2(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +RTCD_EXTERN void (*vp8_dequant_idct_add_y_block)(short *q, short *dq, + unsigned char *dst, int stride, + char *eobs); -void vp8_dequantize_b_c(struct blockd*, short* dqc); -void vp8_dequantize_b_mmx(struct blockd*, short* dqc); -RTCD_EXTERN void (*vp8_dequantize_b)(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); +void vp8_dequantize_b_mmx(struct blockd *, short *dqc); +RTCD_EXTERN void (*vp8_dequantize_b)(struct blockd *, short *dqc); -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_diamond_search_sadx4(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -RTCD_EXTERN int (*vp8_diamond_search_sad)(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_diamond_search_sadx4(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +RTCD_EXTERN int (*vp8_diamond_search_sad)( + struct macroblock *x, struct block *b, struct blockd *d, + union int_mv *ref_mv, union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); -void vp8_fast_quantize_b_c(struct block*, struct blockd*); -void vp8_fast_quantize_b_sse2(struct block*, struct blockd*); -void vp8_fast_quantize_b_ssse3(struct block*, struct blockd*); -RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); +void vp8_fast_quantize_b_sse2(struct block *, struct blockd *); +void vp8_fast_quantize_b_ssse3(struct block *, struct blockd *); +RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block *, struct blockd *); -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -void vp8_filter_by_weight16x16_sse2(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -RTCD_EXTERN void (*vp8_filter_by_weight16x16)(unsigned char* src, +RTCD_EXTERN void (*vp8_filter_by_weight16x16)(unsigned char *src, int src_stride, - unsigned char* dst, - int dst_stride, - int src_weight); + unsigned char *dst, + int dst_stride, int src_weight); -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -void vp8_filter_by_weight8x8_sse2(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -RTCD_EXTERN void (*vp8_filter_by_weight8x8)(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +RTCD_EXTERN void (*vp8_filter_by_weight8x8)(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_full_search_sadx3(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_full_search_sadx8(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_full_search_sadx3(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_full_search_sadx8(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, + int *mvcost[2], union int_mv *center_mv); -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bh_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_bh)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bh_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_bh)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bv_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_bv)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bv_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_bv)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbh_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_mbh)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbh_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_mbh)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbv_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_mbv)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbv_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_mbv)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bhs_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_bh)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bhs_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_bh)(unsigned char *y, int ystride, + const unsigned char *blimit); -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bvs_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_bv)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bvs_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_bv)(unsigned char *y, int ystride, + const unsigned char *blimit); -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_mbh)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_mbh)(unsigned char *y, int ystride, + const unsigned char *blimit); -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_mbv)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_mbv)(unsigned char *y, int ystride, + const unsigned char *blimit); -int vp8_mbblock_error_c(struct macroblock* mb, int dc); -int vp8_mbblock_error_sse2(struct macroblock* mb, int dc); -RTCD_EXTERN int (*vp8_mbblock_error)(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); +int vp8_mbblock_error_sse2(struct macroblock *mb, int dc); +RTCD_EXTERN int (*vp8_mbblock_error)(struct macroblock *mb, int dc); -int vp8_mbuverror_c(struct macroblock* mb); -int vp8_mbuverror_sse2(struct macroblock* mb); -RTCD_EXTERN int (*vp8_mbuverror)(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); +int vp8_mbuverror_sse2(struct macroblock *mb); +RTCD_EXTERN int (*vp8_mbuverror)(struct macroblock *mb); -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_refining_search_sadx4(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -RTCD_EXTERN int (*vp8_refining_search_sad)(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_refining_search_sadx4(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +RTCD_EXTERN int (*vp8_refining_search_sad)( + struct macroblock *x, struct block *b, struct blockd *d, + union int_mv *ref_mv, int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv); -void vp8_regular_quantize_b_c(struct block*, struct blockd*); -void vp8_regular_quantize_b_sse2(struct block*, struct blockd*); -void vp8_regular_quantize_b_sse4_1(struct block*, struct blockd*); -RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); +void vp8_regular_quantize_b_sse2(struct block *, struct blockd *); +void vp8_regular_quantize_b_sse4_1(struct block *, struct blockd *); +RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block *, struct blockd *); -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); -void vp8_short_fdct4x4_sse2(short* input, short* output, int pitch); -RTCD_EXTERN void (*vp8_short_fdct4x4)(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); +void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch); +RTCD_EXTERN void (*vp8_short_fdct4x4)(short *input, short *output, int pitch); -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); -void vp8_short_fdct8x4_sse2(short* input, short* output, int pitch); -RTCD_EXTERN void (*vp8_short_fdct8x4)(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); +void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch); +RTCD_EXTERN void (*vp8_short_fdct8x4)(short *input, short *output, int pitch); -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -void vp8_short_idct4x4llm_mmx(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -RTCD_EXTERN void (*vp8_short_idct4x4llm)(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +RTCD_EXTERN void (*vp8_short_idct4x4llm)(short *input, unsigned char *pred, + int pitch, unsigned char *dst, int dst_stride); -void vp8_short_inv_walsh4x4_c(short* input, short* output); -void vp8_short_inv_walsh4x4_sse2(short* input, short* output); -RTCD_EXTERN void (*vp8_short_inv_walsh4x4)(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); +void vp8_short_inv_walsh4x4_sse2(short *input, short *output); +RTCD_EXTERN void (*vp8_short_inv_walsh4x4)(short *input, short *output); -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); -void vp8_short_walsh4x4_sse2(short* input, short* output, int pitch); -RTCD_EXTERN void (*vp8_short_walsh4x4)(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); +void vp8_short_walsh4x4_sse2(short *input, short *output, int pitch); +RTCD_EXTERN void (*vp8_short_walsh4x4)(short *input, short *output, int pitch); -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); void vp8_rtcd(void); @@ -749,45 +436,32 @@ if (flags & HAS_SSSE3) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_ssse3; vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_c; - if (flags & HAS_MMX) - vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_mmx; + if (flags & HAS_MMX) vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_mmx; vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_c; - if (flags & HAS_MMX) - vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_mmx; + if (flags & HAS_MMX) vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_mmx; vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_c; - if (flags & HAS_SSE2) - vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_sse2; + if (flags & HAS_SSE2) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_sse2; if (flags & HAS_SSSE3) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_ssse3; vp8_block_error = vp8_block_error_c; - if (flags & HAS_SSE2) - vp8_block_error = vp8_block_error_sse2; + if (flags & HAS_SSE2) vp8_block_error = vp8_block_error_sse2; vp8_copy32xn = vp8_copy32xn_c; - if (flags & HAS_SSE2) - vp8_copy32xn = vp8_copy32xn_sse2; - if (flags & HAS_SSE3) - vp8_copy32xn = vp8_copy32xn_sse3; + if (flags & HAS_SSE2) vp8_copy32xn = vp8_copy32xn_sse2; + if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3; vp8_copy_mem16x16 = vp8_copy_mem16x16_c; - if (flags & HAS_SSE2) - vp8_copy_mem16x16 = vp8_copy_mem16x16_sse2; + if (flags & HAS_SSE2) vp8_copy_mem16x16 = vp8_copy_mem16x16_sse2; vp8_copy_mem8x4 = vp8_copy_mem8x4_c; - if (flags & HAS_MMX) - vp8_copy_mem8x4 = vp8_copy_mem8x4_mmx; + if (flags & HAS_MMX) vp8_copy_mem8x4 = vp8_copy_mem8x4_mmx; vp8_copy_mem8x8 = vp8_copy_mem8x8_c; - if (flags & HAS_MMX) - vp8_copy_mem8x8 = vp8_copy_mem8x8_mmx; + if (flags & HAS_MMX) vp8_copy_mem8x8 = vp8_copy_mem8x8_mmx; vp8_dc_only_idct_add = vp8_dc_only_idct_add_c; - if (flags & HAS_MMX) - vp8_dc_only_idct_add = vp8_dc_only_idct_add_mmx; + if (flags & HAS_MMX) vp8_dc_only_idct_add = vp8_dc_only_idct_add_mmx; vp8_denoiser_filter = vp8_denoiser_filter_c; - if (flags & HAS_SSE2) - vp8_denoiser_filter = vp8_denoiser_filter_sse2; + if (flags & HAS_SSE2) vp8_denoiser_filter = vp8_denoiser_filter_sse2; vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_c; - if (flags & HAS_SSE2) - vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_sse2; + if (flags & HAS_SSE2) vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_sse2; vp8_dequant_idct_add = vp8_dequant_idct_add_c; - if (flags & HAS_MMX) - vp8_dequant_idct_add = vp8_dequant_idct_add_mmx; + if (flags & HAS_MMX) vp8_dequant_idct_add = vp8_dequant_idct_add_mmx; vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_c; if (flags & HAS_SSE2) vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_sse2; @@ -795,45 +469,32 @@ if (flags & HAS_SSE2) vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_sse2; vp8_dequantize_b = vp8_dequantize_b_c; - if (flags & HAS_MMX) - vp8_dequantize_b = vp8_dequantize_b_mmx; + if (flags & HAS_MMX) vp8_dequantize_b = vp8_dequantize_b_mmx; vp8_diamond_search_sad = vp8_diamond_search_sad_c; - if (flags & HAS_SSE2) - vp8_diamond_search_sad = vp8_diamond_search_sadx4; + if (flags & HAS_SSE2) vp8_diamond_search_sad = vp8_diamond_search_sadx4; vp8_fast_quantize_b = vp8_fast_quantize_b_c; - if (flags & HAS_SSE2) - vp8_fast_quantize_b = vp8_fast_quantize_b_sse2; - if (flags & HAS_SSSE3) - vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3; + if (flags & HAS_SSE2) vp8_fast_quantize_b = vp8_fast_quantize_b_sse2; + if (flags & HAS_SSSE3) vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3; vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_c; if (flags & HAS_SSE2) vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_sse2; vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_c; - if (flags & HAS_SSE2) - vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_sse2; + if (flags & HAS_SSE2) vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_sse2; vp8_full_search_sad = vp8_full_search_sad_c; - if (flags & HAS_SSE3) - vp8_full_search_sad = vp8_full_search_sadx3; - if (flags & HAS_SSE4_1) - vp8_full_search_sad = vp8_full_search_sadx8; + if (flags & HAS_SSE3) vp8_full_search_sad = vp8_full_search_sadx3; + if (flags & HAS_SSE4_1) vp8_full_search_sad = vp8_full_search_sadx8; vp8_loop_filter_bh = vp8_loop_filter_bh_c; - if (flags & HAS_SSE2) - vp8_loop_filter_bh = vp8_loop_filter_bh_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_bh = vp8_loop_filter_bh_sse2; vp8_loop_filter_bv = vp8_loop_filter_bv_c; - if (flags & HAS_SSE2) - vp8_loop_filter_bv = vp8_loop_filter_bv_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_bv = vp8_loop_filter_bv_sse2; vp8_loop_filter_mbh = vp8_loop_filter_mbh_c; - if (flags & HAS_SSE2) - vp8_loop_filter_mbh = vp8_loop_filter_mbh_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_mbh = vp8_loop_filter_mbh_sse2; vp8_loop_filter_mbv = vp8_loop_filter_mbv_c; - if (flags & HAS_SSE2) - vp8_loop_filter_mbv = vp8_loop_filter_mbv_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_mbv = vp8_loop_filter_mbv_sse2; vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_c; - if (flags & HAS_SSE2) - vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_sse2; vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_c; - if (flags & HAS_SSE2) - vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_sse2; vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_c; if (flags & HAS_SSE2) vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_sse2; @@ -841,54 +502,38 @@ if (flags & HAS_SSE2) vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_sse2; vp8_mbblock_error = vp8_mbblock_error_c; - if (flags & HAS_SSE2) - vp8_mbblock_error = vp8_mbblock_error_sse2; + if (flags & HAS_SSE2) vp8_mbblock_error = vp8_mbblock_error_sse2; vp8_mbuverror = vp8_mbuverror_c; - if (flags & HAS_SSE2) - vp8_mbuverror = vp8_mbuverror_sse2; + if (flags & HAS_SSE2) vp8_mbuverror = vp8_mbuverror_sse2; vp8_refining_search_sad = vp8_refining_search_sad_c; - if (flags & HAS_SSE2) - vp8_refining_search_sad = vp8_refining_search_sadx4; + if (flags & HAS_SSE2) vp8_refining_search_sad = vp8_refining_search_sadx4; vp8_regular_quantize_b = vp8_regular_quantize_b_c; - if (flags & HAS_SSE2) - vp8_regular_quantize_b = vp8_regular_quantize_b_sse2; + if (flags & HAS_SSE2) vp8_regular_quantize_b = vp8_regular_quantize_b_sse2; if (flags & HAS_SSE4_1) vp8_regular_quantize_b = vp8_regular_quantize_b_sse4_1; vp8_short_fdct4x4 = vp8_short_fdct4x4_c; - if (flags & HAS_SSE2) - vp8_short_fdct4x4 = vp8_short_fdct4x4_sse2; + if (flags & HAS_SSE2) vp8_short_fdct4x4 = vp8_short_fdct4x4_sse2; vp8_short_fdct8x4 = vp8_short_fdct8x4_c; - if (flags & HAS_SSE2) - vp8_short_fdct8x4 = vp8_short_fdct8x4_sse2; + if (flags & HAS_SSE2) vp8_short_fdct8x4 = vp8_short_fdct8x4_sse2; vp8_short_idct4x4llm = vp8_short_idct4x4llm_c; - if (flags & HAS_MMX) - vp8_short_idct4x4llm = vp8_short_idct4x4llm_mmx; + if (flags & HAS_MMX) vp8_short_idct4x4llm = vp8_short_idct4x4llm_mmx; vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_c; - if (flags & HAS_SSE2) - vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_sse2; + if (flags & HAS_SSE2) vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_sse2; vp8_short_walsh4x4 = vp8_short_walsh4x4_c; - if (flags & HAS_SSE2) - vp8_short_walsh4x4 = vp8_short_walsh4x4_sse2; + if (flags & HAS_SSE2) vp8_short_walsh4x4 = vp8_short_walsh4x4_sse2; vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_c; - if (flags & HAS_SSE2) - vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2; + if (flags & HAS_SSE2) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2; if (flags & HAS_SSSE3) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3; vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_c; - if (flags & HAS_MMX) - vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_mmx; - if (flags & HAS_SSSE3) - vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3; + if (flags & HAS_MMX) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_mmx; + if (flags & HAS_SSSE3) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3; vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_c; - if (flags & HAS_SSE2) - vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_sse2; - if (flags & HAS_SSSE3) - vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3; + if (flags & HAS_SSE2) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_sse2; + if (flags & HAS_SSSE3) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3; vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_c; - if (flags & HAS_SSE2) - vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_sse2; - if (flags & HAS_SSSE3) - vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3; + if (flags & HAS_SSE2) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_sse2; + if (flags & HAS_SSSE3) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3; } #endif
diff --git a/third_party/libvpx/source/config/mac/ia32/vp9_rtcd.h b/third_party/libvpx/source/config/mac/ia32/vp9_rtcd.h index c8f69b95..1038d05 100644 --- a/third_party/libvpx/source/config/mac/ia32/vp9_rtcd.h +++ b/third_party/libvpx/source/config/mac/ia32/vp9_rtcd.h
@@ -31,466 +31,274 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -int64_t vp9_block_error_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -int64_t vp9_block_error_avx2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +int64_t vp9_block_error_sse2(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +int64_t vp9_block_error_avx2(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); -int64_t vp9_block_error_fp_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); -int64_t vp9_block_error_fp_avx2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); -RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_sse2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); +int64_t vp9_block_error_fp_avx2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); +RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); -int vp9_denoiser_filter_sse2(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); +int vp9_denoiser_filter_sse2(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); -RTCD_EXTERN int (*vp9_denoiser_filter)(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +RTCD_EXTERN int (*vp9_denoiser_filter)(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); -int vp9_diamond_search_sad_avx(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); +int vp9_diamond_search_sad_avx(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); RTCD_EXTERN int (*vp9_diamond_search_sad)( - const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); + const struct macroblock *x, const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, + int *num00, const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_fdct8x8_quant_ssse3(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_fdct8x8_quant)(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_fdct8x8_quant_ssse3(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vp9_fdct8x8_quant)( + const int16_t *input, int stride, tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht16x16_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); -RTCD_EXTERN void (*vp9_fht16x16)(const int16_t* input, - tran_low_t* output, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_fht16x16)(const int16_t *input, tran_low_t *output, + int stride, int tx_type); -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht4x4_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); -RTCD_EXTERN void (*vp9_fht4x4)(const int16_t* input, - tran_low_t* output, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_fht4x4)(const int16_t *input, tran_low_t *output, + int stride, int tx_type); -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht8x8_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); -RTCD_EXTERN void (*vp9_fht8x8)(const int16_t* input, - tran_low_t* output, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_fht8x8)(const int16_t *input, tran_low_t *output, + int stride, int tx_type); -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -void vp9_filter_by_weight16x16_sse2(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); +void vp9_filter_by_weight16x16_sse2(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); -RTCD_EXTERN void (*vp9_filter_by_weight16x16)(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +RTCD_EXTERN void (*vp9_filter_by_weight16x16)(const uint8_t *src, + int src_stride, uint8_t *dst, + int dst_stride, int src_weight); -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -void vp9_filter_by_weight8x8_sse2(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -RTCD_EXTERN void (*vp9_filter_by_weight8x8)(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); +void vp9_filter_by_weight8x8_sse2(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); +RTCD_EXTERN void (*vp9_filter_by_weight8x8)(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vp9_fwht4x4_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vp9_fwht4x4)(const int16_t* input, - tran_low_t* output, +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vp9_fwht4x4_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vp9_fwht4x4)(const int16_t *input, tran_low_t *output, int stride); -int64_t vp9_highbd_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); -int64_t vp9_highbd_block_error_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); -RTCD_EXTERN int64_t (*vp9_highbd_block_error)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, +int64_t vp9_highbd_block_error_c(const tran_low_t *coeff, + const tran_low_t *dqcoeff, intptr_t block_size, + int64_t *ssz, int bd); +int64_t vp9_highbd_block_error_sse2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz, int bd); +RTCD_EXTERN int64_t (*vp9_highbd_block_error)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz, int bd); -void vp9_highbd_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht16x16 vp9_highbd_fht16x16_c -void vp9_highbd_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht4x4 vp9_highbd_fht4x4_c -void vp9_highbd_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht8x8 vp9_highbd_fht8x8_c -void vp9_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_highbd_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_highbd_fwht4x4 vp9_highbd_fwht4x4_c -void vp9_highbd_iht16x16_256_add_c(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); -void vp9_highbd_iht16x16_256_add_sse4_1(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht16x16_256_add)(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); +void vp9_highbd_iht16x16_256_add_c(const tran_low_t *input, uint16_t *output, + int pitch, int tx_type, int bd); +void vp9_highbd_iht16x16_256_add_sse4_1(const tran_low_t *input, + uint16_t *output, int pitch, + int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht16x16_256_add)(const tran_low_t *input, + uint16_t *output, int pitch, + int tx_type, int bd); -void vp9_highbd_iht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -void vp9_highbd_iht4x4_16_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht4x4_16_add)(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +void vp9_highbd_iht4x4_16_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht4x4_16_add)(const tran_low_t *input, + uint16_t *dest, int stride, + int tx_type, int bd); -void vp9_highbd_iht8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht8x8_64_add)(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht8x8_64_add)(const tran_low_t *input, + uint16_t *dest, int stride, + int tx_type, int bd); -void vp9_highbd_mbpost_proc_across_ip_c(uint16_t* src, - int pitch, - int rows, - int cols, - int flimit); +void vp9_highbd_mbpost_proc_across_ip_c(uint16_t *src, int pitch, int rows, + int cols, int flimit); #define vp9_highbd_mbpost_proc_across_ip vp9_highbd_mbpost_proc_across_ip_c -void vp9_highbd_mbpost_proc_down_c(uint16_t* dst, - int pitch, - int rows, - int cols, +void vp9_highbd_mbpost_proc_down_c(uint16_t *dst, int pitch, int rows, int cols, int flimit); #define vp9_highbd_mbpost_proc_down vp9_highbd_mbpost_proc_down_c -void vp9_highbd_post_proc_down_and_across_c(const uint16_t* src_ptr, - uint16_t* dst_ptr, +void vp9_highbd_post_proc_down_and_across_c(const uint16_t *src_ptr, + uint16_t *dst_ptr, int src_pixels_per_line, - int dst_pixels_per_line, - int rows, - int cols, - int flimit); + int dst_pixels_per_line, int rows, + int cols, int flimit); #define vp9_highbd_post_proc_down_and_across \ vp9_highbd_post_proc_down_and_across_c -void vp9_highbd_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp vp9_highbd_quantize_fp_c -void vp9_highbd_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp_32x32 vp9_highbd_quantize_fp_32x32_c -void vp9_highbd_temporal_filter_apply_c(const uint8_t* frame1, - unsigned int stride, - const uint8_t* frame2, - unsigned int block_width, - unsigned int block_height, - int strength, - int filter_weight, - uint32_t* accumulator, - uint16_t* count); +void vp9_highbd_temporal_filter_apply_c( + const uint8_t *frame1, unsigned int stride, const uint8_t *frame2, + unsigned int block_width, unsigned int block_height, int strength, + int filter_weight, uint32_t *accumulator, uint16_t *count); #define vp9_highbd_temporal_filter_apply vp9_highbd_temporal_filter_apply_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); -void vp9_iht16x16_256_add_sse2(const tran_low_t* input, - uint8_t* output, - int pitch, - int tx_type); -RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_sse2(const tran_low_t *input, uint8_t *output, + int pitch, int tx_type); +RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t *input, + uint8_t *output, int pitch, int tx_type); -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t* input, - uint8_t* dest, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t *input, uint8_t *dest, + int stride, int tx_type); -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht8x8_64_add_sse2(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t* input, - uint8_t* dest, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t *input, uint8_t *dest, + int stride, int tx_type); -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_avx2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_quantize_fp)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_avx2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vp9_quantize_fp)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); -void vp9_scale_and_extend_frame_ssse3(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); +void vp9_scale_and_extend_frame_ssse3(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler); RTCD_EXTERN void (*vp9_scale_and_extend_frame)( - const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); + const struct yv12_buffer_config *src, struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); void vp9_rtcd(void); @@ -502,45 +310,32 @@ (void)flags; vp9_block_error = vp9_block_error_c; - if (flags & HAS_SSE2) - vp9_block_error = vp9_block_error_sse2; - if (flags & HAS_AVX2) - vp9_block_error = vp9_block_error_avx2; + if (flags & HAS_SSE2) vp9_block_error = vp9_block_error_sse2; + if (flags & HAS_AVX2) vp9_block_error = vp9_block_error_avx2; vp9_block_error_fp = vp9_block_error_fp_c; - if (flags & HAS_SSE2) - vp9_block_error_fp = vp9_block_error_fp_sse2; - if (flags & HAS_AVX2) - vp9_block_error_fp = vp9_block_error_fp_avx2; + if (flags & HAS_SSE2) vp9_block_error_fp = vp9_block_error_fp_sse2; + if (flags & HAS_AVX2) vp9_block_error_fp = vp9_block_error_fp_avx2; vp9_denoiser_filter = vp9_denoiser_filter_c; - if (flags & HAS_SSE2) - vp9_denoiser_filter = vp9_denoiser_filter_sse2; + if (flags & HAS_SSE2) vp9_denoiser_filter = vp9_denoiser_filter_sse2; vp9_diamond_search_sad = vp9_diamond_search_sad_c; - if (flags & HAS_AVX) - vp9_diamond_search_sad = vp9_diamond_search_sad_avx; + if (flags & HAS_AVX) vp9_diamond_search_sad = vp9_diamond_search_sad_avx; vp9_fdct8x8_quant = vp9_fdct8x8_quant_c; - if (flags & HAS_SSSE3) - vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; + if (flags & HAS_SSSE3) vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; vp9_fht16x16 = vp9_fht16x16_c; - if (flags & HAS_SSE2) - vp9_fht16x16 = vp9_fht16x16_sse2; + if (flags & HAS_SSE2) vp9_fht16x16 = vp9_fht16x16_sse2; vp9_fht4x4 = vp9_fht4x4_c; - if (flags & HAS_SSE2) - vp9_fht4x4 = vp9_fht4x4_sse2; + if (flags & HAS_SSE2) vp9_fht4x4 = vp9_fht4x4_sse2; vp9_fht8x8 = vp9_fht8x8_c; - if (flags & HAS_SSE2) - vp9_fht8x8 = vp9_fht8x8_sse2; + if (flags & HAS_SSE2) vp9_fht8x8 = vp9_fht8x8_sse2; vp9_filter_by_weight16x16 = vp9_filter_by_weight16x16_c; if (flags & HAS_SSE2) vp9_filter_by_weight16x16 = vp9_filter_by_weight16x16_sse2; vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_c; - if (flags & HAS_SSE2) - vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_sse2; + if (flags & HAS_SSE2) vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_sse2; vp9_fwht4x4 = vp9_fwht4x4_c; - if (flags & HAS_SSE2) - vp9_fwht4x4 = vp9_fwht4x4_sse2; + if (flags & HAS_SSE2) vp9_fwht4x4 = vp9_fwht4x4_sse2; vp9_highbd_block_error = vp9_highbd_block_error_c; - if (flags & HAS_SSE2) - vp9_highbd_block_error = vp9_highbd_block_error_sse2; + if (flags & HAS_SSE2) vp9_highbd_block_error = vp9_highbd_block_error_sse2; vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_c; if (flags & HAS_SSE4_1) vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_sse4_1; @@ -551,19 +346,14 @@ if (flags & HAS_SSE4_1) vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1; vp9_iht16x16_256_add = vp9_iht16x16_256_add_c; - if (flags & HAS_SSE2) - vp9_iht16x16_256_add = vp9_iht16x16_256_add_sse2; + if (flags & HAS_SSE2) vp9_iht16x16_256_add = vp9_iht16x16_256_add_sse2; vp9_iht4x4_16_add = vp9_iht4x4_16_add_c; - if (flags & HAS_SSE2) - vp9_iht4x4_16_add = vp9_iht4x4_16_add_sse2; + if (flags & HAS_SSE2) vp9_iht4x4_16_add = vp9_iht4x4_16_add_sse2; vp9_iht8x8_64_add = vp9_iht8x8_64_add_c; - if (flags & HAS_SSE2) - vp9_iht8x8_64_add = vp9_iht8x8_64_add_sse2; + if (flags & HAS_SSE2) vp9_iht8x8_64_add = vp9_iht8x8_64_add_sse2; vp9_quantize_fp = vp9_quantize_fp_c; - if (flags & HAS_SSE2) - vp9_quantize_fp = vp9_quantize_fp_sse2; - if (flags & HAS_AVX2) - vp9_quantize_fp = vp9_quantize_fp_avx2; + if (flags & HAS_SSE2) vp9_quantize_fp = vp9_quantize_fp_sse2; + if (flags & HAS_AVX2) vp9_quantize_fp = vp9_quantize_fp_avx2; vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c; if (flags & HAS_SSSE3) vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_ssse3;
diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/mac/ia32/vpx_dsp_rtcd.h index 4e665cc..f6db41e 100644 --- a/third_party/libvpx/source/config/mac/ia32/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/mac/ia32/vpx_dsp_rtcd.h
@@ -20,8786 +20,5442 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); -unsigned int vpx_avg_4x4_sse2(const uint8_t*, int p); -RTCD_EXTERN unsigned int (*vpx_avg_4x4)(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); +unsigned int vpx_avg_4x4_sse2(const uint8_t *, int p); +RTCD_EXTERN unsigned int (*vpx_avg_4x4)(const uint8_t *, int p); -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); -unsigned int vpx_avg_8x8_sse2(const uint8_t*, int p); -RTCD_EXTERN unsigned int (*vpx_avg_8x8)(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); +unsigned int vpx_avg_8x8_sse2(const uint8_t *, int p); +RTCD_EXTERN unsigned int (*vpx_avg_8x8)(const uint8_t *, int p); -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -void vpx_comp_avg_pred_sse2(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -RTCD_EXTERN void (*vpx_comp_avg_pred)(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +void vpx_comp_avg_pred_sse2(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +RTCD_EXTERN void (*vpx_comp_avg_pred)(uint8_t *comp_pred, const uint8_t *pred, + int width, int height, const uint8_t *ref, int ref_stride); -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avx2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_horiz_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_horiz_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_horiz_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +void vpx_convolve8_avg_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_vert_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_horiz_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_horiz_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_horiz_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_vert_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_vert_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_vert_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_avg_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve_avg)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +RTCD_EXTERN void (*vpx_convolve_avg)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_copy_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_copy_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve_copy)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve_copy)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_c -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_4x4_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_4x4_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_16x16)(uint8_t* dst, +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_32x32)(uint8_t* dst, +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct16x16)(const int16_t* input, - tran_low_t* output, +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct16x16)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_1_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct16x16_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_1_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct16x16_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct32x32)(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct32x32)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_1_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct32x32_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_1_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct32x32_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_rd_sse2(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_fdct32x32_rd)(const int16_t* input, - tran_low_t* output, +RTCD_EXTERN void (*vpx_fdct32x32_rd)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct4x4)(const int16_t* input, - tran_low_t* output, +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct4x4)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_1_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct4x4_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_1_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct4x4_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct8x8)(const int16_t* input, - tran_low_t* output, +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct8x8)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_1_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct8x8_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_1_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct8x8_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_c -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get8x8var_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -RTCD_EXTERN void (*vpx_get8x8var)(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); +void vpx_get8x8var_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +RTCD_EXTERN void (*vpx_get8x8var)(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); -unsigned int vpx_get_mb_ss_c(const int16_t*); -unsigned int vpx_get_mb_ss_sse2(const int16_t*); -RTCD_EXTERN unsigned int (*vpx_get_mb_ss)(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); +unsigned int vpx_get_mb_ss_sse2(const int16_t *); +RTCD_EXTERN unsigned int (*vpx_get_mb_ss)(const int16_t *); -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_16x16_sse2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_16x16_avx2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_16x16_sse2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_16x16_avx2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t *src_diff, + ptrdiff_t src_stride, tran_low_t *coeff); -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_8x8_sse2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_8x8_sse2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t *src_diff, + ptrdiff_t src_stride, tran_low_t *coeff); -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_highbd_10_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get16x16var vpx_highbd_10_get16x16var_c -void vpx_highbd_10_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get8x8var vpx_highbd_10_get8x8var_c -unsigned int vpx_highbd_10_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_mse16x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse16x8 vpx_highbd_10_mse16x8_c -unsigned int vpx_highbd_10_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse8x16 vpx_highbd_10_mse8x16_c -unsigned int vpx_highbd_10_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_mse8x8_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_mse8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_mse8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x4 \ vpx_highbd_10_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x8 \ vpx_highbd_10_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x4 \ vpx_highbd_10_sub_pixel_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x8 \ vpx_highbd_10_sub_pixel_variance4x8_c -uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x4_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -unsigned int vpx_highbd_10_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x16)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x16)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x64)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x4 vpx_highbd_10_variance4x4_c -unsigned int vpx_highbd_10_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x8 vpx_highbd_10_variance4x8_c -unsigned int vpx_highbd_10_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance64x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance64x64)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance8x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance8x4 vpx_highbd_10_variance8x4_c -unsigned int vpx_highbd_10_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -void vpx_highbd_12_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get16x16var vpx_highbd_12_get16x16var_c -void vpx_highbd_12_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get8x8var vpx_highbd_12_get8x8var_c -unsigned int vpx_highbd_12_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_mse16x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse16x8 vpx_highbd_12_mse16x8_c -unsigned int vpx_highbd_12_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse8x16 vpx_highbd_12_mse8x16_c -unsigned int vpx_highbd_12_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_mse8x8_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_mse8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_mse8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x4 \ vpx_highbd_12_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x8 \ vpx_highbd_12_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x4 \ vpx_highbd_12_sub_pixel_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x8 \ vpx_highbd_12_sub_pixel_variance4x8_c -uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x4_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -unsigned int vpx_highbd_12_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x16)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x16)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x64)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x4 vpx_highbd_12_variance4x4_c -unsigned int vpx_highbd_12_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x8 vpx_highbd_12_variance4x8_c -unsigned int vpx_highbd_12_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance64x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance64x64)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance8x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance8x4 vpx_highbd_12_variance8x4_c -unsigned int vpx_highbd_12_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -void vpx_highbd_8_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get16x16var vpx_highbd_8_get16x16var_c -void vpx_highbd_8_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get8x8var vpx_highbd_8_get8x8var_c -unsigned int vpx_highbd_8_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_mse16x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse16x8 vpx_highbd_8_mse16x8_c -unsigned int vpx_highbd_8_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse8x16 vpx_highbd_8_mse8x16_c -unsigned int vpx_highbd_8_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_mse8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_mse8x8)(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_mse8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x4 \ vpx_highbd_8_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x8 \ vpx_highbd_8_sub_pixel_avg_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x4 vpx_highbd_8_sub_pixel_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x8 vpx_highbd_8_sub_pixel_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -unsigned int vpx_highbd_8_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x32)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x32)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x64)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x4 vpx_highbd_8_variance4x4_c -unsigned int vpx_highbd_8_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x8 vpx_highbd_8_variance4x8_c -unsigned int vpx_highbd_8_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance64x32)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance64x64)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance8x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance8x4 vpx_highbd_8_variance8x4_c -unsigned int vpx_highbd_8_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_4x4_c(const uint8_t *, int p); #define vpx_highbd_avg_4x4 vpx_highbd_avg_4x4_c -unsigned int vpx_highbd_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_8x8_c(const uint8_t *, int p); #define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c -void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred, - const uint16_t* pred, - int width, - int height, - const uint16_t* ref, +void vpx_highbd_comp_avg_pred_c(uint16_t *comp_pred, const uint16_t *pred, + int width, int height, const uint16_t *ref, int ref_stride); #define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c -void vpx_highbd_convolve8_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8)(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_avg_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_horiz_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_avg_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_horiz_avx2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg_horiz)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg_horiz)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_vert_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_avg_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_vert_avx2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg_vert)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg_vert)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_horiz_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_horiz)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_horiz_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_horiz)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_vert_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_vert)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_vert_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_vert)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_avg_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_avg_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve_avg)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve_avg_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve_avg_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve_avg)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve_copy_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_copy_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_copy_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve_copy)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_copy_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve_copy_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve_copy_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve_copy)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_d117_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d117_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d117_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d117_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d117_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d135_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d135_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d135_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d135_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d153_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d153_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d153_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d153_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d207_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d207_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d207_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d207_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d45_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d45_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d45_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d45_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d45_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d45_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_4x4_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d45_predictor_4x4_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d45_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d63_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d63_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d63_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d63_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d63_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d63_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d63_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d63_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_16x16)(uint16_t* dst, +void vpx_highbd_dc_128_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_32x32)(uint16_t* dst, +void vpx_highbd_dc_128_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_4x4)(uint16_t* dst, +void vpx_highbd_dc_128_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_8x8)(uint16_t* dst, +void vpx_highbd_dc_128_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_left_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_16x16)(uint16_t* dst, +void vpx_highbd_dc_left_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_left_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_32x32)(uint16_t* dst, +void vpx_highbd_dc_left_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_left_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_4x4)(uint16_t* dst, +void vpx_highbd_dc_left_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_left_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_8x8)(uint16_t* dst, +void vpx_highbd_dc_left_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_predictor_16x16)(uint16_t* dst, +void vpx_highbd_dc_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_predictor_32x32)(uint16_t* dst, +void vpx_highbd_dc_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_predictor_4x4)(uint16_t* dst, +void vpx_highbd_dc_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_predictor_8x8)(uint16_t* dst, +void vpx_highbd_dc_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_top_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_16x16)(uint16_t* dst, +void vpx_highbd_dc_top_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_top_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_32x32)(uint16_t* dst, +void vpx_highbd_dc_top_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_top_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_4x4)(uint16_t* dst, +void vpx_highbd_dc_top_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_top_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_8x8)(uint16_t* dst, +void vpx_highbd_dc_top_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_fdct16x16_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct16x16_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct16x16)(const int16_t* input, - tran_low_t* output, - int stride); +RTCD_EXTERN void (*vpx_highbd_fdct16x16)(const int16_t *input, + tran_low_t *output, int stride); -void vpx_highbd_fdct16x16_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct16x16_1 vpx_highbd_fdct16x16_1_c -void vpx_highbd_fdct32x32_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct32x32)(const int16_t* input, - tran_low_t* output, - int stride); +RTCD_EXTERN void (*vpx_highbd_fdct32x32)(const int16_t *input, + tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32_1 vpx_highbd_fdct32x32_1_c -void vpx_highbd_fdct32x32_rd_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_rd_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct32x32_rd)(const int16_t* input, - tran_low_t* output, - int stride); +RTCD_EXTERN void (*vpx_highbd_fdct32x32_rd)(const int16_t *input, + tran_low_t *output, int stride); -void vpx_highbd_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_highbd_fdct4x4_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_highbd_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct4x4)(const int16_t* input, - tran_low_t* output, +RTCD_EXTERN void (*vpx_highbd_fdct4x4)(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_highbd_fdct8x8_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_highbd_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct8x8)(const int16_t* input, - tran_low_t* output, +RTCD_EXTERN void (*vpx_highbd_fdct8x8)(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct8x8_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct8x8_1 vpx_highbd_fdct8x8_1_c -void vpx_highbd_h_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_h_predictor_16x16)(uint16_t* dst, +void vpx_highbd_h_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_h_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_h_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_h_predictor_32x32)(uint16_t* dst, +void vpx_highbd_h_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_h_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_h_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_h_predictor_4x4)(uint16_t* dst, +void vpx_highbd_h_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_h_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_h_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_h_predictor_8x8)(uint16_t* dst, +void vpx_highbd_h_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_h_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_idct16x16_10_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_10_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_10_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_10_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_10_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_10_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_10_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_10_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_1_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_1_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_256_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_256_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_256_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_256_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_256_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_256_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_256_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_256_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_38_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_38_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_38_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_38_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_38_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_38_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_38_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_38_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_1024_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1024_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1024_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_1024_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_1024_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1024_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1024_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_1024_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_135_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_135_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_135_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_135_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_135_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_135_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_135_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_135_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_1_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_1_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_34_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_34_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_34_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_34_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_34_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_34_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_34_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_34_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_16_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_16_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct4x4_16_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_16_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_16_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct4x4_16_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct4x4_1_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct4x4_1_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct8x8_12_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_12_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_12_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_12_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_12_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_12_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_12_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_12_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct8x8_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_1_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_1_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_64_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_64_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_64_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_64_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_64_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_iwht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_16_add vpx_highbd_iwht4x4_16_add_c -void vpx_highbd_iwht4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_1_add vpx_highbd_iwht4x4_1_add_c -void vpx_highbd_lpf_horizontal_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_16_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_16)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_16_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_16_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_16)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_16_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_16_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_16_dual_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_16_dual)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_horizontal_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_4_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_4)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_4_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_4_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_4)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_horizontal_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_horizontal_4_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_4_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_horizontal_4_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_4_dual)( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); -void vpx_highbd_lpf_horizontal_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_8_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_8)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_8_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_8_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_8)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_horizontal_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_horizontal_8_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_8_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_horizontal_8_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_8_dual)( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); -void vpx_highbd_lpf_vertical_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_16_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_16_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_16)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_16_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_16)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_vertical_16_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_16_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_vertical_16_dual_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_16_dual)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_4_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_4_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_4)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_4_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_4)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_vertical_4_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_4_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_vertical_4_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_4_dual)( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); -void vpx_highbd_lpf_vertical_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_8_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_8_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_8)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_8_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_8)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_vertical_8_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_8_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_vertical_8_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_8_dual)( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); -void vpx_highbd_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_highbd_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_highbd_minmax_8x8 vpx_highbd_minmax_8x8_c -void vpx_highbd_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_highbd_quantize_b_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_highbd_quantize_b)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_highbd_quantize_b_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vpx_highbd_quantize_b)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vpx_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_highbd_quantize_b_32x32_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_highbd_quantize_b_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_highbd_quantize_b_32x32_sse2( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vpx_highbd_quantize_b_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -unsigned int vpx_highbd_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x16)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x16)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x16_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x16_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x16_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad16x16x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad16x16x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x32)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x32)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x32_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad16x32x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad16x32x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x8)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x8)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad16x8x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad16x8x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x16)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x16)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x16_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x16_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x16_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad32x16x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad32x16x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x32)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x32)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x32_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad32x32x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad32x32x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x64)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x64)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x64_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x64_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x64_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad32x64x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad32x64x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x4 vpx_highbd_sad4x4_c -unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x4_avg vpx_highbd_sad4x4_avg_c -void vpx_highbd_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad4x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad4x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad4x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad4x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x8 vpx_highbd_sad4x8_c -unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x8_avg vpx_highbd_sad4x8_avg_c -void vpx_highbd_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad4x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad4x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad4x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad4x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad64x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad64x32)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad64x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad64x32)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad64x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad64x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad64x32_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad64x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad64x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad64x32x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad64x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad64x32x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad64x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad64x64)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad64x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad64x64)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad64x64_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad64x64_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad64x64_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad64x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad64x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad64x64x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad64x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad64x64x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x16)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x16)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad8x16x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad8x16x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x4)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x4)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x4_avg)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x4_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad8x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad8x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x8)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x8)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad8x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad8x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_highbd_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, - ptrdiff_t pred_stride, - int bd); +void vpx_highbd_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, + ptrdiff_t pred_stride, int bd); #define vpx_highbd_subtract_block vpx_highbd_subtract_block_c -void vpx_highbd_tm_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_tm_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_tm_predictor_16x16)(uint16_t* dst, +void vpx_highbd_tm_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_tm_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_tm_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_tm_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_tm_predictor_32x32)(uint16_t* dst, +void vpx_highbd_tm_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_tm_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_tm_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_tm_predictor_4x4)(uint16_t* dst, +void vpx_highbd_tm_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_tm_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_tm_predictor_8x8)(uint16_t* dst, +void vpx_highbd_tm_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_tm_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_v_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_v_predictor_16x16)(uint16_t* dst, +void vpx_highbd_v_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_v_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_v_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_v_predictor_32x32)(uint16_t* dst, +void vpx_highbd_v_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_v_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_v_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_v_predictor_4x4)(uint16_t* dst, +void vpx_highbd_v_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_v_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_v_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_v_predictor_8x8)(uint16_t* dst, +void vpx_highbd_v_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_v_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_10_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_10_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_10_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct16x16_10_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_1_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_1_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct16x16_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_256_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct16x16_256_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_38_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_38_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_38_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct16x16_38_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_1024_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct32x32_1024_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_1_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_1_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct32x32_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_34_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_34_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_34_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct4x4_16_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct4x4_16_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_1_add_sse2(const tran_low_t* input, uint8_t* dest, int stride); -RTCD_EXTERN void (*vpx_idct4x4_1_add)(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); +RTCD_EXTERN void (*vpx_idct4x4_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_12_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_12_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_12_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_1_add_sse2(const tran_low_t* input, uint8_t* dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_1_add)(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); +RTCD_EXTERN void (*vpx_idct8x8_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_64_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_64_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct8x8_64_add)(const tran_low_t *input, uint8_t *dest, int stride); -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); -int16_t vpx_int_pro_col_sse2(const uint8_t* ref, const int width); -RTCD_EXTERN int16_t (*vpx_int_pro_col)(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); +int16_t vpx_int_pro_col_sse2(const uint8_t *ref, const int width); +RTCD_EXTERN int16_t (*vpx_int_pro_col)(const uint8_t *ref, const int width); -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); -void vpx_int_pro_row_sse2(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); -RTCD_EXTERN void (*vpx_int_pro_row)(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); +void vpx_int_pro_row_sse2(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); +RTCD_EXTERN void (*vpx_int_pro_row)(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_iwht4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_iwht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_iwht4x4_16_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_iwht4x4_16_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_avx2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_avx2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_avx2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_sse2(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_avx2(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_4_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_4)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_4)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_4_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_horizontal_4_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_4_dual_sse2( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_horizontal_4_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_8_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_8)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_8)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_8_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_horizontal_8_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_8_dual_sse2( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_horizontal_8_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_16)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_16)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_16_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_16_dual)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_4_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_4)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_4)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_4_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_vertical_4_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_vertical_4_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_8_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_8)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_8)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_8_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_vertical_8_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_vertical_8_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -void vpx_mbpost_proc_across_ip_sse2(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -RTCD_EXTERN void (*vpx_mbpost_proc_across_ip)(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +void vpx_mbpost_proc_across_ip_sse2(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +RTCD_EXTERN void (*vpx_mbpost_proc_across_ip)(unsigned char *dst, int pitch, + int rows, int cols, int flimit); -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); -void vpx_mbpost_proc_down_sse2(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -RTCD_EXTERN void (*vpx_mbpost_proc_down)(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_down_sse2(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +RTCD_EXTERN void (*vpx_mbpost_proc_down)(unsigned char *dst, int pitch, + int rows, int cols, int flimit); -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -void vpx_minmax_8x8_sse2(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -RTCD_EXTERN void (*vpx_minmax_8x8)(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +void vpx_minmax_8x8_sse2(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +RTCD_EXTERN void (*vpx_minmax_8x8)(const uint8_t *s, int p, const uint8_t *d, + int dp, int *min, int *max); -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t* src_ptr, +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse16x8)(const uint8_t* src_ptr, +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x8_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse8x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse8x16)(const uint8_t* src_ptr, +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse8x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse8x8)(const uint8_t* src_ptr, +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); -void vpx_plane_add_noise_sse2(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); -RTCD_EXTERN void (*vpx_plane_add_noise)(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); +void vpx_plane_add_noise_sse2(uint8_t *start, const int8_t *noise, + int blackclamp, int whiteclamp, int width, + int height, int pitch); +RTCD_EXTERN void (*vpx_plane_add_noise)(uint8_t *start, const int8_t *noise, + int blackclamp, int whiteclamp, + int width, int height, int pitch); -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); -void vpx_post_proc_down_and_across_mb_row_sse2(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); +void vpx_post_proc_down_and_across_mb_row_sse2(unsigned char *src, + unsigned char *dst, + int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); -RTCD_EXTERN void (*vpx_post_proc_down_and_across_mb_row)(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); +RTCD_EXTERN void (*vpx_post_proc_down_and_across_mb_row)( + unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_avx(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_avx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_avx(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_avx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad16x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad16x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad16x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad16x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x3_ssse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x3_ssse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad16x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad16x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad16x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad16x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad16x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad16x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x3_ssse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x3_ssse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x16x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x16x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x64x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x64x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad4x4)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad4x4)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad4x4_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad4x4_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad4x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad4x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad4x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad4x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad64x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad64x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad8x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad8x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad8x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad8x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad8x4)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad8x4)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad8x4_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad8x4_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad8x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad8x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -int vpx_satd_c(const tran_low_t* coeff, int length); -int vpx_satd_sse2(const tran_low_t* coeff, int length); -int vpx_satd_avx2(const tran_low_t* coeff, int length); -RTCD_EXTERN int (*vpx_satd)(const tran_low_t* coeff, int length); +int vpx_satd_c(const tran_low_t *coeff, int length); +int vpx_satd_sse2(const tran_low_t *coeff, int length); +int vpx_satd_avx2(const tran_low_t *coeff, int length); +RTCD_EXTERN int (*vpx_satd)(const tran_low_t *coeff, int length); -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_scaled_2d_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_2d_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -void vpx_subtract_block_sse2(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_sse2(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -RTCD_EXTERN void (*vpx_subtract_block)(int rows, - int cols, - int16_t* diff_ptr, +RTCD_EXTERN void (*vpx_subtract_block)(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, - const uint8_t* src_ptr, + const uint8_t *src_ptr, ptrdiff_t src_stride, - const uint8_t* pred_ptr, + const uint8_t *pred_ptr, ptrdiff_t pred_stride); -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); -uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t* src, int stride, int size); -RTCD_EXTERN uint64_t (*vpx_sum_squares_2d_i16)(const int16_t* src, - int stride, +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t *src, int stride, int size); +RTCD_EXTERN uint64_t (*vpx_sum_squares_2d_i16)(const int16_t *src, int stride, int size); -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t* src_ptr, +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x32)(const uint8_t* src_ptr, +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x8)(const uint8_t* src_ptr, +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t* src_ptr, +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t* src_ptr, +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x64)(const uint8_t* src_ptr, +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance4x4)(const uint8_t* src_ptr, +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x4_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance4x4)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance4x8)(const uint8_t* src_ptr, +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance4x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t* src_ptr, +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t* src_ptr, +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance8x16)(const uint8_t* src_ptr, +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance8x4)(const uint8_t* src_ptr, +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance8x4)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance8x8)(const uint8_t* src_ptr, +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); -int vpx_vector_var_sse2(const int16_t* ref, const int16_t* src, const int bwl); -RTCD_EXTERN int (*vpx_vector_var)(const int16_t* ref, - const int16_t* src, +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); +int vpx_vector_var_sse2(const int16_t *ref, const int16_t *src, const int bwl); +RTCD_EXTERN int (*vpx_vector_var)(const int16_t *ref, const int16_t *src, const int bwl); void vpx_dsp_rtcd(void); @@ -8812,62 +5468,40 @@ (void)flags; vpx_avg_4x4 = vpx_avg_4x4_c; - if (flags & HAS_SSE2) - vpx_avg_4x4 = vpx_avg_4x4_sse2; + if (flags & HAS_SSE2) vpx_avg_4x4 = vpx_avg_4x4_sse2; vpx_avg_8x8 = vpx_avg_8x8_c; - if (flags & HAS_SSE2) - vpx_avg_8x8 = vpx_avg_8x8_sse2; + if (flags & HAS_SSE2) vpx_avg_8x8 = vpx_avg_8x8_sse2; vpx_comp_avg_pred = vpx_comp_avg_pred_c; - if (flags & HAS_SSE2) - vpx_comp_avg_pred = vpx_comp_avg_pred_sse2; + if (flags & HAS_SSE2) vpx_comp_avg_pred = vpx_comp_avg_pred_sse2; vpx_convolve8 = vpx_convolve8_c; - if (flags & HAS_SSE2) - vpx_convolve8 = vpx_convolve8_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8 = vpx_convolve8_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8 = vpx_convolve8_avx2; + if (flags & HAS_SSE2) vpx_convolve8 = vpx_convolve8_sse2; + if (flags & HAS_SSSE3) vpx_convolve8 = vpx_convolve8_ssse3; + if (flags & HAS_AVX2) vpx_convolve8 = vpx_convolve8_avx2; vpx_convolve8_avg = vpx_convolve8_avg_c; - if (flags & HAS_SSE2) - vpx_convolve8_avg = vpx_convolve8_avg_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_avg = vpx_convolve8_avg_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg = vpx_convolve8_avg_avx2; + if (flags & HAS_SSE2) vpx_convolve8_avg = vpx_convolve8_avg_sse2; + if (flags & HAS_SSSE3) vpx_convolve8_avg = vpx_convolve8_avg_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_avg = vpx_convolve8_avg_avx2; vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_c; - if (flags & HAS_SSE2) - vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_sse2; + if (flags & HAS_SSE2) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_sse2; if (flags & HAS_SSSE3) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_avx2; + if (flags & HAS_AVX2) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_avx2; vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_c; - if (flags & HAS_SSE2) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_avx2; + if (flags & HAS_SSE2) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_sse2; + if (flags & HAS_SSSE3) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_avx2; vpx_convolve8_horiz = vpx_convolve8_horiz_c; - if (flags & HAS_SSE2) - vpx_convolve8_horiz = vpx_convolve8_horiz_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_horiz = vpx_convolve8_horiz_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_horiz = vpx_convolve8_horiz_avx2; + if (flags & HAS_SSE2) vpx_convolve8_horiz = vpx_convolve8_horiz_sse2; + if (flags & HAS_SSSE3) vpx_convolve8_horiz = vpx_convolve8_horiz_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_horiz = vpx_convolve8_horiz_avx2; vpx_convolve8_vert = vpx_convolve8_vert_c; - if (flags & HAS_SSE2) - vpx_convolve8_vert = vpx_convolve8_vert_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_vert = vpx_convolve8_vert_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_vert = vpx_convolve8_vert_avx2; + if (flags & HAS_SSE2) vpx_convolve8_vert = vpx_convolve8_vert_sse2; + if (flags & HAS_SSSE3) vpx_convolve8_vert = vpx_convolve8_vert_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_vert = vpx_convolve8_vert_avx2; vpx_convolve_avg = vpx_convolve_avg_c; - if (flags & HAS_SSE2) - vpx_convolve_avg = vpx_convolve_avg_sse2; + if (flags & HAS_SSE2) vpx_convolve_avg = vpx_convolve_avg_sse2; vpx_convolve_copy = vpx_convolve_copy_c; - if (flags & HAS_SSE2) - vpx_convolve_copy = vpx_convolve_copy_sse2; + if (flags & HAS_SSE2) vpx_convolve_copy = vpx_convolve_copy_sse2; vpx_d153_predictor_16x16 = vpx_d153_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d153_predictor_16x16 = vpx_d153_predictor_16x16_ssse3; @@ -8875,11 +5509,9 @@ if (flags & HAS_SSSE3) vpx_d153_predictor_32x32 = vpx_d153_predictor_32x32_ssse3; vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_c; - if (flags & HAS_SSSE3) - vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_ssse3; + if (flags & HAS_SSSE3) vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_ssse3; vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_ssse3; vpx_d207_predictor_16x16 = vpx_d207_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d207_predictor_16x16 = vpx_d207_predictor_16x16_ssse3; @@ -8887,11 +5519,9 @@ if (flags & HAS_SSSE3) vpx_d207_predictor_32x32 = vpx_d207_predictor_32x32_ssse3; vpx_d207_predictor_4x4 = vpx_d207_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_d207_predictor_4x4 = vpx_d207_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_d207_predictor_4x4 = vpx_d207_predictor_4x4_sse2; vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_ssse3; vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_ssse3; @@ -8899,11 +5529,9 @@ if (flags & HAS_SSSE3) vpx_d45_predictor_32x32 = vpx_d45_predictor_32x32_ssse3; vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_sse2; vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_sse2; vpx_d63_predictor_16x16 = vpx_d63_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d63_predictor_16x16 = vpx_d63_predictor_16x16_ssse3; @@ -8911,11 +5539,9 @@ if (flags & HAS_SSSE3) vpx_d63_predictor_32x32 = vpx_d63_predictor_32x32_ssse3; vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_c; - if (flags & HAS_SSSE3) - vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_ssse3; + if (flags & HAS_SSSE3) vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_ssse3; vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_ssse3; vpx_dc_128_predictor_16x16 = vpx_dc_128_predictor_16x16_c; if (flags & HAS_SSE2) vpx_dc_128_predictor_16x16 = vpx_dc_128_predictor_16x16_sse2; @@ -8941,17 +5567,13 @@ if (flags & HAS_SSE2) vpx_dc_left_predictor_8x8 = vpx_dc_left_predictor_8x8_sse2; vpx_dc_predictor_16x16 = vpx_dc_predictor_16x16_c; - if (flags & HAS_SSE2) - vpx_dc_predictor_16x16 = vpx_dc_predictor_16x16_sse2; + if (flags & HAS_SSE2) vpx_dc_predictor_16x16 = vpx_dc_predictor_16x16_sse2; vpx_dc_predictor_32x32 = vpx_dc_predictor_32x32_c; - if (flags & HAS_SSE2) - vpx_dc_predictor_32x32 = vpx_dc_predictor_32x32_sse2; + if (flags & HAS_SSE2) vpx_dc_predictor_32x32 = vpx_dc_predictor_32x32_sse2; vpx_dc_predictor_4x4 = vpx_dc_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_dc_predictor_4x4 = vpx_dc_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_dc_predictor_4x4 = vpx_dc_predictor_4x4_sse2; vpx_dc_predictor_8x8 = vpx_dc_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_dc_predictor_8x8 = vpx_dc_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_dc_predictor_8x8 = vpx_dc_predictor_8x8_sse2; vpx_dc_top_predictor_16x16 = vpx_dc_top_predictor_16x16_c; if (flags & HAS_SSE2) vpx_dc_top_predictor_16x16 = vpx_dc_top_predictor_16x16_sse2; @@ -8965,69 +5587,47 @@ if (flags & HAS_SSE2) vpx_dc_top_predictor_8x8 = vpx_dc_top_predictor_8x8_sse2; vpx_fdct16x16 = vpx_fdct16x16_c; - if (flags & HAS_SSE2) - vpx_fdct16x16 = vpx_fdct16x16_sse2; + if (flags & HAS_SSE2) vpx_fdct16x16 = vpx_fdct16x16_sse2; vpx_fdct16x16_1 = vpx_fdct16x16_1_c; - if (flags & HAS_SSE2) - vpx_fdct16x16_1 = vpx_fdct16x16_1_sse2; + if (flags & HAS_SSE2) vpx_fdct16x16_1 = vpx_fdct16x16_1_sse2; vpx_fdct32x32 = vpx_fdct32x32_c; - if (flags & HAS_SSE2) - vpx_fdct32x32 = vpx_fdct32x32_sse2; + if (flags & HAS_SSE2) vpx_fdct32x32 = vpx_fdct32x32_sse2; vpx_fdct32x32_1 = vpx_fdct32x32_1_c; - if (flags & HAS_SSE2) - vpx_fdct32x32_1 = vpx_fdct32x32_1_sse2; + if (flags & HAS_SSE2) vpx_fdct32x32_1 = vpx_fdct32x32_1_sse2; vpx_fdct32x32_rd = vpx_fdct32x32_rd_c; - if (flags & HAS_SSE2) - vpx_fdct32x32_rd = vpx_fdct32x32_rd_sse2; + if (flags & HAS_SSE2) vpx_fdct32x32_rd = vpx_fdct32x32_rd_sse2; vpx_fdct4x4 = vpx_fdct4x4_c; - if (flags & HAS_SSE2) - vpx_fdct4x4 = vpx_fdct4x4_sse2; + if (flags & HAS_SSE2) vpx_fdct4x4 = vpx_fdct4x4_sse2; vpx_fdct4x4_1 = vpx_fdct4x4_1_c; - if (flags & HAS_SSE2) - vpx_fdct4x4_1 = vpx_fdct4x4_1_sse2; + if (flags & HAS_SSE2) vpx_fdct4x4_1 = vpx_fdct4x4_1_sse2; vpx_fdct8x8 = vpx_fdct8x8_c; - if (flags & HAS_SSE2) - vpx_fdct8x8 = vpx_fdct8x8_sse2; + if (flags & HAS_SSE2) vpx_fdct8x8 = vpx_fdct8x8_sse2; vpx_fdct8x8_1 = vpx_fdct8x8_1_c; - if (flags & HAS_SSE2) - vpx_fdct8x8_1 = vpx_fdct8x8_1_sse2; + if (flags & HAS_SSE2) vpx_fdct8x8_1 = vpx_fdct8x8_1_sse2; vpx_get16x16var = vpx_get16x16var_c; - if (flags & HAS_SSE2) - vpx_get16x16var = vpx_get16x16var_sse2; - if (flags & HAS_AVX2) - vpx_get16x16var = vpx_get16x16var_avx2; + if (flags & HAS_SSE2) vpx_get16x16var = vpx_get16x16var_sse2; + if (flags & HAS_AVX2) vpx_get16x16var = vpx_get16x16var_avx2; vpx_get8x8var = vpx_get8x8var_c; - if (flags & HAS_SSE2) - vpx_get8x8var = vpx_get8x8var_sse2; + if (flags & HAS_SSE2) vpx_get8x8var = vpx_get8x8var_sse2; vpx_get_mb_ss = vpx_get_mb_ss_c; - if (flags & HAS_SSE2) - vpx_get_mb_ss = vpx_get_mb_ss_sse2; + if (flags & HAS_SSE2) vpx_get_mb_ss = vpx_get_mb_ss_sse2; vpx_h_predictor_16x16 = vpx_h_predictor_16x16_c; - if (flags & HAS_SSE2) - vpx_h_predictor_16x16 = vpx_h_predictor_16x16_sse2; + if (flags & HAS_SSE2) vpx_h_predictor_16x16 = vpx_h_predictor_16x16_sse2; vpx_h_predictor_32x32 = vpx_h_predictor_32x32_c; - if (flags & HAS_SSE2) - vpx_h_predictor_32x32 = vpx_h_predictor_32x32_sse2; + if (flags & HAS_SSE2) vpx_h_predictor_32x32 = vpx_h_predictor_32x32_sse2; vpx_h_predictor_4x4 = vpx_h_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_h_predictor_4x4 = vpx_h_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_h_predictor_4x4 = vpx_h_predictor_4x4_sse2; vpx_h_predictor_8x8 = vpx_h_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_h_predictor_8x8 = vpx_h_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_h_predictor_8x8 = vpx_h_predictor_8x8_sse2; vpx_hadamard_16x16 = vpx_hadamard_16x16_c; - if (flags & HAS_SSE2) - vpx_hadamard_16x16 = vpx_hadamard_16x16_sse2; - if (flags & HAS_AVX2) - vpx_hadamard_16x16 = vpx_hadamard_16x16_avx2; + if (flags & HAS_SSE2) vpx_hadamard_16x16 = vpx_hadamard_16x16_sse2; + if (flags & HAS_AVX2) vpx_hadamard_16x16 = vpx_hadamard_16x16_avx2; vpx_hadamard_8x8 = vpx_hadamard_8x8_c; - if (flags & HAS_SSE2) - vpx_hadamard_8x8 = vpx_hadamard_8x8_sse2; + if (flags & HAS_SSE2) vpx_hadamard_8x8 = vpx_hadamard_8x8_sse2; vpx_highbd_10_mse16x16 = vpx_highbd_10_mse16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_10_mse16x16 = vpx_highbd_10_mse16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_10_mse16x16 = vpx_highbd_10_mse16x16_sse2; vpx_highbd_10_mse8x8 = vpx_highbd_10_mse8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_10_mse8x8 = vpx_highbd_10_mse8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_10_mse8x8 = vpx_highbd_10_mse8x8_sse2; vpx_highbd_10_sub_pixel_avg_variance16x16 = vpx_highbd_10_sub_pixel_avg_variance16x16_c; if (flags & HAS_SSE2) @@ -9165,11 +5765,9 @@ if (flags & HAS_SSE2) vpx_highbd_10_variance8x8 = vpx_highbd_10_variance8x8_sse2; vpx_highbd_12_mse16x16 = vpx_highbd_12_mse16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_12_mse16x16 = vpx_highbd_12_mse16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_12_mse16x16 = vpx_highbd_12_mse16x16_sse2; vpx_highbd_12_mse8x8 = vpx_highbd_12_mse8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_12_mse8x8 = vpx_highbd_12_mse8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_12_mse8x8 = vpx_highbd_12_mse8x8_sse2; vpx_highbd_12_sub_pixel_avg_variance16x16 = vpx_highbd_12_sub_pixel_avg_variance16x16_c; if (flags & HAS_SSE2) @@ -9307,11 +5905,9 @@ if (flags & HAS_SSE2) vpx_highbd_12_variance8x8 = vpx_highbd_12_variance8x8_sse2; vpx_highbd_8_mse16x16 = vpx_highbd_8_mse16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_8_mse16x16 = vpx_highbd_8_mse16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_8_mse16x16 = vpx_highbd_8_mse16x16_sse2; vpx_highbd_8_mse8x8 = vpx_highbd_8_mse8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_8_mse8x8 = vpx_highbd_8_mse8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_8_mse8x8 = vpx_highbd_8_mse8x8_sse2; vpx_highbd_8_sub_pixel_avg_variance16x16 = vpx_highbd_8_sub_pixel_avg_variance16x16_c; if (flags & HAS_SSE2) @@ -9442,8 +6038,7 @@ if (flags & HAS_SSE2) vpx_highbd_8_variance8x8 = vpx_highbd_8_variance8x8_sse2; vpx_highbd_convolve8 = vpx_highbd_convolve8_c; - if (flags & HAS_AVX2) - vpx_highbd_convolve8 = vpx_highbd_convolve8_avx2; + if (flags & HAS_AVX2) vpx_highbd_convolve8 = vpx_highbd_convolve8_avx2; vpx_highbd_convolve8_avg = vpx_highbd_convolve8_avg_c; if (flags & HAS_AVX2) vpx_highbd_convolve8_avg = vpx_highbd_convolve8_avg_avx2; @@ -9460,10 +6055,8 @@ if (flags & HAS_AVX2) vpx_highbd_convolve8_vert = vpx_highbd_convolve8_vert_avx2; vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_sse2; - if (flags & HAS_AVX2) - vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_avx2; + if (flags & HAS_SSE2) vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_sse2; + if (flags & HAS_AVX2) vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_avx2; vpx_highbd_convolve_copy = vpx_highbd_convolve_copy_c; if (flags & HAS_SSE2) vpx_highbd_convolve_copy = vpx_highbd_convolve_copy_sse2; @@ -9592,20 +6185,15 @@ if (flags & HAS_SSE2) vpx_highbd_dc_top_predictor_8x8 = vpx_highbd_dc_top_predictor_8x8_sse2; vpx_highbd_fdct16x16 = vpx_highbd_fdct16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct16x16 = vpx_highbd_fdct16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct16x16 = vpx_highbd_fdct16x16_sse2; vpx_highbd_fdct32x32 = vpx_highbd_fdct32x32_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct32x32 = vpx_highbd_fdct32x32_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct32x32 = vpx_highbd_fdct32x32_sse2; vpx_highbd_fdct32x32_rd = vpx_highbd_fdct32x32_rd_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct32x32_rd = vpx_highbd_fdct32x32_rd_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct32x32_rd = vpx_highbd_fdct32x32_rd_sse2; vpx_highbd_fdct4x4 = vpx_highbd_fdct4x4_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct4x4 = vpx_highbd_fdct4x4_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct4x4 = vpx_highbd_fdct4x4_sse2; vpx_highbd_fdct8x8 = vpx_highbd_fdct8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct8x8 = vpx_highbd_fdct8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct8x8 = vpx_highbd_fdct8x8_sse2; vpx_highbd_h_predictor_16x16 = vpx_highbd_h_predictor_16x16_c; if (flags & HAS_SSE2) vpx_highbd_h_predictor_16x16 = vpx_highbd_h_predictor_16x16_sse2; @@ -9712,116 +6300,80 @@ if (flags & HAS_SSE2) vpx_highbd_lpf_vertical_8_dual = vpx_highbd_lpf_vertical_8_dual_sse2; vpx_highbd_quantize_b = vpx_highbd_quantize_b_c; - if (flags & HAS_SSE2) - vpx_highbd_quantize_b = vpx_highbd_quantize_b_sse2; + if (flags & HAS_SSE2) vpx_highbd_quantize_b = vpx_highbd_quantize_b_sse2; vpx_highbd_quantize_b_32x32 = vpx_highbd_quantize_b_32x32_c; if (flags & HAS_SSE2) vpx_highbd_quantize_b_32x32 = vpx_highbd_quantize_b_32x32_sse2; vpx_highbd_sad16x16 = vpx_highbd_sad16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x16 = vpx_highbd_sad16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x16 = vpx_highbd_sad16x16_sse2; vpx_highbd_sad16x16_avg = vpx_highbd_sad16x16_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x16_avg = vpx_highbd_sad16x16_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x16_avg = vpx_highbd_sad16x16_avg_sse2; vpx_highbd_sad16x16x4d = vpx_highbd_sad16x16x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x16x4d = vpx_highbd_sad16x16x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x16x4d = vpx_highbd_sad16x16x4d_sse2; vpx_highbd_sad16x32 = vpx_highbd_sad16x32_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x32 = vpx_highbd_sad16x32_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x32 = vpx_highbd_sad16x32_sse2; vpx_highbd_sad16x32_avg = vpx_highbd_sad16x32_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x32_avg = vpx_highbd_sad16x32_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x32_avg = vpx_highbd_sad16x32_avg_sse2; vpx_highbd_sad16x32x4d = vpx_highbd_sad16x32x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x32x4d = vpx_highbd_sad16x32x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x32x4d = vpx_highbd_sad16x32x4d_sse2; vpx_highbd_sad16x8 = vpx_highbd_sad16x8_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x8 = vpx_highbd_sad16x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x8 = vpx_highbd_sad16x8_sse2; vpx_highbd_sad16x8_avg = vpx_highbd_sad16x8_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x8_avg = vpx_highbd_sad16x8_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x8_avg = vpx_highbd_sad16x8_avg_sse2; vpx_highbd_sad16x8x4d = vpx_highbd_sad16x8x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x8x4d = vpx_highbd_sad16x8x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x8x4d = vpx_highbd_sad16x8x4d_sse2; vpx_highbd_sad32x16 = vpx_highbd_sad32x16_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x16 = vpx_highbd_sad32x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x16 = vpx_highbd_sad32x16_sse2; vpx_highbd_sad32x16_avg = vpx_highbd_sad32x16_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x16_avg = vpx_highbd_sad32x16_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x16_avg = vpx_highbd_sad32x16_avg_sse2; vpx_highbd_sad32x16x4d = vpx_highbd_sad32x16x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x16x4d = vpx_highbd_sad32x16x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x16x4d = vpx_highbd_sad32x16x4d_sse2; vpx_highbd_sad32x32 = vpx_highbd_sad32x32_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x32 = vpx_highbd_sad32x32_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x32 = vpx_highbd_sad32x32_sse2; vpx_highbd_sad32x32_avg = vpx_highbd_sad32x32_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x32_avg = vpx_highbd_sad32x32_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x32_avg = vpx_highbd_sad32x32_avg_sse2; vpx_highbd_sad32x32x4d = vpx_highbd_sad32x32x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x32x4d = vpx_highbd_sad32x32x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x32x4d = vpx_highbd_sad32x32x4d_sse2; vpx_highbd_sad32x64 = vpx_highbd_sad32x64_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x64 = vpx_highbd_sad32x64_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x64 = vpx_highbd_sad32x64_sse2; vpx_highbd_sad32x64_avg = vpx_highbd_sad32x64_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x64_avg = vpx_highbd_sad32x64_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x64_avg = vpx_highbd_sad32x64_avg_sse2; vpx_highbd_sad32x64x4d = vpx_highbd_sad32x64x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x64x4d = vpx_highbd_sad32x64x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x64x4d = vpx_highbd_sad32x64x4d_sse2; vpx_highbd_sad4x4x4d = vpx_highbd_sad4x4x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad4x4x4d = vpx_highbd_sad4x4x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad4x4x4d = vpx_highbd_sad4x4x4d_sse2; vpx_highbd_sad4x8x4d = vpx_highbd_sad4x8x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad4x8x4d = vpx_highbd_sad4x8x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad4x8x4d = vpx_highbd_sad4x8x4d_sse2; vpx_highbd_sad64x32 = vpx_highbd_sad64x32_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x32 = vpx_highbd_sad64x32_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x32 = vpx_highbd_sad64x32_sse2; vpx_highbd_sad64x32_avg = vpx_highbd_sad64x32_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x32_avg = vpx_highbd_sad64x32_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x32_avg = vpx_highbd_sad64x32_avg_sse2; vpx_highbd_sad64x32x4d = vpx_highbd_sad64x32x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x32x4d = vpx_highbd_sad64x32x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x32x4d = vpx_highbd_sad64x32x4d_sse2; vpx_highbd_sad64x64 = vpx_highbd_sad64x64_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x64 = vpx_highbd_sad64x64_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x64 = vpx_highbd_sad64x64_sse2; vpx_highbd_sad64x64_avg = vpx_highbd_sad64x64_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x64_avg = vpx_highbd_sad64x64_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x64_avg = vpx_highbd_sad64x64_avg_sse2; vpx_highbd_sad64x64x4d = vpx_highbd_sad64x64x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x64x4d = vpx_highbd_sad64x64x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x64x4d = vpx_highbd_sad64x64x4d_sse2; vpx_highbd_sad8x16 = vpx_highbd_sad8x16_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x16 = vpx_highbd_sad8x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x16 = vpx_highbd_sad8x16_sse2; vpx_highbd_sad8x16_avg = vpx_highbd_sad8x16_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x16_avg = vpx_highbd_sad8x16_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x16_avg = vpx_highbd_sad8x16_avg_sse2; vpx_highbd_sad8x16x4d = vpx_highbd_sad8x16x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x16x4d = vpx_highbd_sad8x16x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x16x4d = vpx_highbd_sad8x16x4d_sse2; vpx_highbd_sad8x4 = vpx_highbd_sad8x4_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x4 = vpx_highbd_sad8x4_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x4 = vpx_highbd_sad8x4_sse2; vpx_highbd_sad8x4_avg = vpx_highbd_sad8x4_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x4_avg = vpx_highbd_sad8x4_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x4_avg = vpx_highbd_sad8x4_avg_sse2; vpx_highbd_sad8x4x4d = vpx_highbd_sad8x4x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x4x4d = vpx_highbd_sad8x4x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x4x4d = vpx_highbd_sad8x4x4d_sse2; vpx_highbd_sad8x8 = vpx_highbd_sad8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x8 = vpx_highbd_sad8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x8 = vpx_highbd_sad8x8_sse2; vpx_highbd_sad8x8_avg = vpx_highbd_sad8x8_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x8_avg = vpx_highbd_sad8x8_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x8_avg = vpx_highbd_sad8x8_avg_sse2; vpx_highbd_sad8x8x4d = vpx_highbd_sad8x8x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x8x4d = vpx_highbd_sad8x8x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x8x4d = vpx_highbd_sad8x8x4d_sse2; vpx_highbd_tm_predictor_16x16 = vpx_highbd_tm_predictor_16x16_c; if (flags & HAS_SSE2) vpx_highbd_tm_predictor_16x16 = vpx_highbd_tm_predictor_16x16_sse2; @@ -9847,324 +6399,218 @@ if (flags & HAS_SSE2) vpx_highbd_v_predictor_8x8 = vpx_highbd_v_predictor_8x8_sse2; vpx_idct16x16_10_add = vpx_idct16x16_10_add_c; - if (flags & HAS_SSE2) - vpx_idct16x16_10_add = vpx_idct16x16_10_add_sse2; + if (flags & HAS_SSE2) vpx_idct16x16_10_add = vpx_idct16x16_10_add_sse2; vpx_idct16x16_1_add = vpx_idct16x16_1_add_c; - if (flags & HAS_SSE2) - vpx_idct16x16_1_add = vpx_idct16x16_1_add_sse2; + if (flags & HAS_SSE2) vpx_idct16x16_1_add = vpx_idct16x16_1_add_sse2; vpx_idct16x16_256_add = vpx_idct16x16_256_add_c; - if (flags & HAS_SSE2) - vpx_idct16x16_256_add = vpx_idct16x16_256_add_sse2; + if (flags & HAS_SSE2) vpx_idct16x16_256_add = vpx_idct16x16_256_add_sse2; vpx_idct16x16_38_add = vpx_idct16x16_38_add_c; - if (flags & HAS_SSE2) - vpx_idct16x16_38_add = vpx_idct16x16_38_add_sse2; + if (flags & HAS_SSE2) vpx_idct16x16_38_add = vpx_idct16x16_38_add_sse2; vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_c; - if (flags & HAS_SSE2) - vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_sse2; + if (flags & HAS_SSE2) vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_sse2; vpx_idct32x32_135_add = vpx_idct32x32_135_add_c; - if (flags & HAS_SSE2) - vpx_idct32x32_135_add = vpx_idct32x32_135_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct32x32_135_add = vpx_idct32x32_135_add_ssse3; + if (flags & HAS_SSE2) vpx_idct32x32_135_add = vpx_idct32x32_135_add_sse2; + if (flags & HAS_SSSE3) vpx_idct32x32_135_add = vpx_idct32x32_135_add_ssse3; vpx_idct32x32_1_add = vpx_idct32x32_1_add_c; - if (flags & HAS_SSE2) - vpx_idct32x32_1_add = vpx_idct32x32_1_add_sse2; + if (flags & HAS_SSE2) vpx_idct32x32_1_add = vpx_idct32x32_1_add_sse2; vpx_idct32x32_34_add = vpx_idct32x32_34_add_c; - if (flags & HAS_SSE2) - vpx_idct32x32_34_add = vpx_idct32x32_34_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct32x32_34_add = vpx_idct32x32_34_add_ssse3; + if (flags & HAS_SSE2) vpx_idct32x32_34_add = vpx_idct32x32_34_add_sse2; + if (flags & HAS_SSSE3) vpx_idct32x32_34_add = vpx_idct32x32_34_add_ssse3; vpx_idct4x4_16_add = vpx_idct4x4_16_add_c; - if (flags & HAS_SSE2) - vpx_idct4x4_16_add = vpx_idct4x4_16_add_sse2; + if (flags & HAS_SSE2) vpx_idct4x4_16_add = vpx_idct4x4_16_add_sse2; vpx_idct4x4_1_add = vpx_idct4x4_1_add_c; - if (flags & HAS_SSE2) - vpx_idct4x4_1_add = vpx_idct4x4_1_add_sse2; + if (flags & HAS_SSE2) vpx_idct4x4_1_add = vpx_idct4x4_1_add_sse2; vpx_idct8x8_12_add = vpx_idct8x8_12_add_c; - if (flags & HAS_SSE2) - vpx_idct8x8_12_add = vpx_idct8x8_12_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct8x8_12_add = vpx_idct8x8_12_add_ssse3; + if (flags & HAS_SSE2) vpx_idct8x8_12_add = vpx_idct8x8_12_add_sse2; + if (flags & HAS_SSSE3) vpx_idct8x8_12_add = vpx_idct8x8_12_add_ssse3; vpx_idct8x8_1_add = vpx_idct8x8_1_add_c; - if (flags & HAS_SSE2) - vpx_idct8x8_1_add = vpx_idct8x8_1_add_sse2; + if (flags & HAS_SSE2) vpx_idct8x8_1_add = vpx_idct8x8_1_add_sse2; vpx_idct8x8_64_add = vpx_idct8x8_64_add_c; - if (flags & HAS_SSE2) - vpx_idct8x8_64_add = vpx_idct8x8_64_add_sse2; + if (flags & HAS_SSE2) vpx_idct8x8_64_add = vpx_idct8x8_64_add_sse2; vpx_int_pro_col = vpx_int_pro_col_c; - if (flags & HAS_SSE2) - vpx_int_pro_col = vpx_int_pro_col_sse2; + if (flags & HAS_SSE2) vpx_int_pro_col = vpx_int_pro_col_sse2; vpx_int_pro_row = vpx_int_pro_row_c; - if (flags & HAS_SSE2) - vpx_int_pro_row = vpx_int_pro_row_sse2; + if (flags & HAS_SSE2) vpx_int_pro_row = vpx_int_pro_row_sse2; vpx_iwht4x4_16_add = vpx_iwht4x4_16_add_c; - if (flags & HAS_SSE2) - vpx_iwht4x4_16_add = vpx_iwht4x4_16_add_sse2; + if (flags & HAS_SSE2) vpx_iwht4x4_16_add = vpx_iwht4x4_16_add_sse2; vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_c; - if (flags & HAS_SSE2) - vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_sse2; - if (flags & HAS_AVX2) - vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_avx2; + if (flags & HAS_SSE2) vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_sse2; + if (flags & HAS_AVX2) vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_avx2; vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_c; if (flags & HAS_SSE2) vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_sse2; if (flags & HAS_AVX2) vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_avx2; vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_c; - if (flags & HAS_SSE2) - vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_sse2; + if (flags & HAS_SSE2) vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_sse2; vpx_lpf_horizontal_4_dual = vpx_lpf_horizontal_4_dual_c; if (flags & HAS_SSE2) vpx_lpf_horizontal_4_dual = vpx_lpf_horizontal_4_dual_sse2; vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_c; - if (flags & HAS_SSE2) - vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_sse2; + if (flags & HAS_SSE2) vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_sse2; vpx_lpf_horizontal_8_dual = vpx_lpf_horizontal_8_dual_c; if (flags & HAS_SSE2) vpx_lpf_horizontal_8_dual = vpx_lpf_horizontal_8_dual_sse2; vpx_lpf_vertical_16 = vpx_lpf_vertical_16_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_16 = vpx_lpf_vertical_16_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_16 = vpx_lpf_vertical_16_sse2; vpx_lpf_vertical_16_dual = vpx_lpf_vertical_16_dual_c; if (flags & HAS_SSE2) vpx_lpf_vertical_16_dual = vpx_lpf_vertical_16_dual_sse2; vpx_lpf_vertical_4 = vpx_lpf_vertical_4_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_4 = vpx_lpf_vertical_4_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_4 = vpx_lpf_vertical_4_sse2; vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_sse2; vpx_lpf_vertical_8 = vpx_lpf_vertical_8_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_8 = vpx_lpf_vertical_8_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_8 = vpx_lpf_vertical_8_sse2; vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_sse2; vpx_mbpost_proc_across_ip = vpx_mbpost_proc_across_ip_c; if (flags & HAS_SSE2) vpx_mbpost_proc_across_ip = vpx_mbpost_proc_across_ip_sse2; vpx_mbpost_proc_down = vpx_mbpost_proc_down_c; - if (flags & HAS_SSE2) - vpx_mbpost_proc_down = vpx_mbpost_proc_down_sse2; + if (flags & HAS_SSE2) vpx_mbpost_proc_down = vpx_mbpost_proc_down_sse2; vpx_minmax_8x8 = vpx_minmax_8x8_c; - if (flags & HAS_SSE2) - vpx_minmax_8x8 = vpx_minmax_8x8_sse2; + if (flags & HAS_SSE2) vpx_minmax_8x8 = vpx_minmax_8x8_sse2; vpx_mse16x16 = vpx_mse16x16_c; - if (flags & HAS_SSE2) - vpx_mse16x16 = vpx_mse16x16_sse2; - if (flags & HAS_AVX2) - vpx_mse16x16 = vpx_mse16x16_avx2; + if (flags & HAS_SSE2) vpx_mse16x16 = vpx_mse16x16_sse2; + if (flags & HAS_AVX2) vpx_mse16x16 = vpx_mse16x16_avx2; vpx_mse16x8 = vpx_mse16x8_c; - if (flags & HAS_SSE2) - vpx_mse16x8 = vpx_mse16x8_sse2; + if (flags & HAS_SSE2) vpx_mse16x8 = vpx_mse16x8_sse2; + if (flags & HAS_AVX2) vpx_mse16x8 = vpx_mse16x8_avx2; vpx_mse8x16 = vpx_mse8x16_c; - if (flags & HAS_SSE2) - vpx_mse8x16 = vpx_mse8x16_sse2; + if (flags & HAS_SSE2) vpx_mse8x16 = vpx_mse8x16_sse2; vpx_mse8x8 = vpx_mse8x8_c; - if (flags & HAS_SSE2) - vpx_mse8x8 = vpx_mse8x8_sse2; + if (flags & HAS_SSE2) vpx_mse8x8 = vpx_mse8x8_sse2; vpx_plane_add_noise = vpx_plane_add_noise_c; - if (flags & HAS_SSE2) - vpx_plane_add_noise = vpx_plane_add_noise_sse2; + if (flags & HAS_SSE2) vpx_plane_add_noise = vpx_plane_add_noise_sse2; vpx_post_proc_down_and_across_mb_row = vpx_post_proc_down_and_across_mb_row_c; if (flags & HAS_SSE2) vpx_post_proc_down_and_across_mb_row = vpx_post_proc_down_and_across_mb_row_sse2; vpx_quantize_b = vpx_quantize_b_c; - if (flags & HAS_SSE2) - vpx_quantize_b = vpx_quantize_b_sse2; - if (flags & HAS_SSSE3) - vpx_quantize_b = vpx_quantize_b_ssse3; - if (flags & HAS_AVX) - vpx_quantize_b = vpx_quantize_b_avx; + if (flags & HAS_SSE2) vpx_quantize_b = vpx_quantize_b_sse2; + if (flags & HAS_SSSE3) vpx_quantize_b = vpx_quantize_b_ssse3; + if (flags & HAS_AVX) vpx_quantize_b = vpx_quantize_b_avx; vpx_quantize_b_32x32 = vpx_quantize_b_32x32_c; - if (flags & HAS_SSSE3) - vpx_quantize_b_32x32 = vpx_quantize_b_32x32_ssse3; - if (flags & HAS_AVX) - vpx_quantize_b_32x32 = vpx_quantize_b_32x32_avx; + if (flags & HAS_SSSE3) vpx_quantize_b_32x32 = vpx_quantize_b_32x32_ssse3; + if (flags & HAS_AVX) vpx_quantize_b_32x32 = vpx_quantize_b_32x32_avx; vpx_sad16x16 = vpx_sad16x16_c; - if (flags & HAS_SSE2) - vpx_sad16x16 = vpx_sad16x16_sse2; + if (flags & HAS_SSE2) vpx_sad16x16 = vpx_sad16x16_sse2; vpx_sad16x16_avg = vpx_sad16x16_avg_c; - if (flags & HAS_SSE2) - vpx_sad16x16_avg = vpx_sad16x16_avg_sse2; + if (flags & HAS_SSE2) vpx_sad16x16_avg = vpx_sad16x16_avg_sse2; vpx_sad16x16x3 = vpx_sad16x16x3_c; - if (flags & HAS_SSE3) - vpx_sad16x16x3 = vpx_sad16x16x3_sse3; - if (flags & HAS_SSSE3) - vpx_sad16x16x3 = vpx_sad16x16x3_ssse3; + if (flags & HAS_SSE3) vpx_sad16x16x3 = vpx_sad16x16x3_sse3; + if (flags & HAS_SSSE3) vpx_sad16x16x3 = vpx_sad16x16x3_ssse3; vpx_sad16x16x4d = vpx_sad16x16x4d_c; - if (flags & HAS_SSE2) - vpx_sad16x16x4d = vpx_sad16x16x4d_sse2; + if (flags & HAS_SSE2) vpx_sad16x16x4d = vpx_sad16x16x4d_sse2; vpx_sad16x16x8 = vpx_sad16x16x8_c; - if (flags & HAS_SSE4_1) - vpx_sad16x16x8 = vpx_sad16x16x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad16x16x8 = vpx_sad16x16x8_sse4_1; vpx_sad16x32 = vpx_sad16x32_c; - if (flags & HAS_SSE2) - vpx_sad16x32 = vpx_sad16x32_sse2; + if (flags & HAS_SSE2) vpx_sad16x32 = vpx_sad16x32_sse2; vpx_sad16x32_avg = vpx_sad16x32_avg_c; - if (flags & HAS_SSE2) - vpx_sad16x32_avg = vpx_sad16x32_avg_sse2; + if (flags & HAS_SSE2) vpx_sad16x32_avg = vpx_sad16x32_avg_sse2; vpx_sad16x32x4d = vpx_sad16x32x4d_c; - if (flags & HAS_SSE2) - vpx_sad16x32x4d = vpx_sad16x32x4d_sse2; + if (flags & HAS_SSE2) vpx_sad16x32x4d = vpx_sad16x32x4d_sse2; vpx_sad16x8 = vpx_sad16x8_c; - if (flags & HAS_SSE2) - vpx_sad16x8 = vpx_sad16x8_sse2; + if (flags & HAS_SSE2) vpx_sad16x8 = vpx_sad16x8_sse2; vpx_sad16x8_avg = vpx_sad16x8_avg_c; - if (flags & HAS_SSE2) - vpx_sad16x8_avg = vpx_sad16x8_avg_sse2; + if (flags & HAS_SSE2) vpx_sad16x8_avg = vpx_sad16x8_avg_sse2; vpx_sad16x8x3 = vpx_sad16x8x3_c; - if (flags & HAS_SSE3) - vpx_sad16x8x3 = vpx_sad16x8x3_sse3; - if (flags & HAS_SSSE3) - vpx_sad16x8x3 = vpx_sad16x8x3_ssse3; + if (flags & HAS_SSE3) vpx_sad16x8x3 = vpx_sad16x8x3_sse3; + if (flags & HAS_SSSE3) vpx_sad16x8x3 = vpx_sad16x8x3_ssse3; vpx_sad16x8x4d = vpx_sad16x8x4d_c; - if (flags & HAS_SSE2) - vpx_sad16x8x4d = vpx_sad16x8x4d_sse2; + if (flags & HAS_SSE2) vpx_sad16x8x4d = vpx_sad16x8x4d_sse2; vpx_sad16x8x8 = vpx_sad16x8x8_c; - if (flags & HAS_SSE4_1) - vpx_sad16x8x8 = vpx_sad16x8x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad16x8x8 = vpx_sad16x8x8_sse4_1; vpx_sad32x16 = vpx_sad32x16_c; - if (flags & HAS_SSE2) - vpx_sad32x16 = vpx_sad32x16_sse2; - if (flags & HAS_AVX2) - vpx_sad32x16 = vpx_sad32x16_avx2; + if (flags & HAS_SSE2) vpx_sad32x16 = vpx_sad32x16_sse2; + if (flags & HAS_AVX2) vpx_sad32x16 = vpx_sad32x16_avx2; vpx_sad32x16_avg = vpx_sad32x16_avg_c; - if (flags & HAS_SSE2) - vpx_sad32x16_avg = vpx_sad32x16_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x16_avg = vpx_sad32x16_avg_avx2; + if (flags & HAS_SSE2) vpx_sad32x16_avg = vpx_sad32x16_avg_sse2; + if (flags & HAS_AVX2) vpx_sad32x16_avg = vpx_sad32x16_avg_avx2; vpx_sad32x16x4d = vpx_sad32x16x4d_c; - if (flags & HAS_SSE2) - vpx_sad32x16x4d = vpx_sad32x16x4d_sse2; + if (flags & HAS_SSE2) vpx_sad32x16x4d = vpx_sad32x16x4d_sse2; vpx_sad32x32 = vpx_sad32x32_c; - if (flags & HAS_SSE2) - vpx_sad32x32 = vpx_sad32x32_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32 = vpx_sad32x32_avx2; + if (flags & HAS_SSE2) vpx_sad32x32 = vpx_sad32x32_sse2; + if (flags & HAS_AVX2) vpx_sad32x32 = vpx_sad32x32_avx2; vpx_sad32x32_avg = vpx_sad32x32_avg_c; - if (flags & HAS_SSE2) - vpx_sad32x32_avg = vpx_sad32x32_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32_avg = vpx_sad32x32_avg_avx2; + if (flags & HAS_SSE2) vpx_sad32x32_avg = vpx_sad32x32_avg_sse2; + if (flags & HAS_AVX2) vpx_sad32x32_avg = vpx_sad32x32_avg_avx2; vpx_sad32x32x4d = vpx_sad32x32x4d_c; - if (flags & HAS_SSE2) - vpx_sad32x32x4d = vpx_sad32x32x4d_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32x4d = vpx_sad32x32x4d_avx2; + if (flags & HAS_SSE2) vpx_sad32x32x4d = vpx_sad32x32x4d_sse2; + if (flags & HAS_AVX2) vpx_sad32x32x4d = vpx_sad32x32x4d_avx2; vpx_sad32x64 = vpx_sad32x64_c; - if (flags & HAS_SSE2) - vpx_sad32x64 = vpx_sad32x64_sse2; - if (flags & HAS_AVX2) - vpx_sad32x64 = vpx_sad32x64_avx2; + if (flags & HAS_SSE2) vpx_sad32x64 = vpx_sad32x64_sse2; + if (flags & HAS_AVX2) vpx_sad32x64 = vpx_sad32x64_avx2; vpx_sad32x64_avg = vpx_sad32x64_avg_c; - if (flags & HAS_SSE2) - vpx_sad32x64_avg = vpx_sad32x64_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x64_avg = vpx_sad32x64_avg_avx2; + if (flags & HAS_SSE2) vpx_sad32x64_avg = vpx_sad32x64_avg_sse2; + if (flags & HAS_AVX2) vpx_sad32x64_avg = vpx_sad32x64_avg_avx2; vpx_sad32x64x4d = vpx_sad32x64x4d_c; - if (flags & HAS_SSE2) - vpx_sad32x64x4d = vpx_sad32x64x4d_sse2; + if (flags & HAS_SSE2) vpx_sad32x64x4d = vpx_sad32x64x4d_sse2; vpx_sad4x4 = vpx_sad4x4_c; - if (flags & HAS_SSE2) - vpx_sad4x4 = vpx_sad4x4_sse2; + if (flags & HAS_SSE2) vpx_sad4x4 = vpx_sad4x4_sse2; vpx_sad4x4_avg = vpx_sad4x4_avg_c; - if (flags & HAS_SSE2) - vpx_sad4x4_avg = vpx_sad4x4_avg_sse2; + if (flags & HAS_SSE2) vpx_sad4x4_avg = vpx_sad4x4_avg_sse2; vpx_sad4x4x3 = vpx_sad4x4x3_c; - if (flags & HAS_SSE3) - vpx_sad4x4x3 = vpx_sad4x4x3_sse3; + if (flags & HAS_SSE3) vpx_sad4x4x3 = vpx_sad4x4x3_sse3; vpx_sad4x4x4d = vpx_sad4x4x4d_c; - if (flags & HAS_SSE2) - vpx_sad4x4x4d = vpx_sad4x4x4d_sse2; + if (flags & HAS_SSE2) vpx_sad4x4x4d = vpx_sad4x4x4d_sse2; vpx_sad4x4x8 = vpx_sad4x4x8_c; - if (flags & HAS_SSE4_1) - vpx_sad4x4x8 = vpx_sad4x4x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad4x4x8 = vpx_sad4x4x8_sse4_1; vpx_sad4x8 = vpx_sad4x8_c; - if (flags & HAS_SSE2) - vpx_sad4x8 = vpx_sad4x8_sse2; + if (flags & HAS_SSE2) vpx_sad4x8 = vpx_sad4x8_sse2; vpx_sad4x8_avg = vpx_sad4x8_avg_c; - if (flags & HAS_SSE2) - vpx_sad4x8_avg = vpx_sad4x8_avg_sse2; + if (flags & HAS_SSE2) vpx_sad4x8_avg = vpx_sad4x8_avg_sse2; vpx_sad4x8x4d = vpx_sad4x8x4d_c; - if (flags & HAS_SSE2) - vpx_sad4x8x4d = vpx_sad4x8x4d_sse2; + if (flags & HAS_SSE2) vpx_sad4x8x4d = vpx_sad4x8x4d_sse2; vpx_sad64x32 = vpx_sad64x32_c; - if (flags & HAS_SSE2) - vpx_sad64x32 = vpx_sad64x32_sse2; - if (flags & HAS_AVX2) - vpx_sad64x32 = vpx_sad64x32_avx2; + if (flags & HAS_SSE2) vpx_sad64x32 = vpx_sad64x32_sse2; + if (flags & HAS_AVX2) vpx_sad64x32 = vpx_sad64x32_avx2; vpx_sad64x32_avg = vpx_sad64x32_avg_c; - if (flags & HAS_SSE2) - vpx_sad64x32_avg = vpx_sad64x32_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad64x32_avg = vpx_sad64x32_avg_avx2; + if (flags & HAS_SSE2) vpx_sad64x32_avg = vpx_sad64x32_avg_sse2; + if (flags & HAS_AVX2) vpx_sad64x32_avg = vpx_sad64x32_avg_avx2; vpx_sad64x32x4d = vpx_sad64x32x4d_c; - if (flags & HAS_SSE2) - vpx_sad64x32x4d = vpx_sad64x32x4d_sse2; + if (flags & HAS_SSE2) vpx_sad64x32x4d = vpx_sad64x32x4d_sse2; vpx_sad64x64 = vpx_sad64x64_c; - if (flags & HAS_SSE2) - vpx_sad64x64 = vpx_sad64x64_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64 = vpx_sad64x64_avx2; + if (flags & HAS_SSE2) vpx_sad64x64 = vpx_sad64x64_sse2; + if (flags & HAS_AVX2) vpx_sad64x64 = vpx_sad64x64_avx2; vpx_sad64x64_avg = vpx_sad64x64_avg_c; - if (flags & HAS_SSE2) - vpx_sad64x64_avg = vpx_sad64x64_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64_avg = vpx_sad64x64_avg_avx2; + if (flags & HAS_SSE2) vpx_sad64x64_avg = vpx_sad64x64_avg_sse2; + if (flags & HAS_AVX2) vpx_sad64x64_avg = vpx_sad64x64_avg_avx2; vpx_sad64x64x4d = vpx_sad64x64x4d_c; - if (flags & HAS_SSE2) - vpx_sad64x64x4d = vpx_sad64x64x4d_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64x4d = vpx_sad64x64x4d_avx2; + if (flags & HAS_SSE2) vpx_sad64x64x4d = vpx_sad64x64x4d_sse2; + if (flags & HAS_AVX2) vpx_sad64x64x4d = vpx_sad64x64x4d_avx2; vpx_sad8x16 = vpx_sad8x16_c; - if (flags & HAS_SSE2) - vpx_sad8x16 = vpx_sad8x16_sse2; + if (flags & HAS_SSE2) vpx_sad8x16 = vpx_sad8x16_sse2; vpx_sad8x16_avg = vpx_sad8x16_avg_c; - if (flags & HAS_SSE2) - vpx_sad8x16_avg = vpx_sad8x16_avg_sse2; + if (flags & HAS_SSE2) vpx_sad8x16_avg = vpx_sad8x16_avg_sse2; vpx_sad8x16x3 = vpx_sad8x16x3_c; - if (flags & HAS_SSE3) - vpx_sad8x16x3 = vpx_sad8x16x3_sse3; + if (flags & HAS_SSE3) vpx_sad8x16x3 = vpx_sad8x16x3_sse3; vpx_sad8x16x4d = vpx_sad8x16x4d_c; - if (flags & HAS_SSE2) - vpx_sad8x16x4d = vpx_sad8x16x4d_sse2; + if (flags & HAS_SSE2) vpx_sad8x16x4d = vpx_sad8x16x4d_sse2; vpx_sad8x16x8 = vpx_sad8x16x8_c; - if (flags & HAS_SSE4_1) - vpx_sad8x16x8 = vpx_sad8x16x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad8x16x8 = vpx_sad8x16x8_sse4_1; vpx_sad8x4 = vpx_sad8x4_c; - if (flags & HAS_SSE2) - vpx_sad8x4 = vpx_sad8x4_sse2; + if (flags & HAS_SSE2) vpx_sad8x4 = vpx_sad8x4_sse2; vpx_sad8x4_avg = vpx_sad8x4_avg_c; - if (flags & HAS_SSE2) - vpx_sad8x4_avg = vpx_sad8x4_avg_sse2; + if (flags & HAS_SSE2) vpx_sad8x4_avg = vpx_sad8x4_avg_sse2; vpx_sad8x4x4d = vpx_sad8x4x4d_c; - if (flags & HAS_SSE2) - vpx_sad8x4x4d = vpx_sad8x4x4d_sse2; + if (flags & HAS_SSE2) vpx_sad8x4x4d = vpx_sad8x4x4d_sse2; vpx_sad8x8 = vpx_sad8x8_c; - if (flags & HAS_SSE2) - vpx_sad8x8 = vpx_sad8x8_sse2; + if (flags & HAS_SSE2) vpx_sad8x8 = vpx_sad8x8_sse2; vpx_sad8x8_avg = vpx_sad8x8_avg_c; - if (flags & HAS_SSE2) - vpx_sad8x8_avg = vpx_sad8x8_avg_sse2; + if (flags & HAS_SSE2) vpx_sad8x8_avg = vpx_sad8x8_avg_sse2; vpx_sad8x8x3 = vpx_sad8x8x3_c; - if (flags & HAS_SSE3) - vpx_sad8x8x3 = vpx_sad8x8x3_sse3; + if (flags & HAS_SSE3) vpx_sad8x8x3 = vpx_sad8x8x3_sse3; vpx_sad8x8x4d = vpx_sad8x8x4d_c; - if (flags & HAS_SSE2) - vpx_sad8x8x4d = vpx_sad8x8x4d_sse2; + if (flags & HAS_SSE2) vpx_sad8x8x4d = vpx_sad8x8x4d_sse2; vpx_sad8x8x8 = vpx_sad8x8x8_c; - if (flags & HAS_SSE4_1) - vpx_sad8x8x8 = vpx_sad8x8x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad8x8x8 = vpx_sad8x8x8_sse4_1; vpx_satd = vpx_satd_c; - if (flags & HAS_SSE2) - vpx_satd = vpx_satd_sse2; - if (flags & HAS_AVX2) - vpx_satd = vpx_satd_avx2; + if (flags & HAS_SSE2) vpx_satd = vpx_satd_sse2; + if (flags & HAS_AVX2) vpx_satd = vpx_satd_avx2; vpx_scaled_2d = vpx_scaled_2d_c; - if (flags & HAS_SSSE3) - vpx_scaled_2d = vpx_scaled_2d_ssse3; + if (flags & HAS_SSSE3) vpx_scaled_2d = vpx_scaled_2d_ssse3; vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_c; if (flags & HAS_SSE2) vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_sse2; @@ -10304,87 +6750,61 @@ if (flags & HAS_SSSE3) vpx_sub_pixel_variance8x8 = vpx_sub_pixel_variance8x8_ssse3; vpx_subtract_block = vpx_subtract_block_c; - if (flags & HAS_SSE2) - vpx_subtract_block = vpx_subtract_block_sse2; + if (flags & HAS_SSE2) vpx_subtract_block = vpx_subtract_block_sse2; vpx_sum_squares_2d_i16 = vpx_sum_squares_2d_i16_c; - if (flags & HAS_SSE2) - vpx_sum_squares_2d_i16 = vpx_sum_squares_2d_i16_sse2; + if (flags & HAS_SSE2) vpx_sum_squares_2d_i16 = vpx_sum_squares_2d_i16_sse2; vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_c; - if (flags & HAS_SSE2) - vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_sse2; + if (flags & HAS_SSE2) vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_sse2; vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_c; - if (flags & HAS_SSE2) - vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_sse2; + if (flags & HAS_SSE2) vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_sse2; vpx_tm_predictor_4x4 = vpx_tm_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_tm_predictor_4x4 = vpx_tm_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_tm_predictor_4x4 = vpx_tm_predictor_4x4_sse2; vpx_tm_predictor_8x8 = vpx_tm_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_tm_predictor_8x8 = vpx_tm_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_tm_predictor_8x8 = vpx_tm_predictor_8x8_sse2; vpx_v_predictor_16x16 = vpx_v_predictor_16x16_c; - if (flags & HAS_SSE2) - vpx_v_predictor_16x16 = vpx_v_predictor_16x16_sse2; + if (flags & HAS_SSE2) vpx_v_predictor_16x16 = vpx_v_predictor_16x16_sse2; vpx_v_predictor_32x32 = vpx_v_predictor_32x32_c; - if (flags & HAS_SSE2) - vpx_v_predictor_32x32 = vpx_v_predictor_32x32_sse2; + if (flags & HAS_SSE2) vpx_v_predictor_32x32 = vpx_v_predictor_32x32_sse2; vpx_v_predictor_4x4 = vpx_v_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_v_predictor_4x4 = vpx_v_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_v_predictor_4x4 = vpx_v_predictor_4x4_sse2; vpx_v_predictor_8x8 = vpx_v_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_v_predictor_8x8 = vpx_v_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_v_predictor_8x8 = vpx_v_predictor_8x8_sse2; vpx_variance16x16 = vpx_variance16x16_c; - if (flags & HAS_SSE2) - vpx_variance16x16 = vpx_variance16x16_sse2; - if (flags & HAS_AVX2) - vpx_variance16x16 = vpx_variance16x16_avx2; + if (flags & HAS_SSE2) vpx_variance16x16 = vpx_variance16x16_sse2; + if (flags & HAS_AVX2) vpx_variance16x16 = vpx_variance16x16_avx2; vpx_variance16x32 = vpx_variance16x32_c; - if (flags & HAS_SSE2) - vpx_variance16x32 = vpx_variance16x32_sse2; + if (flags & HAS_SSE2) vpx_variance16x32 = vpx_variance16x32_sse2; + if (flags & HAS_AVX2) vpx_variance16x32 = vpx_variance16x32_avx2; vpx_variance16x8 = vpx_variance16x8_c; - if (flags & HAS_SSE2) - vpx_variance16x8 = vpx_variance16x8_sse2; + if (flags & HAS_SSE2) vpx_variance16x8 = vpx_variance16x8_sse2; + if (flags & HAS_AVX2) vpx_variance16x8 = vpx_variance16x8_avx2; vpx_variance32x16 = vpx_variance32x16_c; - if (flags & HAS_SSE2) - vpx_variance32x16 = vpx_variance32x16_sse2; - if (flags & HAS_AVX2) - vpx_variance32x16 = vpx_variance32x16_avx2; + if (flags & HAS_SSE2) vpx_variance32x16 = vpx_variance32x16_sse2; + if (flags & HAS_AVX2) vpx_variance32x16 = vpx_variance32x16_avx2; vpx_variance32x32 = vpx_variance32x32_c; - if (flags & HAS_SSE2) - vpx_variance32x32 = vpx_variance32x32_sse2; - if (flags & HAS_AVX2) - vpx_variance32x32 = vpx_variance32x32_avx2; + if (flags & HAS_SSE2) vpx_variance32x32 = vpx_variance32x32_sse2; + if (flags & HAS_AVX2) vpx_variance32x32 = vpx_variance32x32_avx2; vpx_variance32x64 = vpx_variance32x64_c; - if (flags & HAS_SSE2) - vpx_variance32x64 = vpx_variance32x64_sse2; + if (flags & HAS_SSE2) vpx_variance32x64 = vpx_variance32x64_sse2; + if (flags & HAS_AVX2) vpx_variance32x64 = vpx_variance32x64_avx2; vpx_variance4x4 = vpx_variance4x4_c; - if (flags & HAS_SSE2) - vpx_variance4x4 = vpx_variance4x4_sse2; + if (flags & HAS_SSE2) vpx_variance4x4 = vpx_variance4x4_sse2; vpx_variance4x8 = vpx_variance4x8_c; - if (flags & HAS_SSE2) - vpx_variance4x8 = vpx_variance4x8_sse2; + if (flags & HAS_SSE2) vpx_variance4x8 = vpx_variance4x8_sse2; vpx_variance64x32 = vpx_variance64x32_c; - if (flags & HAS_SSE2) - vpx_variance64x32 = vpx_variance64x32_sse2; - if (flags & HAS_AVX2) - vpx_variance64x32 = vpx_variance64x32_avx2; + if (flags & HAS_SSE2) vpx_variance64x32 = vpx_variance64x32_sse2; + if (flags & HAS_AVX2) vpx_variance64x32 = vpx_variance64x32_avx2; vpx_variance64x64 = vpx_variance64x64_c; - if (flags & HAS_SSE2) - vpx_variance64x64 = vpx_variance64x64_sse2; - if (flags & HAS_AVX2) - vpx_variance64x64 = vpx_variance64x64_avx2; + if (flags & HAS_SSE2) vpx_variance64x64 = vpx_variance64x64_sse2; + if (flags & HAS_AVX2) vpx_variance64x64 = vpx_variance64x64_avx2; vpx_variance8x16 = vpx_variance8x16_c; - if (flags & HAS_SSE2) - vpx_variance8x16 = vpx_variance8x16_sse2; + if (flags & HAS_SSE2) vpx_variance8x16 = vpx_variance8x16_sse2; vpx_variance8x4 = vpx_variance8x4_c; - if (flags & HAS_SSE2) - vpx_variance8x4 = vpx_variance8x4_sse2; + if (flags & HAS_SSE2) vpx_variance8x4 = vpx_variance8x4_sse2; vpx_variance8x8 = vpx_variance8x8_c; - if (flags & HAS_SSE2) - vpx_variance8x8 = vpx_variance8x8_sse2; + if (flags & HAS_SSE2) vpx_variance8x8 = vpx_variance8x8_sse2; vpx_vector_var = vpx_vector_var_c; - if (flags & HAS_SSE2) - vpx_vector_var = vpx_vector_var_sse2; + if (flags & HAS_SSE2) vpx_vector_var = vpx_vector_var_sse2; } #endif
diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_scale_rtcd.h b/third_party/libvpx/source/config/mac/ia32/vpx_scale_rtcd.h index 19da7a7..f30cdee1 100644 --- a/third_party/libvpx/source/config/mac/ia32/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/mac/ia32/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/mac/x64/vp8_rtcd.h b/third_party/libvpx/source/config/mac/x64/vp8_rtcd.h index 4e9d062..c876b08 100644 --- a/third_party/libvpx/source/config/mac/x64/vp8_rtcd.h +++ b/third_party/libvpx/source/config/mac/x64/vp8_rtcd.h
@@ -27,605 +27,348 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict16x16_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict16x16_sse2(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict16x16_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_ssse3(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict4x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_mmx -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_mmx -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); -int vp8_block_error_sse2(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); +int vp8_block_error_sse2(short *coeff, short *dqcoeff); #define vp8_block_error vp8_block_error_sse2 -void vp8_copy32xn_c(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -void vp8_copy32xn_sse2(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -void vp8_copy32xn_sse3(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); +void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char *src_ptr, + int source_stride, unsigned char *dst_ptr, + int dst_stride, int n); -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem16x16_sse2(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +void vp8_copy_mem16x16_sse2(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); #define vp8_copy_mem16x16 vp8_copy_mem16x16_sse2 -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_mmx(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_mmx -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_mmx(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x8 vp8_copy_mem8x8_mmx -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -void vp8_dc_only_idct_add_mmx(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +void vp8_dc_only_idct_add_mmx(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); #define vp8_dc_only_idct_add vp8_dc_only_idct_add_mmx -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_sse2(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_sse2(unsigned char *mc_running_avg_y, + int mc_avg_y_stride, unsigned char *running_avg_y, + int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter vp8_denoiser_filter_sse2 -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_sse2(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_uv_sse2(unsigned char *mc_running_avg, + int mc_avg_stride, unsigned char *running_avg, + int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_sse2 -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); -void vp8_dequant_idct_add_mmx(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_mmx(short *input, short *dq, unsigned char *output, int stride); #define vp8_dequant_idct_add vp8_dequant_idct_add_mmx -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -void vp8_dequant_idct_add_uv_block_sse2(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +void vp8_dequant_idct_add_uv_block_sse2(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_sse2 -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -void vp8_dequant_idct_add_y_block_sse2(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +void vp8_dequant_idct_add_y_block_sse2(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_sse2 -void vp8_dequantize_b_c(struct blockd*, short* dqc); -void vp8_dequantize_b_mmx(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); +void vp8_dequantize_b_mmx(struct blockd *, short *dqc); #define vp8_dequantize_b vp8_dequantize_b_mmx -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_diamond_search_sadx4(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_diamond_search_sadx4(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_diamond_search_sad vp8_diamond_search_sadx4 -void vp8_fast_quantize_b_c(struct block*, struct blockd*); -void vp8_fast_quantize_b_sse2(struct block*, struct blockd*); -void vp8_fast_quantize_b_ssse3(struct block*, struct blockd*); -RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); +void vp8_fast_quantize_b_sse2(struct block *, struct blockd *); +void vp8_fast_quantize_b_ssse3(struct block *, struct blockd *); +RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block *, struct blockd *); -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -void vp8_filter_by_weight16x16_sse2(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_sse2 -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -void vp8_filter_by_weight8x8_sse2(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_sse2 -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_full_search_sadx3(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_full_search_sadx8(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_full_search_sadx3(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_full_search_sadx8(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, + int *mvcost[2], union int_mv *center_mv); -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bh_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bh_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bh vp8_loop_filter_bh_sse2 -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bv_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bv_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bv vp8_loop_filter_bv_sse2 -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbh_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbh_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbh vp8_loop_filter_mbh_sse2 -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbv_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbv_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbv vp8_loop_filter_mbv_sse2 -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bhs_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bhs_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_sse2 -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bvs_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bvs_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_sse2 -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbh vp8_loop_filter_simple_horizontal_edge_sse2 -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbv vp8_loop_filter_simple_vertical_edge_sse2 -int vp8_mbblock_error_c(struct macroblock* mb, int dc); -int vp8_mbblock_error_sse2(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); +int vp8_mbblock_error_sse2(struct macroblock *mb, int dc); #define vp8_mbblock_error vp8_mbblock_error_sse2 -int vp8_mbuverror_c(struct macroblock* mb); -int vp8_mbuverror_sse2(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); +int vp8_mbuverror_sse2(struct macroblock *mb); #define vp8_mbuverror vp8_mbuverror_sse2 -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_refining_search_sadx4(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_refining_search_sadx4(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_refining_search_sad vp8_refining_search_sadx4 -void vp8_regular_quantize_b_c(struct block*, struct blockd*); -void vp8_regular_quantize_b_sse2(struct block*, struct blockd*); -void vp8_regular_quantize_b_sse4_1(struct block*, struct blockd*); -RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); +void vp8_regular_quantize_b_sse2(struct block *, struct blockd *); +void vp8_regular_quantize_b_sse4_1(struct block *, struct blockd *); +RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block *, struct blockd *); -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); -void vp8_short_fdct4x4_sse2(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); +void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch); #define vp8_short_fdct4x4 vp8_short_fdct4x4_sse2 -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); -void vp8_short_fdct8x4_sse2(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); +void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch); #define vp8_short_fdct8x4 vp8_short_fdct8x4_sse2 -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -void vp8_short_idct4x4llm_mmx(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); #define vp8_short_idct4x4llm vp8_short_idct4x4llm_mmx -void vp8_short_inv_walsh4x4_c(short* input, short* output); -void vp8_short_inv_walsh4x4_sse2(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); +void vp8_short_inv_walsh4x4_sse2(short *input, short *output); #define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_sse2 -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); -void vp8_short_walsh4x4_sse2(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); +void vp8_short_walsh4x4_sse2(short *input, short *output, int pitch); #define vp8_short_walsh4x4 vp8_short_walsh4x4_sse2 -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); void vp8_rtcd(void); @@ -643,16 +386,12 @@ if (flags & HAS_SSSE3) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_ssse3; vp8_copy32xn = vp8_copy32xn_sse2; - if (flags & HAS_SSE3) - vp8_copy32xn = vp8_copy32xn_sse3; + if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3; vp8_fast_quantize_b = vp8_fast_quantize_b_sse2; - if (flags & HAS_SSSE3) - vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3; + if (flags & HAS_SSSE3) vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3; vp8_full_search_sad = vp8_full_search_sad_c; - if (flags & HAS_SSE3) - vp8_full_search_sad = vp8_full_search_sadx3; - if (flags & HAS_SSE4_1) - vp8_full_search_sad = vp8_full_search_sadx8; + if (flags & HAS_SSE3) vp8_full_search_sad = vp8_full_search_sadx3; + if (flags & HAS_SSE4_1) vp8_full_search_sad = vp8_full_search_sadx8; vp8_regular_quantize_b = vp8_regular_quantize_b_sse2; if (flags & HAS_SSE4_1) vp8_regular_quantize_b = vp8_regular_quantize_b_sse4_1; @@ -660,14 +399,11 @@ if (flags & HAS_SSSE3) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3; vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_mmx; - if (flags & HAS_SSSE3) - vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3; + if (flags & HAS_SSSE3) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3; vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_sse2; - if (flags & HAS_SSSE3) - vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3; + if (flags & HAS_SSSE3) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3; vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_sse2; - if (flags & HAS_SSSE3) - vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3; + if (flags & HAS_SSSE3) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3; } #endif
diff --git a/third_party/libvpx/source/config/mac/x64/vp9_rtcd.h b/third_party/libvpx/source/config/mac/x64/vp9_rtcd.h index 6f00c78..7de827c 100644 --- a/third_party/libvpx/source/config/mac/x64/vp9_rtcd.h +++ b/third_party/libvpx/source/config/mac/x64/vp9_rtcd.h
@@ -31,458 +31,272 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -int64_t vp9_block_error_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -int64_t vp9_block_error_avx2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +int64_t vp9_block_error_sse2(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +int64_t vp9_block_error_avx2(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); -int64_t vp9_block_error_fp_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); -int64_t vp9_block_error_fp_avx2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); -RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_sse2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); +int64_t vp9_block_error_fp_avx2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); +RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); -int vp9_denoiser_filter_sse2(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); +int vp9_denoiser_filter_sse2(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); #define vp9_denoiser_filter vp9_denoiser_filter_sse2 -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); -int vp9_diamond_search_sad_avx(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); +int vp9_diamond_search_sad_avx(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); RTCD_EXTERN int (*vp9_diamond_search_sad)( - const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); + const struct macroblock *x, const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, + int *num00, const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_fdct8x8_quant_ssse3(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_fdct8x8_quant)(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_fdct8x8_quant_ssse3(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vp9_fdct8x8_quant)( + const int16_t *input, int stride, tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht16x16_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_sse2 -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht4x4_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht4x4 vp9_fht4x4_sse2 -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht8x8_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_sse2 -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -void vp9_filter_by_weight16x16_sse2(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); +void vp9_filter_by_weight16x16_sse2(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_sse2 -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -void vp9_filter_by_weight8x8_sse2(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); +void vp9_filter_by_weight8x8_sse2(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_sse2 -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vp9_fwht4x4_sse2(const int16_t* input, tran_low_t* output, int stride); +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vp9_fwht4x4_sse2(const int16_t *input, tran_low_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_sse2 -int64_t vp9_highbd_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); -int64_t vp9_highbd_block_error_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); +int64_t vp9_highbd_block_error_c(const tran_low_t *coeff, + const tran_low_t *dqcoeff, intptr_t block_size, + int64_t *ssz, int bd); +int64_t vp9_highbd_block_error_sse2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz, int bd); #define vp9_highbd_block_error vp9_highbd_block_error_sse2 -void vp9_highbd_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht16x16 vp9_highbd_fht16x16_c -void vp9_highbd_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht4x4 vp9_highbd_fht4x4_c -void vp9_highbd_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht8x8 vp9_highbd_fht8x8_c -void vp9_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_highbd_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_highbd_fwht4x4 vp9_highbd_fwht4x4_c -void vp9_highbd_iht16x16_256_add_c(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); -void vp9_highbd_iht16x16_256_add_sse4_1(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht16x16_256_add)(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); +void vp9_highbd_iht16x16_256_add_c(const tran_low_t *input, uint16_t *output, + int pitch, int tx_type, int bd); +void vp9_highbd_iht16x16_256_add_sse4_1(const tran_low_t *input, + uint16_t *output, int pitch, + int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht16x16_256_add)(const tran_low_t *input, + uint16_t *output, int pitch, + int tx_type, int bd); -void vp9_highbd_iht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -void vp9_highbd_iht4x4_16_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht4x4_16_add)(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +void vp9_highbd_iht4x4_16_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht4x4_16_add)(const tran_low_t *input, + uint16_t *dest, int stride, + int tx_type, int bd); -void vp9_highbd_iht8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht8x8_64_add)(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht8x8_64_add)(const tran_low_t *input, + uint16_t *dest, int stride, + int tx_type, int bd); -void vp9_highbd_mbpost_proc_across_ip_c(uint16_t* src, - int pitch, - int rows, - int cols, - int flimit); +void vp9_highbd_mbpost_proc_across_ip_c(uint16_t *src, int pitch, int rows, + int cols, int flimit); #define vp9_highbd_mbpost_proc_across_ip vp9_highbd_mbpost_proc_across_ip_c -void vp9_highbd_mbpost_proc_down_c(uint16_t* dst, - int pitch, - int rows, - int cols, +void vp9_highbd_mbpost_proc_down_c(uint16_t *dst, int pitch, int rows, int cols, int flimit); #define vp9_highbd_mbpost_proc_down vp9_highbd_mbpost_proc_down_c -void vp9_highbd_post_proc_down_and_across_c(const uint16_t* src_ptr, - uint16_t* dst_ptr, +void vp9_highbd_post_proc_down_and_across_c(const uint16_t *src_ptr, + uint16_t *dst_ptr, int src_pixels_per_line, - int dst_pixels_per_line, - int rows, - int cols, - int flimit); + int dst_pixels_per_line, int rows, + int cols, int flimit); #define vp9_highbd_post_proc_down_and_across \ vp9_highbd_post_proc_down_and_across_c -void vp9_highbd_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp vp9_highbd_quantize_fp_c -void vp9_highbd_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp_32x32 vp9_highbd_quantize_fp_32x32_c -void vp9_highbd_temporal_filter_apply_c(const uint8_t* frame1, - unsigned int stride, - const uint8_t* frame2, - unsigned int block_width, - unsigned int block_height, - int strength, - int filter_weight, - uint32_t* accumulator, - uint16_t* count); +void vp9_highbd_temporal_filter_apply_c( + const uint8_t *frame1, unsigned int stride, const uint8_t *frame2, + unsigned int block_width, unsigned int block_height, int strength, + int filter_weight, uint32_t *accumulator, uint16_t *count); #define vp9_highbd_temporal_filter_apply vp9_highbd_temporal_filter_apply_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); -void vp9_iht16x16_256_add_sse2(const tran_low_t* input, - uint8_t* output, - int pitch, - int tx_type); +void vp9_iht16x16_256_add_sse2(const tran_low_t *input, uint8_t *output, + int pitch, int tx_type); #define vp9_iht16x16_256_add vp9_iht16x16_256_add_sse2 -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht4x4_16_add vp9_iht4x4_16_add_sse2 -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht8x8_64_add_sse2(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht8x8_64_add vp9_iht8x8_64_add_sse2 -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_avx2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_quantize_fp)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_avx2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vp9_quantize_fp)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_32x32_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_quantize_fp_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vp9_quantize_fp_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vp9_quantize_fp_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); -void vp9_scale_and_extend_frame_ssse3(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); +void vp9_scale_and_extend_frame_ssse3(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler); RTCD_EXTERN void (*vp9_scale_and_extend_frame)( - const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); + const struct yv12_buffer_config *src, struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); void vp9_rtcd(void); @@ -494,17 +308,13 @@ (void)flags; vp9_block_error = vp9_block_error_sse2; - if (flags & HAS_AVX2) - vp9_block_error = vp9_block_error_avx2; + if (flags & HAS_AVX2) vp9_block_error = vp9_block_error_avx2; vp9_block_error_fp = vp9_block_error_fp_sse2; - if (flags & HAS_AVX2) - vp9_block_error_fp = vp9_block_error_fp_avx2; + if (flags & HAS_AVX2) vp9_block_error_fp = vp9_block_error_fp_avx2; vp9_diamond_search_sad = vp9_diamond_search_sad_c; - if (flags & HAS_AVX) - vp9_diamond_search_sad = vp9_diamond_search_sad_avx; + if (flags & HAS_AVX) vp9_diamond_search_sad = vp9_diamond_search_sad_avx; vp9_fdct8x8_quant = vp9_fdct8x8_quant_c; - if (flags & HAS_SSSE3) - vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; + if (flags & HAS_SSSE3) vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_c; if (flags & HAS_SSE4_1) vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_sse4_1; @@ -515,13 +325,10 @@ if (flags & HAS_SSE4_1) vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1; vp9_quantize_fp = vp9_quantize_fp_sse2; - if (flags & HAS_SSSE3) - vp9_quantize_fp = vp9_quantize_fp_ssse3; - if (flags & HAS_AVX2) - vp9_quantize_fp = vp9_quantize_fp_avx2; + if (flags & HAS_SSSE3) vp9_quantize_fp = vp9_quantize_fp_ssse3; + if (flags & HAS_AVX2) vp9_quantize_fp = vp9_quantize_fp_avx2; vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_c; - if (flags & HAS_SSSE3) - vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_ssse3; + if (flags & HAS_SSSE3) vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_ssse3; vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c; if (flags & HAS_SSSE3) vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_ssse3;
diff --git a/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h index 49a73711..08c40c9 100644 --- a/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h
@@ -20,7514 +20,4726 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); -unsigned int vpx_avg_4x4_sse2(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); +unsigned int vpx_avg_4x4_sse2(const uint8_t *, int p); #define vpx_avg_4x4 vpx_avg_4x4_sse2 -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); -unsigned int vpx_avg_8x8_sse2(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); +unsigned int vpx_avg_8x8_sse2(const uint8_t *, int p); #define vpx_avg_8x8 vpx_avg_8x8_sse2 -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -void vpx_comp_avg_pred_sse2(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +void vpx_comp_avg_pred_sse2(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); #define vpx_comp_avg_pred vpx_comp_avg_pred_sse2 -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avx2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_horiz_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_horiz_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_horiz_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +void vpx_convolve8_avg_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_vert_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_horiz_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_horiz_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_horiz_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_vert_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_vert_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_vert_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_avg_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_avg vpx_convolve_avg_sse2 -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_copy_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_copy_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_copy vpx_convolve_copy_sse2 -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_c -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_4x4_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_sse2 -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_sse2 -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_sse2 -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_4x4_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_sse2 -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_sse2 -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_sse2 -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_sse2 -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_sse2 -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_sse2 -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_sse2 -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_sse2 -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_sse2 -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_sse2 -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_sse2 -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_sse2 -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_sse2 -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_sse2 -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_sse2 -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_sse2 -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16 vpx_fdct16x16_sse2 -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_1_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_1_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16_1 vpx_fdct16x16_1_sse2 -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32 vpx_fdct32x32_sse2 -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_1_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_1_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_1 vpx_fdct32x32_1_sse2 -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_rd_sse2(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_rd vpx_fdct32x32_rd_sse2 -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4 vpx_fdct4x4_sse2 -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_1_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_1_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4_1 vpx_fdct4x4_1_sse2 -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8 vpx_fdct8x8_sse2 -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_1_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_1_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8_1 vpx_fdct8x8_1_sse2 -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_c -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get8x8var_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); +void vpx_get8x8var_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get8x8var vpx_get8x8var_sse2 -unsigned int vpx_get_mb_ss_c(const int16_t*); -unsigned int vpx_get_mb_ss_sse2(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); +unsigned int vpx_get_mb_ss_sse2(const int16_t *); #define vpx_get_mb_ss vpx_get_mb_ss_sse2 -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_16x16 vpx_h_predictor_16x16_sse2 -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_32x32 vpx_h_predictor_32x32_sse2 -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_4x4 vpx_h_predictor_4x4_sse2 -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_8x8 vpx_h_predictor_8x8_sse2 -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_16x16_sse2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_16x16_avx2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_16x16_sse2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_16x16_avx2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t *src_diff, + ptrdiff_t src_stride, tran_low_t *coeff); -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_8x8_sse2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_8x8_ssse3(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_8x8_sse2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_8x8_ssse3(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t *src_diff, + ptrdiff_t src_stride, tran_low_t *coeff); -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_highbd_10_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get16x16var vpx_highbd_10_get16x16var_c -void vpx_highbd_10_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get8x8var vpx_highbd_10_get8x8var_c -unsigned int vpx_highbd_10_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); #define vpx_highbd_10_mse16x16 vpx_highbd_10_mse16x16_sse2 -unsigned int vpx_highbd_10_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse16x8 vpx_highbd_10_mse16x8_c -unsigned int vpx_highbd_10_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse8x16 vpx_highbd_10_mse8x16_c -unsigned int vpx_highbd_10_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_mse8x8_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse8x8 vpx_highbd_10_mse8x8_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x16 \ vpx_highbd_10_sub_pixel_avg_variance16x16_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x32 \ vpx_highbd_10_sub_pixel_avg_variance16x32_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x8 \ vpx_highbd_10_sub_pixel_avg_variance16x8_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x16 \ vpx_highbd_10_sub_pixel_avg_variance32x16_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x32 \ vpx_highbd_10_sub_pixel_avg_variance32x32_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x64 \ vpx_highbd_10_sub_pixel_avg_variance32x64_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x4 \ vpx_highbd_10_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x8 \ vpx_highbd_10_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance64x32 \ vpx_highbd_10_sub_pixel_avg_variance64x32_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance64x64 \ vpx_highbd_10_sub_pixel_avg_variance64x64_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x16 \ vpx_highbd_10_sub_pixel_avg_variance8x16_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x4 \ vpx_highbd_10_sub_pixel_avg_variance8x4_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x8 \ vpx_highbd_10_sub_pixel_avg_variance8x8_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x16 \ vpx_highbd_10_sub_pixel_variance16x16_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x32 \ vpx_highbd_10_sub_pixel_variance16x32_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x8 \ vpx_highbd_10_sub_pixel_variance16x8_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x16 \ vpx_highbd_10_sub_pixel_variance32x16_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x32 \ vpx_highbd_10_sub_pixel_variance32x32_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x64 \ vpx_highbd_10_sub_pixel_variance32x64_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x4 \ vpx_highbd_10_sub_pixel_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x8 \ vpx_highbd_10_sub_pixel_variance4x8_c -uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance64x32 \ vpx_highbd_10_sub_pixel_variance64x32_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance64x64 \ vpx_highbd_10_sub_pixel_variance64x64_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x16 \ vpx_highbd_10_sub_pixel_variance8x16_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x4_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x4 \ vpx_highbd_10_sub_pixel_variance8x4_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x8 \ vpx_highbd_10_sub_pixel_variance8x8_sse2 -unsigned int vpx_highbd_10_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance16x16 vpx_highbd_10_variance16x16_sse2 -unsigned int vpx_highbd_10_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance16x32 vpx_highbd_10_variance16x32_sse2 -unsigned int vpx_highbd_10_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance16x8 vpx_highbd_10_variance16x8_sse2 -unsigned int vpx_highbd_10_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance32x16 vpx_highbd_10_variance32x16_sse2 -unsigned int vpx_highbd_10_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance32x32 vpx_highbd_10_variance32x32_sse2 -unsigned int vpx_highbd_10_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance32x64 vpx_highbd_10_variance32x64_sse2 -unsigned int vpx_highbd_10_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x4 vpx_highbd_10_variance4x4_c -unsigned int vpx_highbd_10_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x8 vpx_highbd_10_variance4x8_c -unsigned int vpx_highbd_10_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance64x32 vpx_highbd_10_variance64x32_sse2 -unsigned int vpx_highbd_10_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance64x64 vpx_highbd_10_variance64x64_sse2 -unsigned int vpx_highbd_10_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance8x16 vpx_highbd_10_variance8x16_sse2 -unsigned int vpx_highbd_10_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance8x4 vpx_highbd_10_variance8x4_c -unsigned int vpx_highbd_10_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance8x8 vpx_highbd_10_variance8x8_sse2 -void vpx_highbd_12_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get16x16var vpx_highbd_12_get16x16var_c -void vpx_highbd_12_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get8x8var vpx_highbd_12_get8x8var_c -unsigned int vpx_highbd_12_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); #define vpx_highbd_12_mse16x16 vpx_highbd_12_mse16x16_sse2 -unsigned int vpx_highbd_12_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse16x8 vpx_highbd_12_mse16x8_c -unsigned int vpx_highbd_12_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse8x16 vpx_highbd_12_mse8x16_c -unsigned int vpx_highbd_12_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_mse8x8_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse8x8 vpx_highbd_12_mse8x8_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x16 \ vpx_highbd_12_sub_pixel_avg_variance16x16_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x32 \ vpx_highbd_12_sub_pixel_avg_variance16x32_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x8 \ vpx_highbd_12_sub_pixel_avg_variance16x8_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x16 \ vpx_highbd_12_sub_pixel_avg_variance32x16_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x32 \ vpx_highbd_12_sub_pixel_avg_variance32x32_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x64 \ vpx_highbd_12_sub_pixel_avg_variance32x64_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x4 \ vpx_highbd_12_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x8 \ vpx_highbd_12_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance64x32 \ vpx_highbd_12_sub_pixel_avg_variance64x32_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance64x64 \ vpx_highbd_12_sub_pixel_avg_variance64x64_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x16 \ vpx_highbd_12_sub_pixel_avg_variance8x16_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x4 \ vpx_highbd_12_sub_pixel_avg_variance8x4_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x8 \ vpx_highbd_12_sub_pixel_avg_variance8x8_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x16 \ vpx_highbd_12_sub_pixel_variance16x16_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x32 \ vpx_highbd_12_sub_pixel_variance16x32_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x8 \ vpx_highbd_12_sub_pixel_variance16x8_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x16 \ vpx_highbd_12_sub_pixel_variance32x16_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x32 \ vpx_highbd_12_sub_pixel_variance32x32_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x64 \ vpx_highbd_12_sub_pixel_variance32x64_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x4 \ vpx_highbd_12_sub_pixel_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x8 \ vpx_highbd_12_sub_pixel_variance4x8_c -uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance64x32 \ vpx_highbd_12_sub_pixel_variance64x32_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance64x64 \ vpx_highbd_12_sub_pixel_variance64x64_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x16 \ vpx_highbd_12_sub_pixel_variance8x16_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x4_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x4 \ vpx_highbd_12_sub_pixel_variance8x4_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x8 \ vpx_highbd_12_sub_pixel_variance8x8_sse2 -unsigned int vpx_highbd_12_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance16x16 vpx_highbd_12_variance16x16_sse2 -unsigned int vpx_highbd_12_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance16x32 vpx_highbd_12_variance16x32_sse2 -unsigned int vpx_highbd_12_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance16x8 vpx_highbd_12_variance16x8_sse2 -unsigned int vpx_highbd_12_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance32x16 vpx_highbd_12_variance32x16_sse2 -unsigned int vpx_highbd_12_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance32x32 vpx_highbd_12_variance32x32_sse2 -unsigned int vpx_highbd_12_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance32x64 vpx_highbd_12_variance32x64_sse2 -unsigned int vpx_highbd_12_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x4 vpx_highbd_12_variance4x4_c -unsigned int vpx_highbd_12_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x8 vpx_highbd_12_variance4x8_c -unsigned int vpx_highbd_12_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance64x32 vpx_highbd_12_variance64x32_sse2 -unsigned int vpx_highbd_12_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance64x64 vpx_highbd_12_variance64x64_sse2 -unsigned int vpx_highbd_12_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance8x16 vpx_highbd_12_variance8x16_sse2 -unsigned int vpx_highbd_12_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance8x4 vpx_highbd_12_variance8x4_c -unsigned int vpx_highbd_12_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance8x8 vpx_highbd_12_variance8x8_sse2 -void vpx_highbd_8_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get16x16var vpx_highbd_8_get16x16var_c -void vpx_highbd_8_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get8x8var vpx_highbd_8_get8x8var_c -unsigned int vpx_highbd_8_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); #define vpx_highbd_8_mse16x16 vpx_highbd_8_mse16x16_sse2 -unsigned int vpx_highbd_8_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse16x8 vpx_highbd_8_mse16x8_c -unsigned int vpx_highbd_8_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse8x16 vpx_highbd_8_mse8x16_c -unsigned int vpx_highbd_8_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_mse8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse8x8 vpx_highbd_8_mse8x8_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x16 \ vpx_highbd_8_sub_pixel_avg_variance16x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x32 \ vpx_highbd_8_sub_pixel_avg_variance16x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x8 \ vpx_highbd_8_sub_pixel_avg_variance16x8_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x16 \ vpx_highbd_8_sub_pixel_avg_variance32x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x32 \ vpx_highbd_8_sub_pixel_avg_variance32x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x64 \ vpx_highbd_8_sub_pixel_avg_variance32x64_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x4 \ vpx_highbd_8_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x8 \ vpx_highbd_8_sub_pixel_avg_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance64x32 \ vpx_highbd_8_sub_pixel_avg_variance64x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance64x64 \ vpx_highbd_8_sub_pixel_avg_variance64x64_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x16 \ vpx_highbd_8_sub_pixel_avg_variance8x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x4 \ vpx_highbd_8_sub_pixel_avg_variance8x4_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x8 \ vpx_highbd_8_sub_pixel_avg_variance8x8_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x16 \ vpx_highbd_8_sub_pixel_variance16x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x32 \ vpx_highbd_8_sub_pixel_variance16x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x8 \ vpx_highbd_8_sub_pixel_variance16x8_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x16 \ vpx_highbd_8_sub_pixel_variance32x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x32 \ vpx_highbd_8_sub_pixel_variance32x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x64 \ vpx_highbd_8_sub_pixel_variance32x64_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x4 vpx_highbd_8_sub_pixel_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x8 vpx_highbd_8_sub_pixel_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance64x32 \ vpx_highbd_8_sub_pixel_variance64x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance64x64 \ vpx_highbd_8_sub_pixel_variance64x64_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x16 \ vpx_highbd_8_sub_pixel_variance8x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x4 \ vpx_highbd_8_sub_pixel_variance8x4_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x8 \ vpx_highbd_8_sub_pixel_variance8x8_sse2 -unsigned int vpx_highbd_8_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance16x16 vpx_highbd_8_variance16x16_sse2 -unsigned int vpx_highbd_8_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance16x32 vpx_highbd_8_variance16x32_sse2 -unsigned int vpx_highbd_8_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance16x8 vpx_highbd_8_variance16x8_sse2 -unsigned int vpx_highbd_8_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x16 vpx_highbd_8_variance32x16_sse2 -unsigned int vpx_highbd_8_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x32 vpx_highbd_8_variance32x32_sse2 -unsigned int vpx_highbd_8_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x64 vpx_highbd_8_variance32x64_sse2 -unsigned int vpx_highbd_8_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x4 vpx_highbd_8_variance4x4_c -unsigned int vpx_highbd_8_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x8 vpx_highbd_8_variance4x8_c -unsigned int vpx_highbd_8_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance64x32 vpx_highbd_8_variance64x32_sse2 -unsigned int vpx_highbd_8_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance64x64 vpx_highbd_8_variance64x64_sse2 -unsigned int vpx_highbd_8_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance8x16 vpx_highbd_8_variance8x16_sse2 -unsigned int vpx_highbd_8_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance8x4 vpx_highbd_8_variance8x4_c -unsigned int vpx_highbd_8_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance8x8 vpx_highbd_8_variance8x8_sse2 -unsigned int vpx_highbd_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_4x4_c(const uint8_t *, int p); #define vpx_highbd_avg_4x4 vpx_highbd_avg_4x4_c -unsigned int vpx_highbd_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_8x8_c(const uint8_t *, int p); #define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c -void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred, - const uint16_t* pred, - int width, - int height, - const uint16_t* ref, +void vpx_highbd_comp_avg_pred_c(uint16_t *comp_pred, const uint16_t *pred, + int width, int height, const uint16_t *ref, int ref_stride); #define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c -void vpx_highbd_convolve8_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8)(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_avg_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_horiz_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_avg_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_horiz_sse2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_horiz_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); +void vpx_highbd_convolve8_avg_horiz_avx2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg_horiz)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg_horiz)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_vert_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_avg_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_vert_sse2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_vert_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_vert_avx2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg_vert)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg_vert)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_horiz_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_horiz_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_horiz)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_horiz_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_horiz_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_horiz)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_vert_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_vert_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_vert)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_vert_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_vert_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_vert)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_avg_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_avg_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve_avg)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve_avg_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve_avg_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve_avg)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve_copy_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_copy_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_copy_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve_copy)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_copy_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve_copy_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve_copy_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve_copy)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_d117_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d117_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d117_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d117_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d117_predictor_4x4 vpx_highbd_d117_predictor_4x4_sse2 -void vpx_highbd_d117_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d117_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d135_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d135_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d135_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d135_predictor_4x4 vpx_highbd_d135_predictor_4x4_sse2 -void vpx_highbd_d135_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d135_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d153_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d153_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d153_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d153_predictor_4x4 vpx_highbd_d153_predictor_4x4_sse2 -void vpx_highbd_d153_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d153_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d207_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d207_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d207_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d207_predictor_4x4 vpx_highbd_d207_predictor_4x4_sse2 -void vpx_highbd_d207_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d207_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d45_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d45_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d45_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d45_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d45_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d45_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_4x4_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d45_predictor_4x4_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d45_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d63_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d63_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d63_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d63_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d63_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d63_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d63_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d63_predictor_4x4 vpx_highbd_d63_predictor_4x4_sse2 -void vpx_highbd_d63_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d63_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_16x16 vpx_highbd_dc_128_predictor_16x16_sse2 -void vpx_highbd_dc_128_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_32x32 vpx_highbd_dc_128_predictor_32x32_sse2 -void vpx_highbd_dc_128_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_4x4 vpx_highbd_dc_128_predictor_4x4_sse2 -void vpx_highbd_dc_128_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_8x8 vpx_highbd_dc_128_predictor_8x8_sse2 -void vpx_highbd_dc_left_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_16x16 \ vpx_highbd_dc_left_predictor_16x16_sse2 -void vpx_highbd_dc_left_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_32x32 \ vpx_highbd_dc_left_predictor_32x32_sse2 -void vpx_highbd_dc_left_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_4x4 vpx_highbd_dc_left_predictor_4x4_sse2 -void vpx_highbd_dc_left_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_8x8 vpx_highbd_dc_left_predictor_8x8_sse2 -void vpx_highbd_dc_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_16x16 vpx_highbd_dc_predictor_16x16_sse2 -void vpx_highbd_dc_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_32x32 vpx_highbd_dc_predictor_32x32_sse2 -void vpx_highbd_dc_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_4x4 vpx_highbd_dc_predictor_4x4_sse2 -void vpx_highbd_dc_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_8x8 vpx_highbd_dc_predictor_8x8_sse2 -void vpx_highbd_dc_top_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_16x16 vpx_highbd_dc_top_predictor_16x16_sse2 -void vpx_highbd_dc_top_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_32x32 vpx_highbd_dc_top_predictor_32x32_sse2 -void vpx_highbd_dc_top_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_4x4 vpx_highbd_dc_top_predictor_4x4_sse2 -void vpx_highbd_dc_top_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_8x8 vpx_highbd_dc_top_predictor_8x8_sse2 -void vpx_highbd_fdct16x16_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct16x16_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct16x16 vpx_highbd_fdct16x16_sse2 -void vpx_highbd_fdct16x16_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct16x16_1 vpx_highbd_fdct16x16_1_c -void vpx_highbd_fdct32x32_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32 vpx_highbd_fdct32x32_sse2 -void vpx_highbd_fdct32x32_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32_1 vpx_highbd_fdct32x32_1_c -void vpx_highbd_fdct32x32_rd_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_rd_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32_rd vpx_highbd_fdct32x32_rd_sse2 -void vpx_highbd_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_highbd_fdct4x4_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_highbd_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct4x4 vpx_highbd_fdct4x4_sse2 -void vpx_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_highbd_fdct8x8_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_highbd_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct8x8 vpx_highbd_fdct8x8_sse2 -void vpx_highbd_fdct8x8_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct8x8_1 vpx_highbd_fdct8x8_1_c -void vpx_highbd_h_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_h_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_h_predictor_16x16 vpx_highbd_h_predictor_16x16_sse2 -void vpx_highbd_h_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_h_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_h_predictor_32x32 vpx_highbd_h_predictor_32x32_sse2 -void vpx_highbd_h_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_h_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_h_predictor_4x4 vpx_highbd_h_predictor_4x4_sse2 -void vpx_highbd_h_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_h_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_h_predictor_8x8 vpx_highbd_h_predictor_8x8_sse2 -void vpx_highbd_idct16x16_10_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_10_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_10_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_10_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_10_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_10_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_10_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_10_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct16x16_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct16x16_1_add vpx_highbd_idct16x16_1_add_sse2 -void vpx_highbd_idct16x16_256_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_256_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_256_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_256_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_256_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_256_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_256_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_256_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_38_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_38_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_38_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_38_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_38_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_38_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_38_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_38_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_1024_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1024_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1024_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_1024_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_1024_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1024_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1024_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_1024_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_135_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_135_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_135_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_135_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_135_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_135_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_135_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_135_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct32x32_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct32x32_1_add vpx_highbd_idct32x32_1_add_sse2 -void vpx_highbd_idct32x32_34_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_34_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_34_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_34_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_34_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_34_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_34_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_34_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_16_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_16_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct4x4_16_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_16_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_16_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct4x4_16_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct4x4_1_add vpx_highbd_idct4x4_1_add_sse2 -void vpx_highbd_idct8x8_12_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_12_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_12_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_12_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_12_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_12_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_12_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_12_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct8x8_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct8x8_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct8x8_1_add vpx_highbd_idct8x8_1_add_sse2 -void vpx_highbd_idct8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_64_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_64_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_64_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_64_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_64_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_iwht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_16_add vpx_highbd_iwht4x4_16_add_c -void vpx_highbd_iwht4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_1_add vpx_highbd_iwht4x4_1_add_c -void vpx_highbd_lpf_horizontal_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_16_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_16_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_16_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_16 vpx_highbd_lpf_horizontal_16_sse2 -void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_16_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_16_dual_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_16_dual vpx_highbd_lpf_horizontal_16_dual_sse2 -void vpx_highbd_lpf_horizontal_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_4_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_4_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_4_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_4 vpx_highbd_lpf_horizontal_4_sse2 -void vpx_highbd_lpf_horizontal_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_horizontal_4_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_horizontal_4_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_horizontal_4_dual vpx_highbd_lpf_horizontal_4_dual_sse2 -void vpx_highbd_lpf_horizontal_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_8_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_8_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_8_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_8 vpx_highbd_lpf_horizontal_8_sse2 -void vpx_highbd_lpf_horizontal_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_horizontal_8_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_horizontal_8_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_horizontal_8_dual vpx_highbd_lpf_horizontal_8_dual_sse2 -void vpx_highbd_lpf_vertical_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_16_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_16_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_16_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_16 vpx_highbd_lpf_vertical_16_sse2 -void vpx_highbd_lpf_vertical_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_vertical_16_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_vertical_16_dual_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_16_dual vpx_highbd_lpf_vertical_16_dual_sse2 -void vpx_highbd_lpf_vertical_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_4_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_4_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_4_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_4 vpx_highbd_lpf_vertical_4_sse2 -void vpx_highbd_lpf_vertical_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_vertical_4_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_vertical_4_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_vertical_4_dual vpx_highbd_lpf_vertical_4_dual_sse2 -void vpx_highbd_lpf_vertical_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_8_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_8_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_8_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_8 vpx_highbd_lpf_vertical_8_sse2 -void vpx_highbd_lpf_vertical_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_vertical_8_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_vertical_8_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_vertical_8_dual vpx_highbd_lpf_vertical_8_dual_sse2 -void vpx_highbd_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_highbd_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_highbd_minmax_8x8 vpx_highbd_minmax_8x8_c -void vpx_highbd_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_highbd_quantize_b_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_highbd_quantize_b_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_highbd_quantize_b vpx_highbd_quantize_b_sse2 -void vpx_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_highbd_quantize_b_32x32_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_highbd_quantize_b_32x32_sse2( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_highbd_quantize_b_32x32 vpx_highbd_quantize_b_32x32_sse2 -unsigned int vpx_highbd_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x16 vpx_highbd_sad16x16_sse2 -unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x16_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x16_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad16x16_avg vpx_highbd_sad16x16_avg_sse2 -void vpx_highbd_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x16x4d vpx_highbd_sad16x16x4d_sse2 -unsigned int vpx_highbd_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x32 vpx_highbd_sad16x32_sse2 -unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad16x32_avg vpx_highbd_sad16x32_avg_sse2 -void vpx_highbd_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x32x4d vpx_highbd_sad16x32x4d_sse2 -unsigned int vpx_highbd_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x8 vpx_highbd_sad16x8_sse2 -unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad16x8_avg vpx_highbd_sad16x8_avg_sse2 -void vpx_highbd_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x8x4d vpx_highbd_sad16x8x4d_sse2 -unsigned int vpx_highbd_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x16 vpx_highbd_sad32x16_sse2 -unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x16_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x16_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad32x16_avg vpx_highbd_sad32x16_avg_sse2 -void vpx_highbd_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x16x4d vpx_highbd_sad32x16x4d_sse2 -unsigned int vpx_highbd_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x32 vpx_highbd_sad32x32_sse2 -unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad32x32_avg vpx_highbd_sad32x32_avg_sse2 -void vpx_highbd_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x32x4d vpx_highbd_sad32x32x4d_sse2 -unsigned int vpx_highbd_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x64 vpx_highbd_sad32x64_sse2 -unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x64_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x64_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad32x64_avg vpx_highbd_sad32x64_avg_sse2 -void vpx_highbd_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x64x4d vpx_highbd_sad32x64x4d_sse2 -unsigned int vpx_highbd_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x4 vpx_highbd_sad4x4_c -unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x4_avg vpx_highbd_sad4x4_avg_c -void vpx_highbd_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad4x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad4x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad4x4x4d vpx_highbd_sad4x4x4d_sse2 -unsigned int vpx_highbd_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x8 vpx_highbd_sad4x8_c -unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x8_avg vpx_highbd_sad4x8_avg_c -void vpx_highbd_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad4x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad4x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad4x8x4d vpx_highbd_sad4x8x4d_sse2 -unsigned int vpx_highbd_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad64x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad64x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad64x32 vpx_highbd_sad64x32_sse2 -unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad64x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad64x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad64x32_avg vpx_highbd_sad64x32_avg_sse2 -void vpx_highbd_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad64x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad64x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad64x32x4d vpx_highbd_sad64x32x4d_sse2 -unsigned int vpx_highbd_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad64x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad64x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad64x64 vpx_highbd_sad64x64_sse2 -unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad64x64_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad64x64_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad64x64_avg vpx_highbd_sad64x64_avg_sse2 -void vpx_highbd_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad64x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad64x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad64x64x4d vpx_highbd_sad64x64x4d_sse2 -unsigned int vpx_highbd_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x16 vpx_highbd_sad8x16_sse2 -unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x16_avg vpx_highbd_sad8x16_avg_sse2 -void vpx_highbd_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x16x4d vpx_highbd_sad8x16x4d_sse2 -unsigned int vpx_highbd_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x4 vpx_highbd_sad8x4_sse2 -unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x4_avg vpx_highbd_sad8x4_avg_sse2 -void vpx_highbd_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x4x4d vpx_highbd_sad8x4x4d_sse2 -unsigned int vpx_highbd_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x8 vpx_highbd_sad8x8_sse2 -unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x8_avg vpx_highbd_sad8x8_avg_sse2 -void vpx_highbd_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x8x4d vpx_highbd_sad8x8x4d_sse2 -void vpx_highbd_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, - ptrdiff_t pred_stride, - int bd); +void vpx_highbd_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, + ptrdiff_t pred_stride, int bd); #define vpx_highbd_subtract_block vpx_highbd_subtract_block_c -void vpx_highbd_tm_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_tm_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_tm_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_16x16 vpx_highbd_tm_predictor_16x16_sse2 -void vpx_highbd_tm_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_tm_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_tm_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_32x32 vpx_highbd_tm_predictor_32x32_sse2 -void vpx_highbd_tm_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_4x4 vpx_highbd_tm_predictor_4x4_sse2 -void vpx_highbd_tm_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_8x8 vpx_highbd_tm_predictor_8x8_sse2 -void vpx_highbd_v_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_v_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_v_predictor_16x16 vpx_highbd_v_predictor_16x16_sse2 -void vpx_highbd_v_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_v_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_v_predictor_32x32 vpx_highbd_v_predictor_32x32_sse2 -void vpx_highbd_v_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_v_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_v_predictor_4x4 vpx_highbd_v_predictor_4x4_sse2 -void vpx_highbd_v_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_v_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_v_predictor_8x8 vpx_highbd_v_predictor_8x8_sse2 -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_10_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_10_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_10_add vpx_idct16x16_10_add_sse2 -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_1_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_1_add vpx_idct16x16_1_add_sse2 -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_256_add vpx_idct16x16_256_add_sse2 -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_38_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_38_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_38_add vpx_idct16x16_38_add_sse2 -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_sse2 -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_1_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1_add vpx_idct32x32_1_add_sse2 -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_34_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_34_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_34_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_16_add vpx_idct4x4_16_add_sse2 -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_1_add_sse2(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_1_add vpx_idct4x4_1_add_sse2 -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_12_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_12_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_12_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_1_add_sse2(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_1_add vpx_idct8x8_1_add_sse2 -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_64_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_64_add vpx_idct8x8_64_add_sse2 -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); -int16_t vpx_int_pro_col_sse2(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); +int16_t vpx_int_pro_col_sse2(const uint8_t *ref, const int width); #define vpx_int_pro_col vpx_int_pro_col_sse2 -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); -void vpx_int_pro_row_sse2(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); +void vpx_int_pro_row_sse2(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); #define vpx_int_pro_row vpx_int_pro_row_sse2 -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_iwht4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_iwht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_sse2 -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_avx2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_avx2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_avx2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_sse2(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_avx2(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_4_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_sse2 -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_4_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_4_dual_sse2( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_sse2 -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_8_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_sse2 -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_8_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_8_dual_sse2( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_sse2 -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16 vpx_lpf_vertical_16_sse2 -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_sse2 -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_4_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_4 vpx_lpf_vertical_4_sse2 -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_4_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_4_dual vpx_lpf_vertical_4_dual_sse2 -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_8_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_8 vpx_lpf_vertical_8_sse2 -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_8_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_sse2 -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -void vpx_mbpost_proc_across_ip_sse2(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +void vpx_mbpost_proc_across_ip_sse2(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_across_ip vpx_mbpost_proc_across_ip_sse2 -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); -void vpx_mbpost_proc_down_sse2(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_down_sse2(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_down vpx_mbpost_proc_down_sse2 -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -void vpx_minmax_8x8_sse2(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +void vpx_minmax_8x8_sse2(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_minmax_8x8 vpx_minmax_8x8_sse2 -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t* src_ptr, +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -#define vpx_mse16x8 vpx_mse16x8_sse2 +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x8_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse16x8)(const uint8_t *src_ptr, + int source_stride, + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse8x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse8x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x16 vpx_mse8x16_sse2 -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x8 vpx_mse8x8_sse2 -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); -void vpx_plane_add_noise_sse2(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); +void vpx_plane_add_noise_sse2(uint8_t *start, const int8_t *noise, + int blackclamp, int whiteclamp, int width, + int height, int pitch); #define vpx_plane_add_noise vpx_plane_add_noise_sse2 -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); -void vpx_post_proc_down_and_across_mb_row_sse2(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); +void vpx_post_proc_down_and_across_mb_row_sse2(unsigned char *src, + unsigned char *dst, + int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); #define vpx_post_proc_down_and_across_mb_row \ vpx_post_proc_down_and_across_mb_row_sse2 -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_avx(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_avx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_avx(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_avx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x16 vpx_sad16x16_sse2 -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x16_avg vpx_sad16x16_avg_sse2 -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x3_ssse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x3_ssse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x4d vpx_sad16x16x4d_sse2 -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x32 vpx_sad16x32_sse2 -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x32_avg vpx_sad16x32_avg_sse2 -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x32x4d vpx_sad16x32x4d_sse2 -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x8 vpx_sad16x8_sse2 -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x8_avg vpx_sad16x8_avg_sse2 -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x3_ssse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x3_ssse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x4d vpx_sad16x8x4d_sse2 -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x16x4d vpx_sad32x16x4d_sse2 -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x64x4d vpx_sad32x64x4d_sse2 -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x4 vpx_sad4x4_sse2 -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x4_avg vpx_sad4x4_avg_sse2 -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x4d vpx_sad4x4x4d_sse2 -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x8 vpx_sad4x8_sse2 -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x8_avg vpx_sad4x8_avg_sse2 -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x8x4d vpx_sad4x8x4d_sse2 -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x32x4d vpx_sad64x32x4d_sse2 -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x16 vpx_sad8x16_sse2 -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x16_avg vpx_sad8x16_avg_sse2 -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x4d vpx_sad8x16x4d_sse2 -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x4 vpx_sad8x4_sse2 -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x4_avg vpx_sad8x4_avg_sse2 -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x4x4d vpx_sad8x4x4d_sse2 -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x8 vpx_sad8x8_sse2 -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x8_avg vpx_sad8x8_avg_sse2 -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x4d vpx_sad8x8x4d_sse2 -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -int vpx_satd_c(const tran_low_t* coeff, int length); -int vpx_satd_sse2(const tran_low_t* coeff, int length); -int vpx_satd_avx2(const tran_low_t* coeff, int length); -RTCD_EXTERN int (*vpx_satd)(const tran_low_t* coeff, int length); +int vpx_satd_c(const tran_low_t *coeff, int length); +int vpx_satd_sse2(const tran_low_t *coeff, int length); +int vpx_satd_avx2(const tran_low_t *coeff, int length); +RTCD_EXTERN int (*vpx_satd)(const tran_low_t *coeff, int length); -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_scaled_2d_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_2d_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -void vpx_subtract_block_sse2(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_sse2(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); #define vpx_subtract_block vpx_subtract_block_sse2 -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); -uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t* src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t *src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_sse2 -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_sse2 -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_sse2 -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_sse2 -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_sse2 -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_16x16 vpx_v_predictor_16x16_sse2 -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_32x32 vpx_v_predictor_32x32_sse2 -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_4x4 vpx_v_predictor_4x4_sse2 -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_sse2 -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t* src_ptr, +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -#define vpx_variance16x32 vpx_variance16x32_sse2 - -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -#define vpx_variance16x8 vpx_variance16x8_sse2 - -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t* src_ptr, +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t* src_ptr, +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x8)(const uint8_t *src_ptr, + int source_stride, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); + +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -#define vpx_variance32x64 vpx_variance32x64_sse2 +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t *src_ptr, + int source_stride, + const uint8_t *ref_ptr, + int ref_stride, + unsigned int *sse); -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x64)(const uint8_t *src_ptr, + int source_stride, + const uint8_t *ref_ptr, + int ref_stride, + unsigned int *sse); + +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x4_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x4 vpx_variance4x4_sse2 -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x8 vpx_variance4x8_sse2 -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t* src_ptr, +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t* src_ptr, +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x16 vpx_variance8x16_sse2 -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x4 vpx_variance8x4_sse2 -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x8 vpx_variance8x8_sse2 -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); -int vpx_vector_var_sse2(const int16_t* ref, const int16_t* src, const int bwl); +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); +int vpx_vector_var_sse2(const int16_t *ref, const int16_t *src, const int bwl); #define vpx_vector_var vpx_vector_var_sse2 void vpx_dsp_rtcd(void); @@ -7540,35 +4752,24 @@ (void)flags; vpx_convolve8 = vpx_convolve8_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8 = vpx_convolve8_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8 = vpx_convolve8_avx2; + if (flags & HAS_SSSE3) vpx_convolve8 = vpx_convolve8_ssse3; + if (flags & HAS_AVX2) vpx_convolve8 = vpx_convolve8_avx2; vpx_convolve8_avg = vpx_convolve8_avg_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_avg = vpx_convolve8_avg_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg = vpx_convolve8_avg_avx2; + if (flags & HAS_SSSE3) vpx_convolve8_avg = vpx_convolve8_avg_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_avg = vpx_convolve8_avg_avx2; vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_sse2; if (flags & HAS_SSSE3) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_avx2; + if (flags & HAS_AVX2) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_avx2; vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_avx2; + if (flags & HAS_SSSE3) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_avx2; vpx_convolve8_horiz = vpx_convolve8_horiz_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_horiz = vpx_convolve8_horiz_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_horiz = vpx_convolve8_horiz_avx2; + if (flags & HAS_SSSE3) vpx_convolve8_horiz = vpx_convolve8_horiz_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_horiz = vpx_convolve8_horiz_avx2; vpx_convolve8_vert = vpx_convolve8_vert_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_vert = vpx_convolve8_vert_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_vert = vpx_convolve8_vert_avx2; + if (flags & HAS_SSSE3) vpx_convolve8_vert = vpx_convolve8_vert_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_vert = vpx_convolve8_vert_avx2; vpx_d153_predictor_16x16 = vpx_d153_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d153_predictor_16x16 = vpx_d153_predictor_16x16_ssse3; @@ -7576,11 +4777,9 @@ if (flags & HAS_SSSE3) vpx_d153_predictor_32x32 = vpx_d153_predictor_32x32_ssse3; vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_c; - if (flags & HAS_SSSE3) - vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_ssse3; + if (flags & HAS_SSSE3) vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_ssse3; vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_ssse3; vpx_d207_predictor_16x16 = vpx_d207_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d207_predictor_16x16 = vpx_d207_predictor_16x16_ssse3; @@ -7588,8 +4787,7 @@ if (flags & HAS_SSSE3) vpx_d207_predictor_32x32 = vpx_d207_predictor_32x32_ssse3; vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_ssse3; vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_ssse3; @@ -7603,23 +4801,17 @@ if (flags & HAS_SSSE3) vpx_d63_predictor_32x32 = vpx_d63_predictor_32x32_ssse3; vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_c; - if (flags & HAS_SSSE3) - vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_ssse3; + if (flags & HAS_SSSE3) vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_ssse3; vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_ssse3; vpx_get16x16var = vpx_get16x16var_sse2; - if (flags & HAS_AVX2) - vpx_get16x16var = vpx_get16x16var_avx2; + if (flags & HAS_AVX2) vpx_get16x16var = vpx_get16x16var_avx2; vpx_hadamard_16x16 = vpx_hadamard_16x16_sse2; - if (flags & HAS_AVX2) - vpx_hadamard_16x16 = vpx_hadamard_16x16_avx2; + if (flags & HAS_AVX2) vpx_hadamard_16x16 = vpx_hadamard_16x16_avx2; vpx_hadamard_8x8 = vpx_hadamard_8x8_sse2; - if (flags & HAS_SSSE3) - vpx_hadamard_8x8 = vpx_hadamard_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_hadamard_8x8 = vpx_hadamard_8x8_ssse3; vpx_highbd_convolve8 = vpx_highbd_convolve8_sse2; - if (flags & HAS_AVX2) - vpx_highbd_convolve8 = vpx_highbd_convolve8_avx2; + if (flags & HAS_AVX2) vpx_highbd_convolve8 = vpx_highbd_convolve8_avx2; vpx_highbd_convolve8_avg = vpx_highbd_convolve8_avg_sse2; if (flags & HAS_AVX2) vpx_highbd_convolve8_avg = vpx_highbd_convolve8_avg_avx2; @@ -7636,8 +4828,7 @@ if (flags & HAS_AVX2) vpx_highbd_convolve8_vert = vpx_highbd_convolve8_vert_avx2; vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_sse2; - if (flags & HAS_AVX2) - vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_avx2; + if (flags & HAS_AVX2) vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_avx2; vpx_highbd_convolve_copy = vpx_highbd_convolve_copy_sse2; if (flags & HAS_AVX2) vpx_highbd_convolve_copy = vpx_highbd_convolve_copy_avx2; @@ -7726,109 +4917,76 @@ if (flags & HAS_SSE4_1) vpx_highbd_idct8x8_64_add = vpx_highbd_idct8x8_64_add_sse4_1; vpx_idct32x32_135_add = vpx_idct32x32_135_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct32x32_135_add = vpx_idct32x32_135_add_ssse3; + if (flags & HAS_SSSE3) vpx_idct32x32_135_add = vpx_idct32x32_135_add_ssse3; vpx_idct32x32_34_add = vpx_idct32x32_34_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct32x32_34_add = vpx_idct32x32_34_add_ssse3; + if (flags & HAS_SSSE3) vpx_idct32x32_34_add = vpx_idct32x32_34_add_ssse3; vpx_idct8x8_12_add = vpx_idct8x8_12_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct8x8_12_add = vpx_idct8x8_12_add_ssse3; + if (flags & HAS_SSSE3) vpx_idct8x8_12_add = vpx_idct8x8_12_add_ssse3; vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_sse2; - if (flags & HAS_AVX2) - vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_avx2; + if (flags & HAS_AVX2) vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_avx2; vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_sse2; if (flags & HAS_AVX2) vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_avx2; vpx_mse16x16 = vpx_mse16x16_sse2; - if (flags & HAS_AVX2) - vpx_mse16x16 = vpx_mse16x16_avx2; + if (flags & HAS_AVX2) vpx_mse16x16 = vpx_mse16x16_avx2; + vpx_mse16x8 = vpx_mse16x8_sse2; + if (flags & HAS_AVX2) vpx_mse16x8 = vpx_mse16x8_avx2; vpx_quantize_b = vpx_quantize_b_sse2; - if (flags & HAS_SSSE3) - vpx_quantize_b = vpx_quantize_b_ssse3; - if (flags & HAS_AVX) - vpx_quantize_b = vpx_quantize_b_avx; + if (flags & HAS_SSSE3) vpx_quantize_b = vpx_quantize_b_ssse3; + if (flags & HAS_AVX) vpx_quantize_b = vpx_quantize_b_avx; vpx_quantize_b_32x32 = vpx_quantize_b_32x32_c; - if (flags & HAS_SSSE3) - vpx_quantize_b_32x32 = vpx_quantize_b_32x32_ssse3; - if (flags & HAS_AVX) - vpx_quantize_b_32x32 = vpx_quantize_b_32x32_avx; + if (flags & HAS_SSSE3) vpx_quantize_b_32x32 = vpx_quantize_b_32x32_ssse3; + if (flags & HAS_AVX) vpx_quantize_b_32x32 = vpx_quantize_b_32x32_avx; vpx_sad16x16x3 = vpx_sad16x16x3_c; - if (flags & HAS_SSE3) - vpx_sad16x16x3 = vpx_sad16x16x3_sse3; - if (flags & HAS_SSSE3) - vpx_sad16x16x3 = vpx_sad16x16x3_ssse3; + if (flags & HAS_SSE3) vpx_sad16x16x3 = vpx_sad16x16x3_sse3; + if (flags & HAS_SSSE3) vpx_sad16x16x3 = vpx_sad16x16x3_ssse3; vpx_sad16x16x8 = vpx_sad16x16x8_c; - if (flags & HAS_SSE4_1) - vpx_sad16x16x8 = vpx_sad16x16x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad16x16x8 = vpx_sad16x16x8_sse4_1; vpx_sad16x8x3 = vpx_sad16x8x3_c; - if (flags & HAS_SSE3) - vpx_sad16x8x3 = vpx_sad16x8x3_sse3; - if (flags & HAS_SSSE3) - vpx_sad16x8x3 = vpx_sad16x8x3_ssse3; + if (flags & HAS_SSE3) vpx_sad16x8x3 = vpx_sad16x8x3_sse3; + if (flags & HAS_SSSE3) vpx_sad16x8x3 = vpx_sad16x8x3_ssse3; vpx_sad16x8x8 = vpx_sad16x8x8_c; - if (flags & HAS_SSE4_1) - vpx_sad16x8x8 = vpx_sad16x8x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad16x8x8 = vpx_sad16x8x8_sse4_1; vpx_sad32x16 = vpx_sad32x16_sse2; - if (flags & HAS_AVX2) - vpx_sad32x16 = vpx_sad32x16_avx2; + if (flags & HAS_AVX2) vpx_sad32x16 = vpx_sad32x16_avx2; vpx_sad32x16_avg = vpx_sad32x16_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x16_avg = vpx_sad32x16_avg_avx2; + if (flags & HAS_AVX2) vpx_sad32x16_avg = vpx_sad32x16_avg_avx2; vpx_sad32x32 = vpx_sad32x32_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32 = vpx_sad32x32_avx2; + if (flags & HAS_AVX2) vpx_sad32x32 = vpx_sad32x32_avx2; vpx_sad32x32_avg = vpx_sad32x32_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32_avg = vpx_sad32x32_avg_avx2; + if (flags & HAS_AVX2) vpx_sad32x32_avg = vpx_sad32x32_avg_avx2; vpx_sad32x32x4d = vpx_sad32x32x4d_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32x4d = vpx_sad32x32x4d_avx2; + if (flags & HAS_AVX2) vpx_sad32x32x4d = vpx_sad32x32x4d_avx2; vpx_sad32x64 = vpx_sad32x64_sse2; - if (flags & HAS_AVX2) - vpx_sad32x64 = vpx_sad32x64_avx2; + if (flags & HAS_AVX2) vpx_sad32x64 = vpx_sad32x64_avx2; vpx_sad32x64_avg = vpx_sad32x64_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x64_avg = vpx_sad32x64_avg_avx2; + if (flags & HAS_AVX2) vpx_sad32x64_avg = vpx_sad32x64_avg_avx2; vpx_sad4x4x3 = vpx_sad4x4x3_c; - if (flags & HAS_SSE3) - vpx_sad4x4x3 = vpx_sad4x4x3_sse3; + if (flags & HAS_SSE3) vpx_sad4x4x3 = vpx_sad4x4x3_sse3; vpx_sad4x4x8 = vpx_sad4x4x8_c; - if (flags & HAS_SSE4_1) - vpx_sad4x4x8 = vpx_sad4x4x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad4x4x8 = vpx_sad4x4x8_sse4_1; vpx_sad64x32 = vpx_sad64x32_sse2; - if (flags & HAS_AVX2) - vpx_sad64x32 = vpx_sad64x32_avx2; + if (flags & HAS_AVX2) vpx_sad64x32 = vpx_sad64x32_avx2; vpx_sad64x32_avg = vpx_sad64x32_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad64x32_avg = vpx_sad64x32_avg_avx2; + if (flags & HAS_AVX2) vpx_sad64x32_avg = vpx_sad64x32_avg_avx2; vpx_sad64x64 = vpx_sad64x64_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64 = vpx_sad64x64_avx2; + if (flags & HAS_AVX2) vpx_sad64x64 = vpx_sad64x64_avx2; vpx_sad64x64_avg = vpx_sad64x64_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64_avg = vpx_sad64x64_avg_avx2; + if (flags & HAS_AVX2) vpx_sad64x64_avg = vpx_sad64x64_avg_avx2; vpx_sad64x64x4d = vpx_sad64x64x4d_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64x4d = vpx_sad64x64x4d_avx2; + if (flags & HAS_AVX2) vpx_sad64x64x4d = vpx_sad64x64x4d_avx2; vpx_sad8x16x3 = vpx_sad8x16x3_c; - if (flags & HAS_SSE3) - vpx_sad8x16x3 = vpx_sad8x16x3_sse3; + if (flags & HAS_SSE3) vpx_sad8x16x3 = vpx_sad8x16x3_sse3; vpx_sad8x16x8 = vpx_sad8x16x8_c; - if (flags & HAS_SSE4_1) - vpx_sad8x16x8 = vpx_sad8x16x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad8x16x8 = vpx_sad8x16x8_sse4_1; vpx_sad8x8x3 = vpx_sad8x8x3_c; - if (flags & HAS_SSE3) - vpx_sad8x8x3 = vpx_sad8x8x3_sse3; + if (flags & HAS_SSE3) vpx_sad8x8x3 = vpx_sad8x8x3_sse3; vpx_sad8x8x8 = vpx_sad8x8x8_c; - if (flags & HAS_SSE4_1) - vpx_sad8x8x8 = vpx_sad8x8x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad8x8x8 = vpx_sad8x8x8_sse4_1; vpx_satd = vpx_satd_sse2; - if (flags & HAS_AVX2) - vpx_satd = vpx_satd_avx2; + if (flags & HAS_AVX2) vpx_satd = vpx_satd_avx2; vpx_scaled_2d = vpx_scaled_2d_c; - if (flags & HAS_SSSE3) - vpx_scaled_2d = vpx_scaled_2d_ssse3; + if (flags & HAS_SSSE3) vpx_scaled_2d = vpx_scaled_2d_ssse3; vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_sse2; if (flags & HAS_SSSE3) vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_ssse3; @@ -7916,20 +5074,21 @@ if (flags & HAS_SSSE3) vpx_sub_pixel_variance8x8 = vpx_sub_pixel_variance8x8_ssse3; vpx_variance16x16 = vpx_variance16x16_sse2; - if (flags & HAS_AVX2) - vpx_variance16x16 = vpx_variance16x16_avx2; + if (flags & HAS_AVX2) vpx_variance16x16 = vpx_variance16x16_avx2; + vpx_variance16x32 = vpx_variance16x32_sse2; + if (flags & HAS_AVX2) vpx_variance16x32 = vpx_variance16x32_avx2; + vpx_variance16x8 = vpx_variance16x8_sse2; + if (flags & HAS_AVX2) vpx_variance16x8 = vpx_variance16x8_avx2; vpx_variance32x16 = vpx_variance32x16_sse2; - if (flags & HAS_AVX2) - vpx_variance32x16 = vpx_variance32x16_avx2; + if (flags & HAS_AVX2) vpx_variance32x16 = vpx_variance32x16_avx2; vpx_variance32x32 = vpx_variance32x32_sse2; - if (flags & HAS_AVX2) - vpx_variance32x32 = vpx_variance32x32_avx2; + if (flags & HAS_AVX2) vpx_variance32x32 = vpx_variance32x32_avx2; + vpx_variance32x64 = vpx_variance32x64_sse2; + if (flags & HAS_AVX2) vpx_variance32x64 = vpx_variance32x64_avx2; vpx_variance64x32 = vpx_variance64x32_sse2; - if (flags & HAS_AVX2) - vpx_variance64x32 = vpx_variance64x32_avx2; + if (flags & HAS_AVX2) vpx_variance64x32 = vpx_variance64x32_avx2; vpx_variance64x64 = vpx_variance64x64_sse2; - if (flags & HAS_AVX2) - vpx_variance64x64 = vpx_variance64x64_avx2; + if (flags & HAS_AVX2) vpx_variance64x64 = vpx_variance64x64_avx2; } #endif
diff --git a/third_party/libvpx/source/config/mac/x64/vpx_scale_rtcd.h b/third_party/libvpx/source/config/mac/x64/vpx_scale_rtcd.h index 19da7a7..f30cdee1 100644 --- a/third_party/libvpx/source/config/mac/x64/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/mac/x64/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/nacl/vp8_rtcd.h b/third_party/libvpx/source/config/nacl/vp8_rtcd.h index dc054d6..c5cded6 100644 --- a/third_party/libvpx/source/config/nacl/vp8_rtcd.h +++ b/third_party/libvpx/source/config/nacl/vp8_rtcd.h
@@ -27,312 +27,201 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict16x16 vp8_bilinear_predict16x16_c -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_c -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_c -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x8 vp8_bilinear_predict8x8_c -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); #define vp8_block_error vp8_block_error_c -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem16x16 vp8_copy_mem16x16_c -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_c -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x8 vp8_copy_mem8x8_c -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); #define vp8_dc_only_idct_add vp8_dc_only_idct_add_c -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter vp8_denoiser_filter_c -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_c -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); #define vp8_dequant_idct_add vp8_dequant_idct_add_c -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_c -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_c -void vp8_dequantize_b_c(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); #define vp8_dequantize_b vp8_dequantize_b_c -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_diamond_search_sad vp8_diamond_search_sad_c -void vp8_fast_quantize_b_c(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); #define vp8_fast_quantize_b vp8_fast_quantize_b_c -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_c -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_c -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_full_search_sad vp8_full_search_sad_c -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bh vp8_loop_filter_bh_c -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bv vp8_loop_filter_bv_c -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbh vp8_loop_filter_mbh_c -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbv vp8_loop_filter_mbv_c -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_c -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_c -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbh vp8_loop_filter_simple_horizontal_edge_c -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbv vp8_loop_filter_simple_vertical_edge_c -int vp8_mbblock_error_c(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); #define vp8_mbblock_error vp8_mbblock_error_c -int vp8_mbuverror_c(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); #define vp8_mbuverror vp8_mbuverror_c -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_refining_search_sad vp8_refining_search_sad_c -void vp8_regular_quantize_b_c(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); #define vp8_regular_quantize_b vp8_regular_quantize_b_c -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); #define vp8_short_fdct4x4 vp8_short_fdct4x4_c -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); #define vp8_short_fdct8x4 vp8_short_fdct8x4_c -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); #define vp8_short_idct4x4llm vp8_short_idct4x4llm_c -void vp8_short_inv_walsh4x4_c(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); #define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_c -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); #define vp8_short_walsh4x4 vp8_short_walsh4x4_c -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict16x16 vp8_sixtap_predict16x16_c -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_c -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x4 vp8_sixtap_predict8x4_c -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_sixtap_predict8x8 vp8_sixtap_predict8x8_c void vp8_rtcd(void);
diff --git a/third_party/libvpx/source/config/nacl/vp9_rtcd.h b/third_party/libvpx/source/config/nacl/vp9_rtcd.h index 289a739..8c1bbc4 100644 --- a/third_party/libvpx/source/config/nacl/vp9_rtcd.h +++ b/third_party/libvpx/source/config/nacl/vp9_rtcd.h
@@ -31,247 +31,160 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); #define vp9_block_error vp9_block_error_c -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); #define vp9_block_error_fp vp9_block_error_fp_c -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); #define vp9_denoiser_filter vp9_denoiser_filter_c -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); #define vp9_diamond_search_sad vp9_diamond_search_sad_c -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_fdct8x8_quant vp9_fdct8x8_quant_c -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_c -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht4x4 vp9_fht4x4_c -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_c -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_c -int64_t vp9_highbd_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); +int64_t vp9_highbd_block_error_c(const tran_low_t *coeff, + const tran_low_t *dqcoeff, intptr_t block_size, + int64_t *ssz, int bd); #define vp9_highbd_block_error vp9_highbd_block_error_c -void vp9_highbd_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht16x16 vp9_highbd_fht16x16_c -void vp9_highbd_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht4x4 vp9_highbd_fht4x4_c -void vp9_highbd_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht8x8 vp9_highbd_fht8x8_c -void vp9_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_highbd_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_highbd_fwht4x4 vp9_highbd_fwht4x4_c -void vp9_highbd_iht16x16_256_add_c(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); +void vp9_highbd_iht16x16_256_add_c(const tran_low_t *input, uint16_t *output, + int pitch, int tx_type, int bd); #define vp9_highbd_iht16x16_256_add vp9_highbd_iht16x16_256_add_c -void vp9_highbd_iht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); #define vp9_highbd_iht4x4_16_add vp9_highbd_iht4x4_16_add_c -void vp9_highbd_iht8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); #define vp9_highbd_iht8x8_64_add vp9_highbd_iht8x8_64_add_c -void vp9_highbd_mbpost_proc_across_ip_c(uint16_t* src, - int pitch, - int rows, - int cols, - int flimit); +void vp9_highbd_mbpost_proc_across_ip_c(uint16_t *src, int pitch, int rows, + int cols, int flimit); #define vp9_highbd_mbpost_proc_across_ip vp9_highbd_mbpost_proc_across_ip_c -void vp9_highbd_mbpost_proc_down_c(uint16_t* dst, - int pitch, - int rows, - int cols, +void vp9_highbd_mbpost_proc_down_c(uint16_t *dst, int pitch, int rows, int cols, int flimit); #define vp9_highbd_mbpost_proc_down vp9_highbd_mbpost_proc_down_c -void vp9_highbd_post_proc_down_and_across_c(const uint16_t* src_ptr, - uint16_t* dst_ptr, +void vp9_highbd_post_proc_down_and_across_c(const uint16_t *src_ptr, + uint16_t *dst_ptr, int src_pixels_per_line, - int dst_pixels_per_line, - int rows, - int cols, - int flimit); + int dst_pixels_per_line, int rows, + int cols, int flimit); #define vp9_highbd_post_proc_down_and_across \ vp9_highbd_post_proc_down_and_across_c -void vp9_highbd_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp vp9_highbd_quantize_fp_c -void vp9_highbd_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp_32x32 vp9_highbd_quantize_fp_32x32_c -void vp9_highbd_temporal_filter_apply_c(const uint8_t* frame1, - unsigned int stride, - const uint8_t* frame2, - unsigned int block_width, - unsigned int block_height, - int strength, - int filter_weight, - uint32_t* accumulator, - uint16_t* count); +void vp9_highbd_temporal_filter_apply_c( + const uint8_t *frame1, unsigned int stride, const uint8_t *frame2, + unsigned int block_width, unsigned int block_height, int strength, + int filter_weight, uint32_t *accumulator, uint16_t *count); #define vp9_highbd_temporal_filter_apply vp9_highbd_temporal_filter_apply_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); #define vp9_iht16x16_256_add vp9_iht16x16_256_add_c -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht4x4_16_add vp9_iht4x4_16_add_c -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht8x8_64_add vp9_iht8x8_64_add_c -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vp9_quantize_fp vp9_quantize_fp_c -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); #define vp9_scale_and_extend_frame vp9_scale_and_extend_frame_c void vp9_rtcd(void);
diff --git a/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h index 9770717..8f4462c 100644 --- a/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h
@@ -20,3807 +20,2635 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); #define vpx_avg_4x4 vpx_avg_4x4_c -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); #define vpx_avg_8x8 vpx_avg_8x8_c -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); #define vpx_comp_avg_pred vpx_comp_avg_pred_c -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8 vpx_convolve8_c -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve8_avg vpx_convolve8_avg_c -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_horiz vpx_convolve8_avg_horiz_c -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_avg_vert vpx_convolve8_avg_vert_c -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_horiz vpx_convolve8_horiz_c -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve8_vert vpx_convolve8_vert_c -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve_avg vpx_convolve_avg_c -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_convolve_copy vpx_convolve_copy_c -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_c -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_16x16 vpx_d153_predictor_16x16_c -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_32x32 vpx_d153_predictor_32x32_c -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_4x4 vpx_d153_predictor_4x4_c -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d153_predictor_8x8 vpx_d153_predictor_8x8_c -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_16x16 vpx_d207_predictor_16x16_c -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_32x32 vpx_d207_predictor_32x32_c -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_c -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_8x8 vpx_d207_predictor_8x8_c -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_16x16 vpx_d45_predictor_16x16_c -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_32x32 vpx_d45_predictor_32x32_c -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_c -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_c -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_16x16 vpx_d63_predictor_16x16_c -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_32x32 vpx_d63_predictor_32x32_c -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_4x4 vpx_d63_predictor_4x4_c -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63_predictor_8x8 vpx_d63_predictor_8x8_c -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_c -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_c -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_c -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_c -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_c -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_c -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_c -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_c -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_c -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_c -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_c -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_c -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_c -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_c -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_c -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_c -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16 vpx_fdct16x16_c -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16_1 vpx_fdct16x16_1_c -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32 vpx_fdct32x32_c -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_1 vpx_fdct32x32_1_c -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_rd vpx_fdct32x32_rd_c -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4 vpx_fdct4x4_c -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4_1 vpx_fdct4x4_1_c -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8 vpx_fdct8x8_c -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8_1 vpx_fdct8x8_1_c -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get16x16var vpx_get16x16var_c -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_c -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); #define vpx_get8x8var vpx_get8x8var_c -unsigned int vpx_get_mb_ss_c(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); #define vpx_get_mb_ss vpx_get_mb_ss_c -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_16x16 vpx_h_predictor_16x16_c -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_32x32 vpx_h_predictor_32x32_c -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_4x4 vpx_h_predictor_4x4_c -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_8x8 vpx_h_predictor_8x8_c -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); #define vpx_hadamard_16x16 vpx_hadamard_16x16_c -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); #define vpx_hadamard_8x8 vpx_hadamard_8x8_c -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_highbd_10_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get16x16var vpx_highbd_10_get16x16var_c -void vpx_highbd_10_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get8x8var vpx_highbd_10_get8x8var_c -unsigned int vpx_highbd_10_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse16x16 vpx_highbd_10_mse16x16_c -unsigned int vpx_highbd_10_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse16x8 vpx_highbd_10_mse16x8_c -unsigned int vpx_highbd_10_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse8x16 vpx_highbd_10_mse8x16_c -unsigned int vpx_highbd_10_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse8x8 vpx_highbd_10_mse8x8_c uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x16 \ vpx_highbd_10_sub_pixel_avg_variance16x16_c uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x32 \ vpx_highbd_10_sub_pixel_avg_variance16x32_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x8 \ vpx_highbd_10_sub_pixel_avg_variance16x8_c uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x16 \ vpx_highbd_10_sub_pixel_avg_variance32x16_c uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x32 \ vpx_highbd_10_sub_pixel_avg_variance32x32_c uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x64 \ vpx_highbd_10_sub_pixel_avg_variance32x64_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x4 \ vpx_highbd_10_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x8 \ vpx_highbd_10_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance64x32 \ vpx_highbd_10_sub_pixel_avg_variance64x32_c uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance64x64 \ vpx_highbd_10_sub_pixel_avg_variance64x64_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x16 \ vpx_highbd_10_sub_pixel_avg_variance8x16_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x4 \ vpx_highbd_10_sub_pixel_avg_variance8x4_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x8 \ vpx_highbd_10_sub_pixel_avg_variance8x8_c -uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x16 \ vpx_highbd_10_sub_pixel_variance16x16_c -uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x32 \ vpx_highbd_10_sub_pixel_variance16x32_c -uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x8 \ vpx_highbd_10_sub_pixel_variance16x8_c -uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x16 \ vpx_highbd_10_sub_pixel_variance32x16_c -uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x32 \ vpx_highbd_10_sub_pixel_variance32x32_c -uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x64 \ vpx_highbd_10_sub_pixel_variance32x64_c -uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x4 \ vpx_highbd_10_sub_pixel_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x8 \ vpx_highbd_10_sub_pixel_variance4x8_c -uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance64x32 \ vpx_highbd_10_sub_pixel_variance64x32_c -uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance64x64 \ vpx_highbd_10_sub_pixel_variance64x64_c -uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x16 \ vpx_highbd_10_sub_pixel_variance8x16_c -uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x4 \ vpx_highbd_10_sub_pixel_variance8x4_c -uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x8 \ vpx_highbd_10_sub_pixel_variance8x8_c -unsigned int vpx_highbd_10_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance16x16 vpx_highbd_10_variance16x16_c -unsigned int vpx_highbd_10_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance16x32 vpx_highbd_10_variance16x32_c -unsigned int vpx_highbd_10_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance16x8 vpx_highbd_10_variance16x8_c -unsigned int vpx_highbd_10_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance32x16 vpx_highbd_10_variance32x16_c -unsigned int vpx_highbd_10_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance32x32 vpx_highbd_10_variance32x32_c -unsigned int vpx_highbd_10_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance32x64 vpx_highbd_10_variance32x64_c -unsigned int vpx_highbd_10_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x4 vpx_highbd_10_variance4x4_c -unsigned int vpx_highbd_10_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x8 vpx_highbd_10_variance4x8_c -unsigned int vpx_highbd_10_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance64x32 vpx_highbd_10_variance64x32_c -unsigned int vpx_highbd_10_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance64x64 vpx_highbd_10_variance64x64_c -unsigned int vpx_highbd_10_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance8x16 vpx_highbd_10_variance8x16_c -unsigned int vpx_highbd_10_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance8x4 vpx_highbd_10_variance8x4_c -unsigned int vpx_highbd_10_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance8x8 vpx_highbd_10_variance8x8_c -void vpx_highbd_12_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get16x16var vpx_highbd_12_get16x16var_c -void vpx_highbd_12_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get8x8var vpx_highbd_12_get8x8var_c -unsigned int vpx_highbd_12_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse16x16 vpx_highbd_12_mse16x16_c -unsigned int vpx_highbd_12_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse16x8 vpx_highbd_12_mse16x8_c -unsigned int vpx_highbd_12_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse8x16 vpx_highbd_12_mse8x16_c -unsigned int vpx_highbd_12_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse8x8 vpx_highbd_12_mse8x8_c uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x16 \ vpx_highbd_12_sub_pixel_avg_variance16x16_c uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x32 \ vpx_highbd_12_sub_pixel_avg_variance16x32_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x8 \ vpx_highbd_12_sub_pixel_avg_variance16x8_c uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x16 \ vpx_highbd_12_sub_pixel_avg_variance32x16_c uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x32 \ vpx_highbd_12_sub_pixel_avg_variance32x32_c uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x64 \ vpx_highbd_12_sub_pixel_avg_variance32x64_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x4 \ vpx_highbd_12_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x8 \ vpx_highbd_12_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance64x32 \ vpx_highbd_12_sub_pixel_avg_variance64x32_c uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance64x64 \ vpx_highbd_12_sub_pixel_avg_variance64x64_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x16 \ vpx_highbd_12_sub_pixel_avg_variance8x16_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x4 \ vpx_highbd_12_sub_pixel_avg_variance8x4_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x8 \ vpx_highbd_12_sub_pixel_avg_variance8x8_c -uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x16 \ vpx_highbd_12_sub_pixel_variance16x16_c -uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x32 \ vpx_highbd_12_sub_pixel_variance16x32_c -uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x8 \ vpx_highbd_12_sub_pixel_variance16x8_c -uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x16 \ vpx_highbd_12_sub_pixel_variance32x16_c -uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x32 \ vpx_highbd_12_sub_pixel_variance32x32_c -uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x64 \ vpx_highbd_12_sub_pixel_variance32x64_c -uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x4 \ vpx_highbd_12_sub_pixel_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x8 \ vpx_highbd_12_sub_pixel_variance4x8_c -uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance64x32 \ vpx_highbd_12_sub_pixel_variance64x32_c -uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance64x64 \ vpx_highbd_12_sub_pixel_variance64x64_c -uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x16 \ vpx_highbd_12_sub_pixel_variance8x16_c -uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x4 \ vpx_highbd_12_sub_pixel_variance8x4_c -uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x8 \ vpx_highbd_12_sub_pixel_variance8x8_c -unsigned int vpx_highbd_12_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance16x16 vpx_highbd_12_variance16x16_c -unsigned int vpx_highbd_12_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance16x32 vpx_highbd_12_variance16x32_c -unsigned int vpx_highbd_12_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance16x8 vpx_highbd_12_variance16x8_c -unsigned int vpx_highbd_12_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance32x16 vpx_highbd_12_variance32x16_c -unsigned int vpx_highbd_12_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance32x32 vpx_highbd_12_variance32x32_c -unsigned int vpx_highbd_12_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance32x64 vpx_highbd_12_variance32x64_c -unsigned int vpx_highbd_12_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x4 vpx_highbd_12_variance4x4_c -unsigned int vpx_highbd_12_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x8 vpx_highbd_12_variance4x8_c -unsigned int vpx_highbd_12_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance64x32 vpx_highbd_12_variance64x32_c -unsigned int vpx_highbd_12_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance64x64 vpx_highbd_12_variance64x64_c -unsigned int vpx_highbd_12_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance8x16 vpx_highbd_12_variance8x16_c -unsigned int vpx_highbd_12_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance8x4 vpx_highbd_12_variance8x4_c -unsigned int vpx_highbd_12_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance8x8 vpx_highbd_12_variance8x8_c -void vpx_highbd_8_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get16x16var vpx_highbd_8_get16x16var_c -void vpx_highbd_8_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get8x8var vpx_highbd_8_get8x8var_c -unsigned int vpx_highbd_8_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse16x16 vpx_highbd_8_mse16x16_c -unsigned int vpx_highbd_8_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse16x8 vpx_highbd_8_mse16x8_c -unsigned int vpx_highbd_8_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse8x16 vpx_highbd_8_mse8x16_c -unsigned int vpx_highbd_8_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse8x8 vpx_highbd_8_mse8x8_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x16 \ vpx_highbd_8_sub_pixel_avg_variance16x16_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x32 \ vpx_highbd_8_sub_pixel_avg_variance16x32_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x8 \ vpx_highbd_8_sub_pixel_avg_variance16x8_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x16 \ vpx_highbd_8_sub_pixel_avg_variance32x16_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x32 \ vpx_highbd_8_sub_pixel_avg_variance32x32_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x64 \ vpx_highbd_8_sub_pixel_avg_variance32x64_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x4 \ vpx_highbd_8_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x8 \ vpx_highbd_8_sub_pixel_avg_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance64x32 \ vpx_highbd_8_sub_pixel_avg_variance64x32_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance64x64 \ vpx_highbd_8_sub_pixel_avg_variance64x64_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x16 \ vpx_highbd_8_sub_pixel_avg_variance8x16_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x4 \ vpx_highbd_8_sub_pixel_avg_variance8x4_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x8 \ vpx_highbd_8_sub_pixel_avg_variance8x8_c -uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x16 \ vpx_highbd_8_sub_pixel_variance16x16_c -uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x32 \ vpx_highbd_8_sub_pixel_variance16x32_c -uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x8 \ vpx_highbd_8_sub_pixel_variance16x8_c -uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x16 \ vpx_highbd_8_sub_pixel_variance32x16_c -uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x32 \ vpx_highbd_8_sub_pixel_variance32x32_c -uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x64 \ vpx_highbd_8_sub_pixel_variance32x64_c -uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x4 vpx_highbd_8_sub_pixel_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x8 vpx_highbd_8_sub_pixel_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance64x32 \ vpx_highbd_8_sub_pixel_variance64x32_c -uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance64x64 \ vpx_highbd_8_sub_pixel_variance64x64_c -uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x16 \ vpx_highbd_8_sub_pixel_variance8x16_c -uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x4 vpx_highbd_8_sub_pixel_variance8x4_c -uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x8 vpx_highbd_8_sub_pixel_variance8x8_c -unsigned int vpx_highbd_8_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance16x16 vpx_highbd_8_variance16x16_c -unsigned int vpx_highbd_8_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance16x32 vpx_highbd_8_variance16x32_c -unsigned int vpx_highbd_8_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance16x8 vpx_highbd_8_variance16x8_c -unsigned int vpx_highbd_8_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x16 vpx_highbd_8_variance32x16_c -unsigned int vpx_highbd_8_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x32 vpx_highbd_8_variance32x32_c -unsigned int vpx_highbd_8_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x64 vpx_highbd_8_variance32x64_c -unsigned int vpx_highbd_8_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x4 vpx_highbd_8_variance4x4_c -unsigned int vpx_highbd_8_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x8 vpx_highbd_8_variance4x8_c -unsigned int vpx_highbd_8_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance64x32 vpx_highbd_8_variance64x32_c -unsigned int vpx_highbd_8_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance64x64 vpx_highbd_8_variance64x64_c -unsigned int vpx_highbd_8_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance8x16 vpx_highbd_8_variance8x16_c -unsigned int vpx_highbd_8_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance8x4 vpx_highbd_8_variance8x4_c -unsigned int vpx_highbd_8_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance8x8 vpx_highbd_8_variance8x8_c -unsigned int vpx_highbd_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_4x4_c(const uint8_t *, int p); #define vpx_highbd_avg_4x4 vpx_highbd_avg_4x4_c -unsigned int vpx_highbd_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_8x8_c(const uint8_t *, int p); #define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c -void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred, - const uint16_t* pred, - int width, - int height, - const uint16_t* ref, +void vpx_highbd_comp_avg_pred_c(uint16_t *comp_pred, const uint16_t *pred, + int width, int height, const uint16_t *ref, int ref_stride); #define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c -void vpx_highbd_convolve8_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); #define vpx_highbd_convolve8 vpx_highbd_convolve8_c -void vpx_highbd_convolve8_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); #define vpx_highbd_convolve8_avg vpx_highbd_convolve8_avg_c -void vpx_highbd_convolve8_avg_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_avg_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); #define vpx_highbd_convolve8_avg_horiz vpx_highbd_convolve8_avg_horiz_c -void vpx_highbd_convolve8_avg_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_avg_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); #define vpx_highbd_convolve8_avg_vert vpx_highbd_convolve8_avg_vert_c -void vpx_highbd_convolve8_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); #define vpx_highbd_convolve8_horiz vpx_highbd_convolve8_horiz_c -void vpx_highbd_convolve8_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); #define vpx_highbd_convolve8_vert vpx_highbd_convolve8_vert_c -void vpx_highbd_convolve_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); #define vpx_highbd_convolve_avg vpx_highbd_convolve_avg_c -void vpx_highbd_convolve_copy_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_copy_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); #define vpx_highbd_convolve_copy vpx_highbd_convolve_copy_c -void vpx_highbd_d117_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d117_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d117_predictor_16x16 vpx_highbd_d117_predictor_16x16_c -void vpx_highbd_d117_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d117_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d117_predictor_32x32 vpx_highbd_d117_predictor_32x32_c -void vpx_highbd_d117_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d117_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d117_predictor_4x4 vpx_highbd_d117_predictor_4x4_c -void vpx_highbd_d117_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d117_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d117_predictor_8x8 vpx_highbd_d117_predictor_8x8_c -void vpx_highbd_d135_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d135_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d135_predictor_16x16 vpx_highbd_d135_predictor_16x16_c -void vpx_highbd_d135_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d135_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d135_predictor_32x32 vpx_highbd_d135_predictor_32x32_c -void vpx_highbd_d135_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d135_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d135_predictor_4x4 vpx_highbd_d135_predictor_4x4_c -void vpx_highbd_d135_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d135_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d135_predictor_8x8 vpx_highbd_d135_predictor_8x8_c -void vpx_highbd_d153_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d153_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d153_predictor_16x16 vpx_highbd_d153_predictor_16x16_c -void vpx_highbd_d153_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d153_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d153_predictor_32x32 vpx_highbd_d153_predictor_32x32_c -void vpx_highbd_d153_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d153_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d153_predictor_4x4 vpx_highbd_d153_predictor_4x4_c -void vpx_highbd_d153_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d153_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d153_predictor_8x8 vpx_highbd_d153_predictor_8x8_c -void vpx_highbd_d207_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d207_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d207_predictor_16x16 vpx_highbd_d207_predictor_16x16_c -void vpx_highbd_d207_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d207_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d207_predictor_32x32 vpx_highbd_d207_predictor_32x32_c -void vpx_highbd_d207_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d207_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d207_predictor_4x4 vpx_highbd_d207_predictor_4x4_c -void vpx_highbd_d207_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d207_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d207_predictor_8x8 vpx_highbd_d207_predictor_8x8_c -void vpx_highbd_d45_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d45_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d45_predictor_16x16 vpx_highbd_d45_predictor_16x16_c -void vpx_highbd_d45_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d45_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d45_predictor_32x32 vpx_highbd_d45_predictor_32x32_c -void vpx_highbd_d45_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_d45_predictor_4x4 vpx_highbd_d45_predictor_4x4_c -void vpx_highbd_d45_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_d45_predictor_8x8 vpx_highbd_d45_predictor_8x8_c -void vpx_highbd_d63_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d63_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d63_predictor_16x16 vpx_highbd_d63_predictor_16x16_c -void vpx_highbd_d63_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d63_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d63_predictor_32x32 vpx_highbd_d63_predictor_32x32_c -void vpx_highbd_d63_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_d63_predictor_4x4 vpx_highbd_d63_predictor_4x4_c -void vpx_highbd_d63_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_d63_predictor_8x8 vpx_highbd_d63_predictor_8x8_c -void vpx_highbd_dc_128_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_16x16 vpx_highbd_dc_128_predictor_16x16_c -void vpx_highbd_dc_128_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_32x32 vpx_highbd_dc_128_predictor_32x32_c -void vpx_highbd_dc_128_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_4x4 vpx_highbd_dc_128_predictor_4x4_c -void vpx_highbd_dc_128_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_8x8 vpx_highbd_dc_128_predictor_8x8_c -void vpx_highbd_dc_left_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_16x16 vpx_highbd_dc_left_predictor_16x16_c -void vpx_highbd_dc_left_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_32x32 vpx_highbd_dc_left_predictor_32x32_c -void vpx_highbd_dc_left_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_4x4 vpx_highbd_dc_left_predictor_4x4_c -void vpx_highbd_dc_left_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_8x8 vpx_highbd_dc_left_predictor_8x8_c -void vpx_highbd_dc_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_16x16 vpx_highbd_dc_predictor_16x16_c -void vpx_highbd_dc_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_32x32 vpx_highbd_dc_predictor_32x32_c -void vpx_highbd_dc_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_4x4 vpx_highbd_dc_predictor_4x4_c -void vpx_highbd_dc_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_8x8 vpx_highbd_dc_predictor_8x8_c -void vpx_highbd_dc_top_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_16x16 vpx_highbd_dc_top_predictor_16x16_c -void vpx_highbd_dc_top_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_32x32 vpx_highbd_dc_top_predictor_32x32_c -void vpx_highbd_dc_top_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_4x4 vpx_highbd_dc_top_predictor_4x4_c -void vpx_highbd_dc_top_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_8x8 vpx_highbd_dc_top_predictor_8x8_c -void vpx_highbd_fdct16x16_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct16x16 vpx_highbd_fdct16x16_c -void vpx_highbd_fdct16x16_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct16x16_1 vpx_highbd_fdct16x16_1_c -void vpx_highbd_fdct32x32_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32 vpx_highbd_fdct32x32_c -void vpx_highbd_fdct32x32_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32_1 vpx_highbd_fdct32x32_1_c -void vpx_highbd_fdct32x32_rd_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32_rd vpx_highbd_fdct32x32_rd_c -void vpx_highbd_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct4x4 vpx_highbd_fdct4x4_c -void vpx_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); +void vpx_highbd_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct8x8 vpx_highbd_fdct8x8_c -void vpx_highbd_fdct8x8_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct8x8_1 vpx_highbd_fdct8x8_1_c -void vpx_highbd_h_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_h_predictor_16x16 vpx_highbd_h_predictor_16x16_c -void vpx_highbd_h_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_h_predictor_32x32 vpx_highbd_h_predictor_32x32_c -void vpx_highbd_h_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_h_predictor_4x4 vpx_highbd_h_predictor_4x4_c -void vpx_highbd_h_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_h_predictor_8x8 vpx_highbd_h_predictor_8x8_c -void vpx_highbd_idct16x16_10_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct16x16_10_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct16x16_10_add vpx_highbd_idct16x16_10_add_c -void vpx_highbd_idct16x16_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct16x16_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct16x16_1_add vpx_highbd_idct16x16_1_add_c -void vpx_highbd_idct16x16_256_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct16x16_256_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct16x16_256_add vpx_highbd_idct16x16_256_add_c -void vpx_highbd_idct16x16_38_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct16x16_38_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct16x16_38_add vpx_highbd_idct16x16_38_add_c -void vpx_highbd_idct32x32_1024_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct32x32_1024_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct32x32_1024_add vpx_highbd_idct32x32_1024_add_c -void vpx_highbd_idct32x32_135_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct32x32_135_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct32x32_135_add vpx_highbd_idct32x32_135_add_c -void vpx_highbd_idct32x32_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct32x32_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct32x32_1_add vpx_highbd_idct32x32_1_add_c -void vpx_highbd_idct32x32_34_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct32x32_34_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct32x32_34_add vpx_highbd_idct32x32_34_add_c -void vpx_highbd_idct4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct4x4_16_add vpx_highbd_idct4x4_16_add_c -void vpx_highbd_idct4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct4x4_1_add vpx_highbd_idct4x4_1_add_c -void vpx_highbd_idct8x8_12_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct8x8_12_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct8x8_12_add vpx_highbd_idct8x8_12_add_c -void vpx_highbd_idct8x8_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct8x8_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct8x8_1_add vpx_highbd_idct8x8_1_add_c -void vpx_highbd_idct8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct8x8_64_add vpx_highbd_idct8x8_64_add_c -void vpx_highbd_iwht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_16_add vpx_highbd_iwht4x4_16_add_c -void vpx_highbd_iwht4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_1_add vpx_highbd_iwht4x4_1_add_c -void vpx_highbd_lpf_horizontal_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_16_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_16 vpx_highbd_lpf_horizontal_16_c -void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_16_dual vpx_highbd_lpf_horizontal_16_dual_c -void vpx_highbd_lpf_horizontal_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_4_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_4 vpx_highbd_lpf_horizontal_4_c -void vpx_highbd_lpf_horizontal_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_horizontal_4_dual vpx_highbd_lpf_horizontal_4_dual_c -void vpx_highbd_lpf_horizontal_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_8_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_8 vpx_highbd_lpf_horizontal_8_c -void vpx_highbd_lpf_horizontal_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_horizontal_8_dual vpx_highbd_lpf_horizontal_8_dual_c -void vpx_highbd_lpf_vertical_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_16_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_16 vpx_highbd_lpf_vertical_16_c -void vpx_highbd_lpf_vertical_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_16_dual vpx_highbd_lpf_vertical_16_dual_c -void vpx_highbd_lpf_vertical_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_4_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_4 vpx_highbd_lpf_vertical_4_c -void vpx_highbd_lpf_vertical_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_vertical_4_dual vpx_highbd_lpf_vertical_4_dual_c -void vpx_highbd_lpf_vertical_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_8_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_8 vpx_highbd_lpf_vertical_8_c -void vpx_highbd_lpf_vertical_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_vertical_8_dual vpx_highbd_lpf_vertical_8_dual_c -void vpx_highbd_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_highbd_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_highbd_minmax_8x8 vpx_highbd_minmax_8x8_c -void vpx_highbd_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_highbd_quantize_b vpx_highbd_quantize_b_c -void vpx_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_highbd_quantize_b_32x32 vpx_highbd_quantize_b_32x32_c -unsigned int vpx_highbd_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x16 vpx_highbd_sad16x16_c -unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad16x16_avg vpx_highbd_sad16x16_avg_c -void vpx_highbd_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x16x4d vpx_highbd_sad16x16x4d_c -unsigned int vpx_highbd_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x32 vpx_highbd_sad16x32_c -unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad16x32_avg vpx_highbd_sad16x32_avg_c -void vpx_highbd_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x32x4d vpx_highbd_sad16x32x4d_c -unsigned int vpx_highbd_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x8 vpx_highbd_sad16x8_c -unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad16x8_avg vpx_highbd_sad16x8_avg_c -void vpx_highbd_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x8x4d vpx_highbd_sad16x8x4d_c -unsigned int vpx_highbd_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x16 vpx_highbd_sad32x16_c -unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad32x16_avg vpx_highbd_sad32x16_avg_c -void vpx_highbd_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x16x4d vpx_highbd_sad32x16x4d_c -unsigned int vpx_highbd_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x32 vpx_highbd_sad32x32_c -unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad32x32_avg vpx_highbd_sad32x32_avg_c -void vpx_highbd_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x32x4d vpx_highbd_sad32x32x4d_c -unsigned int vpx_highbd_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x64 vpx_highbd_sad32x64_c -unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad32x64_avg vpx_highbd_sad32x64_avg_c -void vpx_highbd_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x64x4d vpx_highbd_sad32x64x4d_c -unsigned int vpx_highbd_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x4 vpx_highbd_sad4x4_c -unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x4_avg vpx_highbd_sad4x4_avg_c -void vpx_highbd_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad4x4x4d vpx_highbd_sad4x4x4d_c -unsigned int vpx_highbd_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x8 vpx_highbd_sad4x8_c -unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x8_avg vpx_highbd_sad4x8_avg_c -void vpx_highbd_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad4x8x4d vpx_highbd_sad4x8x4d_c -unsigned int vpx_highbd_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad64x32 vpx_highbd_sad64x32_c -unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad64x32_avg vpx_highbd_sad64x32_avg_c -void vpx_highbd_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad64x32x4d vpx_highbd_sad64x32x4d_c -unsigned int vpx_highbd_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad64x64 vpx_highbd_sad64x64_c -unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad64x64_avg vpx_highbd_sad64x64_avg_c -void vpx_highbd_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad64x64x4d vpx_highbd_sad64x64x4d_c -unsigned int vpx_highbd_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x16 vpx_highbd_sad8x16_c -unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x16_avg vpx_highbd_sad8x16_avg_c -void vpx_highbd_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x16x4d vpx_highbd_sad8x16x4d_c -unsigned int vpx_highbd_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x4 vpx_highbd_sad8x4_c -unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x4_avg vpx_highbd_sad8x4_avg_c -void vpx_highbd_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x4x4d vpx_highbd_sad8x4x4d_c -unsigned int vpx_highbd_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x8 vpx_highbd_sad8x8_c -unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x8_avg vpx_highbd_sad8x8_avg_c -void vpx_highbd_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x8x4d vpx_highbd_sad8x8x4d_c -void vpx_highbd_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, - ptrdiff_t pred_stride, - int bd); +void vpx_highbd_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, + ptrdiff_t pred_stride, int bd); #define vpx_highbd_subtract_block vpx_highbd_subtract_block_c -void vpx_highbd_tm_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_16x16 vpx_highbd_tm_predictor_16x16_c -void vpx_highbd_tm_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_32x32 vpx_highbd_tm_predictor_32x32_c -void vpx_highbd_tm_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_4x4 vpx_highbd_tm_predictor_4x4_c -void vpx_highbd_tm_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_8x8 vpx_highbd_tm_predictor_8x8_c -void vpx_highbd_v_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_v_predictor_16x16 vpx_highbd_v_predictor_16x16_c -void vpx_highbd_v_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_v_predictor_32x32 vpx_highbd_v_predictor_32x32_c -void vpx_highbd_v_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_v_predictor_4x4 vpx_highbd_v_predictor_4x4_c -void vpx_highbd_v_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); #define vpx_highbd_v_predictor_8x8 vpx_highbd_v_predictor_8x8_c -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_10_add vpx_idct16x16_10_add_c -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_1_add vpx_idct16x16_1_add_c -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_256_add vpx_idct16x16_256_add_c -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_38_add vpx_idct16x16_38_add_c -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_c -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_135_add vpx_idct32x32_135_add_c -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1_add vpx_idct32x32_1_add_c -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_34_add vpx_idct32x32_34_add_c -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_16_add vpx_idct4x4_16_add_c -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_1_add vpx_idct4x4_1_add_c -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_12_add vpx_idct8x8_12_add_c -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_1_add vpx_idct8x8_1_add_c -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_64_add vpx_idct8x8_64_add_c -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); #define vpx_int_pro_col vpx_int_pro_col_c -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); #define vpx_int_pro_row vpx_int_pro_row_c -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_c -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16 vpx_lpf_horizontal_16_c -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_16_dual vpx_lpf_horizontal_16_dual_c -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_c -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_c -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_c -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_c -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16 vpx_lpf_vertical_16_c -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_c -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_4 vpx_lpf_vertical_4_c -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_4_dual vpx_lpf_vertical_4_dual_c -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_8 vpx_lpf_vertical_8_c -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_c -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_across_ip vpx_mbpost_proc_across_ip_c -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); #define vpx_mbpost_proc_down vpx_mbpost_proc_down_c -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_minmax_8x8 vpx_minmax_8x8_c -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x16 vpx_mse16x16_c -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse16x8 vpx_mse16x8_c -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x16 vpx_mse8x16_c -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x8 vpx_mse8x8_c -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); #define vpx_plane_add_noise vpx_plane_add_noise_c -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); #define vpx_post_proc_down_and_across_mb_row \ vpx_post_proc_down_and_across_mb_row_c -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); #define vpx_quantize_b vpx_quantize_b_c -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_quantize_b_32x32 vpx_quantize_b_32x32_c -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x16 vpx_sad16x16_c -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x16_avg vpx_sad16x16_avg_c -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x3 vpx_sad16x16x3_c -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x4d vpx_sad16x16x4d_c -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x8 vpx_sad16x16x8_c -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x32 vpx_sad16x32_c -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x32_avg vpx_sad16x32_avg_c -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x32x4d vpx_sad16x32x4d_c -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x8 vpx_sad16x8_c -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x8_avg vpx_sad16x8_avg_c -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x3 vpx_sad16x8x3_c -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x4d vpx_sad16x8x4d_c -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x8 vpx_sad16x8x8_c -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x16 vpx_sad32x16_c -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x16_avg vpx_sad32x16_avg_c -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x16x4d vpx_sad32x16x4d_c -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x32 vpx_sad32x32_c -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x32_avg vpx_sad32x32_avg_c -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x32x4d vpx_sad32x32x4d_c -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad32x64 vpx_sad32x64_c -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad32x64_avg vpx_sad32x64_avg_c -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x64x4d vpx_sad32x64x4d_c -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x4 vpx_sad4x4_c -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x4_avg vpx_sad4x4_avg_c -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x3 vpx_sad4x4x3_c -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x4d vpx_sad4x4x4d_c -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x8 vpx_sad4x4x8_c -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x8 vpx_sad4x8_c -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x8_avg vpx_sad4x8_avg_c -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x8x4d vpx_sad4x8x4d_c -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x32 vpx_sad64x32_c -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x32_avg vpx_sad64x32_avg_c -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x32x4d vpx_sad64x32x4d_c -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad64x64 vpx_sad64x64_c -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad64x64_avg vpx_sad64x64_avg_c -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x64x4d vpx_sad64x64x4d_c -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x16 vpx_sad8x16_c -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x16_avg vpx_sad8x16_avg_c -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x3 vpx_sad8x16x3_c -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x4d vpx_sad8x16x4d_c -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x8 vpx_sad8x16x8_c -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x4 vpx_sad8x4_c -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x4_avg vpx_sad8x4_avg_c -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x4x4d vpx_sad8x4x4d_c -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x8 vpx_sad8x8_c -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x8_avg vpx_sad8x8_avg_c -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x3 vpx_sad8x8x3_c -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x4d vpx_sad8x8x4d_c -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x8 vpx_sad8x8x8_c -int vpx_satd_c(const tran_low_t* coeff, int length); +int vpx_satd_c(const tran_low_t *coeff, int length); #define vpx_satd vpx_satd_c -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_2d vpx_scaled_2d_c -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x16 vpx_sub_pixel_avg_variance16x16_c -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x32 vpx_sub_pixel_avg_variance16x32_c -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance16x8 vpx_sub_pixel_avg_variance16x8_c -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x16 vpx_sub_pixel_avg_variance32x16_c -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x32 vpx_sub_pixel_avg_variance32x32_c -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance32x64 vpx_sub_pixel_avg_variance32x64_c -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x4 vpx_sub_pixel_avg_variance4x4_c -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance4x8 vpx_sub_pixel_avg_variance4x8_c -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x32 vpx_sub_pixel_avg_variance64x32_c -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance64x64 vpx_sub_pixel_avg_variance64x64_c -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x16 vpx_sub_pixel_avg_variance8x16_c -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x4 vpx_sub_pixel_avg_variance8x4_c -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_sub_pixel_avg_variance8x8 vpx_sub_pixel_avg_variance8x8_c -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x16 vpx_sub_pixel_variance16x16_c -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance16x32 vpx_sub_pixel_variance16x32_c -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance16x8 vpx_sub_pixel_variance16x8_c -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x16 vpx_sub_pixel_variance32x16_c -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x32 vpx_sub_pixel_variance32x32_c -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance32x64 vpx_sub_pixel_variance32x64_c -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance4x4 vpx_sub_pixel_variance4x4_c -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance4x8 vpx_sub_pixel_variance4x8_c -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x32 vpx_sub_pixel_variance64x32_c -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_sub_pixel_variance64x64 vpx_sub_pixel_variance64x64_c -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x16 vpx_sub_pixel_variance8x16_c -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_c -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); #define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_c -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); #define vpx_subtract_block vpx_subtract_block_c -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_c -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_c -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_c -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_c -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_16x16 vpx_v_predictor_16x16_c -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_32x32 vpx_v_predictor_32x32_c -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_4x4 vpx_v_predictor_4x4_c -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_c -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x16 vpx_variance16x16_c -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x32 vpx_variance16x32_c -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance16x8 vpx_variance16x8_c -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x16 vpx_variance32x16_c -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x32 vpx_variance32x32_c -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance32x64 vpx_variance32x64_c -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x4 vpx_variance4x4_c -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x8 vpx_variance4x8_c -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x32 vpx_variance64x32_c -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance64x64 vpx_variance64x64_c -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x16 vpx_variance8x16_c -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x4 vpx_variance8x4_c -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x8 vpx_variance8x8_c -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); #define vpx_vector_var vpx_vector_var_c void vpx_dsp_rtcd(void);
diff --git a/third_party/libvpx/source/config/nacl/vpx_scale_rtcd.h b/third_party/libvpx/source/config/nacl/vpx_scale_rtcd.h index c5196db4d..aa7e4b1 100644 --- a/third_party/libvpx/source/config/nacl/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/nacl/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/vpx_version.h b/third_party/libvpx/source/config/vpx_version.h index cf24c88..6fa647d 100644 --- a/third_party/libvpx/source/config/vpx_version.h +++ b/third_party/libvpx/source/config/vpx_version.h
@@ -2,7 +2,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 7 #define VERSION_PATCH 0 -#define VERSION_EXTRA "262-gbe5df6080" +#define VERSION_EXTRA "291-g3b460db21" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.7.0-262-gbe5df6080" -#define VERSION_STRING " v1.7.0-262-gbe5df6080" +#define VERSION_STRING_NOSP "v1.7.0-291-g3b460db21" +#define VERSION_STRING " v1.7.0-291-g3b460db21"
diff --git a/third_party/libvpx/source/config/win/ia32/vp8_rtcd.h b/third_party/libvpx/source/config/win/ia32/vp8_rtcd.h index 9472db1..834d00c0 100644 --- a/third_party/libvpx/source/config/win/ia32/vp8_rtcd.h +++ b/third_party/libvpx/source/config/win/ia32/vp8_rtcd.h
@@ -27,712 +27,399 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict16x16_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict16x16_sse2(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict16x16_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_ssse3(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict4x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict4x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict4x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict8x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict8x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); -int vp8_block_error_sse2(short* coeff, short* dqcoeff); -RTCD_EXTERN int (*vp8_block_error)(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); +int vp8_block_error_sse2(short *coeff, short *dqcoeff); +RTCD_EXTERN int (*vp8_block_error)(short *coeff, short *dqcoeff); -void vp8_copy32xn_c(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -void vp8_copy32xn_sse2(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -void vp8_copy32xn_sse3(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); +void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char *src_ptr, + int source_stride, unsigned char *dst_ptr, + int dst_stride, int n); -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem16x16_sse2(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_copy_mem16x16)(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +void vp8_copy_mem16x16_sse2(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_copy_mem16x16)(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_mmx(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_mmx(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_copy_mem8x8)(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_copy_mem8x8)(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -void vp8_dc_only_idct_add_mmx(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -RTCD_EXTERN void (*vp8_dc_only_idct_add)(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +void vp8_dc_only_idct_add_mmx(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +RTCD_EXTERN void (*vp8_dc_only_idct_add)(short input, unsigned char *pred, + int pred_stride, unsigned char *dst, int dst_stride); -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_sse2(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_sse2(unsigned char *mc_running_avg_y, + int mc_avg_y_stride, unsigned char *running_avg_y, + int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -RTCD_EXTERN int (*vp8_denoiser_filter)(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, - int increase_denoising); +RTCD_EXTERN int (*vp8_denoiser_filter)( + unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_sse2(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_uv_sse2(unsigned char *mc_running_avg, + int mc_avg_stride, unsigned char *running_avg, + int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -RTCD_EXTERN int (*vp8_denoiser_filter_uv)(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, - int increase_denoising); +RTCD_EXTERN int (*vp8_denoiser_filter_uv)( + unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); -void vp8_dequant_idct_add_mmx(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_mmx(short *input, short *dq, unsigned char *output, int stride); -RTCD_EXTERN void (*vp8_dequant_idct_add)(short* input, - short* dq, - unsigned char* output, - int stride); +RTCD_EXTERN void (*vp8_dequant_idct_add)(short *input, short *dq, + unsigned char *output, int stride); -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -void vp8_dequant_idct_add_uv_block_sse2(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -RTCD_EXTERN void (*vp8_dequant_idct_add_uv_block)(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +void vp8_dequant_idct_add_uv_block_sse2(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +RTCD_EXTERN void (*vp8_dequant_idct_add_uv_block)(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, + int stride, char *eobs); -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -void vp8_dequant_idct_add_y_block_sse2(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -RTCD_EXTERN void (*vp8_dequant_idct_add_y_block)(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +void vp8_dequant_idct_add_y_block_sse2(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +RTCD_EXTERN void (*vp8_dequant_idct_add_y_block)(short *q, short *dq, + unsigned char *dst, int stride, + char *eobs); -void vp8_dequantize_b_c(struct blockd*, short* dqc); -void vp8_dequantize_b_mmx(struct blockd*, short* dqc); -RTCD_EXTERN void (*vp8_dequantize_b)(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); +void vp8_dequantize_b_mmx(struct blockd *, short *dqc); +RTCD_EXTERN void (*vp8_dequantize_b)(struct blockd *, short *dqc); -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_diamond_search_sadx4(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -RTCD_EXTERN int (*vp8_diamond_search_sad)(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_diamond_search_sadx4(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +RTCD_EXTERN int (*vp8_diamond_search_sad)( + struct macroblock *x, struct block *b, struct blockd *d, + union int_mv *ref_mv, union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); -void vp8_fast_quantize_b_c(struct block*, struct blockd*); -void vp8_fast_quantize_b_sse2(struct block*, struct blockd*); -void vp8_fast_quantize_b_ssse3(struct block*, struct blockd*); -RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); +void vp8_fast_quantize_b_sse2(struct block *, struct blockd *); +void vp8_fast_quantize_b_ssse3(struct block *, struct blockd *); +RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block *, struct blockd *); -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -void vp8_filter_by_weight16x16_sse2(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -RTCD_EXTERN void (*vp8_filter_by_weight16x16)(unsigned char* src, +RTCD_EXTERN void (*vp8_filter_by_weight16x16)(unsigned char *src, int src_stride, - unsigned char* dst, - int dst_stride, - int src_weight); + unsigned char *dst, + int dst_stride, int src_weight); -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -void vp8_filter_by_weight8x8_sse2(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -RTCD_EXTERN void (*vp8_filter_by_weight8x8)(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +RTCD_EXTERN void (*vp8_filter_by_weight8x8)(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_full_search_sadx3(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_full_search_sadx8(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_full_search_sadx3(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_full_search_sadx8(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, + int *mvcost[2], union int_mv *center_mv); -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bh_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_bh)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bh_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_bh)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bv_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_bv)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bv_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_bv)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbh_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_mbh)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbh_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_mbh)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbv_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -RTCD_EXTERN void (*vp8_loop_filter_mbv)(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbv_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); +RTCD_EXTERN void (*vp8_loop_filter_mbv)(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, - struct loop_filter_info* lfi); + struct loop_filter_info *lfi); -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bhs_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_bh)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bhs_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_bh)(unsigned char *y, int ystride, + const unsigned char *blimit); -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bvs_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_bv)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bvs_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_bv)(unsigned char *y, int ystride, + const unsigned char *blimit); -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_mbh)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_mbh)(unsigned char *y, int ystride, + const unsigned char *blimit); -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); -RTCD_EXTERN void (*vp8_loop_filter_simple_mbv)(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); +RTCD_EXTERN void (*vp8_loop_filter_simple_mbv)(unsigned char *y, int ystride, + const unsigned char *blimit); -int vp8_mbblock_error_c(struct macroblock* mb, int dc); -int vp8_mbblock_error_sse2(struct macroblock* mb, int dc); -RTCD_EXTERN int (*vp8_mbblock_error)(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); +int vp8_mbblock_error_sse2(struct macroblock *mb, int dc); +RTCD_EXTERN int (*vp8_mbblock_error)(struct macroblock *mb, int dc); -int vp8_mbuverror_c(struct macroblock* mb); -int vp8_mbuverror_sse2(struct macroblock* mb); -RTCD_EXTERN int (*vp8_mbuverror)(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); +int vp8_mbuverror_sse2(struct macroblock *mb); +RTCD_EXTERN int (*vp8_mbuverror)(struct macroblock *mb); -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_refining_search_sadx4(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -RTCD_EXTERN int (*vp8_refining_search_sad)(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_refining_search_sadx4(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +RTCD_EXTERN int (*vp8_refining_search_sad)( + struct macroblock *x, struct block *b, struct blockd *d, + union int_mv *ref_mv, int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv); -void vp8_regular_quantize_b_c(struct block*, struct blockd*); -void vp8_regular_quantize_b_sse2(struct block*, struct blockd*); -void vp8_regular_quantize_b_sse4_1(struct block*, struct blockd*); -RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); +void vp8_regular_quantize_b_sse2(struct block *, struct blockd *); +void vp8_regular_quantize_b_sse4_1(struct block *, struct blockd *); +RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block *, struct blockd *); -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); -void vp8_short_fdct4x4_sse2(short* input, short* output, int pitch); -RTCD_EXTERN void (*vp8_short_fdct4x4)(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); +void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch); +RTCD_EXTERN void (*vp8_short_fdct4x4)(short *input, short *output, int pitch); -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); -void vp8_short_fdct8x4_sse2(short* input, short* output, int pitch); -RTCD_EXTERN void (*vp8_short_fdct8x4)(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); +void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch); +RTCD_EXTERN void (*vp8_short_fdct8x4)(short *input, short *output, int pitch); -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -void vp8_short_idct4x4llm_mmx(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -RTCD_EXTERN void (*vp8_short_idct4x4llm)(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +RTCD_EXTERN void (*vp8_short_idct4x4llm)(short *input, unsigned char *pred, + int pitch, unsigned char *dst, int dst_stride); -void vp8_short_inv_walsh4x4_c(short* input, short* output); -void vp8_short_inv_walsh4x4_sse2(short* input, short* output); -RTCD_EXTERN void (*vp8_short_inv_walsh4x4)(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); +void vp8_short_inv_walsh4x4_sse2(short *input, short *output); +RTCD_EXTERN void (*vp8_short_inv_walsh4x4)(short *input, short *output); -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); -void vp8_short_walsh4x4_sse2(short* input, short* output, int pitch); -RTCD_EXTERN void (*vp8_short_walsh4x4)(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); +void vp8_short_walsh4x4_sse2(short *input, short *output, int pitch); +RTCD_EXTERN void (*vp8_short_walsh4x4)(short *input, short *output, int pitch); -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); void vp8_rtcd(void); @@ -749,45 +436,32 @@ if (flags & HAS_SSSE3) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_ssse3; vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_c; - if (flags & HAS_MMX) - vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_mmx; + if (flags & HAS_MMX) vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_mmx; vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_c; - if (flags & HAS_MMX) - vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_mmx; + if (flags & HAS_MMX) vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_mmx; vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_c; - if (flags & HAS_SSE2) - vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_sse2; + if (flags & HAS_SSE2) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_sse2; if (flags & HAS_SSSE3) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_ssse3; vp8_block_error = vp8_block_error_c; - if (flags & HAS_SSE2) - vp8_block_error = vp8_block_error_sse2; + if (flags & HAS_SSE2) vp8_block_error = vp8_block_error_sse2; vp8_copy32xn = vp8_copy32xn_c; - if (flags & HAS_SSE2) - vp8_copy32xn = vp8_copy32xn_sse2; - if (flags & HAS_SSE3) - vp8_copy32xn = vp8_copy32xn_sse3; + if (flags & HAS_SSE2) vp8_copy32xn = vp8_copy32xn_sse2; + if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3; vp8_copy_mem16x16 = vp8_copy_mem16x16_c; - if (flags & HAS_SSE2) - vp8_copy_mem16x16 = vp8_copy_mem16x16_sse2; + if (flags & HAS_SSE2) vp8_copy_mem16x16 = vp8_copy_mem16x16_sse2; vp8_copy_mem8x4 = vp8_copy_mem8x4_c; - if (flags & HAS_MMX) - vp8_copy_mem8x4 = vp8_copy_mem8x4_mmx; + if (flags & HAS_MMX) vp8_copy_mem8x4 = vp8_copy_mem8x4_mmx; vp8_copy_mem8x8 = vp8_copy_mem8x8_c; - if (flags & HAS_MMX) - vp8_copy_mem8x8 = vp8_copy_mem8x8_mmx; + if (flags & HAS_MMX) vp8_copy_mem8x8 = vp8_copy_mem8x8_mmx; vp8_dc_only_idct_add = vp8_dc_only_idct_add_c; - if (flags & HAS_MMX) - vp8_dc_only_idct_add = vp8_dc_only_idct_add_mmx; + if (flags & HAS_MMX) vp8_dc_only_idct_add = vp8_dc_only_idct_add_mmx; vp8_denoiser_filter = vp8_denoiser_filter_c; - if (flags & HAS_SSE2) - vp8_denoiser_filter = vp8_denoiser_filter_sse2; + if (flags & HAS_SSE2) vp8_denoiser_filter = vp8_denoiser_filter_sse2; vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_c; - if (flags & HAS_SSE2) - vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_sse2; + if (flags & HAS_SSE2) vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_sse2; vp8_dequant_idct_add = vp8_dequant_idct_add_c; - if (flags & HAS_MMX) - vp8_dequant_idct_add = vp8_dequant_idct_add_mmx; + if (flags & HAS_MMX) vp8_dequant_idct_add = vp8_dequant_idct_add_mmx; vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_c; if (flags & HAS_SSE2) vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_sse2; @@ -795,45 +469,32 @@ if (flags & HAS_SSE2) vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_sse2; vp8_dequantize_b = vp8_dequantize_b_c; - if (flags & HAS_MMX) - vp8_dequantize_b = vp8_dequantize_b_mmx; + if (flags & HAS_MMX) vp8_dequantize_b = vp8_dequantize_b_mmx; vp8_diamond_search_sad = vp8_diamond_search_sad_c; - if (flags & HAS_SSE2) - vp8_diamond_search_sad = vp8_diamond_search_sadx4; + if (flags & HAS_SSE2) vp8_diamond_search_sad = vp8_diamond_search_sadx4; vp8_fast_quantize_b = vp8_fast_quantize_b_c; - if (flags & HAS_SSE2) - vp8_fast_quantize_b = vp8_fast_quantize_b_sse2; - if (flags & HAS_SSSE3) - vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3; + if (flags & HAS_SSE2) vp8_fast_quantize_b = vp8_fast_quantize_b_sse2; + if (flags & HAS_SSSE3) vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3; vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_c; if (flags & HAS_SSE2) vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_sse2; vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_c; - if (flags & HAS_SSE2) - vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_sse2; + if (flags & HAS_SSE2) vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_sse2; vp8_full_search_sad = vp8_full_search_sad_c; - if (flags & HAS_SSE3) - vp8_full_search_sad = vp8_full_search_sadx3; - if (flags & HAS_SSE4_1) - vp8_full_search_sad = vp8_full_search_sadx8; + if (flags & HAS_SSE3) vp8_full_search_sad = vp8_full_search_sadx3; + if (flags & HAS_SSE4_1) vp8_full_search_sad = vp8_full_search_sadx8; vp8_loop_filter_bh = vp8_loop_filter_bh_c; - if (flags & HAS_SSE2) - vp8_loop_filter_bh = vp8_loop_filter_bh_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_bh = vp8_loop_filter_bh_sse2; vp8_loop_filter_bv = vp8_loop_filter_bv_c; - if (flags & HAS_SSE2) - vp8_loop_filter_bv = vp8_loop_filter_bv_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_bv = vp8_loop_filter_bv_sse2; vp8_loop_filter_mbh = vp8_loop_filter_mbh_c; - if (flags & HAS_SSE2) - vp8_loop_filter_mbh = vp8_loop_filter_mbh_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_mbh = vp8_loop_filter_mbh_sse2; vp8_loop_filter_mbv = vp8_loop_filter_mbv_c; - if (flags & HAS_SSE2) - vp8_loop_filter_mbv = vp8_loop_filter_mbv_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_mbv = vp8_loop_filter_mbv_sse2; vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_c; - if (flags & HAS_SSE2) - vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_sse2; vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_c; - if (flags & HAS_SSE2) - vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_sse2; + if (flags & HAS_SSE2) vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_sse2; vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_c; if (flags & HAS_SSE2) vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_sse2; @@ -841,54 +502,38 @@ if (flags & HAS_SSE2) vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_sse2; vp8_mbblock_error = vp8_mbblock_error_c; - if (flags & HAS_SSE2) - vp8_mbblock_error = vp8_mbblock_error_sse2; + if (flags & HAS_SSE2) vp8_mbblock_error = vp8_mbblock_error_sse2; vp8_mbuverror = vp8_mbuverror_c; - if (flags & HAS_SSE2) - vp8_mbuverror = vp8_mbuverror_sse2; + if (flags & HAS_SSE2) vp8_mbuverror = vp8_mbuverror_sse2; vp8_refining_search_sad = vp8_refining_search_sad_c; - if (flags & HAS_SSE2) - vp8_refining_search_sad = vp8_refining_search_sadx4; + if (flags & HAS_SSE2) vp8_refining_search_sad = vp8_refining_search_sadx4; vp8_regular_quantize_b = vp8_regular_quantize_b_c; - if (flags & HAS_SSE2) - vp8_regular_quantize_b = vp8_regular_quantize_b_sse2; + if (flags & HAS_SSE2) vp8_regular_quantize_b = vp8_regular_quantize_b_sse2; if (flags & HAS_SSE4_1) vp8_regular_quantize_b = vp8_regular_quantize_b_sse4_1; vp8_short_fdct4x4 = vp8_short_fdct4x4_c; - if (flags & HAS_SSE2) - vp8_short_fdct4x4 = vp8_short_fdct4x4_sse2; + if (flags & HAS_SSE2) vp8_short_fdct4x4 = vp8_short_fdct4x4_sse2; vp8_short_fdct8x4 = vp8_short_fdct8x4_c; - if (flags & HAS_SSE2) - vp8_short_fdct8x4 = vp8_short_fdct8x4_sse2; + if (flags & HAS_SSE2) vp8_short_fdct8x4 = vp8_short_fdct8x4_sse2; vp8_short_idct4x4llm = vp8_short_idct4x4llm_c; - if (flags & HAS_MMX) - vp8_short_idct4x4llm = vp8_short_idct4x4llm_mmx; + if (flags & HAS_MMX) vp8_short_idct4x4llm = vp8_short_idct4x4llm_mmx; vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_c; - if (flags & HAS_SSE2) - vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_sse2; + if (flags & HAS_SSE2) vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_sse2; vp8_short_walsh4x4 = vp8_short_walsh4x4_c; - if (flags & HAS_SSE2) - vp8_short_walsh4x4 = vp8_short_walsh4x4_sse2; + if (flags & HAS_SSE2) vp8_short_walsh4x4 = vp8_short_walsh4x4_sse2; vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_c; - if (flags & HAS_SSE2) - vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2; + if (flags & HAS_SSE2) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2; if (flags & HAS_SSSE3) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3; vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_c; - if (flags & HAS_MMX) - vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_mmx; - if (flags & HAS_SSSE3) - vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3; + if (flags & HAS_MMX) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_mmx; + if (flags & HAS_SSSE3) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3; vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_c; - if (flags & HAS_SSE2) - vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_sse2; - if (flags & HAS_SSSE3) - vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3; + if (flags & HAS_SSE2) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_sse2; + if (flags & HAS_SSSE3) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3; vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_c; - if (flags & HAS_SSE2) - vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_sse2; - if (flags & HAS_SSSE3) - vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3; + if (flags & HAS_SSE2) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_sse2; + if (flags & HAS_SSSE3) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3; } #endif
diff --git a/third_party/libvpx/source/config/win/ia32/vp9_rtcd.h b/third_party/libvpx/source/config/win/ia32/vp9_rtcd.h index c8f69b95..1038d05 100644 --- a/third_party/libvpx/source/config/win/ia32/vp9_rtcd.h +++ b/third_party/libvpx/source/config/win/ia32/vp9_rtcd.h
@@ -31,466 +31,274 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -int64_t vp9_block_error_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -int64_t vp9_block_error_avx2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +int64_t vp9_block_error_sse2(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +int64_t vp9_block_error_avx2(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); -int64_t vp9_block_error_fp_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); -int64_t vp9_block_error_fp_avx2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); -RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_sse2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); +int64_t vp9_block_error_fp_avx2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); +RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); -int vp9_denoiser_filter_sse2(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); +int vp9_denoiser_filter_sse2(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); -RTCD_EXTERN int (*vp9_denoiser_filter)(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +RTCD_EXTERN int (*vp9_denoiser_filter)(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); -int vp9_diamond_search_sad_avx(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); +int vp9_diamond_search_sad_avx(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); RTCD_EXTERN int (*vp9_diamond_search_sad)( - const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); + const struct macroblock *x, const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, + int *num00, const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_fdct8x8_quant_ssse3(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_fdct8x8_quant)(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_fdct8x8_quant_ssse3(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vp9_fdct8x8_quant)( + const int16_t *input, int stride, tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht16x16_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); -RTCD_EXTERN void (*vp9_fht16x16)(const int16_t* input, - tran_low_t* output, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_fht16x16)(const int16_t *input, tran_low_t *output, + int stride, int tx_type); -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht4x4_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); -RTCD_EXTERN void (*vp9_fht4x4)(const int16_t* input, - tran_low_t* output, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_fht4x4)(const int16_t *input, tran_low_t *output, + int stride, int tx_type); -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht8x8_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); -RTCD_EXTERN void (*vp9_fht8x8)(const int16_t* input, - tran_low_t* output, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_fht8x8)(const int16_t *input, tran_low_t *output, + int stride, int tx_type); -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -void vp9_filter_by_weight16x16_sse2(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); +void vp9_filter_by_weight16x16_sse2(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); -RTCD_EXTERN void (*vp9_filter_by_weight16x16)(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +RTCD_EXTERN void (*vp9_filter_by_weight16x16)(const uint8_t *src, + int src_stride, uint8_t *dst, + int dst_stride, int src_weight); -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -void vp9_filter_by_weight8x8_sse2(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -RTCD_EXTERN void (*vp9_filter_by_weight8x8)(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); +void vp9_filter_by_weight8x8_sse2(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); +RTCD_EXTERN void (*vp9_filter_by_weight8x8)(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vp9_fwht4x4_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vp9_fwht4x4)(const int16_t* input, - tran_low_t* output, +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vp9_fwht4x4_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vp9_fwht4x4)(const int16_t *input, tran_low_t *output, int stride); -int64_t vp9_highbd_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); -int64_t vp9_highbd_block_error_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); -RTCD_EXTERN int64_t (*vp9_highbd_block_error)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, +int64_t vp9_highbd_block_error_c(const tran_low_t *coeff, + const tran_low_t *dqcoeff, intptr_t block_size, + int64_t *ssz, int bd); +int64_t vp9_highbd_block_error_sse2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz, int bd); +RTCD_EXTERN int64_t (*vp9_highbd_block_error)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz, int bd); -void vp9_highbd_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht16x16 vp9_highbd_fht16x16_c -void vp9_highbd_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht4x4 vp9_highbd_fht4x4_c -void vp9_highbd_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht8x8 vp9_highbd_fht8x8_c -void vp9_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_highbd_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_highbd_fwht4x4 vp9_highbd_fwht4x4_c -void vp9_highbd_iht16x16_256_add_c(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); -void vp9_highbd_iht16x16_256_add_sse4_1(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht16x16_256_add)(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); +void vp9_highbd_iht16x16_256_add_c(const tran_low_t *input, uint16_t *output, + int pitch, int tx_type, int bd); +void vp9_highbd_iht16x16_256_add_sse4_1(const tran_low_t *input, + uint16_t *output, int pitch, + int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht16x16_256_add)(const tran_low_t *input, + uint16_t *output, int pitch, + int tx_type, int bd); -void vp9_highbd_iht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -void vp9_highbd_iht4x4_16_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht4x4_16_add)(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +void vp9_highbd_iht4x4_16_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht4x4_16_add)(const tran_low_t *input, + uint16_t *dest, int stride, + int tx_type, int bd); -void vp9_highbd_iht8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht8x8_64_add)(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht8x8_64_add)(const tran_low_t *input, + uint16_t *dest, int stride, + int tx_type, int bd); -void vp9_highbd_mbpost_proc_across_ip_c(uint16_t* src, - int pitch, - int rows, - int cols, - int flimit); +void vp9_highbd_mbpost_proc_across_ip_c(uint16_t *src, int pitch, int rows, + int cols, int flimit); #define vp9_highbd_mbpost_proc_across_ip vp9_highbd_mbpost_proc_across_ip_c -void vp9_highbd_mbpost_proc_down_c(uint16_t* dst, - int pitch, - int rows, - int cols, +void vp9_highbd_mbpost_proc_down_c(uint16_t *dst, int pitch, int rows, int cols, int flimit); #define vp9_highbd_mbpost_proc_down vp9_highbd_mbpost_proc_down_c -void vp9_highbd_post_proc_down_and_across_c(const uint16_t* src_ptr, - uint16_t* dst_ptr, +void vp9_highbd_post_proc_down_and_across_c(const uint16_t *src_ptr, + uint16_t *dst_ptr, int src_pixels_per_line, - int dst_pixels_per_line, - int rows, - int cols, - int flimit); + int dst_pixels_per_line, int rows, + int cols, int flimit); #define vp9_highbd_post_proc_down_and_across \ vp9_highbd_post_proc_down_and_across_c -void vp9_highbd_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp vp9_highbd_quantize_fp_c -void vp9_highbd_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp_32x32 vp9_highbd_quantize_fp_32x32_c -void vp9_highbd_temporal_filter_apply_c(const uint8_t* frame1, - unsigned int stride, - const uint8_t* frame2, - unsigned int block_width, - unsigned int block_height, - int strength, - int filter_weight, - uint32_t* accumulator, - uint16_t* count); +void vp9_highbd_temporal_filter_apply_c( + const uint8_t *frame1, unsigned int stride, const uint8_t *frame2, + unsigned int block_width, unsigned int block_height, int strength, + int filter_weight, uint32_t *accumulator, uint16_t *count); #define vp9_highbd_temporal_filter_apply vp9_highbd_temporal_filter_apply_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); -void vp9_iht16x16_256_add_sse2(const tran_low_t* input, - uint8_t* output, - int pitch, - int tx_type); -RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_sse2(const tran_low_t *input, uint8_t *output, + int pitch, int tx_type); +RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t *input, + uint8_t *output, int pitch, int tx_type); -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t* input, - uint8_t* dest, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t *input, uint8_t *dest, + int stride, int tx_type); -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht8x8_64_add_sse2(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t* input, - uint8_t* dest, - int stride, - int tx_type); +RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t *input, uint8_t *dest, + int stride, int tx_type); -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_avx2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_quantize_fp)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_avx2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vp9_quantize_fp)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); -void vp9_scale_and_extend_frame_ssse3(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); +void vp9_scale_and_extend_frame_ssse3(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler); RTCD_EXTERN void (*vp9_scale_and_extend_frame)( - const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); + const struct yv12_buffer_config *src, struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); void vp9_rtcd(void); @@ -502,45 +310,32 @@ (void)flags; vp9_block_error = vp9_block_error_c; - if (flags & HAS_SSE2) - vp9_block_error = vp9_block_error_sse2; - if (flags & HAS_AVX2) - vp9_block_error = vp9_block_error_avx2; + if (flags & HAS_SSE2) vp9_block_error = vp9_block_error_sse2; + if (flags & HAS_AVX2) vp9_block_error = vp9_block_error_avx2; vp9_block_error_fp = vp9_block_error_fp_c; - if (flags & HAS_SSE2) - vp9_block_error_fp = vp9_block_error_fp_sse2; - if (flags & HAS_AVX2) - vp9_block_error_fp = vp9_block_error_fp_avx2; + if (flags & HAS_SSE2) vp9_block_error_fp = vp9_block_error_fp_sse2; + if (flags & HAS_AVX2) vp9_block_error_fp = vp9_block_error_fp_avx2; vp9_denoiser_filter = vp9_denoiser_filter_c; - if (flags & HAS_SSE2) - vp9_denoiser_filter = vp9_denoiser_filter_sse2; + if (flags & HAS_SSE2) vp9_denoiser_filter = vp9_denoiser_filter_sse2; vp9_diamond_search_sad = vp9_diamond_search_sad_c; - if (flags & HAS_AVX) - vp9_diamond_search_sad = vp9_diamond_search_sad_avx; + if (flags & HAS_AVX) vp9_diamond_search_sad = vp9_diamond_search_sad_avx; vp9_fdct8x8_quant = vp9_fdct8x8_quant_c; - if (flags & HAS_SSSE3) - vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; + if (flags & HAS_SSSE3) vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; vp9_fht16x16 = vp9_fht16x16_c; - if (flags & HAS_SSE2) - vp9_fht16x16 = vp9_fht16x16_sse2; + if (flags & HAS_SSE2) vp9_fht16x16 = vp9_fht16x16_sse2; vp9_fht4x4 = vp9_fht4x4_c; - if (flags & HAS_SSE2) - vp9_fht4x4 = vp9_fht4x4_sse2; + if (flags & HAS_SSE2) vp9_fht4x4 = vp9_fht4x4_sse2; vp9_fht8x8 = vp9_fht8x8_c; - if (flags & HAS_SSE2) - vp9_fht8x8 = vp9_fht8x8_sse2; + if (flags & HAS_SSE2) vp9_fht8x8 = vp9_fht8x8_sse2; vp9_filter_by_weight16x16 = vp9_filter_by_weight16x16_c; if (flags & HAS_SSE2) vp9_filter_by_weight16x16 = vp9_filter_by_weight16x16_sse2; vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_c; - if (flags & HAS_SSE2) - vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_sse2; + if (flags & HAS_SSE2) vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_sse2; vp9_fwht4x4 = vp9_fwht4x4_c; - if (flags & HAS_SSE2) - vp9_fwht4x4 = vp9_fwht4x4_sse2; + if (flags & HAS_SSE2) vp9_fwht4x4 = vp9_fwht4x4_sse2; vp9_highbd_block_error = vp9_highbd_block_error_c; - if (flags & HAS_SSE2) - vp9_highbd_block_error = vp9_highbd_block_error_sse2; + if (flags & HAS_SSE2) vp9_highbd_block_error = vp9_highbd_block_error_sse2; vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_c; if (flags & HAS_SSE4_1) vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_sse4_1; @@ -551,19 +346,14 @@ if (flags & HAS_SSE4_1) vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1; vp9_iht16x16_256_add = vp9_iht16x16_256_add_c; - if (flags & HAS_SSE2) - vp9_iht16x16_256_add = vp9_iht16x16_256_add_sse2; + if (flags & HAS_SSE2) vp9_iht16x16_256_add = vp9_iht16x16_256_add_sse2; vp9_iht4x4_16_add = vp9_iht4x4_16_add_c; - if (flags & HAS_SSE2) - vp9_iht4x4_16_add = vp9_iht4x4_16_add_sse2; + if (flags & HAS_SSE2) vp9_iht4x4_16_add = vp9_iht4x4_16_add_sse2; vp9_iht8x8_64_add = vp9_iht8x8_64_add_c; - if (flags & HAS_SSE2) - vp9_iht8x8_64_add = vp9_iht8x8_64_add_sse2; + if (flags & HAS_SSE2) vp9_iht8x8_64_add = vp9_iht8x8_64_add_sse2; vp9_quantize_fp = vp9_quantize_fp_c; - if (flags & HAS_SSE2) - vp9_quantize_fp = vp9_quantize_fp_sse2; - if (flags & HAS_AVX2) - vp9_quantize_fp = vp9_quantize_fp_avx2; + if (flags & HAS_SSE2) vp9_quantize_fp = vp9_quantize_fp_sse2; + if (flags & HAS_AVX2) vp9_quantize_fp = vp9_quantize_fp_avx2; vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c; if (flags & HAS_SSSE3) vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_ssse3;
diff --git a/third_party/libvpx/source/config/win/ia32/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/win/ia32/vpx_dsp_rtcd.h index 4e665cc..f6db41e 100644 --- a/third_party/libvpx/source/config/win/ia32/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/win/ia32/vpx_dsp_rtcd.h
@@ -20,8786 +20,5442 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); -unsigned int vpx_avg_4x4_sse2(const uint8_t*, int p); -RTCD_EXTERN unsigned int (*vpx_avg_4x4)(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); +unsigned int vpx_avg_4x4_sse2(const uint8_t *, int p); +RTCD_EXTERN unsigned int (*vpx_avg_4x4)(const uint8_t *, int p); -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); -unsigned int vpx_avg_8x8_sse2(const uint8_t*, int p); -RTCD_EXTERN unsigned int (*vpx_avg_8x8)(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); +unsigned int vpx_avg_8x8_sse2(const uint8_t *, int p); +RTCD_EXTERN unsigned int (*vpx_avg_8x8)(const uint8_t *, int p); -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -void vpx_comp_avg_pred_sse2(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -RTCD_EXTERN void (*vpx_comp_avg_pred)(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +void vpx_comp_avg_pred_sse2(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +RTCD_EXTERN void (*vpx_comp_avg_pred)(uint8_t *comp_pred, const uint8_t *pred, + int width, int height, const uint8_t *ref, int ref_stride); -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avx2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_horiz_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_horiz_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_horiz_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +void vpx_convolve8_avg_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_vert_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_horiz_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_horiz_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_horiz_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_vert_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_vert_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_vert_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_avg_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve_avg)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +RTCD_EXTERN void (*vpx_convolve_avg)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_copy_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_copy_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve_copy)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve_copy)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_c -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_4x4_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_4x4_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_128_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_128_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_16x16)(uint8_t* dst, +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_32x32)(uint8_t* dst, +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_left_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_left_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_dc_top_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_dc_top_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct16x16)(const int16_t* input, - tran_low_t* output, +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct16x16)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_1_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct16x16_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_1_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct16x16_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct32x32)(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct32x32)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_1_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct32x32_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_1_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct32x32_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_rd_sse2(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_fdct32x32_rd)(const int16_t* input, - tran_low_t* output, +RTCD_EXTERN void (*vpx_fdct32x32_rd)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct4x4)(const int16_t* input, - tran_low_t* output, +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct4x4)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_1_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct4x4_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_1_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct4x4_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct8x8)(const int16_t* input, - tran_low_t* output, +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct8x8)(const int16_t *input, tran_low_t *output, int stride); -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_1_sse2(const int16_t* input, tran_low_t* output, int stride); -RTCD_EXTERN void (*vpx_fdct8x8_1)(const int16_t* input, - tran_low_t* output, +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_1_sse2(const int16_t *input, tran_low_t *output, int stride); +RTCD_EXTERN void (*vpx_fdct8x8_1)(const int16_t *input, tran_low_t *output, int stride); -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_c -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get8x8var_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -RTCD_EXTERN void (*vpx_get8x8var)(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); +void vpx_get8x8var_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +RTCD_EXTERN void (*vpx_get8x8var)(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); -unsigned int vpx_get_mb_ss_c(const int16_t*); -unsigned int vpx_get_mb_ss_sse2(const int16_t*); -RTCD_EXTERN unsigned int (*vpx_get_mb_ss)(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); +unsigned int vpx_get_mb_ss_sse2(const int16_t *); +RTCD_EXTERN unsigned int (*vpx_get_mb_ss)(const int16_t *); -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_h_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_h_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_16x16_sse2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_16x16_avx2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_16x16_sse2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_16x16_avx2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t *src_diff, + ptrdiff_t src_stride, tran_low_t *coeff); -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_8x8_sse2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_8x8_sse2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t *src_diff, + ptrdiff_t src_stride, tran_low_t *coeff); -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_highbd_10_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get16x16var vpx_highbd_10_get16x16var_c -void vpx_highbd_10_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get8x8var vpx_highbd_10_get8x8var_c -unsigned int vpx_highbd_10_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_mse16x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse16x8 vpx_highbd_10_mse16x8_c -unsigned int vpx_highbd_10_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse8x16 vpx_highbd_10_mse8x16_c -unsigned int vpx_highbd_10_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_mse8x8_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_mse8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_mse8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x4 \ vpx_highbd_10_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x8 \ vpx_highbd_10_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x4 \ vpx_highbd_10_sub_pixel_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x8 \ vpx_highbd_10_sub_pixel_variance4x8_c -uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x4_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_10_sub_pixel_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -unsigned int vpx_highbd_10_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x16)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x16)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x64)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance32x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x4 vpx_highbd_10_variance4x4_c -unsigned int vpx_highbd_10_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x8 vpx_highbd_10_variance4x8_c -unsigned int vpx_highbd_10_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance64x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance64x64)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance8x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_10_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance8x4 vpx_highbd_10_variance8x4_c -unsigned int vpx_highbd_10_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_10_variance8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_10_variance8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -void vpx_highbd_12_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get16x16var vpx_highbd_12_get16x16var_c -void vpx_highbd_12_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get8x8var vpx_highbd_12_get8x8var_c -unsigned int vpx_highbd_12_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_mse16x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse16x8 vpx_highbd_12_mse16x8_c -unsigned int vpx_highbd_12_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse8x16 vpx_highbd_12_mse8x16_c -unsigned int vpx_highbd_12_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_mse8x8_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_mse8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_mse8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x4 \ vpx_highbd_12_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x8 \ vpx_highbd_12_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x4 \ vpx_highbd_12_sub_pixel_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x8 \ vpx_highbd_12_sub_pixel_variance4x8_c -uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x4_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_12_sub_pixel_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -unsigned int vpx_highbd_12_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x16)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x16)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x64)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance32x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x4 vpx_highbd_12_variance4x4_c -unsigned int vpx_highbd_12_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x8 vpx_highbd_12_variance4x8_c -unsigned int vpx_highbd_12_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance64x32)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance64x64)(const uint8_t* src_ptr, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance8x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_12_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance8x4 vpx_highbd_12_variance8x4_c -unsigned int vpx_highbd_12_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_12_variance8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_12_variance8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -void vpx_highbd_8_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get16x16var vpx_highbd_8_get16x16var_c -void vpx_highbd_8_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get8x8var vpx_highbd_8_get8x8var_c -unsigned int vpx_highbd_8_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_mse16x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse16x8 vpx_highbd_8_mse16x8_c -unsigned int vpx_highbd_8_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse8x16 vpx_highbd_8_mse8x16_c -unsigned int vpx_highbd_8_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_mse8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_mse8x8)(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_mse8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int recon_stride, - unsigned int* sse); + unsigned int *sse); -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x4 \ vpx_highbd_8_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x8 \ vpx_highbd_8_sub_pixel_avg_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x4 vpx_highbd_8_sub_pixel_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x8 vpx_highbd_8_sub_pixel_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); RTCD_EXTERN uint32_t (*vpx_highbd_8_sub_pixel_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -unsigned int vpx_highbd_8_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x32)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x32)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x64)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance32x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x4 vpx_highbd_8_variance4x4_c -unsigned int vpx_highbd_8_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x8 vpx_highbd_8_variance4x8_c -unsigned int vpx_highbd_8_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance64x32)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance64x64)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance8x16)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_8_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance8x4 vpx_highbd_8_variance8x4_c -unsigned int vpx_highbd_8_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_highbd_8_variance8x8)(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_highbd_8_variance8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_highbd_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_4x4_c(const uint8_t *, int p); #define vpx_highbd_avg_4x4 vpx_highbd_avg_4x4_c -unsigned int vpx_highbd_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_8x8_c(const uint8_t *, int p); #define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c -void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred, - const uint16_t* pred, - int width, - int height, - const uint16_t* ref, +void vpx_highbd_comp_avg_pred_c(uint16_t *comp_pred, const uint16_t *pred, + int width, int height, const uint16_t *ref, int ref_stride); #define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c -void vpx_highbd_convolve8_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8)(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_avg_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_horiz_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_avg_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_horiz_avx2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg_horiz)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg_horiz)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_vert_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_avg_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_vert_avx2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg_vert)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg_vert)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_horiz_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_horiz)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_horiz_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_horiz)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_vert_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_vert)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_vert_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_vert)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_avg_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_avg_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve_avg)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve_avg_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve_avg_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve_avg)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve_copy_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_copy_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_copy_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve_copy)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_copy_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve_copy_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve_copy_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve_copy)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_d117_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d117_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d117_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d117_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d117_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d135_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d135_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d135_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d135_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d153_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d153_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d153_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d153_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d207_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d207_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d207_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d207_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d45_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d45_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d45_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d45_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d45_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d45_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_4x4_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d45_predictor_4x4_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d45_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d63_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d63_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d63_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d63_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d63_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d63_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d63_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d63_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_16x16)(uint16_t* dst, +void vpx_highbd_dc_128_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_32x32)(uint16_t* dst, +void vpx_highbd_dc_128_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_4x4)(uint16_t* dst, +void vpx_highbd_dc_128_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_8x8)(uint16_t* dst, +void vpx_highbd_dc_128_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_128_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_left_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_16x16)(uint16_t* dst, +void vpx_highbd_dc_left_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_left_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_32x32)(uint16_t* dst, +void vpx_highbd_dc_left_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_left_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_4x4)(uint16_t* dst, +void vpx_highbd_dc_left_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_left_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_8x8)(uint16_t* dst, +void vpx_highbd_dc_left_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_left_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_predictor_16x16)(uint16_t* dst, +void vpx_highbd_dc_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_predictor_32x32)(uint16_t* dst, +void vpx_highbd_dc_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_predictor_4x4)(uint16_t* dst, +void vpx_highbd_dc_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_predictor_8x8)(uint16_t* dst, +void vpx_highbd_dc_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_top_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_16x16)(uint16_t* dst, +void vpx_highbd_dc_top_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_top_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_32x32)(uint16_t* dst, +void vpx_highbd_dc_top_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_top_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_4x4)(uint16_t* dst, +void vpx_highbd_dc_top_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_top_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_8x8)(uint16_t* dst, +void vpx_highbd_dc_top_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_dc_top_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_fdct16x16_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct16x16_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct16x16)(const int16_t* input, - tran_low_t* output, - int stride); +RTCD_EXTERN void (*vpx_highbd_fdct16x16)(const int16_t *input, + tran_low_t *output, int stride); -void vpx_highbd_fdct16x16_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct16x16_1 vpx_highbd_fdct16x16_1_c -void vpx_highbd_fdct32x32_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct32x32)(const int16_t* input, - tran_low_t* output, - int stride); +RTCD_EXTERN void (*vpx_highbd_fdct32x32)(const int16_t *input, + tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32_1 vpx_highbd_fdct32x32_1_c -void vpx_highbd_fdct32x32_rd_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_rd_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct32x32_rd)(const int16_t* input, - tran_low_t* output, - int stride); +RTCD_EXTERN void (*vpx_highbd_fdct32x32_rd)(const int16_t *input, + tran_low_t *output, int stride); -void vpx_highbd_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_highbd_fdct4x4_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_highbd_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct4x4)(const int16_t* input, - tran_low_t* output, +RTCD_EXTERN void (*vpx_highbd_fdct4x4)(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_highbd_fdct8x8_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_highbd_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride); -RTCD_EXTERN void (*vpx_highbd_fdct8x8)(const int16_t* input, - tran_low_t* output, +RTCD_EXTERN void (*vpx_highbd_fdct8x8)(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct8x8_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct8x8_1 vpx_highbd_fdct8x8_1_c -void vpx_highbd_h_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_h_predictor_16x16)(uint16_t* dst, +void vpx_highbd_h_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_h_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_h_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_h_predictor_32x32)(uint16_t* dst, +void vpx_highbd_h_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_h_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_h_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_h_predictor_4x4)(uint16_t* dst, +void vpx_highbd_h_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_h_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_h_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_h_predictor_8x8)(uint16_t* dst, +void vpx_highbd_h_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_h_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_idct16x16_10_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_10_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_10_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_10_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_10_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_10_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_10_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_10_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_1_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_1_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_256_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_256_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_256_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_256_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_256_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_256_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_256_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_256_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_38_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_38_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_38_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_38_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_38_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_38_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_38_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_38_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_1024_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1024_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1024_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_1024_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_1024_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1024_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1024_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_1024_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_135_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_135_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_135_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_135_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_135_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_135_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_135_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_135_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_1_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_1_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_34_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_34_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_34_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_34_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_34_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_34_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_34_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_34_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_16_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_16_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct4x4_16_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_16_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_16_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct4x4_16_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct4x4_1_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct4x4_1_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct8x8_12_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_12_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_12_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_12_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_12_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_12_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_12_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_12_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct8x8_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_1_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_1_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_64_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_64_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_64_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_64_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_64_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_iwht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_16_add vpx_highbd_iwht4x4_16_add_c -void vpx_highbd_iwht4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_1_add vpx_highbd_iwht4x4_1_add_c -void vpx_highbd_lpf_horizontal_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_16_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_16)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_16_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_16_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_16)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_16_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_16_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_16_dual_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_16_dual)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_horizontal_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_4_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_4)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_4_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_4_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_4)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_horizontal_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_horizontal_4_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_4_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_horizontal_4_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_4_dual)( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); -void vpx_highbd_lpf_horizontal_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_8_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_8)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_8_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_8_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_8)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_horizontal_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_horizontal_8_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_8_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_horizontal_8_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_horizontal_8_dual)( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); -void vpx_highbd_lpf_vertical_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_16_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_16_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_16)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_16_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_16)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_vertical_16_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_16_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_vertical_16_dual_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_16_dual)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_4_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_4_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_4)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_4_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_4)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_vertical_4_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_4_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_vertical_4_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_4_dual)( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); -void vpx_highbd_lpf_vertical_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_8_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_8_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_8)(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_8_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_8)(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_vertical_8_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -RTCD_EXTERN void (*vpx_highbd_lpf_vertical_8_dual)(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_vertical_8_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +RTCD_EXTERN void (*vpx_highbd_lpf_vertical_8_dual)( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); -void vpx_highbd_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_highbd_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_highbd_minmax_8x8 vpx_highbd_minmax_8x8_c -void vpx_highbd_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_highbd_quantize_b_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_highbd_quantize_b)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_highbd_quantize_b_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vpx_highbd_quantize_b)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vpx_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_highbd_quantize_b_32x32_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_highbd_quantize_b_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_highbd_quantize_b_32x32_sse2( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vpx_highbd_quantize_b_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -unsigned int vpx_highbd_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x16)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x16)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x16_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x16_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x16_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad16x16x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad16x16x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x32)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x32)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x32_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad16x32x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad16x32x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x8)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x8)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad16x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad16x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad16x8x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad16x8x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x16)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x16)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x16_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x16_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x16_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad32x16x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad32x16x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x32)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x32)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x32_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad32x32x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad32x32x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x64)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x64)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x64_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x64_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad32x64_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad32x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad32x64x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad32x64x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x4 vpx_highbd_sad4x4_c -unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x4_avg vpx_highbd_sad4x4_avg_c -void vpx_highbd_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad4x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad4x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad4x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad4x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x8 vpx_highbd_sad4x8_c -unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x8_avg vpx_highbd_sad4x8_avg_c -void vpx_highbd_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad4x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad4x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad4x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad4x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad64x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad64x32)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad64x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad64x32)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad64x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad64x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad64x32_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad64x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad64x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad64x32x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad64x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad64x32x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad64x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad64x64)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad64x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad64x64)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad64x64_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad64x64_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad64x64_avg)(const uint8_t* src_ptr, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad64x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad64x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad64x64x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad64x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad64x64x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x16)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x16)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad8x16x4d)(const uint8_t* src_ptr, +void vpx_highbd_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad8x16x4d)(const uint8_t *src_ptr, int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x4)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x4)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x4_avg)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x4_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad8x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad8x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_highbd_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x8)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x8)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_highbd_sad8x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_highbd_sad8x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_highbd_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_highbd_sad8x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_highbd_sad8x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_highbd_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, - ptrdiff_t pred_stride, - int bd); +void vpx_highbd_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, + ptrdiff_t pred_stride, int bd); #define vpx_highbd_subtract_block vpx_highbd_subtract_block_c -void vpx_highbd_tm_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_tm_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_tm_predictor_16x16)(uint16_t* dst, +void vpx_highbd_tm_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_tm_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_tm_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_tm_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_tm_predictor_32x32)(uint16_t* dst, +void vpx_highbd_tm_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_tm_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_tm_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_tm_predictor_4x4)(uint16_t* dst, +void vpx_highbd_tm_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_tm_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_tm_predictor_8x8)(uint16_t* dst, +void vpx_highbd_tm_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_tm_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_v_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_v_predictor_16x16)(uint16_t* dst, +void vpx_highbd_v_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_v_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_v_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_v_predictor_32x32)(uint16_t* dst, +void vpx_highbd_v_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_v_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_v_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_v_predictor_4x4)(uint16_t* dst, +void vpx_highbd_v_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_v_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_v_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_v_predictor_8x8)(uint16_t* dst, +void vpx_highbd_v_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_v_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_10_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_10_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_10_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct16x16_10_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_1_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_1_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct16x16_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_256_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct16x16_256_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_38_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_38_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct16x16_38_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct16x16_38_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_1024_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct32x32_1024_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_1_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_1_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct32x32_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_34_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_34_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_34_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct4x4_16_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct4x4_16_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_1_add_sse2(const tran_low_t* input, uint8_t* dest, int stride); -RTCD_EXTERN void (*vpx_idct4x4_1_add)(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); +RTCD_EXTERN void (*vpx_idct4x4_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_12_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_12_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_12_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_1_add_sse2(const tran_low_t* input, uint8_t* dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_1_add)(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); +RTCD_EXTERN void (*vpx_idct8x8_1_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_64_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_64_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct8x8_64_add)(const tran_low_t *input, uint8_t *dest, int stride); -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); -int16_t vpx_int_pro_col_sse2(const uint8_t* ref, const int width); -RTCD_EXTERN int16_t (*vpx_int_pro_col)(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); +int16_t vpx_int_pro_col_sse2(const uint8_t *ref, const int width); +RTCD_EXTERN int16_t (*vpx_int_pro_col)(const uint8_t *ref, const int width); -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); -void vpx_int_pro_row_sse2(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); -RTCD_EXTERN void (*vpx_int_pro_row)(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); +void vpx_int_pro_row_sse2(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); +RTCD_EXTERN void (*vpx_int_pro_row)(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_iwht4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_iwht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_iwht4x4_16_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_iwht4x4_16_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_avx2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_avx2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_avx2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_sse2(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_avx2(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_4_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_4)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_4)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_4_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_horizontal_4_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_4_dual_sse2( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_horizontal_4_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_8_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_8)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_8)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_8_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_horizontal_8_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_8_dual_sse2( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_horizontal_8_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_16)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_16)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_16_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_16_dual)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_4_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_4)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_4)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_4_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_vertical_4_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_vertical_4_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_8_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_vertical_8)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_vertical_8)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_8_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -RTCD_EXTERN void (*vpx_lpf_vertical_8_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +RTCD_EXTERN void (*vpx_lpf_vertical_8_dual)( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -void vpx_mbpost_proc_across_ip_sse2(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -RTCD_EXTERN void (*vpx_mbpost_proc_across_ip)(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +void vpx_mbpost_proc_across_ip_sse2(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +RTCD_EXTERN void (*vpx_mbpost_proc_across_ip)(unsigned char *dst, int pitch, + int rows, int cols, int flimit); -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); -void vpx_mbpost_proc_down_sse2(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -RTCD_EXTERN void (*vpx_mbpost_proc_down)(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_down_sse2(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +RTCD_EXTERN void (*vpx_mbpost_proc_down)(unsigned char *dst, int pitch, + int rows, int cols, int flimit); -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -void vpx_minmax_8x8_sse2(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -RTCD_EXTERN void (*vpx_minmax_8x8)(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +void vpx_minmax_8x8_sse2(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +RTCD_EXTERN void (*vpx_minmax_8x8)(const uint8_t *s, int p, const uint8_t *d, + int dp, int *min, int *max); -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t* src_ptr, +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse16x8)(const uint8_t* src_ptr, +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x8_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse8x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse8x16)(const uint8_t* src_ptr, +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse8x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse8x8)(const uint8_t* src_ptr, +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); -void vpx_plane_add_noise_sse2(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); -RTCD_EXTERN void (*vpx_plane_add_noise)(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); +void vpx_plane_add_noise_sse2(uint8_t *start, const int8_t *noise, + int blackclamp, int whiteclamp, int width, + int height, int pitch); +RTCD_EXTERN void (*vpx_plane_add_noise)(uint8_t *start, const int8_t *noise, + int blackclamp, int whiteclamp, + int width, int height, int pitch); -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); -void vpx_post_proc_down_and_across_mb_row_sse2(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); +void vpx_post_proc_down_and_across_mb_row_sse2(unsigned char *src, + unsigned char *dst, + int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); -RTCD_EXTERN void (*vpx_post_proc_down_and_across_mb_row)(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); +RTCD_EXTERN void (*vpx_post_proc_down_and_across_mb_row)( + unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_avx(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_avx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_avx(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_avx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad16x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad16x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad16x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad16x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x3_ssse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x3_ssse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad16x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad16x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad16x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad16x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad16x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad16x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x3_ssse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x3_ssse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x16x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x16x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x64x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x64x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad4x4)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad4x4)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad4x4_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad4x4_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad4x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad4x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad4x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad4x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad64x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad64x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad8x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad8x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad8x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad8x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad8x4)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad8x4)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad8x4_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad8x4_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x4x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x4x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad8x8_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad8x8_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -int vpx_satd_c(const tran_low_t* coeff, int length); -int vpx_satd_sse2(const tran_low_t* coeff, int length); -int vpx_satd_avx2(const tran_low_t* coeff, int length); -RTCD_EXTERN int (*vpx_satd)(const tran_low_t* coeff, int length); +int vpx_satd_c(const tran_low_t *coeff, int length); +int vpx_satd_sse2(const tran_low_t *coeff, int length); +int vpx_satd_avx2(const tran_low_t *coeff, int length); +RTCD_EXTERN int (*vpx_satd)(const tran_low_t *coeff, int length); -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_scaled_2d_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_2d_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -void vpx_subtract_block_sse2(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_sse2(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -RTCD_EXTERN void (*vpx_subtract_block)(int rows, - int cols, - int16_t* diff_ptr, +RTCD_EXTERN void (*vpx_subtract_block)(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, - const uint8_t* src_ptr, + const uint8_t *src_ptr, ptrdiff_t src_stride, - const uint8_t* pred_ptr, + const uint8_t *pred_ptr, ptrdiff_t pred_stride); -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); -uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t* src, int stride, int size); -RTCD_EXTERN uint64_t (*vpx_sum_squares_2d_i16)(const int16_t* src, - int stride, +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t *src, int stride, int size); +RTCD_EXTERN uint64_t (*vpx_sum_squares_2d_i16)(const int16_t *src, int stride, int size); -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_tm_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_tm_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_v_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_v_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t* src_ptr, +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x32)(const uint8_t* src_ptr, +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x8)(const uint8_t* src_ptr, +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t* src_ptr, +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t* src_ptr, +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x64)(const uint8_t* src_ptr, +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance4x4)(const uint8_t* src_ptr, +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x4_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance4x4)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance4x8)(const uint8_t* src_ptr, +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance4x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t* src_ptr, +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t* src_ptr, +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance8x16)(const uint8_t* src_ptr, +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance8x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance8x4)(const uint8_t* src_ptr, +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance8x4)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance8x8)(const uint8_t* src_ptr, +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance8x8)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); -int vpx_vector_var_sse2(const int16_t* ref, const int16_t* src, const int bwl); -RTCD_EXTERN int (*vpx_vector_var)(const int16_t* ref, - const int16_t* src, +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); +int vpx_vector_var_sse2(const int16_t *ref, const int16_t *src, const int bwl); +RTCD_EXTERN int (*vpx_vector_var)(const int16_t *ref, const int16_t *src, const int bwl); void vpx_dsp_rtcd(void); @@ -8812,62 +5468,40 @@ (void)flags; vpx_avg_4x4 = vpx_avg_4x4_c; - if (flags & HAS_SSE2) - vpx_avg_4x4 = vpx_avg_4x4_sse2; + if (flags & HAS_SSE2) vpx_avg_4x4 = vpx_avg_4x4_sse2; vpx_avg_8x8 = vpx_avg_8x8_c; - if (flags & HAS_SSE2) - vpx_avg_8x8 = vpx_avg_8x8_sse2; + if (flags & HAS_SSE2) vpx_avg_8x8 = vpx_avg_8x8_sse2; vpx_comp_avg_pred = vpx_comp_avg_pred_c; - if (flags & HAS_SSE2) - vpx_comp_avg_pred = vpx_comp_avg_pred_sse2; + if (flags & HAS_SSE2) vpx_comp_avg_pred = vpx_comp_avg_pred_sse2; vpx_convolve8 = vpx_convolve8_c; - if (flags & HAS_SSE2) - vpx_convolve8 = vpx_convolve8_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8 = vpx_convolve8_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8 = vpx_convolve8_avx2; + if (flags & HAS_SSE2) vpx_convolve8 = vpx_convolve8_sse2; + if (flags & HAS_SSSE3) vpx_convolve8 = vpx_convolve8_ssse3; + if (flags & HAS_AVX2) vpx_convolve8 = vpx_convolve8_avx2; vpx_convolve8_avg = vpx_convolve8_avg_c; - if (flags & HAS_SSE2) - vpx_convolve8_avg = vpx_convolve8_avg_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_avg = vpx_convolve8_avg_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg = vpx_convolve8_avg_avx2; + if (flags & HAS_SSE2) vpx_convolve8_avg = vpx_convolve8_avg_sse2; + if (flags & HAS_SSSE3) vpx_convolve8_avg = vpx_convolve8_avg_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_avg = vpx_convolve8_avg_avx2; vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_c; - if (flags & HAS_SSE2) - vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_sse2; + if (flags & HAS_SSE2) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_sse2; if (flags & HAS_SSSE3) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_avx2; + if (flags & HAS_AVX2) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_avx2; vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_c; - if (flags & HAS_SSE2) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_avx2; + if (flags & HAS_SSE2) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_sse2; + if (flags & HAS_SSSE3) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_avx2; vpx_convolve8_horiz = vpx_convolve8_horiz_c; - if (flags & HAS_SSE2) - vpx_convolve8_horiz = vpx_convolve8_horiz_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_horiz = vpx_convolve8_horiz_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_horiz = vpx_convolve8_horiz_avx2; + if (flags & HAS_SSE2) vpx_convolve8_horiz = vpx_convolve8_horiz_sse2; + if (flags & HAS_SSSE3) vpx_convolve8_horiz = vpx_convolve8_horiz_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_horiz = vpx_convolve8_horiz_avx2; vpx_convolve8_vert = vpx_convolve8_vert_c; - if (flags & HAS_SSE2) - vpx_convolve8_vert = vpx_convolve8_vert_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_vert = vpx_convolve8_vert_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_vert = vpx_convolve8_vert_avx2; + if (flags & HAS_SSE2) vpx_convolve8_vert = vpx_convolve8_vert_sse2; + if (flags & HAS_SSSE3) vpx_convolve8_vert = vpx_convolve8_vert_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_vert = vpx_convolve8_vert_avx2; vpx_convolve_avg = vpx_convolve_avg_c; - if (flags & HAS_SSE2) - vpx_convolve_avg = vpx_convolve_avg_sse2; + if (flags & HAS_SSE2) vpx_convolve_avg = vpx_convolve_avg_sse2; vpx_convolve_copy = vpx_convolve_copy_c; - if (flags & HAS_SSE2) - vpx_convolve_copy = vpx_convolve_copy_sse2; + if (flags & HAS_SSE2) vpx_convolve_copy = vpx_convolve_copy_sse2; vpx_d153_predictor_16x16 = vpx_d153_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d153_predictor_16x16 = vpx_d153_predictor_16x16_ssse3; @@ -8875,11 +5509,9 @@ if (flags & HAS_SSSE3) vpx_d153_predictor_32x32 = vpx_d153_predictor_32x32_ssse3; vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_c; - if (flags & HAS_SSSE3) - vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_ssse3; + if (flags & HAS_SSSE3) vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_ssse3; vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_ssse3; vpx_d207_predictor_16x16 = vpx_d207_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d207_predictor_16x16 = vpx_d207_predictor_16x16_ssse3; @@ -8887,11 +5519,9 @@ if (flags & HAS_SSSE3) vpx_d207_predictor_32x32 = vpx_d207_predictor_32x32_ssse3; vpx_d207_predictor_4x4 = vpx_d207_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_d207_predictor_4x4 = vpx_d207_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_d207_predictor_4x4 = vpx_d207_predictor_4x4_sse2; vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_ssse3; vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_ssse3; @@ -8899,11 +5529,9 @@ if (flags & HAS_SSSE3) vpx_d45_predictor_32x32 = vpx_d45_predictor_32x32_ssse3; vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_sse2; vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_sse2; vpx_d63_predictor_16x16 = vpx_d63_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d63_predictor_16x16 = vpx_d63_predictor_16x16_ssse3; @@ -8911,11 +5539,9 @@ if (flags & HAS_SSSE3) vpx_d63_predictor_32x32 = vpx_d63_predictor_32x32_ssse3; vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_c; - if (flags & HAS_SSSE3) - vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_ssse3; + if (flags & HAS_SSSE3) vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_ssse3; vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_ssse3; vpx_dc_128_predictor_16x16 = vpx_dc_128_predictor_16x16_c; if (flags & HAS_SSE2) vpx_dc_128_predictor_16x16 = vpx_dc_128_predictor_16x16_sse2; @@ -8941,17 +5567,13 @@ if (flags & HAS_SSE2) vpx_dc_left_predictor_8x8 = vpx_dc_left_predictor_8x8_sse2; vpx_dc_predictor_16x16 = vpx_dc_predictor_16x16_c; - if (flags & HAS_SSE2) - vpx_dc_predictor_16x16 = vpx_dc_predictor_16x16_sse2; + if (flags & HAS_SSE2) vpx_dc_predictor_16x16 = vpx_dc_predictor_16x16_sse2; vpx_dc_predictor_32x32 = vpx_dc_predictor_32x32_c; - if (flags & HAS_SSE2) - vpx_dc_predictor_32x32 = vpx_dc_predictor_32x32_sse2; + if (flags & HAS_SSE2) vpx_dc_predictor_32x32 = vpx_dc_predictor_32x32_sse2; vpx_dc_predictor_4x4 = vpx_dc_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_dc_predictor_4x4 = vpx_dc_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_dc_predictor_4x4 = vpx_dc_predictor_4x4_sse2; vpx_dc_predictor_8x8 = vpx_dc_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_dc_predictor_8x8 = vpx_dc_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_dc_predictor_8x8 = vpx_dc_predictor_8x8_sse2; vpx_dc_top_predictor_16x16 = vpx_dc_top_predictor_16x16_c; if (flags & HAS_SSE2) vpx_dc_top_predictor_16x16 = vpx_dc_top_predictor_16x16_sse2; @@ -8965,69 +5587,47 @@ if (flags & HAS_SSE2) vpx_dc_top_predictor_8x8 = vpx_dc_top_predictor_8x8_sse2; vpx_fdct16x16 = vpx_fdct16x16_c; - if (flags & HAS_SSE2) - vpx_fdct16x16 = vpx_fdct16x16_sse2; + if (flags & HAS_SSE2) vpx_fdct16x16 = vpx_fdct16x16_sse2; vpx_fdct16x16_1 = vpx_fdct16x16_1_c; - if (flags & HAS_SSE2) - vpx_fdct16x16_1 = vpx_fdct16x16_1_sse2; + if (flags & HAS_SSE2) vpx_fdct16x16_1 = vpx_fdct16x16_1_sse2; vpx_fdct32x32 = vpx_fdct32x32_c; - if (flags & HAS_SSE2) - vpx_fdct32x32 = vpx_fdct32x32_sse2; + if (flags & HAS_SSE2) vpx_fdct32x32 = vpx_fdct32x32_sse2; vpx_fdct32x32_1 = vpx_fdct32x32_1_c; - if (flags & HAS_SSE2) - vpx_fdct32x32_1 = vpx_fdct32x32_1_sse2; + if (flags & HAS_SSE2) vpx_fdct32x32_1 = vpx_fdct32x32_1_sse2; vpx_fdct32x32_rd = vpx_fdct32x32_rd_c; - if (flags & HAS_SSE2) - vpx_fdct32x32_rd = vpx_fdct32x32_rd_sse2; + if (flags & HAS_SSE2) vpx_fdct32x32_rd = vpx_fdct32x32_rd_sse2; vpx_fdct4x4 = vpx_fdct4x4_c; - if (flags & HAS_SSE2) - vpx_fdct4x4 = vpx_fdct4x4_sse2; + if (flags & HAS_SSE2) vpx_fdct4x4 = vpx_fdct4x4_sse2; vpx_fdct4x4_1 = vpx_fdct4x4_1_c; - if (flags & HAS_SSE2) - vpx_fdct4x4_1 = vpx_fdct4x4_1_sse2; + if (flags & HAS_SSE2) vpx_fdct4x4_1 = vpx_fdct4x4_1_sse2; vpx_fdct8x8 = vpx_fdct8x8_c; - if (flags & HAS_SSE2) - vpx_fdct8x8 = vpx_fdct8x8_sse2; + if (flags & HAS_SSE2) vpx_fdct8x8 = vpx_fdct8x8_sse2; vpx_fdct8x8_1 = vpx_fdct8x8_1_c; - if (flags & HAS_SSE2) - vpx_fdct8x8_1 = vpx_fdct8x8_1_sse2; + if (flags & HAS_SSE2) vpx_fdct8x8_1 = vpx_fdct8x8_1_sse2; vpx_get16x16var = vpx_get16x16var_c; - if (flags & HAS_SSE2) - vpx_get16x16var = vpx_get16x16var_sse2; - if (flags & HAS_AVX2) - vpx_get16x16var = vpx_get16x16var_avx2; + if (flags & HAS_SSE2) vpx_get16x16var = vpx_get16x16var_sse2; + if (flags & HAS_AVX2) vpx_get16x16var = vpx_get16x16var_avx2; vpx_get8x8var = vpx_get8x8var_c; - if (flags & HAS_SSE2) - vpx_get8x8var = vpx_get8x8var_sse2; + if (flags & HAS_SSE2) vpx_get8x8var = vpx_get8x8var_sse2; vpx_get_mb_ss = vpx_get_mb_ss_c; - if (flags & HAS_SSE2) - vpx_get_mb_ss = vpx_get_mb_ss_sse2; + if (flags & HAS_SSE2) vpx_get_mb_ss = vpx_get_mb_ss_sse2; vpx_h_predictor_16x16 = vpx_h_predictor_16x16_c; - if (flags & HAS_SSE2) - vpx_h_predictor_16x16 = vpx_h_predictor_16x16_sse2; + if (flags & HAS_SSE2) vpx_h_predictor_16x16 = vpx_h_predictor_16x16_sse2; vpx_h_predictor_32x32 = vpx_h_predictor_32x32_c; - if (flags & HAS_SSE2) - vpx_h_predictor_32x32 = vpx_h_predictor_32x32_sse2; + if (flags & HAS_SSE2) vpx_h_predictor_32x32 = vpx_h_predictor_32x32_sse2; vpx_h_predictor_4x4 = vpx_h_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_h_predictor_4x4 = vpx_h_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_h_predictor_4x4 = vpx_h_predictor_4x4_sse2; vpx_h_predictor_8x8 = vpx_h_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_h_predictor_8x8 = vpx_h_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_h_predictor_8x8 = vpx_h_predictor_8x8_sse2; vpx_hadamard_16x16 = vpx_hadamard_16x16_c; - if (flags & HAS_SSE2) - vpx_hadamard_16x16 = vpx_hadamard_16x16_sse2; - if (flags & HAS_AVX2) - vpx_hadamard_16x16 = vpx_hadamard_16x16_avx2; + if (flags & HAS_SSE2) vpx_hadamard_16x16 = vpx_hadamard_16x16_sse2; + if (flags & HAS_AVX2) vpx_hadamard_16x16 = vpx_hadamard_16x16_avx2; vpx_hadamard_8x8 = vpx_hadamard_8x8_c; - if (flags & HAS_SSE2) - vpx_hadamard_8x8 = vpx_hadamard_8x8_sse2; + if (flags & HAS_SSE2) vpx_hadamard_8x8 = vpx_hadamard_8x8_sse2; vpx_highbd_10_mse16x16 = vpx_highbd_10_mse16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_10_mse16x16 = vpx_highbd_10_mse16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_10_mse16x16 = vpx_highbd_10_mse16x16_sse2; vpx_highbd_10_mse8x8 = vpx_highbd_10_mse8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_10_mse8x8 = vpx_highbd_10_mse8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_10_mse8x8 = vpx_highbd_10_mse8x8_sse2; vpx_highbd_10_sub_pixel_avg_variance16x16 = vpx_highbd_10_sub_pixel_avg_variance16x16_c; if (flags & HAS_SSE2) @@ -9165,11 +5765,9 @@ if (flags & HAS_SSE2) vpx_highbd_10_variance8x8 = vpx_highbd_10_variance8x8_sse2; vpx_highbd_12_mse16x16 = vpx_highbd_12_mse16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_12_mse16x16 = vpx_highbd_12_mse16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_12_mse16x16 = vpx_highbd_12_mse16x16_sse2; vpx_highbd_12_mse8x8 = vpx_highbd_12_mse8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_12_mse8x8 = vpx_highbd_12_mse8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_12_mse8x8 = vpx_highbd_12_mse8x8_sse2; vpx_highbd_12_sub_pixel_avg_variance16x16 = vpx_highbd_12_sub_pixel_avg_variance16x16_c; if (flags & HAS_SSE2) @@ -9307,11 +5905,9 @@ if (flags & HAS_SSE2) vpx_highbd_12_variance8x8 = vpx_highbd_12_variance8x8_sse2; vpx_highbd_8_mse16x16 = vpx_highbd_8_mse16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_8_mse16x16 = vpx_highbd_8_mse16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_8_mse16x16 = vpx_highbd_8_mse16x16_sse2; vpx_highbd_8_mse8x8 = vpx_highbd_8_mse8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_8_mse8x8 = vpx_highbd_8_mse8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_8_mse8x8 = vpx_highbd_8_mse8x8_sse2; vpx_highbd_8_sub_pixel_avg_variance16x16 = vpx_highbd_8_sub_pixel_avg_variance16x16_c; if (flags & HAS_SSE2) @@ -9442,8 +6038,7 @@ if (flags & HAS_SSE2) vpx_highbd_8_variance8x8 = vpx_highbd_8_variance8x8_sse2; vpx_highbd_convolve8 = vpx_highbd_convolve8_c; - if (flags & HAS_AVX2) - vpx_highbd_convolve8 = vpx_highbd_convolve8_avx2; + if (flags & HAS_AVX2) vpx_highbd_convolve8 = vpx_highbd_convolve8_avx2; vpx_highbd_convolve8_avg = vpx_highbd_convolve8_avg_c; if (flags & HAS_AVX2) vpx_highbd_convolve8_avg = vpx_highbd_convolve8_avg_avx2; @@ -9460,10 +6055,8 @@ if (flags & HAS_AVX2) vpx_highbd_convolve8_vert = vpx_highbd_convolve8_vert_avx2; vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_sse2; - if (flags & HAS_AVX2) - vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_avx2; + if (flags & HAS_SSE2) vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_sse2; + if (flags & HAS_AVX2) vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_avx2; vpx_highbd_convolve_copy = vpx_highbd_convolve_copy_c; if (flags & HAS_SSE2) vpx_highbd_convolve_copy = vpx_highbd_convolve_copy_sse2; @@ -9592,20 +6185,15 @@ if (flags & HAS_SSE2) vpx_highbd_dc_top_predictor_8x8 = vpx_highbd_dc_top_predictor_8x8_sse2; vpx_highbd_fdct16x16 = vpx_highbd_fdct16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct16x16 = vpx_highbd_fdct16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct16x16 = vpx_highbd_fdct16x16_sse2; vpx_highbd_fdct32x32 = vpx_highbd_fdct32x32_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct32x32 = vpx_highbd_fdct32x32_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct32x32 = vpx_highbd_fdct32x32_sse2; vpx_highbd_fdct32x32_rd = vpx_highbd_fdct32x32_rd_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct32x32_rd = vpx_highbd_fdct32x32_rd_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct32x32_rd = vpx_highbd_fdct32x32_rd_sse2; vpx_highbd_fdct4x4 = vpx_highbd_fdct4x4_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct4x4 = vpx_highbd_fdct4x4_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct4x4 = vpx_highbd_fdct4x4_sse2; vpx_highbd_fdct8x8 = vpx_highbd_fdct8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_fdct8x8 = vpx_highbd_fdct8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_fdct8x8 = vpx_highbd_fdct8x8_sse2; vpx_highbd_h_predictor_16x16 = vpx_highbd_h_predictor_16x16_c; if (flags & HAS_SSE2) vpx_highbd_h_predictor_16x16 = vpx_highbd_h_predictor_16x16_sse2; @@ -9712,116 +6300,80 @@ if (flags & HAS_SSE2) vpx_highbd_lpf_vertical_8_dual = vpx_highbd_lpf_vertical_8_dual_sse2; vpx_highbd_quantize_b = vpx_highbd_quantize_b_c; - if (flags & HAS_SSE2) - vpx_highbd_quantize_b = vpx_highbd_quantize_b_sse2; + if (flags & HAS_SSE2) vpx_highbd_quantize_b = vpx_highbd_quantize_b_sse2; vpx_highbd_quantize_b_32x32 = vpx_highbd_quantize_b_32x32_c; if (flags & HAS_SSE2) vpx_highbd_quantize_b_32x32 = vpx_highbd_quantize_b_32x32_sse2; vpx_highbd_sad16x16 = vpx_highbd_sad16x16_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x16 = vpx_highbd_sad16x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x16 = vpx_highbd_sad16x16_sse2; vpx_highbd_sad16x16_avg = vpx_highbd_sad16x16_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x16_avg = vpx_highbd_sad16x16_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x16_avg = vpx_highbd_sad16x16_avg_sse2; vpx_highbd_sad16x16x4d = vpx_highbd_sad16x16x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x16x4d = vpx_highbd_sad16x16x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x16x4d = vpx_highbd_sad16x16x4d_sse2; vpx_highbd_sad16x32 = vpx_highbd_sad16x32_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x32 = vpx_highbd_sad16x32_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x32 = vpx_highbd_sad16x32_sse2; vpx_highbd_sad16x32_avg = vpx_highbd_sad16x32_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x32_avg = vpx_highbd_sad16x32_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x32_avg = vpx_highbd_sad16x32_avg_sse2; vpx_highbd_sad16x32x4d = vpx_highbd_sad16x32x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x32x4d = vpx_highbd_sad16x32x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x32x4d = vpx_highbd_sad16x32x4d_sse2; vpx_highbd_sad16x8 = vpx_highbd_sad16x8_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x8 = vpx_highbd_sad16x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x8 = vpx_highbd_sad16x8_sse2; vpx_highbd_sad16x8_avg = vpx_highbd_sad16x8_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x8_avg = vpx_highbd_sad16x8_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x8_avg = vpx_highbd_sad16x8_avg_sse2; vpx_highbd_sad16x8x4d = vpx_highbd_sad16x8x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad16x8x4d = vpx_highbd_sad16x8x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad16x8x4d = vpx_highbd_sad16x8x4d_sse2; vpx_highbd_sad32x16 = vpx_highbd_sad32x16_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x16 = vpx_highbd_sad32x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x16 = vpx_highbd_sad32x16_sse2; vpx_highbd_sad32x16_avg = vpx_highbd_sad32x16_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x16_avg = vpx_highbd_sad32x16_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x16_avg = vpx_highbd_sad32x16_avg_sse2; vpx_highbd_sad32x16x4d = vpx_highbd_sad32x16x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x16x4d = vpx_highbd_sad32x16x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x16x4d = vpx_highbd_sad32x16x4d_sse2; vpx_highbd_sad32x32 = vpx_highbd_sad32x32_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x32 = vpx_highbd_sad32x32_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x32 = vpx_highbd_sad32x32_sse2; vpx_highbd_sad32x32_avg = vpx_highbd_sad32x32_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x32_avg = vpx_highbd_sad32x32_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x32_avg = vpx_highbd_sad32x32_avg_sse2; vpx_highbd_sad32x32x4d = vpx_highbd_sad32x32x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x32x4d = vpx_highbd_sad32x32x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x32x4d = vpx_highbd_sad32x32x4d_sse2; vpx_highbd_sad32x64 = vpx_highbd_sad32x64_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x64 = vpx_highbd_sad32x64_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x64 = vpx_highbd_sad32x64_sse2; vpx_highbd_sad32x64_avg = vpx_highbd_sad32x64_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x64_avg = vpx_highbd_sad32x64_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x64_avg = vpx_highbd_sad32x64_avg_sse2; vpx_highbd_sad32x64x4d = vpx_highbd_sad32x64x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad32x64x4d = vpx_highbd_sad32x64x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad32x64x4d = vpx_highbd_sad32x64x4d_sse2; vpx_highbd_sad4x4x4d = vpx_highbd_sad4x4x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad4x4x4d = vpx_highbd_sad4x4x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad4x4x4d = vpx_highbd_sad4x4x4d_sse2; vpx_highbd_sad4x8x4d = vpx_highbd_sad4x8x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad4x8x4d = vpx_highbd_sad4x8x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad4x8x4d = vpx_highbd_sad4x8x4d_sse2; vpx_highbd_sad64x32 = vpx_highbd_sad64x32_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x32 = vpx_highbd_sad64x32_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x32 = vpx_highbd_sad64x32_sse2; vpx_highbd_sad64x32_avg = vpx_highbd_sad64x32_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x32_avg = vpx_highbd_sad64x32_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x32_avg = vpx_highbd_sad64x32_avg_sse2; vpx_highbd_sad64x32x4d = vpx_highbd_sad64x32x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x32x4d = vpx_highbd_sad64x32x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x32x4d = vpx_highbd_sad64x32x4d_sse2; vpx_highbd_sad64x64 = vpx_highbd_sad64x64_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x64 = vpx_highbd_sad64x64_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x64 = vpx_highbd_sad64x64_sse2; vpx_highbd_sad64x64_avg = vpx_highbd_sad64x64_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x64_avg = vpx_highbd_sad64x64_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x64_avg = vpx_highbd_sad64x64_avg_sse2; vpx_highbd_sad64x64x4d = vpx_highbd_sad64x64x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad64x64x4d = vpx_highbd_sad64x64x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad64x64x4d = vpx_highbd_sad64x64x4d_sse2; vpx_highbd_sad8x16 = vpx_highbd_sad8x16_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x16 = vpx_highbd_sad8x16_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x16 = vpx_highbd_sad8x16_sse2; vpx_highbd_sad8x16_avg = vpx_highbd_sad8x16_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x16_avg = vpx_highbd_sad8x16_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x16_avg = vpx_highbd_sad8x16_avg_sse2; vpx_highbd_sad8x16x4d = vpx_highbd_sad8x16x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x16x4d = vpx_highbd_sad8x16x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x16x4d = vpx_highbd_sad8x16x4d_sse2; vpx_highbd_sad8x4 = vpx_highbd_sad8x4_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x4 = vpx_highbd_sad8x4_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x4 = vpx_highbd_sad8x4_sse2; vpx_highbd_sad8x4_avg = vpx_highbd_sad8x4_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x4_avg = vpx_highbd_sad8x4_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x4_avg = vpx_highbd_sad8x4_avg_sse2; vpx_highbd_sad8x4x4d = vpx_highbd_sad8x4x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x4x4d = vpx_highbd_sad8x4x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x4x4d = vpx_highbd_sad8x4x4d_sse2; vpx_highbd_sad8x8 = vpx_highbd_sad8x8_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x8 = vpx_highbd_sad8x8_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x8 = vpx_highbd_sad8x8_sse2; vpx_highbd_sad8x8_avg = vpx_highbd_sad8x8_avg_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x8_avg = vpx_highbd_sad8x8_avg_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x8_avg = vpx_highbd_sad8x8_avg_sse2; vpx_highbd_sad8x8x4d = vpx_highbd_sad8x8x4d_c; - if (flags & HAS_SSE2) - vpx_highbd_sad8x8x4d = vpx_highbd_sad8x8x4d_sse2; + if (flags & HAS_SSE2) vpx_highbd_sad8x8x4d = vpx_highbd_sad8x8x4d_sse2; vpx_highbd_tm_predictor_16x16 = vpx_highbd_tm_predictor_16x16_c; if (flags & HAS_SSE2) vpx_highbd_tm_predictor_16x16 = vpx_highbd_tm_predictor_16x16_sse2; @@ -9847,324 +6399,218 @@ if (flags & HAS_SSE2) vpx_highbd_v_predictor_8x8 = vpx_highbd_v_predictor_8x8_sse2; vpx_idct16x16_10_add = vpx_idct16x16_10_add_c; - if (flags & HAS_SSE2) - vpx_idct16x16_10_add = vpx_idct16x16_10_add_sse2; + if (flags & HAS_SSE2) vpx_idct16x16_10_add = vpx_idct16x16_10_add_sse2; vpx_idct16x16_1_add = vpx_idct16x16_1_add_c; - if (flags & HAS_SSE2) - vpx_idct16x16_1_add = vpx_idct16x16_1_add_sse2; + if (flags & HAS_SSE2) vpx_idct16x16_1_add = vpx_idct16x16_1_add_sse2; vpx_idct16x16_256_add = vpx_idct16x16_256_add_c; - if (flags & HAS_SSE2) - vpx_idct16x16_256_add = vpx_idct16x16_256_add_sse2; + if (flags & HAS_SSE2) vpx_idct16x16_256_add = vpx_idct16x16_256_add_sse2; vpx_idct16x16_38_add = vpx_idct16x16_38_add_c; - if (flags & HAS_SSE2) - vpx_idct16x16_38_add = vpx_idct16x16_38_add_sse2; + if (flags & HAS_SSE2) vpx_idct16x16_38_add = vpx_idct16x16_38_add_sse2; vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_c; - if (flags & HAS_SSE2) - vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_sse2; + if (flags & HAS_SSE2) vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_sse2; vpx_idct32x32_135_add = vpx_idct32x32_135_add_c; - if (flags & HAS_SSE2) - vpx_idct32x32_135_add = vpx_idct32x32_135_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct32x32_135_add = vpx_idct32x32_135_add_ssse3; + if (flags & HAS_SSE2) vpx_idct32x32_135_add = vpx_idct32x32_135_add_sse2; + if (flags & HAS_SSSE3) vpx_idct32x32_135_add = vpx_idct32x32_135_add_ssse3; vpx_idct32x32_1_add = vpx_idct32x32_1_add_c; - if (flags & HAS_SSE2) - vpx_idct32x32_1_add = vpx_idct32x32_1_add_sse2; + if (flags & HAS_SSE2) vpx_idct32x32_1_add = vpx_idct32x32_1_add_sse2; vpx_idct32x32_34_add = vpx_idct32x32_34_add_c; - if (flags & HAS_SSE2) - vpx_idct32x32_34_add = vpx_idct32x32_34_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct32x32_34_add = vpx_idct32x32_34_add_ssse3; + if (flags & HAS_SSE2) vpx_idct32x32_34_add = vpx_idct32x32_34_add_sse2; + if (flags & HAS_SSSE3) vpx_idct32x32_34_add = vpx_idct32x32_34_add_ssse3; vpx_idct4x4_16_add = vpx_idct4x4_16_add_c; - if (flags & HAS_SSE2) - vpx_idct4x4_16_add = vpx_idct4x4_16_add_sse2; + if (flags & HAS_SSE2) vpx_idct4x4_16_add = vpx_idct4x4_16_add_sse2; vpx_idct4x4_1_add = vpx_idct4x4_1_add_c; - if (flags & HAS_SSE2) - vpx_idct4x4_1_add = vpx_idct4x4_1_add_sse2; + if (flags & HAS_SSE2) vpx_idct4x4_1_add = vpx_idct4x4_1_add_sse2; vpx_idct8x8_12_add = vpx_idct8x8_12_add_c; - if (flags & HAS_SSE2) - vpx_idct8x8_12_add = vpx_idct8x8_12_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct8x8_12_add = vpx_idct8x8_12_add_ssse3; + if (flags & HAS_SSE2) vpx_idct8x8_12_add = vpx_idct8x8_12_add_sse2; + if (flags & HAS_SSSE3) vpx_idct8x8_12_add = vpx_idct8x8_12_add_ssse3; vpx_idct8x8_1_add = vpx_idct8x8_1_add_c; - if (flags & HAS_SSE2) - vpx_idct8x8_1_add = vpx_idct8x8_1_add_sse2; + if (flags & HAS_SSE2) vpx_idct8x8_1_add = vpx_idct8x8_1_add_sse2; vpx_idct8x8_64_add = vpx_idct8x8_64_add_c; - if (flags & HAS_SSE2) - vpx_idct8x8_64_add = vpx_idct8x8_64_add_sse2; + if (flags & HAS_SSE2) vpx_idct8x8_64_add = vpx_idct8x8_64_add_sse2; vpx_int_pro_col = vpx_int_pro_col_c; - if (flags & HAS_SSE2) - vpx_int_pro_col = vpx_int_pro_col_sse2; + if (flags & HAS_SSE2) vpx_int_pro_col = vpx_int_pro_col_sse2; vpx_int_pro_row = vpx_int_pro_row_c; - if (flags & HAS_SSE2) - vpx_int_pro_row = vpx_int_pro_row_sse2; + if (flags & HAS_SSE2) vpx_int_pro_row = vpx_int_pro_row_sse2; vpx_iwht4x4_16_add = vpx_iwht4x4_16_add_c; - if (flags & HAS_SSE2) - vpx_iwht4x4_16_add = vpx_iwht4x4_16_add_sse2; + if (flags & HAS_SSE2) vpx_iwht4x4_16_add = vpx_iwht4x4_16_add_sse2; vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_c; - if (flags & HAS_SSE2) - vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_sse2; - if (flags & HAS_AVX2) - vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_avx2; + if (flags & HAS_SSE2) vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_sse2; + if (flags & HAS_AVX2) vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_avx2; vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_c; if (flags & HAS_SSE2) vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_sse2; if (flags & HAS_AVX2) vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_avx2; vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_c; - if (flags & HAS_SSE2) - vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_sse2; + if (flags & HAS_SSE2) vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_sse2; vpx_lpf_horizontal_4_dual = vpx_lpf_horizontal_4_dual_c; if (flags & HAS_SSE2) vpx_lpf_horizontal_4_dual = vpx_lpf_horizontal_4_dual_sse2; vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_c; - if (flags & HAS_SSE2) - vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_sse2; + if (flags & HAS_SSE2) vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_sse2; vpx_lpf_horizontal_8_dual = vpx_lpf_horizontal_8_dual_c; if (flags & HAS_SSE2) vpx_lpf_horizontal_8_dual = vpx_lpf_horizontal_8_dual_sse2; vpx_lpf_vertical_16 = vpx_lpf_vertical_16_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_16 = vpx_lpf_vertical_16_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_16 = vpx_lpf_vertical_16_sse2; vpx_lpf_vertical_16_dual = vpx_lpf_vertical_16_dual_c; if (flags & HAS_SSE2) vpx_lpf_vertical_16_dual = vpx_lpf_vertical_16_dual_sse2; vpx_lpf_vertical_4 = vpx_lpf_vertical_4_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_4 = vpx_lpf_vertical_4_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_4 = vpx_lpf_vertical_4_sse2; vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_sse2; vpx_lpf_vertical_8 = vpx_lpf_vertical_8_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_8 = vpx_lpf_vertical_8_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_8 = vpx_lpf_vertical_8_sse2; vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_c; - if (flags & HAS_SSE2) - vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_sse2; + if (flags & HAS_SSE2) vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_sse2; vpx_mbpost_proc_across_ip = vpx_mbpost_proc_across_ip_c; if (flags & HAS_SSE2) vpx_mbpost_proc_across_ip = vpx_mbpost_proc_across_ip_sse2; vpx_mbpost_proc_down = vpx_mbpost_proc_down_c; - if (flags & HAS_SSE2) - vpx_mbpost_proc_down = vpx_mbpost_proc_down_sse2; + if (flags & HAS_SSE2) vpx_mbpost_proc_down = vpx_mbpost_proc_down_sse2; vpx_minmax_8x8 = vpx_minmax_8x8_c; - if (flags & HAS_SSE2) - vpx_minmax_8x8 = vpx_minmax_8x8_sse2; + if (flags & HAS_SSE2) vpx_minmax_8x8 = vpx_minmax_8x8_sse2; vpx_mse16x16 = vpx_mse16x16_c; - if (flags & HAS_SSE2) - vpx_mse16x16 = vpx_mse16x16_sse2; - if (flags & HAS_AVX2) - vpx_mse16x16 = vpx_mse16x16_avx2; + if (flags & HAS_SSE2) vpx_mse16x16 = vpx_mse16x16_sse2; + if (flags & HAS_AVX2) vpx_mse16x16 = vpx_mse16x16_avx2; vpx_mse16x8 = vpx_mse16x8_c; - if (flags & HAS_SSE2) - vpx_mse16x8 = vpx_mse16x8_sse2; + if (flags & HAS_SSE2) vpx_mse16x8 = vpx_mse16x8_sse2; + if (flags & HAS_AVX2) vpx_mse16x8 = vpx_mse16x8_avx2; vpx_mse8x16 = vpx_mse8x16_c; - if (flags & HAS_SSE2) - vpx_mse8x16 = vpx_mse8x16_sse2; + if (flags & HAS_SSE2) vpx_mse8x16 = vpx_mse8x16_sse2; vpx_mse8x8 = vpx_mse8x8_c; - if (flags & HAS_SSE2) - vpx_mse8x8 = vpx_mse8x8_sse2; + if (flags & HAS_SSE2) vpx_mse8x8 = vpx_mse8x8_sse2; vpx_plane_add_noise = vpx_plane_add_noise_c; - if (flags & HAS_SSE2) - vpx_plane_add_noise = vpx_plane_add_noise_sse2; + if (flags & HAS_SSE2) vpx_plane_add_noise = vpx_plane_add_noise_sse2; vpx_post_proc_down_and_across_mb_row = vpx_post_proc_down_and_across_mb_row_c; if (flags & HAS_SSE2) vpx_post_proc_down_and_across_mb_row = vpx_post_proc_down_and_across_mb_row_sse2; vpx_quantize_b = vpx_quantize_b_c; - if (flags & HAS_SSE2) - vpx_quantize_b = vpx_quantize_b_sse2; - if (flags & HAS_SSSE3) - vpx_quantize_b = vpx_quantize_b_ssse3; - if (flags & HAS_AVX) - vpx_quantize_b = vpx_quantize_b_avx; + if (flags & HAS_SSE2) vpx_quantize_b = vpx_quantize_b_sse2; + if (flags & HAS_SSSE3) vpx_quantize_b = vpx_quantize_b_ssse3; + if (flags & HAS_AVX) vpx_quantize_b = vpx_quantize_b_avx; vpx_quantize_b_32x32 = vpx_quantize_b_32x32_c; - if (flags & HAS_SSSE3) - vpx_quantize_b_32x32 = vpx_quantize_b_32x32_ssse3; - if (flags & HAS_AVX) - vpx_quantize_b_32x32 = vpx_quantize_b_32x32_avx; + if (flags & HAS_SSSE3) vpx_quantize_b_32x32 = vpx_quantize_b_32x32_ssse3; + if (flags & HAS_AVX) vpx_quantize_b_32x32 = vpx_quantize_b_32x32_avx; vpx_sad16x16 = vpx_sad16x16_c; - if (flags & HAS_SSE2) - vpx_sad16x16 = vpx_sad16x16_sse2; + if (flags & HAS_SSE2) vpx_sad16x16 = vpx_sad16x16_sse2; vpx_sad16x16_avg = vpx_sad16x16_avg_c; - if (flags & HAS_SSE2) - vpx_sad16x16_avg = vpx_sad16x16_avg_sse2; + if (flags & HAS_SSE2) vpx_sad16x16_avg = vpx_sad16x16_avg_sse2; vpx_sad16x16x3 = vpx_sad16x16x3_c; - if (flags & HAS_SSE3) - vpx_sad16x16x3 = vpx_sad16x16x3_sse3; - if (flags & HAS_SSSE3) - vpx_sad16x16x3 = vpx_sad16x16x3_ssse3; + if (flags & HAS_SSE3) vpx_sad16x16x3 = vpx_sad16x16x3_sse3; + if (flags & HAS_SSSE3) vpx_sad16x16x3 = vpx_sad16x16x3_ssse3; vpx_sad16x16x4d = vpx_sad16x16x4d_c; - if (flags & HAS_SSE2) - vpx_sad16x16x4d = vpx_sad16x16x4d_sse2; + if (flags & HAS_SSE2) vpx_sad16x16x4d = vpx_sad16x16x4d_sse2; vpx_sad16x16x8 = vpx_sad16x16x8_c; - if (flags & HAS_SSE4_1) - vpx_sad16x16x8 = vpx_sad16x16x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad16x16x8 = vpx_sad16x16x8_sse4_1; vpx_sad16x32 = vpx_sad16x32_c; - if (flags & HAS_SSE2) - vpx_sad16x32 = vpx_sad16x32_sse2; + if (flags & HAS_SSE2) vpx_sad16x32 = vpx_sad16x32_sse2; vpx_sad16x32_avg = vpx_sad16x32_avg_c; - if (flags & HAS_SSE2) - vpx_sad16x32_avg = vpx_sad16x32_avg_sse2; + if (flags & HAS_SSE2) vpx_sad16x32_avg = vpx_sad16x32_avg_sse2; vpx_sad16x32x4d = vpx_sad16x32x4d_c; - if (flags & HAS_SSE2) - vpx_sad16x32x4d = vpx_sad16x32x4d_sse2; + if (flags & HAS_SSE2) vpx_sad16x32x4d = vpx_sad16x32x4d_sse2; vpx_sad16x8 = vpx_sad16x8_c; - if (flags & HAS_SSE2) - vpx_sad16x8 = vpx_sad16x8_sse2; + if (flags & HAS_SSE2) vpx_sad16x8 = vpx_sad16x8_sse2; vpx_sad16x8_avg = vpx_sad16x8_avg_c; - if (flags & HAS_SSE2) - vpx_sad16x8_avg = vpx_sad16x8_avg_sse2; + if (flags & HAS_SSE2) vpx_sad16x8_avg = vpx_sad16x8_avg_sse2; vpx_sad16x8x3 = vpx_sad16x8x3_c; - if (flags & HAS_SSE3) - vpx_sad16x8x3 = vpx_sad16x8x3_sse3; - if (flags & HAS_SSSE3) - vpx_sad16x8x3 = vpx_sad16x8x3_ssse3; + if (flags & HAS_SSE3) vpx_sad16x8x3 = vpx_sad16x8x3_sse3; + if (flags & HAS_SSSE3) vpx_sad16x8x3 = vpx_sad16x8x3_ssse3; vpx_sad16x8x4d = vpx_sad16x8x4d_c; - if (flags & HAS_SSE2) - vpx_sad16x8x4d = vpx_sad16x8x4d_sse2; + if (flags & HAS_SSE2) vpx_sad16x8x4d = vpx_sad16x8x4d_sse2; vpx_sad16x8x8 = vpx_sad16x8x8_c; - if (flags & HAS_SSE4_1) - vpx_sad16x8x8 = vpx_sad16x8x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad16x8x8 = vpx_sad16x8x8_sse4_1; vpx_sad32x16 = vpx_sad32x16_c; - if (flags & HAS_SSE2) - vpx_sad32x16 = vpx_sad32x16_sse2; - if (flags & HAS_AVX2) - vpx_sad32x16 = vpx_sad32x16_avx2; + if (flags & HAS_SSE2) vpx_sad32x16 = vpx_sad32x16_sse2; + if (flags & HAS_AVX2) vpx_sad32x16 = vpx_sad32x16_avx2; vpx_sad32x16_avg = vpx_sad32x16_avg_c; - if (flags & HAS_SSE2) - vpx_sad32x16_avg = vpx_sad32x16_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x16_avg = vpx_sad32x16_avg_avx2; + if (flags & HAS_SSE2) vpx_sad32x16_avg = vpx_sad32x16_avg_sse2; + if (flags & HAS_AVX2) vpx_sad32x16_avg = vpx_sad32x16_avg_avx2; vpx_sad32x16x4d = vpx_sad32x16x4d_c; - if (flags & HAS_SSE2) - vpx_sad32x16x4d = vpx_sad32x16x4d_sse2; + if (flags & HAS_SSE2) vpx_sad32x16x4d = vpx_sad32x16x4d_sse2; vpx_sad32x32 = vpx_sad32x32_c; - if (flags & HAS_SSE2) - vpx_sad32x32 = vpx_sad32x32_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32 = vpx_sad32x32_avx2; + if (flags & HAS_SSE2) vpx_sad32x32 = vpx_sad32x32_sse2; + if (flags & HAS_AVX2) vpx_sad32x32 = vpx_sad32x32_avx2; vpx_sad32x32_avg = vpx_sad32x32_avg_c; - if (flags & HAS_SSE2) - vpx_sad32x32_avg = vpx_sad32x32_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32_avg = vpx_sad32x32_avg_avx2; + if (flags & HAS_SSE2) vpx_sad32x32_avg = vpx_sad32x32_avg_sse2; + if (flags & HAS_AVX2) vpx_sad32x32_avg = vpx_sad32x32_avg_avx2; vpx_sad32x32x4d = vpx_sad32x32x4d_c; - if (flags & HAS_SSE2) - vpx_sad32x32x4d = vpx_sad32x32x4d_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32x4d = vpx_sad32x32x4d_avx2; + if (flags & HAS_SSE2) vpx_sad32x32x4d = vpx_sad32x32x4d_sse2; + if (flags & HAS_AVX2) vpx_sad32x32x4d = vpx_sad32x32x4d_avx2; vpx_sad32x64 = vpx_sad32x64_c; - if (flags & HAS_SSE2) - vpx_sad32x64 = vpx_sad32x64_sse2; - if (flags & HAS_AVX2) - vpx_sad32x64 = vpx_sad32x64_avx2; + if (flags & HAS_SSE2) vpx_sad32x64 = vpx_sad32x64_sse2; + if (flags & HAS_AVX2) vpx_sad32x64 = vpx_sad32x64_avx2; vpx_sad32x64_avg = vpx_sad32x64_avg_c; - if (flags & HAS_SSE2) - vpx_sad32x64_avg = vpx_sad32x64_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x64_avg = vpx_sad32x64_avg_avx2; + if (flags & HAS_SSE2) vpx_sad32x64_avg = vpx_sad32x64_avg_sse2; + if (flags & HAS_AVX2) vpx_sad32x64_avg = vpx_sad32x64_avg_avx2; vpx_sad32x64x4d = vpx_sad32x64x4d_c; - if (flags & HAS_SSE2) - vpx_sad32x64x4d = vpx_sad32x64x4d_sse2; + if (flags & HAS_SSE2) vpx_sad32x64x4d = vpx_sad32x64x4d_sse2; vpx_sad4x4 = vpx_sad4x4_c; - if (flags & HAS_SSE2) - vpx_sad4x4 = vpx_sad4x4_sse2; + if (flags & HAS_SSE2) vpx_sad4x4 = vpx_sad4x4_sse2; vpx_sad4x4_avg = vpx_sad4x4_avg_c; - if (flags & HAS_SSE2) - vpx_sad4x4_avg = vpx_sad4x4_avg_sse2; + if (flags & HAS_SSE2) vpx_sad4x4_avg = vpx_sad4x4_avg_sse2; vpx_sad4x4x3 = vpx_sad4x4x3_c; - if (flags & HAS_SSE3) - vpx_sad4x4x3 = vpx_sad4x4x3_sse3; + if (flags & HAS_SSE3) vpx_sad4x4x3 = vpx_sad4x4x3_sse3; vpx_sad4x4x4d = vpx_sad4x4x4d_c; - if (flags & HAS_SSE2) - vpx_sad4x4x4d = vpx_sad4x4x4d_sse2; + if (flags & HAS_SSE2) vpx_sad4x4x4d = vpx_sad4x4x4d_sse2; vpx_sad4x4x8 = vpx_sad4x4x8_c; - if (flags & HAS_SSE4_1) - vpx_sad4x4x8 = vpx_sad4x4x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad4x4x8 = vpx_sad4x4x8_sse4_1; vpx_sad4x8 = vpx_sad4x8_c; - if (flags & HAS_SSE2) - vpx_sad4x8 = vpx_sad4x8_sse2; + if (flags & HAS_SSE2) vpx_sad4x8 = vpx_sad4x8_sse2; vpx_sad4x8_avg = vpx_sad4x8_avg_c; - if (flags & HAS_SSE2) - vpx_sad4x8_avg = vpx_sad4x8_avg_sse2; + if (flags & HAS_SSE2) vpx_sad4x8_avg = vpx_sad4x8_avg_sse2; vpx_sad4x8x4d = vpx_sad4x8x4d_c; - if (flags & HAS_SSE2) - vpx_sad4x8x4d = vpx_sad4x8x4d_sse2; + if (flags & HAS_SSE2) vpx_sad4x8x4d = vpx_sad4x8x4d_sse2; vpx_sad64x32 = vpx_sad64x32_c; - if (flags & HAS_SSE2) - vpx_sad64x32 = vpx_sad64x32_sse2; - if (flags & HAS_AVX2) - vpx_sad64x32 = vpx_sad64x32_avx2; + if (flags & HAS_SSE2) vpx_sad64x32 = vpx_sad64x32_sse2; + if (flags & HAS_AVX2) vpx_sad64x32 = vpx_sad64x32_avx2; vpx_sad64x32_avg = vpx_sad64x32_avg_c; - if (flags & HAS_SSE2) - vpx_sad64x32_avg = vpx_sad64x32_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad64x32_avg = vpx_sad64x32_avg_avx2; + if (flags & HAS_SSE2) vpx_sad64x32_avg = vpx_sad64x32_avg_sse2; + if (flags & HAS_AVX2) vpx_sad64x32_avg = vpx_sad64x32_avg_avx2; vpx_sad64x32x4d = vpx_sad64x32x4d_c; - if (flags & HAS_SSE2) - vpx_sad64x32x4d = vpx_sad64x32x4d_sse2; + if (flags & HAS_SSE2) vpx_sad64x32x4d = vpx_sad64x32x4d_sse2; vpx_sad64x64 = vpx_sad64x64_c; - if (flags & HAS_SSE2) - vpx_sad64x64 = vpx_sad64x64_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64 = vpx_sad64x64_avx2; + if (flags & HAS_SSE2) vpx_sad64x64 = vpx_sad64x64_sse2; + if (flags & HAS_AVX2) vpx_sad64x64 = vpx_sad64x64_avx2; vpx_sad64x64_avg = vpx_sad64x64_avg_c; - if (flags & HAS_SSE2) - vpx_sad64x64_avg = vpx_sad64x64_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64_avg = vpx_sad64x64_avg_avx2; + if (flags & HAS_SSE2) vpx_sad64x64_avg = vpx_sad64x64_avg_sse2; + if (flags & HAS_AVX2) vpx_sad64x64_avg = vpx_sad64x64_avg_avx2; vpx_sad64x64x4d = vpx_sad64x64x4d_c; - if (flags & HAS_SSE2) - vpx_sad64x64x4d = vpx_sad64x64x4d_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64x4d = vpx_sad64x64x4d_avx2; + if (flags & HAS_SSE2) vpx_sad64x64x4d = vpx_sad64x64x4d_sse2; + if (flags & HAS_AVX2) vpx_sad64x64x4d = vpx_sad64x64x4d_avx2; vpx_sad8x16 = vpx_sad8x16_c; - if (flags & HAS_SSE2) - vpx_sad8x16 = vpx_sad8x16_sse2; + if (flags & HAS_SSE2) vpx_sad8x16 = vpx_sad8x16_sse2; vpx_sad8x16_avg = vpx_sad8x16_avg_c; - if (flags & HAS_SSE2) - vpx_sad8x16_avg = vpx_sad8x16_avg_sse2; + if (flags & HAS_SSE2) vpx_sad8x16_avg = vpx_sad8x16_avg_sse2; vpx_sad8x16x3 = vpx_sad8x16x3_c; - if (flags & HAS_SSE3) - vpx_sad8x16x3 = vpx_sad8x16x3_sse3; + if (flags & HAS_SSE3) vpx_sad8x16x3 = vpx_sad8x16x3_sse3; vpx_sad8x16x4d = vpx_sad8x16x4d_c; - if (flags & HAS_SSE2) - vpx_sad8x16x4d = vpx_sad8x16x4d_sse2; + if (flags & HAS_SSE2) vpx_sad8x16x4d = vpx_sad8x16x4d_sse2; vpx_sad8x16x8 = vpx_sad8x16x8_c; - if (flags & HAS_SSE4_1) - vpx_sad8x16x8 = vpx_sad8x16x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad8x16x8 = vpx_sad8x16x8_sse4_1; vpx_sad8x4 = vpx_sad8x4_c; - if (flags & HAS_SSE2) - vpx_sad8x4 = vpx_sad8x4_sse2; + if (flags & HAS_SSE2) vpx_sad8x4 = vpx_sad8x4_sse2; vpx_sad8x4_avg = vpx_sad8x4_avg_c; - if (flags & HAS_SSE2) - vpx_sad8x4_avg = vpx_sad8x4_avg_sse2; + if (flags & HAS_SSE2) vpx_sad8x4_avg = vpx_sad8x4_avg_sse2; vpx_sad8x4x4d = vpx_sad8x4x4d_c; - if (flags & HAS_SSE2) - vpx_sad8x4x4d = vpx_sad8x4x4d_sse2; + if (flags & HAS_SSE2) vpx_sad8x4x4d = vpx_sad8x4x4d_sse2; vpx_sad8x8 = vpx_sad8x8_c; - if (flags & HAS_SSE2) - vpx_sad8x8 = vpx_sad8x8_sse2; + if (flags & HAS_SSE2) vpx_sad8x8 = vpx_sad8x8_sse2; vpx_sad8x8_avg = vpx_sad8x8_avg_c; - if (flags & HAS_SSE2) - vpx_sad8x8_avg = vpx_sad8x8_avg_sse2; + if (flags & HAS_SSE2) vpx_sad8x8_avg = vpx_sad8x8_avg_sse2; vpx_sad8x8x3 = vpx_sad8x8x3_c; - if (flags & HAS_SSE3) - vpx_sad8x8x3 = vpx_sad8x8x3_sse3; + if (flags & HAS_SSE3) vpx_sad8x8x3 = vpx_sad8x8x3_sse3; vpx_sad8x8x4d = vpx_sad8x8x4d_c; - if (flags & HAS_SSE2) - vpx_sad8x8x4d = vpx_sad8x8x4d_sse2; + if (flags & HAS_SSE2) vpx_sad8x8x4d = vpx_sad8x8x4d_sse2; vpx_sad8x8x8 = vpx_sad8x8x8_c; - if (flags & HAS_SSE4_1) - vpx_sad8x8x8 = vpx_sad8x8x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad8x8x8 = vpx_sad8x8x8_sse4_1; vpx_satd = vpx_satd_c; - if (flags & HAS_SSE2) - vpx_satd = vpx_satd_sse2; - if (flags & HAS_AVX2) - vpx_satd = vpx_satd_avx2; + if (flags & HAS_SSE2) vpx_satd = vpx_satd_sse2; + if (flags & HAS_AVX2) vpx_satd = vpx_satd_avx2; vpx_scaled_2d = vpx_scaled_2d_c; - if (flags & HAS_SSSE3) - vpx_scaled_2d = vpx_scaled_2d_ssse3; + if (flags & HAS_SSSE3) vpx_scaled_2d = vpx_scaled_2d_ssse3; vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_c; if (flags & HAS_SSE2) vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_sse2; @@ -10304,87 +6750,61 @@ if (flags & HAS_SSSE3) vpx_sub_pixel_variance8x8 = vpx_sub_pixel_variance8x8_ssse3; vpx_subtract_block = vpx_subtract_block_c; - if (flags & HAS_SSE2) - vpx_subtract_block = vpx_subtract_block_sse2; + if (flags & HAS_SSE2) vpx_subtract_block = vpx_subtract_block_sse2; vpx_sum_squares_2d_i16 = vpx_sum_squares_2d_i16_c; - if (flags & HAS_SSE2) - vpx_sum_squares_2d_i16 = vpx_sum_squares_2d_i16_sse2; + if (flags & HAS_SSE2) vpx_sum_squares_2d_i16 = vpx_sum_squares_2d_i16_sse2; vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_c; - if (flags & HAS_SSE2) - vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_sse2; + if (flags & HAS_SSE2) vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_sse2; vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_c; - if (flags & HAS_SSE2) - vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_sse2; + if (flags & HAS_SSE2) vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_sse2; vpx_tm_predictor_4x4 = vpx_tm_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_tm_predictor_4x4 = vpx_tm_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_tm_predictor_4x4 = vpx_tm_predictor_4x4_sse2; vpx_tm_predictor_8x8 = vpx_tm_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_tm_predictor_8x8 = vpx_tm_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_tm_predictor_8x8 = vpx_tm_predictor_8x8_sse2; vpx_v_predictor_16x16 = vpx_v_predictor_16x16_c; - if (flags & HAS_SSE2) - vpx_v_predictor_16x16 = vpx_v_predictor_16x16_sse2; + if (flags & HAS_SSE2) vpx_v_predictor_16x16 = vpx_v_predictor_16x16_sse2; vpx_v_predictor_32x32 = vpx_v_predictor_32x32_c; - if (flags & HAS_SSE2) - vpx_v_predictor_32x32 = vpx_v_predictor_32x32_sse2; + if (flags & HAS_SSE2) vpx_v_predictor_32x32 = vpx_v_predictor_32x32_sse2; vpx_v_predictor_4x4 = vpx_v_predictor_4x4_c; - if (flags & HAS_SSE2) - vpx_v_predictor_4x4 = vpx_v_predictor_4x4_sse2; + if (flags & HAS_SSE2) vpx_v_predictor_4x4 = vpx_v_predictor_4x4_sse2; vpx_v_predictor_8x8 = vpx_v_predictor_8x8_c; - if (flags & HAS_SSE2) - vpx_v_predictor_8x8 = vpx_v_predictor_8x8_sse2; + if (flags & HAS_SSE2) vpx_v_predictor_8x8 = vpx_v_predictor_8x8_sse2; vpx_variance16x16 = vpx_variance16x16_c; - if (flags & HAS_SSE2) - vpx_variance16x16 = vpx_variance16x16_sse2; - if (flags & HAS_AVX2) - vpx_variance16x16 = vpx_variance16x16_avx2; + if (flags & HAS_SSE2) vpx_variance16x16 = vpx_variance16x16_sse2; + if (flags & HAS_AVX2) vpx_variance16x16 = vpx_variance16x16_avx2; vpx_variance16x32 = vpx_variance16x32_c; - if (flags & HAS_SSE2) - vpx_variance16x32 = vpx_variance16x32_sse2; + if (flags & HAS_SSE2) vpx_variance16x32 = vpx_variance16x32_sse2; + if (flags & HAS_AVX2) vpx_variance16x32 = vpx_variance16x32_avx2; vpx_variance16x8 = vpx_variance16x8_c; - if (flags & HAS_SSE2) - vpx_variance16x8 = vpx_variance16x8_sse2; + if (flags & HAS_SSE2) vpx_variance16x8 = vpx_variance16x8_sse2; + if (flags & HAS_AVX2) vpx_variance16x8 = vpx_variance16x8_avx2; vpx_variance32x16 = vpx_variance32x16_c; - if (flags & HAS_SSE2) - vpx_variance32x16 = vpx_variance32x16_sse2; - if (flags & HAS_AVX2) - vpx_variance32x16 = vpx_variance32x16_avx2; + if (flags & HAS_SSE2) vpx_variance32x16 = vpx_variance32x16_sse2; + if (flags & HAS_AVX2) vpx_variance32x16 = vpx_variance32x16_avx2; vpx_variance32x32 = vpx_variance32x32_c; - if (flags & HAS_SSE2) - vpx_variance32x32 = vpx_variance32x32_sse2; - if (flags & HAS_AVX2) - vpx_variance32x32 = vpx_variance32x32_avx2; + if (flags & HAS_SSE2) vpx_variance32x32 = vpx_variance32x32_sse2; + if (flags & HAS_AVX2) vpx_variance32x32 = vpx_variance32x32_avx2; vpx_variance32x64 = vpx_variance32x64_c; - if (flags & HAS_SSE2) - vpx_variance32x64 = vpx_variance32x64_sse2; + if (flags & HAS_SSE2) vpx_variance32x64 = vpx_variance32x64_sse2; + if (flags & HAS_AVX2) vpx_variance32x64 = vpx_variance32x64_avx2; vpx_variance4x4 = vpx_variance4x4_c; - if (flags & HAS_SSE2) - vpx_variance4x4 = vpx_variance4x4_sse2; + if (flags & HAS_SSE2) vpx_variance4x4 = vpx_variance4x4_sse2; vpx_variance4x8 = vpx_variance4x8_c; - if (flags & HAS_SSE2) - vpx_variance4x8 = vpx_variance4x8_sse2; + if (flags & HAS_SSE2) vpx_variance4x8 = vpx_variance4x8_sse2; vpx_variance64x32 = vpx_variance64x32_c; - if (flags & HAS_SSE2) - vpx_variance64x32 = vpx_variance64x32_sse2; - if (flags & HAS_AVX2) - vpx_variance64x32 = vpx_variance64x32_avx2; + if (flags & HAS_SSE2) vpx_variance64x32 = vpx_variance64x32_sse2; + if (flags & HAS_AVX2) vpx_variance64x32 = vpx_variance64x32_avx2; vpx_variance64x64 = vpx_variance64x64_c; - if (flags & HAS_SSE2) - vpx_variance64x64 = vpx_variance64x64_sse2; - if (flags & HAS_AVX2) - vpx_variance64x64 = vpx_variance64x64_avx2; + if (flags & HAS_SSE2) vpx_variance64x64 = vpx_variance64x64_sse2; + if (flags & HAS_AVX2) vpx_variance64x64 = vpx_variance64x64_avx2; vpx_variance8x16 = vpx_variance8x16_c; - if (flags & HAS_SSE2) - vpx_variance8x16 = vpx_variance8x16_sse2; + if (flags & HAS_SSE2) vpx_variance8x16 = vpx_variance8x16_sse2; vpx_variance8x4 = vpx_variance8x4_c; - if (flags & HAS_SSE2) - vpx_variance8x4 = vpx_variance8x4_sse2; + if (flags & HAS_SSE2) vpx_variance8x4 = vpx_variance8x4_sse2; vpx_variance8x8 = vpx_variance8x8_c; - if (flags & HAS_SSE2) - vpx_variance8x8 = vpx_variance8x8_sse2; + if (flags & HAS_SSE2) vpx_variance8x8 = vpx_variance8x8_sse2; vpx_vector_var = vpx_vector_var_c; - if (flags & HAS_SSE2) - vpx_vector_var = vpx_vector_var_sse2; + if (flags & HAS_SSE2) vpx_vector_var = vpx_vector_var_sse2; } #endif
diff --git a/third_party/libvpx/source/config/win/ia32/vpx_scale_rtcd.h b/third_party/libvpx/source/config/win/ia32/vpx_scale_rtcd.h index 19da7a7..f30cdee1 100644 --- a/third_party/libvpx/source/config/win/ia32/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/win/ia32/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/third_party/libvpx/source/config/win/x64/vp8_rtcd.h b/third_party/libvpx/source/config/win/x64/vp8_rtcd.h index 4e9d062..c876b08 100644 --- a/third_party/libvpx/source/config/win/x64/vp8_rtcd.h +++ b/third_party/libvpx/source/config/win/x64/vp8_rtcd.h
@@ -27,605 +27,348 @@ extern "C" { #endif -void vp8_bilinear_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict16x16_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict16x16_sse2(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict16x16_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict16x16_ssse3(unsigned char *src, int src_pitch, + int xofst, int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict4x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_mmx -void vp8_bilinear_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); #define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_mmx -void vp8_bilinear_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_bilinear_predict8x8_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_bilinear_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_blend_b_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, + int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c -void vp8_blend_mb_inner_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_inner vp8_blend_mb_inner_c -void vp8_blend_mb_outer_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int y1, - int u1, - int v1, - int alpha, - int stride); +void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, + int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_mb_outer vp8_blend_mb_outer_c -int vp8_block_error_c(short* coeff, short* dqcoeff); -int vp8_block_error_sse2(short* coeff, short* dqcoeff); +int vp8_block_error_c(short *coeff, short *dqcoeff); +int vp8_block_error_sse2(short *coeff, short *dqcoeff); #define vp8_block_error vp8_block_error_sse2 -void vp8_copy32xn_c(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -void vp8_copy32xn_sse2(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -void vp8_copy32xn_sse3(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); -RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char* src_ptr, - int source_stride, - unsigned char* dst_ptr, - int dst_stride, - int n); +void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, + unsigned char *dst_ptr, int dst_stride, int n); +RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char *src_ptr, + int source_stride, unsigned char *dst_ptr, + int dst_stride, int n); -void vp8_copy_mem16x16_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem16x16_sse2(unsigned char* src, - int src_pitch, - unsigned char* dst, - int dst_pitch); +void vp8_copy_mem16x16_sse2(unsigned char *src, int src_pitch, + unsigned char *dst, int dst_pitch); #define vp8_copy_mem16x16 vp8_copy_mem16x16_sse2 -void vp8_copy_mem8x4_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x4_mmx(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_mmx -void vp8_copy_mem8x8_c(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_copy_mem8x8_mmx(unsigned char* src, - int src_pitch, - unsigned char* dst, +void vp8_copy_mem8x8_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x8 vp8_copy_mem8x8_mmx -void vp8_dc_only_idct_add_c(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); -void vp8_dc_only_idct_add_mmx(short input, - unsigned char* pred, - int pred_stride, - unsigned char* dst, - int dst_stride); +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); +void vp8_dc_only_idct_add_mmx(short input, unsigned char *pred, int pred_stride, + unsigned char *dst, int dst_stride); #define vp8_dc_only_idct_add vp8_dc_only_idct_add_mmx -int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, + unsigned char *running_avg_y, int avg_y_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_sse2(unsigned char* mc_running_avg_y, - int mc_avg_y_stride, - unsigned char* running_avg_y, - int avg_y_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_sse2(unsigned char *mc_running_avg_y, + int mc_avg_y_stride, unsigned char *running_avg_y, + int avg_y_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter vp8_denoiser_filter_sse2 -int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, + unsigned char *running_avg, int avg_stride, + unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); -int vp8_denoiser_filter_uv_sse2(unsigned char* mc_running_avg, - int mc_avg_stride, - unsigned char* running_avg, - int avg_stride, - unsigned char* sig, - int sig_stride, - unsigned int motion_magnitude, +int vp8_denoiser_filter_uv_sse2(unsigned char *mc_running_avg, + int mc_avg_stride, unsigned char *running_avg, + int avg_stride, unsigned char *sig, + int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_sse2 -void vp8_dequant_idct_add_c(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); -void vp8_dequant_idct_add_mmx(short* input, - short* dq, - unsigned char* output, +void vp8_dequant_idct_add_mmx(short *input, short *dq, unsigned char *output, int stride); #define vp8_dequant_idct_add vp8_dequant_idct_add_mmx -void vp8_dequant_idct_add_uv_block_c(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); -void vp8_dequant_idct_add_uv_block_sse2(short* q, - short* dq, - unsigned char* dst_u, - unsigned char* dst_v, - int stride, - char* eobs); +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); +void vp8_dequant_idct_add_uv_block_sse2(short *q, short *dq, + unsigned char *dst_u, + unsigned char *dst_v, int stride, + char *eobs); #define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_sse2 -void vp8_dequant_idct_add_y_block_c(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); -void vp8_dequant_idct_add_y_block_sse2(short* q, - short* dq, - unsigned char* dst, - int stride, - char* eobs); +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); +void vp8_dequant_idct_add_y_block_sse2(short *q, short *dq, unsigned char *dst, + int stride, char *eobs); #define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_sse2 -void vp8_dequantize_b_c(struct blockd*, short* dqc); -void vp8_dequantize_b_mmx(struct blockd*, short* dqc); +void vp8_dequantize_b_c(struct blockd *, short *dqc); +void vp8_dequantize_b_mmx(struct blockd *, short *dqc); #define vp8_dequantize_b vp8_dequantize_b_mmx -int vp8_diamond_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_diamond_search_sadx4(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - union int_mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_diamond_search_sadx4(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + union int_mv *best_mv, int search_param, + int sad_per_bit, int *num00, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_diamond_search_sad vp8_diamond_search_sadx4 -void vp8_fast_quantize_b_c(struct block*, struct blockd*); -void vp8_fast_quantize_b_sse2(struct block*, struct blockd*); -void vp8_fast_quantize_b_ssse3(struct block*, struct blockd*); -RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block*, struct blockd*); +void vp8_fast_quantize_b_c(struct block *, struct blockd *); +void vp8_fast_quantize_b_sse2(struct block *, struct blockd *); +void vp8_fast_quantize_b_ssse3(struct block *, struct blockd *); +RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block *, struct blockd *); -void vp8_filter_by_weight16x16_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -void vp8_filter_by_weight16x16_sse2(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_sse2 -void vp8_filter_by_weight4x4_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c -void vp8_filter_by_weight8x8_c(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); -void vp8_filter_by_weight8x8_sse2(unsigned char* src, - int src_stride, - unsigned char* dst, - int dst_stride, +void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, int src_weight); #define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_sse2 -int vp8_full_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_full_search_sadx3(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_full_search_sadx8(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_full_search_sadx3(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_full_search_sadx8(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, + int *mvcost[2], union int_mv *center_mv); -void vp8_loop_filter_bh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bh_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bh_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bh vp8_loop_filter_bh_sse2 -void vp8_loop_filter_bv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_bv_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_bv_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_bv vp8_loop_filter_bv_sse2 -void vp8_loop_filter_mbh_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbh_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbh_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbh vp8_loop_filter_mbh_sse2 -void vp8_loop_filter_mbv_c(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); -void vp8_loop_filter_mbv_sse2(unsigned char* y, - unsigned char* u, - unsigned char* v, - int ystride, - int uv_stride, - struct loop_filter_info* lfi); +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, + int ystride, int uv_stride, + struct loop_filter_info *lfi); +void vp8_loop_filter_mbv_sse2(unsigned char *y, unsigned char *u, + unsigned char *v, int ystride, int uv_stride, + struct loop_filter_info *lfi); #define vp8_loop_filter_mbv vp8_loop_filter_mbv_sse2 -void vp8_loop_filter_bhs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bhs_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bhs_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_sse2 -void vp8_loop_filter_bvs_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_bvs_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_bvs_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_sse2 -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbh vp8_loop_filter_simple_horizontal_edge_sse2 -void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y, - int ystride, - const unsigned char* blimit); -void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char* y, - int ystride, - const unsigned char* blimit); +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, + const unsigned char *blimit); +void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char *y, int ystride, + const unsigned char *blimit); #define vp8_loop_filter_simple_mbv vp8_loop_filter_simple_vertical_edge_sse2 -int vp8_mbblock_error_c(struct macroblock* mb, int dc); -int vp8_mbblock_error_sse2(struct macroblock* mb, int dc); +int vp8_mbblock_error_c(struct macroblock *mb, int dc); +int vp8_mbblock_error_sse2(struct macroblock *mb, int dc); #define vp8_mbblock_error vp8_mbblock_error_sse2 -int vp8_mbuverror_c(struct macroblock* mb); -int vp8_mbuverror_sse2(struct macroblock* mb); +int vp8_mbuverror_c(struct macroblock *mb); +int vp8_mbuverror_sse2(struct macroblock *mb); #define vp8_mbuverror vp8_mbuverror_sse2 -int vp8_refining_search_sad_c(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); -int vp8_refining_search_sadx4(struct macroblock* x, - struct block* b, - struct blockd* d, - union int_mv* ref_mv, - int sad_per_bit, - int distance, - struct variance_vtable* fn_ptr, - int* mvcost[2], - union int_mv* center_mv); +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); +int vp8_refining_search_sadx4(struct macroblock *x, struct block *b, + struct blockd *d, union int_mv *ref_mv, + int sad_per_bit, int distance, + struct variance_vtable *fn_ptr, int *mvcost[2], + union int_mv *center_mv); #define vp8_refining_search_sad vp8_refining_search_sadx4 -void vp8_regular_quantize_b_c(struct block*, struct blockd*); -void vp8_regular_quantize_b_sse2(struct block*, struct blockd*); -void vp8_regular_quantize_b_sse4_1(struct block*, struct blockd*); -RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block*, struct blockd*); +void vp8_regular_quantize_b_c(struct block *, struct blockd *); +void vp8_regular_quantize_b_sse2(struct block *, struct blockd *); +void vp8_regular_quantize_b_sse4_1(struct block *, struct blockd *); +RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block *, struct blockd *); -void vp8_short_fdct4x4_c(short* input, short* output, int pitch); -void vp8_short_fdct4x4_sse2(short* input, short* output, int pitch); +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); +void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch); #define vp8_short_fdct4x4 vp8_short_fdct4x4_sse2 -void vp8_short_fdct8x4_c(short* input, short* output, int pitch); -void vp8_short_fdct8x4_sse2(short* input, short* output, int pitch); +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); +void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch); #define vp8_short_fdct8x4 vp8_short_fdct8x4_sse2 -void vp8_short_idct4x4llm_c(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); -void vp8_short_idct4x4llm_mmx(short* input, - unsigned char* pred, - int pitch, - unsigned char* dst, - int dst_stride); +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); +void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred, int pitch, + unsigned char *dst, int dst_stride); #define vp8_short_idct4x4llm vp8_short_idct4x4llm_mmx -void vp8_short_inv_walsh4x4_c(short* input, short* output); -void vp8_short_inv_walsh4x4_sse2(short* input, short* output); +void vp8_short_inv_walsh4x4_c(short *input, short *output); +void vp8_short_inv_walsh4x4_sse2(short *input, short *output); #define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_sse2 -void vp8_short_inv_walsh4x4_1_c(short* input, short* output); +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c -void vp8_short_walsh4x4_c(short* input, short* output, int pitch); -void vp8_short_walsh4x4_sse2(short* input, short* output, int pitch); +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); +void vp8_short_walsh4x4_sse2(short *input, short *output, int pitch); #define vp8_short_walsh4x4 vp8_short_walsh4x4_sse2 -void vp8_sixtap_predict16x16_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict16x16_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict4x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_mmx(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict4x4_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict4x4_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x4_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x4_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x4_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); -void vp8_sixtap_predict8x8_c(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_sse2(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -void vp8_sixtap_predict8x8_ssse3(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); -RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char* src, - int src_pitch, - int xofst, - int yofst, - unsigned char* dst, - int dst_pitch); +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +void vp8_sixtap_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, + int yofst, unsigned char *dst, int dst_pitch); +RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char *src, int src_pitch, + int xofst, int yofst, + unsigned char *dst, int dst_pitch); void vp8_rtcd(void); @@ -643,16 +386,12 @@ if (flags & HAS_SSSE3) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_ssse3; vp8_copy32xn = vp8_copy32xn_sse2; - if (flags & HAS_SSE3) - vp8_copy32xn = vp8_copy32xn_sse3; + if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3; vp8_fast_quantize_b = vp8_fast_quantize_b_sse2; - if (flags & HAS_SSSE3) - vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3; + if (flags & HAS_SSSE3) vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3; vp8_full_search_sad = vp8_full_search_sad_c; - if (flags & HAS_SSE3) - vp8_full_search_sad = vp8_full_search_sadx3; - if (flags & HAS_SSE4_1) - vp8_full_search_sad = vp8_full_search_sadx8; + if (flags & HAS_SSE3) vp8_full_search_sad = vp8_full_search_sadx3; + if (flags & HAS_SSE4_1) vp8_full_search_sad = vp8_full_search_sadx8; vp8_regular_quantize_b = vp8_regular_quantize_b_sse2; if (flags & HAS_SSE4_1) vp8_regular_quantize_b = vp8_regular_quantize_b_sse4_1; @@ -660,14 +399,11 @@ if (flags & HAS_SSSE3) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3; vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_mmx; - if (flags & HAS_SSSE3) - vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3; + if (flags & HAS_SSSE3) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3; vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_sse2; - if (flags & HAS_SSSE3) - vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3; + if (flags & HAS_SSSE3) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3; vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_sse2; - if (flags & HAS_SSSE3) - vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3; + if (flags & HAS_SSSE3) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3; } #endif
diff --git a/third_party/libvpx/source/config/win/x64/vp9_rtcd.h b/third_party/libvpx/source/config/win/x64/vp9_rtcd.h index 6f00c78..7de827c 100644 --- a/third_party/libvpx/source/config/win/x64/vp9_rtcd.h +++ b/third_party/libvpx/source/config/win/x64/vp9_rtcd.h
@@ -31,458 +31,272 @@ extern "C" { #endif -int64_t vp9_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -int64_t vp9_block_error_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -int64_t vp9_block_error_avx2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); -RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz); +int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +int64_t vp9_block_error_sse2(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +int64_t vp9_block_error_avx2(const tran_low_t *coeff, const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); +RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz); -int64_t vp9_block_error_fp_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); -int64_t vp9_block_error_fp_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); -int64_t vp9_block_error_fp_avx2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - int block_size); -RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t* coeff, - const tran_low_t* dqcoeff, +int64_t vp9_block_error_fp_sse2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); +int64_t vp9_block_error_fp_avx2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); +RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t *coeff, + const tran_low_t *dqcoeff, int block_size); -int vp9_denoiser_filter_c(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, - int motion_magnitude); -int vp9_denoiser_filter_sse2(const uint8_t* sig, - int sig_stride, - const uint8_t* mc_avg, - int mc_avg_stride, - uint8_t* avg, - int avg_stride, - int increase_denoising, - BLOCK_SIZE bs, +int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, int increase_denoising, + BLOCK_SIZE bs, int motion_magnitude); +int vp9_denoiser_filter_sse2(const uint8_t *sig, int sig_stride, + const uint8_t *mc_avg, int mc_avg_stride, + uint8_t *avg, int avg_stride, + int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); #define vp9_denoiser_filter vp9_denoiser_filter_sse2 -int vp9_diamond_search_sad_c(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); -int vp9_diamond_search_sad_avx(const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); +int vp9_diamond_search_sad_avx(const struct macroblock *x, + const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, + int search_param, int sad_per_bit, int *num00, + const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); RTCD_EXTERN int (*vp9_diamond_search_sad)( - const struct macroblock* x, - const struct search_site_config* cfg, - struct mv* ref_mv, - struct mv* best_mv, - int search_param, - int sad_per_bit, - int* num00, - const struct vp9_variance_vtable* fn_ptr, - const struct mv* center_mv); + const struct macroblock *x, const struct search_site_config *cfg, + struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, + int *num00, const struct vp9_variance_vtable *fn_ptr, + const struct mv *center_mv); -void vp9_fdct8x8_quant_c(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_fdct8x8_quant_ssse3(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_fdct8x8_quant)(const int16_t* input, - int stride, - tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_fdct8x8_quant_c(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_fdct8x8_quant_ssse3(const int16_t *input, int stride, + tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vp9_fdct8x8_quant)( + const int16_t *input, int stride, tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); -void vp9_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht16x16_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht16x16_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_sse2 -void vp9_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht4x4_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht4x4_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht4x4 vp9_fht4x4_sse2 -void vp9_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -void vp9_fht8x8_sse2(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_fht8x8_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_sse2 -void vp9_filter_by_weight16x16_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -void vp9_filter_by_weight16x16_sse2(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, +void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); +void vp9_filter_by_weight16x16_sse2(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_sse2 -void vp9_filter_by_weight8x8_c(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); -void vp9_filter_by_weight8x8_sse2(const uint8_t* src, - int src_stride, - uint8_t* dst, - int dst_stride, - int src_weight); +void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, + int dst_stride, int src_weight); +void vp9_filter_by_weight8x8_sse2(const uint8_t *src, int src_stride, + uint8_t *dst, int dst_stride, int src_weight); #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_sse2 -void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vp9_fwht4x4_sse2(const int16_t* input, tran_low_t* output, int stride); +void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vp9_fwht4x4_sse2(const int16_t *input, tran_low_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_sse2 -int64_t vp9_highbd_block_error_c(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); -int64_t vp9_highbd_block_error_sse2(const tran_low_t* coeff, - const tran_low_t* dqcoeff, - intptr_t block_size, - int64_t* ssz, - int bd); +int64_t vp9_highbd_block_error_c(const tran_low_t *coeff, + const tran_low_t *dqcoeff, intptr_t block_size, + int64_t *ssz, int bd); +int64_t vp9_highbd_block_error_sse2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, + intptr_t block_size, int64_t *ssz, int bd); #define vp9_highbd_block_error vp9_highbd_block_error_sse2 -void vp9_highbd_fht16x16_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht16x16 vp9_highbd_fht16x16_c -void vp9_highbd_fht4x4_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht4x4 vp9_highbd_fht4x4_c -void vp9_highbd_fht8x8_c(const int16_t* input, - tran_low_t* output, - int stride, +void vp9_highbd_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); #define vp9_highbd_fht8x8 vp9_highbd_fht8x8_c -void vp9_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); +void vp9_highbd_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); #define vp9_highbd_fwht4x4 vp9_highbd_fwht4x4_c -void vp9_highbd_iht16x16_256_add_c(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); -void vp9_highbd_iht16x16_256_add_sse4_1(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht16x16_256_add)(const tran_low_t* input, - uint16_t* output, - int pitch, - int tx_type, - int bd); +void vp9_highbd_iht16x16_256_add_c(const tran_low_t *input, uint16_t *output, + int pitch, int tx_type, int bd); +void vp9_highbd_iht16x16_256_add_sse4_1(const tran_low_t *input, + uint16_t *output, int pitch, + int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht16x16_256_add)(const tran_low_t *input, + uint16_t *output, int pitch, + int tx_type, int bd); -void vp9_highbd_iht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -void vp9_highbd_iht4x4_16_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht4x4_16_add)(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +void vp9_highbd_iht4x4_16_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht4x4_16_add)(const tran_low_t *input, + uint16_t *dest, int stride, + int tx_type, int bd); -void vp9_highbd_iht8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); -RTCD_EXTERN void (*vp9_highbd_iht8x8_64_add)(const tran_low_t* input, - uint16_t* dest, - int stride, - int tx_type, - int bd); +void vp9_highbd_iht8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int tx_type, int bd); +RTCD_EXTERN void (*vp9_highbd_iht8x8_64_add)(const tran_low_t *input, + uint16_t *dest, int stride, + int tx_type, int bd); -void vp9_highbd_mbpost_proc_across_ip_c(uint16_t* src, - int pitch, - int rows, - int cols, - int flimit); +void vp9_highbd_mbpost_proc_across_ip_c(uint16_t *src, int pitch, int rows, + int cols, int flimit); #define vp9_highbd_mbpost_proc_across_ip vp9_highbd_mbpost_proc_across_ip_c -void vp9_highbd_mbpost_proc_down_c(uint16_t* dst, - int pitch, - int rows, - int cols, +void vp9_highbd_mbpost_proc_down_c(uint16_t *dst, int pitch, int rows, int cols, int flimit); #define vp9_highbd_mbpost_proc_down vp9_highbd_mbpost_proc_down_c -void vp9_highbd_post_proc_down_and_across_c(const uint16_t* src_ptr, - uint16_t* dst_ptr, +void vp9_highbd_post_proc_down_and_across_c(const uint16_t *src_ptr, + uint16_t *dst_ptr, int src_pixels_per_line, - int dst_pixels_per_line, - int rows, - int cols, - int flimit); + int dst_pixels_per_line, int rows, + int cols, int flimit); #define vp9_highbd_post_proc_down_and_across \ vp9_highbd_post_proc_down_and_across_c -void vp9_highbd_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp vp9_highbd_quantize_fp_c -void vp9_highbd_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_highbd_quantize_fp_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vp9_highbd_quantize_fp_32x32 vp9_highbd_quantize_fp_32x32_c -void vp9_highbd_temporal_filter_apply_c(const uint8_t* frame1, - unsigned int stride, - const uint8_t* frame2, - unsigned int block_width, - unsigned int block_height, - int strength, - int filter_weight, - uint32_t* accumulator, - uint16_t* count); +void vp9_highbd_temporal_filter_apply_c( + const uint8_t *frame1, unsigned int stride, const uint8_t *frame2, + unsigned int block_width, unsigned int block_height, int strength, + int filter_weight, uint32_t *accumulator, uint16_t *count); #define vp9_highbd_temporal_filter_apply vp9_highbd_temporal_filter_apply_c -void vp9_iht16x16_256_add_c(const tran_low_t* input, - uint8_t* output, - int pitch, +void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); -void vp9_iht16x16_256_add_sse2(const tran_low_t* input, - uint8_t* output, - int pitch, - int tx_type); +void vp9_iht16x16_256_add_sse2(const tran_low_t *input, uint8_t *output, + int pitch, int tx_type); #define vp9_iht16x16_256_add vp9_iht16x16_256_add_sse2 -void vp9_iht4x4_16_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht4x4_16_add vp9_iht4x4_16_add_sse2 -void vp9_iht8x8_64_add_c(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); -void vp9_iht8x8_64_add_sse2(const tran_low_t* input, - uint8_t* dest, - int stride, +void vp9_iht8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int stride, int tx_type); #define vp9_iht8x8_64_add vp9_iht8x8_64_add_sse2 -void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_avx2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_quantize_fp)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vp9_quantize_fp_avx2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vp9_quantize_fp)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vp9_quantize_fp_32x32_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vp9_quantize_fp_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* round_ptr, - const int16_t* quant_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vp9_quantize_fp_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *round_ptr, + const int16_t *quant_ptr, + tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vp9_quantize_fp_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *round_ptr, const int16_t *quant_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); -void vp9_scale_and_extend_frame_ssse3(const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, +void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); +void vp9_scale_and_extend_frame_ssse3(const struct yv12_buffer_config *src, + struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler); RTCD_EXTERN void (*vp9_scale_and_extend_frame)( - const struct yv12_buffer_config* src, - struct yv12_buffer_config* dst, - INTERP_FILTER filter_type, - int phase_scaler); + const struct yv12_buffer_config *src, struct yv12_buffer_config *dst, + INTERP_FILTER filter_type, int phase_scaler); void vp9_rtcd(void); @@ -494,17 +308,13 @@ (void)flags; vp9_block_error = vp9_block_error_sse2; - if (flags & HAS_AVX2) - vp9_block_error = vp9_block_error_avx2; + if (flags & HAS_AVX2) vp9_block_error = vp9_block_error_avx2; vp9_block_error_fp = vp9_block_error_fp_sse2; - if (flags & HAS_AVX2) - vp9_block_error_fp = vp9_block_error_fp_avx2; + if (flags & HAS_AVX2) vp9_block_error_fp = vp9_block_error_fp_avx2; vp9_diamond_search_sad = vp9_diamond_search_sad_c; - if (flags & HAS_AVX) - vp9_diamond_search_sad = vp9_diamond_search_sad_avx; + if (flags & HAS_AVX) vp9_diamond_search_sad = vp9_diamond_search_sad_avx; vp9_fdct8x8_quant = vp9_fdct8x8_quant_c; - if (flags & HAS_SSSE3) - vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; + if (flags & HAS_SSSE3) vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_c; if (flags & HAS_SSE4_1) vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_sse4_1; @@ -515,13 +325,10 @@ if (flags & HAS_SSE4_1) vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1; vp9_quantize_fp = vp9_quantize_fp_sse2; - if (flags & HAS_SSSE3) - vp9_quantize_fp = vp9_quantize_fp_ssse3; - if (flags & HAS_AVX2) - vp9_quantize_fp = vp9_quantize_fp_avx2; + if (flags & HAS_SSSE3) vp9_quantize_fp = vp9_quantize_fp_ssse3; + if (flags & HAS_AVX2) vp9_quantize_fp = vp9_quantize_fp_avx2; vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_c; - if (flags & HAS_SSSE3) - vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_ssse3; + if (flags & HAS_SSSE3) vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_ssse3; vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c; if (flags & HAS_SSSE3) vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_ssse3;
diff --git a/third_party/libvpx/source/config/win/x64/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/win/x64/vpx_dsp_rtcd.h index 49a73711..08c40c9 100644 --- a/third_party/libvpx/source/config/win/x64/vpx_dsp_rtcd.h +++ b/third_party/libvpx/source/config/win/x64/vpx_dsp_rtcd.h
@@ -20,7514 +20,4726 @@ extern "C" { #endif -unsigned int vpx_avg_4x4_c(const uint8_t*, int p); -unsigned int vpx_avg_4x4_sse2(const uint8_t*, int p); +unsigned int vpx_avg_4x4_c(const uint8_t *, int p); +unsigned int vpx_avg_4x4_sse2(const uint8_t *, int p); #define vpx_avg_4x4 vpx_avg_4x4_sse2 -unsigned int vpx_avg_8x8_c(const uint8_t*, int p); -unsigned int vpx_avg_8x8_sse2(const uint8_t*, int p); +unsigned int vpx_avg_8x8_c(const uint8_t *, int p); +unsigned int vpx_avg_8x8_sse2(const uint8_t *, int p); #define vpx_avg_8x8 vpx_avg_8x8_sse2 -void vpx_comp_avg_pred_c(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); -void vpx_comp_avg_pred_sse2(uint8_t* comp_pred, - const uint8_t* pred, - int width, - int height, - const uint8_t* ref, - int ref_stride); +void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); +void vpx_comp_avg_pred_sse2(uint8_t *comp_pred, const uint8_t *pred, int width, + int height, const uint8_t *ref, int ref_stride); #define vpx_comp_avg_pred vpx_comp_avg_pred_sse2 -void vpx_convolve8_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve8_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avx2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_avg)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_horiz_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_horiz_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_horiz_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +void vpx_convolve8_avg_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_convolve8_avg_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_avg_vert_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_avg_vert_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_avg_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve8_avg_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_avg_vert)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, + int y_step_q4, int w, int h); -void vpx_convolve8_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_horiz_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_horiz_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_horiz_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, +RTCD_EXTERN void (*vpx_convolve8_horiz)(const uint8_t *src, + ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve8_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve8_vert_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); +void vpx_convolve8_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_vert_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_convolve8_vert_avx2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve8_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +RTCD_EXTERN void (*vpx_convolve8_vert)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_convolve_avg_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_avg_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_avg vpx_convolve_avg_sse2 -void vpx_convolve_copy_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -void vpx_convolve_copy_sse2(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +void vpx_convolve_copy_sse2(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_convolve_copy vpx_convolve_copy_sse2 -void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c -void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c -void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c -void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c -void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c -void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c -void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_c -void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c -void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_4x4_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d153_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d153_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d153_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d153_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_sse2 -void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d207_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d207_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d207_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d207_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_sse2 -void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d45_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d45_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_sse2 -void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c -void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_16x16_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_16x16)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_32x32_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_32x32)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_4x4_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_4x4)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_d63_predictor_8x8_ssse3(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -RTCD_EXTERN void (*vpx_d63_predictor_8x8)(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_d63_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +RTCD_EXTERN void (*vpx_d63_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); -void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c -void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_sse2 -void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_sse2 -void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_sse2 -void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_128_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_128_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_sse2 -void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_sse2 -void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, + const uint8_t *left); #define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_sse2 -void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_sse2 -void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_left_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_left_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_sse2 -void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_sse2 -void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_sse2 -void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_sse2 -void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_sse2 -void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_sse2 -void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_sse2 -void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_sse2 -void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_dc_top_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_dc_top_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_sse2 -void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16 vpx_fdct16x16_sse2 -void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct16x16_1_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct16x16_1_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct16x16_1 vpx_fdct16x16_1_sse2 -void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32 vpx_fdct32x32_sse2 -void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_1_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_1_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_1 vpx_fdct32x32_1_sse2 -void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct32x32_rd_sse2(const int16_t* input, - tran_low_t* output, +void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct32x32_rd vpx_fdct32x32_rd_sse2 -void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4 vpx_fdct4x4_sse2 -void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct4x4_1_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct4x4_1_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct4x4_1 vpx_fdct4x4_1_sse2 -void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8 vpx_fdct8x8_sse2 -void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_fdct8x8_1_sse2(const int16_t* input, tran_low_t* output, int stride); +void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_fdct8x8_1_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_fdct8x8_1 vpx_fdct8x8_1_sse2 -void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get16x16var_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +void vpx_get16x16var_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); +RTCD_EXTERN void (*vpx_get16x16var)(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); -unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, - const unsigned char* ref_ptr, - int ref_stride); +unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, + const unsigned char *ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_c -void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); -void vpx_get8x8var_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, + int *sum); +void vpx_get8x8var_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_get8x8var vpx_get8x8var_sse2 -unsigned int vpx_get_mb_ss_c(const int16_t*); -unsigned int vpx_get_mb_ss_sse2(const int16_t*); +unsigned int vpx_get_mb_ss_c(const int16_t *); +unsigned int vpx_get_mb_ss_sse2(const int16_t *); #define vpx_get_mb_ss vpx_get_mb_ss_sse2 -void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_16x16 vpx_h_predictor_16x16_sse2 -void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_32x32 vpx_h_predictor_32x32_sse2 -void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_4x4 vpx_h_predictor_4x4_sse2 -void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_h_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_h_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_h_predictor_8x8 vpx_h_predictor_8x8_sse2 -void vpx_hadamard_16x16_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_16x16_sse2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_16x16_avx2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_16x16_sse2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_16x16_avx2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t *src_diff, + ptrdiff_t src_stride, tran_low_t *coeff); -void vpx_hadamard_8x8_c(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_8x8_sse2(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -void vpx_hadamard_8x8_ssse3(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); -RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t* src_diff, - ptrdiff_t src_stride, - tran_low_t* coeff); +void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_8x8_sse2(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +void vpx_hadamard_8x8_ssse3(const int16_t *src_diff, ptrdiff_t src_stride, + tran_low_t *coeff); +RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t *src_diff, + ptrdiff_t src_stride, tran_low_t *coeff); -void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c -void vpx_highbd_10_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get16x16var vpx_highbd_10_get16x16var_c -void vpx_highbd_10_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_10_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_10_get8x8var vpx_highbd_10_get8x8var_c -unsigned int vpx_highbd_10_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); #define vpx_highbd_10_mse16x16 vpx_highbd_10_mse16x16_sse2 -unsigned int vpx_highbd_10_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse16x8 vpx_highbd_10_mse16x8_c -unsigned int vpx_highbd_10_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_10_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse8x16 vpx_highbd_10_mse8x16_c -unsigned int vpx_highbd_10_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_mse8x8_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_10_mse8x8 vpx_highbd_10_mse8x8_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x16 \ vpx_highbd_10_sub_pixel_avg_variance16x16_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x32 \ vpx_highbd_10_sub_pixel_avg_variance16x32_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance16x8 \ vpx_highbd_10_sub_pixel_avg_variance16x8_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x16 \ vpx_highbd_10_sub_pixel_avg_variance32x16_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x32 \ vpx_highbd_10_sub_pixel_avg_variance32x32_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance32x64 \ vpx_highbd_10_sub_pixel_avg_variance32x64_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x4 \ vpx_highbd_10_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance4x8 \ vpx_highbd_10_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance64x32 \ vpx_highbd_10_sub_pixel_avg_variance64x32_sse2 uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance64x64 \ vpx_highbd_10_sub_pixel_avg_variance64x64_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x16 \ vpx_highbd_10_sub_pixel_avg_variance8x16_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x4 \ vpx_highbd_10_sub_pixel_avg_variance8x4_sse2 -uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_10_sub_pixel_avg_variance8x8 \ vpx_highbd_10_sub_pixel_avg_variance8x8_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x16 \ vpx_highbd_10_sub_pixel_variance16x16_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x32 \ vpx_highbd_10_sub_pixel_variance16x32_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance16x8 \ vpx_highbd_10_sub_pixel_variance16x8_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x16 \ vpx_highbd_10_sub_pixel_variance32x16_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x32 \ vpx_highbd_10_sub_pixel_variance32x32_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance32x64 \ vpx_highbd_10_sub_pixel_variance32x64_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x4 \ vpx_highbd_10_sub_pixel_variance4x4_c -uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance4x8 \ vpx_highbd_10_sub_pixel_variance4x8_c -uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance64x32 \ vpx_highbd_10_sub_pixel_variance64x32_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance64x64 \ vpx_highbd_10_sub_pixel_variance64x64_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x16 \ vpx_highbd_10_sub_pixel_variance8x16_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x4_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x4 \ vpx_highbd_10_sub_pixel_variance8x4_sse2 -uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_10_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_10_sub_pixel_variance8x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_10_sub_pixel_variance8x8 \ vpx_highbd_10_sub_pixel_variance8x8_sse2 -unsigned int vpx_highbd_10_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance16x16 vpx_highbd_10_variance16x16_sse2 -unsigned int vpx_highbd_10_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance16x32 vpx_highbd_10_variance16x32_sse2 -unsigned int vpx_highbd_10_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance16x8 vpx_highbd_10_variance16x8_sse2 -unsigned int vpx_highbd_10_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance32x16 vpx_highbd_10_variance32x16_sse2 -unsigned int vpx_highbd_10_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance32x32 vpx_highbd_10_variance32x32_sse2 -unsigned int vpx_highbd_10_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance32x64 vpx_highbd_10_variance32x64_sse2 -unsigned int vpx_highbd_10_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x4 vpx_highbd_10_variance4x4_c -unsigned int vpx_highbd_10_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance4x8 vpx_highbd_10_variance4x8_c -unsigned int vpx_highbd_10_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance64x32 vpx_highbd_10_variance64x32_sse2 -unsigned int vpx_highbd_10_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_10_variance64x64 vpx_highbd_10_variance64x64_sse2 -unsigned int vpx_highbd_10_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_10_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance8x16 vpx_highbd_10_variance8x16_sse2 -unsigned int vpx_highbd_10_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_10_variance8x4 vpx_highbd_10_variance8x4_c -unsigned int vpx_highbd_10_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_10_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_10_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_10_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_10_variance8x8 vpx_highbd_10_variance8x8_sse2 -void vpx_highbd_12_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get16x16var vpx_highbd_12_get16x16var_c -void vpx_highbd_12_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_12_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_12_get8x8var vpx_highbd_12_get8x8var_c -unsigned int vpx_highbd_12_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); #define vpx_highbd_12_mse16x16 vpx_highbd_12_mse16x16_sse2 -unsigned int vpx_highbd_12_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse16x8 vpx_highbd_12_mse16x8_c -unsigned int vpx_highbd_12_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_12_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse8x16 vpx_highbd_12_mse8x16_c -unsigned int vpx_highbd_12_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_mse8x8_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_12_mse8x8 vpx_highbd_12_mse8x8_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x16 \ vpx_highbd_12_sub_pixel_avg_variance16x16_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x32 \ vpx_highbd_12_sub_pixel_avg_variance16x32_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance16x8 \ vpx_highbd_12_sub_pixel_avg_variance16x8_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x16 \ vpx_highbd_12_sub_pixel_avg_variance32x16_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x32 \ vpx_highbd_12_sub_pixel_avg_variance32x32_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance32x64 \ vpx_highbd_12_sub_pixel_avg_variance32x64_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x4 \ vpx_highbd_12_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance4x8 \ vpx_highbd_12_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance64x32 \ vpx_highbd_12_sub_pixel_avg_variance64x32_sse2 uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_c( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance64x64 \ vpx_highbd_12_sub_pixel_avg_variance64x64_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x16 \ vpx_highbd_12_sub_pixel_avg_variance8x16_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x4 \ vpx_highbd_12_sub_pixel_avg_variance8x4_sse2 -uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_12_sub_pixel_avg_variance8x8 \ vpx_highbd_12_sub_pixel_avg_variance8x8_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x16 \ vpx_highbd_12_sub_pixel_variance16x16_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x32 \ vpx_highbd_12_sub_pixel_variance16x32_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance16x8 \ vpx_highbd_12_sub_pixel_variance16x8_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x16 \ vpx_highbd_12_sub_pixel_variance32x16_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x32 \ vpx_highbd_12_sub_pixel_variance32x32_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance32x64 \ vpx_highbd_12_sub_pixel_variance32x64_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x4 \ vpx_highbd_12_sub_pixel_variance4x4_c -uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance4x8 \ vpx_highbd_12_sub_pixel_variance4x8_c -uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance64x32 \ vpx_highbd_12_sub_pixel_variance64x32_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance64x64 \ vpx_highbd_12_sub_pixel_variance64x64_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x16 \ vpx_highbd_12_sub_pixel_variance8x16_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x4_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x4 \ vpx_highbd_12_sub_pixel_variance8x4_sse2 -uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_12_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_12_sub_pixel_variance8x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_12_sub_pixel_variance8x8 \ vpx_highbd_12_sub_pixel_variance8x8_sse2 -unsigned int vpx_highbd_12_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance16x16 vpx_highbd_12_variance16x16_sse2 -unsigned int vpx_highbd_12_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance16x32 vpx_highbd_12_variance16x32_sse2 -unsigned int vpx_highbd_12_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance16x8 vpx_highbd_12_variance16x8_sse2 -unsigned int vpx_highbd_12_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance32x16 vpx_highbd_12_variance32x16_sse2 -unsigned int vpx_highbd_12_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance32x32 vpx_highbd_12_variance32x32_sse2 -unsigned int vpx_highbd_12_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance32x64 vpx_highbd_12_variance32x64_sse2 -unsigned int vpx_highbd_12_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x4 vpx_highbd_12_variance4x4_c -unsigned int vpx_highbd_12_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance4x8 vpx_highbd_12_variance4x8_c -unsigned int vpx_highbd_12_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance64x32 vpx_highbd_12_variance64x32_sse2 -unsigned int vpx_highbd_12_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); #define vpx_highbd_12_variance64x64 vpx_highbd_12_variance64x64_sse2 -unsigned int vpx_highbd_12_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_12_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance8x16 vpx_highbd_12_variance8x16_sse2 -unsigned int vpx_highbd_12_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_12_variance8x4 vpx_highbd_12_variance8x4_c -unsigned int vpx_highbd_12_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_12_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_12_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_12_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_12_variance8x8 vpx_highbd_12_variance8x8_sse2 -void vpx_highbd_8_get16x16var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get16x16var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get16x16var vpx_highbd_8_get16x16var_c -void vpx_highbd_8_get8x8var_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse, - int* sum); +void vpx_highbd_8_get8x8var_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse, int *sum); #define vpx_highbd_8_get8x8var vpx_highbd_8_get8x8var_c -unsigned int vpx_highbd_8_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_mse16x16_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); #define vpx_highbd_8_mse16x16 vpx_highbd_8_mse16x16_sse2 -unsigned int vpx_highbd_8_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse16x8 vpx_highbd_8_mse16x8_c -unsigned int vpx_highbd_8_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse8x16 vpx_highbd_8_mse8x16_c -unsigned int vpx_highbd_8_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_mse8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_highbd_8_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_highbd_8_mse8x8 vpx_highbd_8_mse8x8_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x16 \ vpx_highbd_8_sub_pixel_avg_variance16x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x32 \ vpx_highbd_8_sub_pixel_avg_variance16x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance16x8 \ vpx_highbd_8_sub_pixel_avg_variance16x8_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x16 \ vpx_highbd_8_sub_pixel_avg_variance32x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x32 \ vpx_highbd_8_sub_pixel_avg_variance32x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance32x64 \ vpx_highbd_8_sub_pixel_avg_variance32x64_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x4 \ vpx_highbd_8_sub_pixel_avg_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance4x8 \ vpx_highbd_8_sub_pixel_avg_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance64x32 \ vpx_highbd_8_sub_pixel_avg_variance64x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance64x64 \ vpx_highbd_8_sub_pixel_avg_variance64x64_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x16 \ vpx_highbd_8_sub_pixel_avg_variance8x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x4 \ vpx_highbd_8_sub_pixel_avg_variance8x4_sse2 -uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, +uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + int xoffset, int yoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_sse2( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); #define vpx_highbd_8_sub_pixel_avg_variance8x8 \ vpx_highbd_8_sub_pixel_avg_variance8x8_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x16 \ vpx_highbd_8_sub_pixel_variance16x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x32 \ vpx_highbd_8_sub_pixel_variance16x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance16x8_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance16x8 \ vpx_highbd_8_sub_pixel_variance16x8_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x16 \ vpx_highbd_8_sub_pixel_variance32x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x32 \ vpx_highbd_8_sub_pixel_variance32x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance32x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance32x64 \ vpx_highbd_8_sub_pixel_variance32x64_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x4 vpx_highbd_8_sub_pixel_variance4x4_c -uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance4x8 vpx_highbd_8_sub_pixel_variance4x8_c -uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance64x32_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance64x32 \ vpx_highbd_8_sub_pixel_variance64x32_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance64x64_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance64x64 \ vpx_highbd_8_sub_pixel_variance64x64_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x16_sse2( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x16 \ vpx_highbd_8_sub_pixel_variance8x16_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x4 \ vpx_highbd_8_sub_pixel_variance8x4_sse2 -uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_highbd_8_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); #define vpx_highbd_8_sub_pixel_variance8x8 \ vpx_highbd_8_sub_pixel_variance8x8_sse2 -unsigned int vpx_highbd_8_variance16x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance16x16 vpx_highbd_8_variance16x16_sse2 -unsigned int vpx_highbd_8_variance16x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance16x32 vpx_highbd_8_variance16x32_sse2 -unsigned int vpx_highbd_8_variance16x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance16x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance16x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance16x8 vpx_highbd_8_variance16x8_sse2 -unsigned int vpx_highbd_8_variance32x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x16 vpx_highbd_8_variance32x16_sse2 -unsigned int vpx_highbd_8_variance32x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x32 vpx_highbd_8_variance32x32_sse2 -unsigned int vpx_highbd_8_variance32x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance32x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance32x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance32x64 vpx_highbd_8_variance32x64_sse2 -unsigned int vpx_highbd_8_variance4x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x4 vpx_highbd_8_variance4x4_c -unsigned int vpx_highbd_8_variance4x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance4x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance4x8 vpx_highbd_8_variance4x8_c -unsigned int vpx_highbd_8_variance64x32_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x32_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance64x32_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance64x32 vpx_highbd_8_variance64x32_sse2 -unsigned int vpx_highbd_8_variance64x64_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance64x64_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance64x64_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); +unsigned int vpx_highbd_8_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance64x64 vpx_highbd_8_variance64x64_sse2 -unsigned int vpx_highbd_8_variance8x16_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x16_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance8x16_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance8x16 vpx_highbd_8_variance8x16_sse2 -unsigned int vpx_highbd_8_variance8x4_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x4_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_highbd_8_variance8x4 vpx_highbd_8_variance8x4_c -unsigned int vpx_highbd_8_variance8x8_c(const uint8_t* src_ptr, +unsigned int vpx_highbd_8_variance8x8_c(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_highbd_8_variance8x8_sse2(const uint8_t* src_ptr, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_highbd_8_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); #define vpx_highbd_8_variance8x8 vpx_highbd_8_variance8x8_sse2 -unsigned int vpx_highbd_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_4x4_c(const uint8_t *, int p); #define vpx_highbd_avg_4x4 vpx_highbd_avg_4x4_c -unsigned int vpx_highbd_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_8x8_c(const uint8_t *, int p); #define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c -void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred, - const uint16_t* pred, - int width, - int height, - const uint16_t* ref, +void vpx_highbd_comp_avg_pred_c(uint16_t *comp_pred, const uint16_t *pred, + int width, int height, const uint16_t *ref, int ref_stride); #define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c -void vpx_highbd_convolve8_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8)(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_avg_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_horiz_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_avg_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_horiz_sse2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_horiz_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); +void vpx_highbd_convolve8_avg_horiz_avx2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg_horiz)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, + int y_step_q4, int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg_horiz)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_avg_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_vert_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, +void vpx_highbd_convolve8_avg_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_vert_sse2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_avg_vert_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_avg_vert_avx2(const uint16_t *src, + ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_avg_vert)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_avg_vert)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_horiz_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_horiz_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_horiz_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_horiz)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_horiz_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_horiz_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_horiz_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_horiz)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve8_vert_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_vert_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve8_vert_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve8_vert)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve8_vert_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve8_vert_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve8_vert_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve8_vert)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve_avg_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_avg_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_avg_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve_avg)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_avg_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve_avg_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve_avg_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve_avg)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_convolve_copy_c(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_copy_sse2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -void vpx_highbd_convolve_copy_avx2(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); -RTCD_EXTERN void (*vpx_highbd_convolve_copy)(const uint16_t* src, - ptrdiff_t src_stride, - uint16_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h, - int bps); +void vpx_highbd_convolve_copy_c(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, + int h, int bps); +void vpx_highbd_convolve_copy_sse2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +void vpx_highbd_convolve_copy_avx2(const uint16_t *src, ptrdiff_t src_stride, + uint16_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h, int bps); +RTCD_EXTERN void (*vpx_highbd_convolve_copy)( + const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h, int bps); -void vpx_highbd_d117_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d117_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d117_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d117_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d117_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d117_predictor_4x4 vpx_highbd_d117_predictor_4x4_sse2 -void vpx_highbd_d117_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d117_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d117_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d117_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d117_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d117_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d135_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d135_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d135_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d135_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d135_predictor_4x4 vpx_highbd_d135_predictor_4x4_sse2 -void vpx_highbd_d135_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d135_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d135_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d135_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d135_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d135_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d153_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d153_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d153_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d153_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d153_predictor_4x4 vpx_highbd_d153_predictor_4x4_sse2 -void vpx_highbd_d153_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d153_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d153_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d153_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d153_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d153_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d207_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d207_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d207_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d207_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d207_predictor_4x4 vpx_highbd_d207_predictor_4x4_sse2 -void vpx_highbd_d207_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d207_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d207_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d207_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d207_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d207_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d45_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d45_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d45_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d45_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d45_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d45_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_4x4_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_4x4)(uint16_t* dst, +void vpx_highbd_d45_predictor_4x4_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_4x4)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d45_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d45_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d45_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d45_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d45_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d63_predictor_16x16_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_16x16)(uint16_t* dst, +void vpx_highbd_d63_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d63_predictor_16x16_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_16x16)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_d63_predictor_32x32_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_32x32)(uint16_t* dst, +void vpx_highbd_d63_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_d63_predictor_32x32_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_32x32)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_d63_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_d63_predictor_4x4 vpx_highbd_d63_predictor_4x4_sse2 -void vpx_highbd_d63_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_d63_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_d63_predictor_8x8_ssse3(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -RTCD_EXTERN void (*vpx_highbd_d63_predictor_8x8)(uint16_t* dst, +void vpx_highbd_d63_predictor_8x8_ssse3(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +RTCD_EXTERN void (*vpx_highbd_d63_predictor_8x8)(uint16_t *dst, ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); + const uint16_t *above, + const uint16_t *left, int bd); -void vpx_highbd_dc_128_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_16x16 vpx_highbd_dc_128_predictor_16x16_sse2 -void vpx_highbd_dc_128_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_32x32 vpx_highbd_dc_128_predictor_32x32_sse2 -void vpx_highbd_dc_128_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_4x4 vpx_highbd_dc_128_predictor_4x4_sse2 -void vpx_highbd_dc_128_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_128_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_128_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_128_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_128_predictor_8x8 vpx_highbd_dc_128_predictor_8x8_sse2 -void vpx_highbd_dc_left_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_16x16 \ vpx_highbd_dc_left_predictor_16x16_sse2 -void vpx_highbd_dc_left_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_32x32 \ vpx_highbd_dc_left_predictor_32x32_sse2 -void vpx_highbd_dc_left_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_4x4 vpx_highbd_dc_left_predictor_4x4_sse2 -void vpx_highbd_dc_left_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_left_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_left_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_left_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_left_predictor_8x8 vpx_highbd_dc_left_predictor_8x8_sse2 -void vpx_highbd_dc_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_16x16 vpx_highbd_dc_predictor_16x16_sse2 -void vpx_highbd_dc_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_32x32 vpx_highbd_dc_predictor_32x32_sse2 -void vpx_highbd_dc_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_4x4 vpx_highbd_dc_predictor_4x4_sse2 -void vpx_highbd_dc_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_dc_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_dc_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_predictor_8x8 vpx_highbd_dc_predictor_8x8_sse2 -void vpx_highbd_dc_top_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_16x16 vpx_highbd_dc_top_predictor_16x16_sse2 -void vpx_highbd_dc_top_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_32x32 vpx_highbd_dc_top_predictor_32x32_sse2 -void vpx_highbd_dc_top_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_4x4 vpx_highbd_dc_top_predictor_4x4_sse2 -void vpx_highbd_dc_top_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_dc_top_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_dc_top_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_dc_top_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_dc_top_predictor_8x8 vpx_highbd_dc_top_predictor_8x8_sse2 -void vpx_highbd_fdct16x16_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct16x16_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct16x16 vpx_highbd_fdct16x16_sse2 -void vpx_highbd_fdct16x16_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct16x16_1 vpx_highbd_fdct16x16_1_c -void vpx_highbd_fdct32x32_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32 vpx_highbd_fdct32x32_sse2 -void vpx_highbd_fdct32x32_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32_1 vpx_highbd_fdct32x32_1_c -void vpx_highbd_fdct32x32_rd_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); -void vpx_highbd_fdct32x32_rd_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct32x32_rd vpx_highbd_fdct32x32_rd_sse2 -void vpx_highbd_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_highbd_fdct4x4_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_highbd_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct4x4 vpx_highbd_fdct4x4_sse2 -void vpx_highbd_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride); -void vpx_highbd_fdct8x8_sse2(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); +void vpx_highbd_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct8x8 vpx_highbd_fdct8x8_sse2 -void vpx_highbd_fdct8x8_1_c(const int16_t* input, - tran_low_t* output, +void vpx_highbd_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); #define vpx_highbd_fdct8x8_1 vpx_highbd_fdct8x8_1_c -void vpx_highbd_h_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_h_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_h_predictor_16x16 vpx_highbd_h_predictor_16x16_sse2 -void vpx_highbd_h_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_h_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_h_predictor_32x32 vpx_highbd_h_predictor_32x32_sse2 -void vpx_highbd_h_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_h_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_h_predictor_4x4 vpx_highbd_h_predictor_4x4_sse2 -void vpx_highbd_h_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_h_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_h_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_h_predictor_8x8 vpx_highbd_h_predictor_8x8_sse2 -void vpx_highbd_idct16x16_10_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_10_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_10_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_10_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_10_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_10_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_10_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_10_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct16x16_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct16x16_1_add vpx_highbd_idct16x16_1_add_sse2 -void vpx_highbd_idct16x16_256_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_256_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_256_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_256_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_256_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_256_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_256_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_256_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct16x16_38_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_38_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct16x16_38_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct16x16_38_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct16x16_38_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_38_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct16x16_38_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct16x16_38_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_1024_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1024_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1024_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_1024_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_1024_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1024_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1024_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_1024_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_135_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_135_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_135_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_135_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_135_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_135_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_135_add_sse4_1(const tran_low_t *input, + uint16_t *dest, int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_135_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct32x32_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct32x32_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct32x32_1_add vpx_highbd_idct32x32_1_add_sse2 -void vpx_highbd_idct32x32_34_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_34_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct32x32_34_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct32x32_34_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct32x32_34_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_34_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct32x32_34_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct32x32_34_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_16_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_16_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct4x4_16_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_16_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_16_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct4x4_16_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct4x4_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct4x4_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct4x4_1_add vpx_highbd_idct4x4_1_add_sse2 -void vpx_highbd_idct8x8_12_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_12_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_12_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_12_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_12_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_12_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_12_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_12_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_idct8x8_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_1_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_idct8x8_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_1_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_idct8x8_1_add vpx_highbd_idct8x8_1_add_sse2 -void vpx_highbd_idct8x8_64_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_64_add_sse2(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -void vpx_highbd_idct8x8_64_add_sse4_1(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); -RTCD_EXTERN void (*vpx_highbd_idct8x8_64_add)(const tran_low_t* input, - uint16_t* dest, - int stride, +void vpx_highbd_idct8x8_64_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_64_add_sse2(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +void vpx_highbd_idct8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest, + int stride, int bd); +RTCD_EXTERN void (*vpx_highbd_idct8x8_64_add)(const tran_low_t *input, + uint16_t *dest, int stride, int bd); -void vpx_highbd_iwht4x4_16_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_16_add vpx_highbd_iwht4x4_16_add_c -void vpx_highbd_iwht4x4_1_add_c(const tran_low_t* input, - uint16_t* dest, - int stride, - int bd); +void vpx_highbd_iwht4x4_1_add_c(const tran_low_t *input, uint16_t *dest, + int stride, int bd); #define vpx_highbd_iwht4x4_1_add vpx_highbd_iwht4x4_1_add_c -void vpx_highbd_lpf_horizontal_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_16_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_16_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_16_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_16 vpx_highbd_lpf_horizontal_16_sse2 -void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_16_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_16_dual_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_16_dual vpx_highbd_lpf_horizontal_16_dual_sse2 -void vpx_highbd_lpf_horizontal_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_4_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_4_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_4_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_4 vpx_highbd_lpf_horizontal_4_sse2 -void vpx_highbd_lpf_horizontal_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_horizontal_4_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_horizontal_4_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_horizontal_4_dual vpx_highbd_lpf_horizontal_4_dual_sse2 -void vpx_highbd_lpf_horizontal_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_horizontal_8_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_horizontal_8_c(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_horizontal_8_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_horizontal_8 vpx_highbd_lpf_horizontal_8_sse2 -void vpx_highbd_lpf_horizontal_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_horizontal_8_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_horizontal_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_horizontal_8_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_horizontal_8_dual vpx_highbd_lpf_horizontal_8_dual_sse2 -void vpx_highbd_lpf_vertical_16_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_16_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_16_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_16_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_16 vpx_highbd_lpf_vertical_16_sse2 -void vpx_highbd_lpf_vertical_16_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); -void vpx_highbd_lpf_vertical_16_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_16_dual_c(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); +void vpx_highbd_lpf_vertical_16_dual_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_16_dual vpx_highbd_lpf_vertical_16_dual_sse2 -void vpx_highbd_lpf_vertical_4_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_4_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_4_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_4_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_4 vpx_highbd_lpf_vertical_4_sse2 -void vpx_highbd_lpf_vertical_4_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_vertical_4_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_4_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_vertical_4_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_vertical_4_dual vpx_highbd_lpf_vertical_4_dual_sse2 -void vpx_highbd_lpf_vertical_8_c(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, +void vpx_highbd_lpf_vertical_8_c(uint16_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh, int bd); -void vpx_highbd_lpf_vertical_8_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh, - int bd); +void vpx_highbd_lpf_vertical_8_sse2(uint16_t *s, int pitch, + const uint8_t *blimit, const uint8_t *limit, + const uint8_t *thresh, int bd); #define vpx_highbd_lpf_vertical_8 vpx_highbd_lpf_vertical_8_sse2 -void vpx_highbd_lpf_vertical_8_dual_c(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); -void vpx_highbd_lpf_vertical_8_dual_sse2(uint16_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1, - int bd); +void vpx_highbd_lpf_vertical_8_dual_c( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); +void vpx_highbd_lpf_vertical_8_dual_sse2( + uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1, int bd); #define vpx_highbd_lpf_vertical_8_dual vpx_highbd_lpf_vertical_8_dual_sse2 -void vpx_highbd_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_highbd_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_highbd_minmax_8x8 vpx_highbd_minmax_8x8_c -void vpx_highbd_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_highbd_quantize_b_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_highbd_quantize_b_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_highbd_quantize_b vpx_highbd_quantize_b_sse2 -void vpx_highbd_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_highbd_quantize_b_32x32_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_highbd_quantize_b_32x32_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_highbd_quantize_b_32x32_sse2( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); #define vpx_highbd_quantize_b_32x32 vpx_highbd_quantize_b_32x32_sse2 -unsigned int vpx_highbd_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x16 vpx_highbd_sad16x16_sse2 -unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x16_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x16_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad16x16_avg vpx_highbd_sad16x16_avg_sse2 -void vpx_highbd_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x16x4d vpx_highbd_sad16x16x4d_sse2 -unsigned int vpx_highbd_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x32 vpx_highbd_sad16x32_sse2 -unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad16x32_avg vpx_highbd_sad16x32_avg_sse2 -void vpx_highbd_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x32x4d vpx_highbd_sad16x32x4d_sse2 -unsigned int vpx_highbd_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad16x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad16x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad16x8 vpx_highbd_sad16x8_sse2 -unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad16x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad16x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad16x8_avg vpx_highbd_sad16x8_avg_sse2 -void vpx_highbd_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad16x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad16x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad16x8x4d vpx_highbd_sad16x8x4d_sse2 -unsigned int vpx_highbd_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x16 vpx_highbd_sad32x16_sse2 -unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x16_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x16_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad32x16_avg vpx_highbd_sad32x16_avg_sse2 -void vpx_highbd_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x16x4d vpx_highbd_sad32x16x4d_sse2 -unsigned int vpx_highbd_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x32 vpx_highbd_sad32x32_sse2 -unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad32x32_avg vpx_highbd_sad32x32_avg_sse2 -void vpx_highbd_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x32x4d vpx_highbd_sad32x32x4d_sse2 -unsigned int vpx_highbd_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad32x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad32x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad32x64 vpx_highbd_sad32x64_sse2 -unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad32x64_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad32x64_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad32x64_avg vpx_highbd_sad32x64_avg_sse2 -void vpx_highbd_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad32x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad32x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad32x64x4d vpx_highbd_sad32x64x4d_sse2 -unsigned int vpx_highbd_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x4 vpx_highbd_sad4x4_c -unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x4_avg vpx_highbd_sad4x4_avg_c -void vpx_highbd_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad4x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad4x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad4x4x4d vpx_highbd_sad4x4x4d_sse2 -unsigned int vpx_highbd_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad4x8 vpx_highbd_sad4x8_c -unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad4x8_avg vpx_highbd_sad4x8_avg_c -void vpx_highbd_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad4x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad4x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad4x8x4d vpx_highbd_sad4x8x4d_sse2 -unsigned int vpx_highbd_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad64x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad64x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad64x32 vpx_highbd_sad64x32_sse2 -unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad64x32_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad64x32_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad64x32_avg vpx_highbd_sad64x32_avg_sse2 -void vpx_highbd_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad64x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad64x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad64x32x4d vpx_highbd_sad64x32x4d_sse2 -unsigned int vpx_highbd_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad64x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad64x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad64x64 vpx_highbd_sad64x64_sse2 -unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad64x64_avg_sse2(const uint8_t* src_ptr, +unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad64x64_avg_sse2(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); #define vpx_highbd_sad64x64_avg vpx_highbd_sad64x64_avg_sse2 -void vpx_highbd_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad64x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad64x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad64x64x4d vpx_highbd_sad64x64x4d_sse2 -unsigned int vpx_highbd_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x16 vpx_highbd_sad8x16_sse2 -unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x16_avg vpx_highbd_sad8x16_avg_sse2 -void vpx_highbd_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x16x4d vpx_highbd_sad8x16x4d_sse2 -unsigned int vpx_highbd_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x4 vpx_highbd_sad8x4_sse2 -unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x4_avg vpx_highbd_sad8x4_avg_sse2 -void vpx_highbd_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x4x4d vpx_highbd_sad8x4x4d_sse2 -unsigned int vpx_highbd_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_highbd_sad8x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_highbd_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_highbd_sad8x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_highbd_sad8x8 vpx_highbd_sad8x8_sse2 -unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_highbd_sad8x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_highbd_sad8x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_highbd_sad8x8_avg vpx_highbd_sad8x8_avg_sse2 -void vpx_highbd_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_highbd_sad8x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_highbd_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_highbd_sad8x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_highbd_sad8x8x4d vpx_highbd_sad8x8x4d_sse2 -void vpx_highbd_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, - ptrdiff_t pred_stride, - int bd); +void vpx_highbd_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, + ptrdiff_t pred_stride, int bd); #define vpx_highbd_subtract_block vpx_highbd_subtract_block_c -void vpx_highbd_tm_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_tm_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_tm_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_16x16 vpx_highbd_tm_predictor_16x16_sse2 -void vpx_highbd_tm_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); -void vpx_highbd_tm_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); +void vpx_highbd_tm_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_32x32 vpx_highbd_tm_predictor_32x32_sse2 -void vpx_highbd_tm_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_4x4 vpx_highbd_tm_predictor_4x4_sse2 -void vpx_highbd_tm_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_tm_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_tm_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_tm_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_tm_predictor_8x8 vpx_highbd_tm_predictor_8x8_sse2 -void vpx_highbd_v_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_16x16_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_v_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_v_predictor_16x16 vpx_highbd_v_predictor_16x16_sse2 -void vpx_highbd_v_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_32x32_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_v_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_v_predictor_32x32 vpx_highbd_v_predictor_32x32_sse2 -void vpx_highbd_v_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_4x4_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_v_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_v_predictor_4x4 vpx_highbd_v_predictor_4x4_sse2 -void vpx_highbd_v_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, +void vpx_highbd_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, const uint16_t *left, int bd); -void vpx_highbd_v_predictor_8x8_sse2(uint16_t* dst, - ptrdiff_t y_stride, - const uint16_t* above, - const uint16_t* left, - int bd); +void vpx_highbd_v_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, + const uint16_t *above, + const uint16_t *left, int bd); #define vpx_highbd_v_predictor_8x8 vpx_highbd_v_predictor_8x8_sse2 -void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_10_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_10_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_10_add vpx_idct16x16_10_add_sse2 -void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_1_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_1_add vpx_idct16x16_1_add_sse2 -void vpx_idct16x16_256_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct16x16_256_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_256_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_256_add vpx_idct16x16_256_add_sse2 -void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct16x16_38_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct16x16_38_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct16x16_38_add vpx_idct16x16_38_add_sse2 -void vpx_idct32x32_1024_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_1024_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1024_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_sse2 -void vpx_idct32x32_135_add_c(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_135_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_135_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t* input, - uint8_t* dest, - int stride); +RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t *input, + uint8_t *dest, int stride); -void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_1_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct32x32_1_add vpx_idct32x32_1_add_sse2 -void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct32x32_34_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct32x32_34_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct32x32_34_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct32x32_34_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_16_add vpx_idct4x4_16_add_sse2 -void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct4x4_1_add_sse2(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct4x4_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct4x4_1_add vpx_idct4x4_1_add_sse2 -void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_12_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_12_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_12_add_ssse3(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_12_add_ssse3(const tran_low_t *input, uint8_t *dest, int stride); -RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t* input, - uint8_t* dest, +RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t *input, uint8_t *dest, int stride); -void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_1_add_sse2(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_1_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_1_add vpx_idct8x8_1_add_sse2 -void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_idct8x8_64_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_idct8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_idct8x8_64_add vpx_idct8x8_64_add_sse2 -int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width); -int16_t vpx_int_pro_col_sse2(const uint8_t* ref, const int width); +int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width); +int16_t vpx_int_pro_col_sse2(const uint8_t *ref, const int width); #define vpx_int_pro_col vpx_int_pro_col_sse2 -void vpx_int_pro_row_c(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, +void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height); -void vpx_int_pro_row_sse2(int16_t* hbuf, - const uint8_t* ref, - const int ref_stride, - const int height); +void vpx_int_pro_row_sse2(int16_t *hbuf, const uint8_t *ref, + const int ref_stride, const int height); #define vpx_int_pro_row vpx_int_pro_row_sse2 -void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride); -void vpx_iwht4x4_16_add_sse2(const tran_low_t* input, - uint8_t* dest, +void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride); +void vpx_iwht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_sse2 -void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride); +void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride); #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c -void vpx_lpf_horizontal_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_avx2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_avx2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_16_dual_avx2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_sse2(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); +void vpx_lpf_horizontal_16_dual_avx2(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); +RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t *s, int pitch, + const uint8_t *blimit, + const uint8_t *limit, + const uint8_t *thresh); -void vpx_lpf_horizontal_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_4_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_sse2 -void vpx_lpf_horizontal_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_4_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_4_dual_sse2( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_sse2 -void vpx_lpf_horizontal_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_horizontal_8_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_horizontal_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_sse2 -void vpx_lpf_horizontal_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_horizontal_8_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_horizontal_8_dual_sse2( + uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, + const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_sse2 -void vpx_lpf_vertical_16_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16 vpx_lpf_vertical_16_sse2 -void vpx_lpf_vertical_16_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_16_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_16_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_sse2 -void vpx_lpf_vertical_4_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_4_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_4 vpx_lpf_vertical_4_sse2 -void vpx_lpf_vertical_4_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_4_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_4_dual vpx_lpf_vertical_4_dual_sse2 -void vpx_lpf_vertical_8_c(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); -void vpx_lpf_vertical_8_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit, - const uint8_t* limit, - const uint8_t* thresh); +void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); +void vpx_lpf_vertical_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, + const uint8_t *limit, const uint8_t *thresh); #define vpx_lpf_vertical_8 vpx_lpf_vertical_8_sse2 -void vpx_lpf_vertical_8_dual_c(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); -void vpx_lpf_vertical_8_dual_sse2(uint8_t* s, - int pitch, - const uint8_t* blimit0, - const uint8_t* limit0, - const uint8_t* thresh0, - const uint8_t* blimit1, - const uint8_t* limit1, - const uint8_t* thresh1); +void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); +void vpx_lpf_vertical_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, + const uint8_t *limit0, const uint8_t *thresh0, + const uint8_t *blimit1, const uint8_t *limit1, + const uint8_t *thresh1); #define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_sse2 -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); -void vpx_mbpost_proc_across_ip_sse2(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, + int cols, int flimit); +void vpx_mbpost_proc_across_ip_sse2(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_across_ip vpx_mbpost_proc_across_ip_sse2 -void vpx_mbpost_proc_down_c(unsigned char* dst, - int pitch, - int rows, - int cols, +void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, int flimit); -void vpx_mbpost_proc_down_sse2(unsigned char* dst, - int pitch, - int rows, - int cols, - int flimit); +void vpx_mbpost_proc_down_sse2(unsigned char *dst, int pitch, int rows, + int cols, int flimit); #define vpx_mbpost_proc_down vpx_mbpost_proc_down_sse2 -void vpx_minmax_8x8_c(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); -void vpx_minmax_8x8_sse2(const uint8_t* s, - int p, - const uint8_t* d, - int dp, - int* min, - int* max); +void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); +void vpx_minmax_8x8_sse2(const uint8_t *s, int p, const uint8_t *d, int dp, + int *min, int *max); #define vpx_minmax_8x8 vpx_minmax_8x8_sse2 -unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t* src_ptr, +unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse16x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -#define vpx_mse16x8 vpx_mse16x8_sse2 +unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse16x8_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_mse16x8)(const uint8_t *src_ptr, + int source_stride, + const uint8_t *ref_ptr, + int recon_stride, unsigned int *sse); -unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse8x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse8x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x16 vpx_mse8x16_sse2 -unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); -unsigned int vpx_mse8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int recon_stride, - unsigned int* sse); +unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); +unsigned int vpx_mse8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int recon_stride, + unsigned int *sse); #define vpx_mse8x8 vpx_mse8x8_sse2 -void vpx_plane_add_noise_c(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); -void vpx_plane_add_noise_sse2(uint8_t* start, - const int8_t* noise, - int blackclamp, - int whiteclamp, - int width, - int height, - int pitch); +void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, + int whiteclamp, int width, int height, int pitch); +void vpx_plane_add_noise_sse2(uint8_t *start, const int8_t *noise, + int blackclamp, int whiteclamp, int width, + int height, int pitch); #define vpx_plane_add_noise vpx_plane_add_noise_sse2 -void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, - int size); -void vpx_post_proc_down_and_across_mb_row_sse2(unsigned char* src, - unsigned char* dst, - int src_pitch, - int dst_pitch, - int cols, - unsigned char* flimits, +void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, + unsigned char *dst, int src_pitch, + int dst_pitch, int cols, + unsigned char *flimits, int size); +void vpx_post_proc_down_and_across_mb_row_sse2(unsigned char *src, + unsigned char *dst, + int src_pitch, int dst_pitch, + int cols, unsigned char *flimits, int size); #define vpx_post_proc_down_and_across_mb_row \ vpx_post_proc_down_and_across_mb_row_sse2 -void vpx_quantize_b_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_sse2(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_avx(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_sse2(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +void vpx_quantize_b_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_avx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, + uint16_t *eob_ptr, const int16_t *scan, + const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_ssse3(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -void vpx_quantize_b_32x32_avx(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); -RTCD_EXTERN void (*vpx_quantize_b_32x32)(const tran_low_t* coeff_ptr, - intptr_t n_coeffs, - int skip_block, - const int16_t* zbin_ptr, - const int16_t* round_ptr, - const int16_t* quant_ptr, - const int16_t* quant_shift_ptr, - tran_low_t* qcoeff_ptr, - tran_low_t* dqcoeff_ptr, - const int16_t* dequant_ptr, - uint16_t* eob_ptr, - const int16_t* scan, - const int16_t* iscan); +void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +void vpx_quantize_b_32x32_avx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, + int skip_block, const int16_t *zbin_ptr, + const int16_t *round_ptr, + const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, + tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); +RTCD_EXTERN void (*vpx_quantize_b_32x32)( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan); -unsigned int vpx_sad16x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x16 vpx_sad16x16_sse2 -unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x16_avg vpx_sad16x16_avg_sse2 -void vpx_sad16x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x3_ssse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x3_ssse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad16x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x16x4d vpx_sad16x16x4d_sse2 -void vpx_sad16x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x16x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x16x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad16x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x32 vpx_sad16x32_sse2 -unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x32_avg vpx_sad16x32_avg_sse2 -void vpx_sad16x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x32x4d vpx_sad16x32x4d_sse2 -unsigned int vpx_sad16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad16x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad16x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad16x8 vpx_sad16x8_sse2 -unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad16x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad16x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad16x8_avg vpx_sad16x8_avg_sse2 -void vpx_sad16x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x3_ssse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x3_ssse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad16x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad16x8x4d vpx_sad16x8x4d_sse2 -void vpx_sad16x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad16x8x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad16x8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad16x8x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad16x8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad32x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x16_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x16_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x16)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x16_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x16_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x16_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x16x4d vpx_sad32x16x4d_sse2 -unsigned int vpx_sad32x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x32_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x32_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x32_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x32_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x32x4d_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x32x4d_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad32x32x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad32x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad32x64_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad32x64_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad32x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad32x64_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad32x64_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad32x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad32x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad32x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad32x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad32x64x4d vpx_sad32x64x4d_sse2 -unsigned int vpx_sad4x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x4 vpx_sad4x4_sse2 -unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x4_avg vpx_sad4x4_avg_sse2 -void vpx_sad4x4x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad4x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x4x4d vpx_sad4x4x4d_sse2 -void vpx_sad4x4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x4x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad4x4x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad4x4x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad4x4x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad4x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad4x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad4x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad4x8 vpx_sad4x8_sse2 -unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad4x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad4x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad4x8_avg vpx_sad4x8_avg_sse2 -void vpx_sad4x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad4x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad4x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad4x8x4d vpx_sad4x8x4d_sse2 -unsigned int vpx_sad64x32_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x32_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x32_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x32)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x32_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x32_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x32_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x32x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x32x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x32x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad64x32x4d vpx_sad64x32x4d_sse2 -unsigned int vpx_sad64x64_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad64x64_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, +unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad64x64_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vpx_sad64x64)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); -unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad64x64_avg_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t* src_ptr, +unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad64x64_avg_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +RTCD_EXTERN unsigned int (*vpx_sad64x64_avg)(const uint8_t *src_ptr, int src_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - const uint8_t* second_pred); + const uint8_t *second_pred); -void vpx_sad64x64x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad64x64x4d_avx2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad64x64x4d_avx2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad64x64x4d)(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], + int ref_stride, uint32_t *sad_array); -unsigned int vpx_sad8x16_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x16_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x16_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x16 vpx_sad8x16_sse2 -unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x16_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x16_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x16_avg vpx_sad8x16_avg_sse2 -void vpx_sad8x16x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad8x16x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x16x4d vpx_sad8x16x4d_sse2 -void vpx_sad8x16x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x16x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x16x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x16x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x16x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -unsigned int vpx_sad8x4_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x4_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x4_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x4 vpx_sad8x4_sse2 -unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x4_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x4_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x4_avg vpx_sad8x4_avg_sse2 -void vpx_sad8x4x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x4x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x4x4d vpx_sad8x4x4d_sse2 -unsigned int vpx_sad8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); -unsigned int vpx_sad8x8_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride); +unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); +unsigned int vpx_sad8x8_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride); #define vpx_sad8x8 vpx_sad8x8_sse2 -unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); -unsigned int vpx_sad8x8_avg_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - const uint8_t* second_pred); +unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); +unsigned int vpx_sad8x8_avg_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + const uint8_t *second_pred); #define vpx_sad8x8_avg vpx_sad8x8_avg_sse2 -void vpx_sad8x8x3_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x3_sse3(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x3)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x3_sse3(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x3)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -void vpx_sad8x8x4d_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x4d_sse2(const uint8_t* src_ptr, - int src_stride, - const uint8_t* const ref_ptr[], - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x4d_sse2(const uint8_t *src_ptr, int src_stride, + const uint8_t *const ref_ptr[], int ref_stride, + uint32_t *sad_array); #define vpx_sad8x8x4d vpx_sad8x8x4d_sse2 -void vpx_sad8x8x8_c(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -void vpx_sad8x8x8_sse4_1(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); -RTCD_EXTERN void (*vpx_sad8x8x8)(const uint8_t* src_ptr, - int src_stride, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sad_array); +void vpx_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +void vpx_sad8x8x8_sse4_1(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); +RTCD_EXTERN void (*vpx_sad8x8x8)(const uint8_t *src_ptr, int src_stride, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sad_array); -int vpx_satd_c(const tran_low_t* coeff, int length); -int vpx_satd_sse2(const tran_low_t* coeff, int length); -int vpx_satd_avx2(const tran_low_t* coeff, int length); -RTCD_EXTERN int (*vpx_satd)(const tran_low_t* coeff, int length); +int vpx_satd_c(const tran_low_t *coeff, int length); +int vpx_satd_sse2(const tran_low_t *coeff, int length); +int vpx_satd_avx2(const tran_low_t *coeff, int length); +RTCD_EXTERN int (*vpx_satd)(const tran_low_t *coeff, int length); -void vpx_scaled_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h); -void vpx_scaled_2d_ssse3(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); -RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_2d_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); +RTCD_EXTERN void (*vpx_scaled_2d)(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); -void vpx_scaled_avg_2d_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_avg_2d vpx_scaled_avg_2d_c -void vpx_scaled_avg_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, +void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, + int x_step_q4, int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c -void vpx_scaled_avg_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, + uint8_t *dst, ptrdiff_t dst_stride, + const InterpKernel *filter, int x0_q4, int x_step_q4, + int y0_q4, int y_step_q4, int w, int h); #define vpx_scaled_avg_vert vpx_scaled_avg_vert_c -void vpx_scaled_horiz_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_horiz vpx_scaled_horiz_c -void vpx_scaled_vert_c(const uint8_t* src, - ptrdiff_t src_stride, - uint8_t* dst, - ptrdiff_t dst_stride, - const InterpKernel* filter, - int x0_q4, - int x_step_q4, - int y0_q4, - int y_step_q4, - int w, - int h); +void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, + ptrdiff_t dst_stride, const InterpKernel *filter, + int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, + int w, int h); #define vpx_scaled_vert vpx_scaled_vert_c -uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance16x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance16x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance16x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x32_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance32x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance32x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance32x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance4x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance4x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance4x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x32)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance64x64_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance64x64)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x16)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x4)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); -uint32_t vpx_sub_pixel_avg_variance8x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, +uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); +uint32_t vpx_sub_pixel_avg_variance8x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse, + const uint8_t *second_pred); RTCD_EXTERN uint32_t (*vpx_sub_pixel_avg_variance8x8)( - const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse, - const uint8_t* second_pred); + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, + const uint8_t *second_pred); -uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance16x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance16x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x32_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance32x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance32x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance32x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance4x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance4x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance4x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x32_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x32_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x32)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance64x64_avx2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance64x64)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x16_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x16_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x16)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x4_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x4_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x4)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -uint32_t vpx_sub_pixel_variance8x8_ssse3(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); -RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, - const uint8_t* ref_ptr, - int ref_stride, - uint32_t* sse); +uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, + int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, + uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +uint32_t vpx_sub_pixel_variance8x8_ssse3(const uint8_t *src_ptr, + int source_stride, int xoffset, + int yoffset, const uint8_t *ref_ptr, + int ref_stride, uint32_t *sse); +RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)( + const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, + const uint8_t *ref_ptr, int ref_stride, uint32_t *sse); -void vpx_subtract_block_c(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); -void vpx_subtract_block_sse2(int rows, - int cols, - int16_t* diff_ptr, - ptrdiff_t diff_stride, - const uint8_t* src_ptr, - ptrdiff_t src_stride, - const uint8_t* pred_ptr, +void vpx_subtract_block_sse2(int rows, int cols, int16_t *diff_ptr, + ptrdiff_t diff_stride, const uint8_t *src_ptr, + ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); #define vpx_subtract_block vpx_subtract_block_sse2 -uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); -uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t* src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); +uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t *src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_sse2 -void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_sse2 -void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_sse2 -void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_sse2 -void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_tm_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_tm_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_sse2 -void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_16x16_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_16x16 vpx_v_predictor_16x16_sse2 -void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_32x32_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_32x32 vpx_v_predictor_32x32_sse2 -void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_4x4_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_4x4 vpx_v_predictor_4x4_sse2 -void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); -void vpx_v_predictor_8x8_sse2(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); +void vpx_v_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_sse2 -unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t* src_ptr, +unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -#define vpx_variance16x32 vpx_variance16x32_sse2 - -unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance16x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -#define vpx_variance16x8 vpx_variance16x8_sse2 - -unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x16_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t* src_ptr, +unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x32_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t* src_ptr, +unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance16x8_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance16x8)(const uint8_t *src_ptr, + int source_stride, + const uint8_t *ref_ptr, + int ref_stride, unsigned int *sse); + +unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x16_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x16)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance32x64_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -#define vpx_variance32x64 vpx_variance32x64_sse2 +unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x32)(const uint8_t *src_ptr, + int source_stride, + const uint8_t *ref_ptr, + int ref_stride, + unsigned int *sse); -unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x4_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance32x64_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance32x64)(const uint8_t *src_ptr, + int source_stride, + const uint8_t *ref_ptr, + int ref_stride, + unsigned int *sse); + +unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x4_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x4 vpx_variance4x4_sse2 -unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance4x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance4x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance4x8 vpx_variance4x8_sse2 -unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x32_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t* src_ptr, +unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x32_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x32)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance64x64_avx2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t* src_ptr, +unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance64x64_avx2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +RTCD_EXTERN unsigned int (*vpx_variance64x64)(const uint8_t *src_ptr, int source_stride, - const uint8_t* ref_ptr, + const uint8_t *ref_ptr, int ref_stride, - unsigned int* sse); + unsigned int *sse); -unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x16_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x16 vpx_variance8x16_sse2 -unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x4_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x4 vpx_variance8x4_sse2 -unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); -unsigned int vpx_variance8x8_sse2(const uint8_t* src_ptr, - int source_stride, - const uint8_t* ref_ptr, - int ref_stride, - unsigned int* sse); +unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); +unsigned int vpx_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, + const uint8_t *ref_ptr, int ref_stride, + unsigned int *sse); #define vpx_variance8x8 vpx_variance8x8_sse2 -void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, - const uint8_t* above, - const uint8_t* left); +void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, + const uint8_t *above, const uint8_t *left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c -int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl); -int vpx_vector_var_sse2(const int16_t* ref, const int16_t* src, const int bwl); +int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl); +int vpx_vector_var_sse2(const int16_t *ref, const int16_t *src, const int bwl); #define vpx_vector_var vpx_vector_var_sse2 void vpx_dsp_rtcd(void); @@ -7540,35 +4752,24 @@ (void)flags; vpx_convolve8 = vpx_convolve8_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8 = vpx_convolve8_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8 = vpx_convolve8_avx2; + if (flags & HAS_SSSE3) vpx_convolve8 = vpx_convolve8_ssse3; + if (flags & HAS_AVX2) vpx_convolve8 = vpx_convolve8_avx2; vpx_convolve8_avg = vpx_convolve8_avg_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_avg = vpx_convolve8_avg_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg = vpx_convolve8_avg_avx2; + if (flags & HAS_SSSE3) vpx_convolve8_avg = vpx_convolve8_avg_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_avg = vpx_convolve8_avg_avx2; vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_sse2; if (flags & HAS_SSSE3) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_avx2; + if (flags & HAS_AVX2) vpx_convolve8_avg_horiz = vpx_convolve8_avg_horiz_avx2; vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_avx2; + if (flags & HAS_SSSE3) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_avg_vert = vpx_convolve8_avg_vert_avx2; vpx_convolve8_horiz = vpx_convolve8_horiz_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_horiz = vpx_convolve8_horiz_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_horiz = vpx_convolve8_horiz_avx2; + if (flags & HAS_SSSE3) vpx_convolve8_horiz = vpx_convolve8_horiz_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_horiz = vpx_convolve8_horiz_avx2; vpx_convolve8_vert = vpx_convolve8_vert_sse2; - if (flags & HAS_SSSE3) - vpx_convolve8_vert = vpx_convolve8_vert_ssse3; - if (flags & HAS_AVX2) - vpx_convolve8_vert = vpx_convolve8_vert_avx2; + if (flags & HAS_SSSE3) vpx_convolve8_vert = vpx_convolve8_vert_ssse3; + if (flags & HAS_AVX2) vpx_convolve8_vert = vpx_convolve8_vert_avx2; vpx_d153_predictor_16x16 = vpx_d153_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d153_predictor_16x16 = vpx_d153_predictor_16x16_ssse3; @@ -7576,11 +4777,9 @@ if (flags & HAS_SSSE3) vpx_d153_predictor_32x32 = vpx_d153_predictor_32x32_ssse3; vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_c; - if (flags & HAS_SSSE3) - vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_ssse3; + if (flags & HAS_SSSE3) vpx_d153_predictor_4x4 = vpx_d153_predictor_4x4_ssse3; vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d153_predictor_8x8 = vpx_d153_predictor_8x8_ssse3; vpx_d207_predictor_16x16 = vpx_d207_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d207_predictor_16x16 = vpx_d207_predictor_16x16_ssse3; @@ -7588,8 +4787,7 @@ if (flags & HAS_SSSE3) vpx_d207_predictor_32x32 = vpx_d207_predictor_32x32_ssse3; vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d207_predictor_8x8 = vpx_d207_predictor_8x8_ssse3; vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_c; if (flags & HAS_SSSE3) vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_ssse3; @@ -7603,23 +4801,17 @@ if (flags & HAS_SSSE3) vpx_d63_predictor_32x32 = vpx_d63_predictor_32x32_ssse3; vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_c; - if (flags & HAS_SSSE3) - vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_ssse3; + if (flags & HAS_SSSE3) vpx_d63_predictor_4x4 = vpx_d63_predictor_4x4_ssse3; vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_c; - if (flags & HAS_SSSE3) - vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_d63_predictor_8x8 = vpx_d63_predictor_8x8_ssse3; vpx_get16x16var = vpx_get16x16var_sse2; - if (flags & HAS_AVX2) - vpx_get16x16var = vpx_get16x16var_avx2; + if (flags & HAS_AVX2) vpx_get16x16var = vpx_get16x16var_avx2; vpx_hadamard_16x16 = vpx_hadamard_16x16_sse2; - if (flags & HAS_AVX2) - vpx_hadamard_16x16 = vpx_hadamard_16x16_avx2; + if (flags & HAS_AVX2) vpx_hadamard_16x16 = vpx_hadamard_16x16_avx2; vpx_hadamard_8x8 = vpx_hadamard_8x8_sse2; - if (flags & HAS_SSSE3) - vpx_hadamard_8x8 = vpx_hadamard_8x8_ssse3; + if (flags & HAS_SSSE3) vpx_hadamard_8x8 = vpx_hadamard_8x8_ssse3; vpx_highbd_convolve8 = vpx_highbd_convolve8_sse2; - if (flags & HAS_AVX2) - vpx_highbd_convolve8 = vpx_highbd_convolve8_avx2; + if (flags & HAS_AVX2) vpx_highbd_convolve8 = vpx_highbd_convolve8_avx2; vpx_highbd_convolve8_avg = vpx_highbd_convolve8_avg_sse2; if (flags & HAS_AVX2) vpx_highbd_convolve8_avg = vpx_highbd_convolve8_avg_avx2; @@ -7636,8 +4828,7 @@ if (flags & HAS_AVX2) vpx_highbd_convolve8_vert = vpx_highbd_convolve8_vert_avx2; vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_sse2; - if (flags & HAS_AVX2) - vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_avx2; + if (flags & HAS_AVX2) vpx_highbd_convolve_avg = vpx_highbd_convolve_avg_avx2; vpx_highbd_convolve_copy = vpx_highbd_convolve_copy_sse2; if (flags & HAS_AVX2) vpx_highbd_convolve_copy = vpx_highbd_convolve_copy_avx2; @@ -7726,109 +4917,76 @@ if (flags & HAS_SSE4_1) vpx_highbd_idct8x8_64_add = vpx_highbd_idct8x8_64_add_sse4_1; vpx_idct32x32_135_add = vpx_idct32x32_135_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct32x32_135_add = vpx_idct32x32_135_add_ssse3; + if (flags & HAS_SSSE3) vpx_idct32x32_135_add = vpx_idct32x32_135_add_ssse3; vpx_idct32x32_34_add = vpx_idct32x32_34_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct32x32_34_add = vpx_idct32x32_34_add_ssse3; + if (flags & HAS_SSSE3) vpx_idct32x32_34_add = vpx_idct32x32_34_add_ssse3; vpx_idct8x8_12_add = vpx_idct8x8_12_add_sse2; - if (flags & HAS_SSSE3) - vpx_idct8x8_12_add = vpx_idct8x8_12_add_ssse3; + if (flags & HAS_SSSE3) vpx_idct8x8_12_add = vpx_idct8x8_12_add_ssse3; vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_sse2; - if (flags & HAS_AVX2) - vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_avx2; + if (flags & HAS_AVX2) vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_avx2; vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_sse2; if (flags & HAS_AVX2) vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_avx2; vpx_mse16x16 = vpx_mse16x16_sse2; - if (flags & HAS_AVX2) - vpx_mse16x16 = vpx_mse16x16_avx2; + if (flags & HAS_AVX2) vpx_mse16x16 = vpx_mse16x16_avx2; + vpx_mse16x8 = vpx_mse16x8_sse2; + if (flags & HAS_AVX2) vpx_mse16x8 = vpx_mse16x8_avx2; vpx_quantize_b = vpx_quantize_b_sse2; - if (flags & HAS_SSSE3) - vpx_quantize_b = vpx_quantize_b_ssse3; - if (flags & HAS_AVX) - vpx_quantize_b = vpx_quantize_b_avx; + if (flags & HAS_SSSE3) vpx_quantize_b = vpx_quantize_b_ssse3; + if (flags & HAS_AVX) vpx_quantize_b = vpx_quantize_b_avx; vpx_quantize_b_32x32 = vpx_quantize_b_32x32_c; - if (flags & HAS_SSSE3) - vpx_quantize_b_32x32 = vpx_quantize_b_32x32_ssse3; - if (flags & HAS_AVX) - vpx_quantize_b_32x32 = vpx_quantize_b_32x32_avx; + if (flags & HAS_SSSE3) vpx_quantize_b_32x32 = vpx_quantize_b_32x32_ssse3; + if (flags & HAS_AVX) vpx_quantize_b_32x32 = vpx_quantize_b_32x32_avx; vpx_sad16x16x3 = vpx_sad16x16x3_c; - if (flags & HAS_SSE3) - vpx_sad16x16x3 = vpx_sad16x16x3_sse3; - if (flags & HAS_SSSE3) - vpx_sad16x16x3 = vpx_sad16x16x3_ssse3; + if (flags & HAS_SSE3) vpx_sad16x16x3 = vpx_sad16x16x3_sse3; + if (flags & HAS_SSSE3) vpx_sad16x16x3 = vpx_sad16x16x3_ssse3; vpx_sad16x16x8 = vpx_sad16x16x8_c; - if (flags & HAS_SSE4_1) - vpx_sad16x16x8 = vpx_sad16x16x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad16x16x8 = vpx_sad16x16x8_sse4_1; vpx_sad16x8x3 = vpx_sad16x8x3_c; - if (flags & HAS_SSE3) - vpx_sad16x8x3 = vpx_sad16x8x3_sse3; - if (flags & HAS_SSSE3) - vpx_sad16x8x3 = vpx_sad16x8x3_ssse3; + if (flags & HAS_SSE3) vpx_sad16x8x3 = vpx_sad16x8x3_sse3; + if (flags & HAS_SSSE3) vpx_sad16x8x3 = vpx_sad16x8x3_ssse3; vpx_sad16x8x8 = vpx_sad16x8x8_c; - if (flags & HAS_SSE4_1) - vpx_sad16x8x8 = vpx_sad16x8x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad16x8x8 = vpx_sad16x8x8_sse4_1; vpx_sad32x16 = vpx_sad32x16_sse2; - if (flags & HAS_AVX2) - vpx_sad32x16 = vpx_sad32x16_avx2; + if (flags & HAS_AVX2) vpx_sad32x16 = vpx_sad32x16_avx2; vpx_sad32x16_avg = vpx_sad32x16_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x16_avg = vpx_sad32x16_avg_avx2; + if (flags & HAS_AVX2) vpx_sad32x16_avg = vpx_sad32x16_avg_avx2; vpx_sad32x32 = vpx_sad32x32_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32 = vpx_sad32x32_avx2; + if (flags & HAS_AVX2) vpx_sad32x32 = vpx_sad32x32_avx2; vpx_sad32x32_avg = vpx_sad32x32_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32_avg = vpx_sad32x32_avg_avx2; + if (flags & HAS_AVX2) vpx_sad32x32_avg = vpx_sad32x32_avg_avx2; vpx_sad32x32x4d = vpx_sad32x32x4d_sse2; - if (flags & HAS_AVX2) - vpx_sad32x32x4d = vpx_sad32x32x4d_avx2; + if (flags & HAS_AVX2) vpx_sad32x32x4d = vpx_sad32x32x4d_avx2; vpx_sad32x64 = vpx_sad32x64_sse2; - if (flags & HAS_AVX2) - vpx_sad32x64 = vpx_sad32x64_avx2; + if (flags & HAS_AVX2) vpx_sad32x64 = vpx_sad32x64_avx2; vpx_sad32x64_avg = vpx_sad32x64_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad32x64_avg = vpx_sad32x64_avg_avx2; + if (flags & HAS_AVX2) vpx_sad32x64_avg = vpx_sad32x64_avg_avx2; vpx_sad4x4x3 = vpx_sad4x4x3_c; - if (flags & HAS_SSE3) - vpx_sad4x4x3 = vpx_sad4x4x3_sse3; + if (flags & HAS_SSE3) vpx_sad4x4x3 = vpx_sad4x4x3_sse3; vpx_sad4x4x8 = vpx_sad4x4x8_c; - if (flags & HAS_SSE4_1) - vpx_sad4x4x8 = vpx_sad4x4x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad4x4x8 = vpx_sad4x4x8_sse4_1; vpx_sad64x32 = vpx_sad64x32_sse2; - if (flags & HAS_AVX2) - vpx_sad64x32 = vpx_sad64x32_avx2; + if (flags & HAS_AVX2) vpx_sad64x32 = vpx_sad64x32_avx2; vpx_sad64x32_avg = vpx_sad64x32_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad64x32_avg = vpx_sad64x32_avg_avx2; + if (flags & HAS_AVX2) vpx_sad64x32_avg = vpx_sad64x32_avg_avx2; vpx_sad64x64 = vpx_sad64x64_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64 = vpx_sad64x64_avx2; + if (flags & HAS_AVX2) vpx_sad64x64 = vpx_sad64x64_avx2; vpx_sad64x64_avg = vpx_sad64x64_avg_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64_avg = vpx_sad64x64_avg_avx2; + if (flags & HAS_AVX2) vpx_sad64x64_avg = vpx_sad64x64_avg_avx2; vpx_sad64x64x4d = vpx_sad64x64x4d_sse2; - if (flags & HAS_AVX2) - vpx_sad64x64x4d = vpx_sad64x64x4d_avx2; + if (flags & HAS_AVX2) vpx_sad64x64x4d = vpx_sad64x64x4d_avx2; vpx_sad8x16x3 = vpx_sad8x16x3_c; - if (flags & HAS_SSE3) - vpx_sad8x16x3 = vpx_sad8x16x3_sse3; + if (flags & HAS_SSE3) vpx_sad8x16x3 = vpx_sad8x16x3_sse3; vpx_sad8x16x8 = vpx_sad8x16x8_c; - if (flags & HAS_SSE4_1) - vpx_sad8x16x8 = vpx_sad8x16x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad8x16x8 = vpx_sad8x16x8_sse4_1; vpx_sad8x8x3 = vpx_sad8x8x3_c; - if (flags & HAS_SSE3) - vpx_sad8x8x3 = vpx_sad8x8x3_sse3; + if (flags & HAS_SSE3) vpx_sad8x8x3 = vpx_sad8x8x3_sse3; vpx_sad8x8x8 = vpx_sad8x8x8_c; - if (flags & HAS_SSE4_1) - vpx_sad8x8x8 = vpx_sad8x8x8_sse4_1; + if (flags & HAS_SSE4_1) vpx_sad8x8x8 = vpx_sad8x8x8_sse4_1; vpx_satd = vpx_satd_sse2; - if (flags & HAS_AVX2) - vpx_satd = vpx_satd_avx2; + if (flags & HAS_AVX2) vpx_satd = vpx_satd_avx2; vpx_scaled_2d = vpx_scaled_2d_c; - if (flags & HAS_SSSE3) - vpx_scaled_2d = vpx_scaled_2d_ssse3; + if (flags & HAS_SSSE3) vpx_scaled_2d = vpx_scaled_2d_ssse3; vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_sse2; if (flags & HAS_SSSE3) vpx_sub_pixel_avg_variance16x16 = vpx_sub_pixel_avg_variance16x16_ssse3; @@ -7916,20 +5074,21 @@ if (flags & HAS_SSSE3) vpx_sub_pixel_variance8x8 = vpx_sub_pixel_variance8x8_ssse3; vpx_variance16x16 = vpx_variance16x16_sse2; - if (flags & HAS_AVX2) - vpx_variance16x16 = vpx_variance16x16_avx2; + if (flags & HAS_AVX2) vpx_variance16x16 = vpx_variance16x16_avx2; + vpx_variance16x32 = vpx_variance16x32_sse2; + if (flags & HAS_AVX2) vpx_variance16x32 = vpx_variance16x32_avx2; + vpx_variance16x8 = vpx_variance16x8_sse2; + if (flags & HAS_AVX2) vpx_variance16x8 = vpx_variance16x8_avx2; vpx_variance32x16 = vpx_variance32x16_sse2; - if (flags & HAS_AVX2) - vpx_variance32x16 = vpx_variance32x16_avx2; + if (flags & HAS_AVX2) vpx_variance32x16 = vpx_variance32x16_avx2; vpx_variance32x32 = vpx_variance32x32_sse2; - if (flags & HAS_AVX2) - vpx_variance32x32 = vpx_variance32x32_avx2; + if (flags & HAS_AVX2) vpx_variance32x32 = vpx_variance32x32_avx2; + vpx_variance32x64 = vpx_variance32x64_sse2; + if (flags & HAS_AVX2) vpx_variance32x64 = vpx_variance32x64_avx2; vpx_variance64x32 = vpx_variance64x32_sse2; - if (flags & HAS_AVX2) - vpx_variance64x32 = vpx_variance64x32_avx2; + if (flags & HAS_AVX2) vpx_variance64x32 = vpx_variance64x32_avx2; vpx_variance64x64 = vpx_variance64x64_sse2; - if (flags & HAS_AVX2) - vpx_variance64x64 = vpx_variance64x64_avx2; + if (flags & HAS_AVX2) vpx_variance64x64 = vpx_variance64x64_avx2; } #endif
diff --git a/third_party/libvpx/source/config/win/x64/vpx_scale_rtcd.h b/third_party/libvpx/source/config/win/x64/vpx_scale_rtcd.h index 19da7a7..f30cdee1 100644 --- a/third_party/libvpx/source/config/win/x64/vpx_scale_rtcd.h +++ b/third_party/libvpx/source/config/win/x64/vpx_scale_rtcd.h
@@ -14,71 +14,68 @@ extern "C" { #endif -void vp8_horizontal_line_2_1_scale_c(const unsigned char* source, +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c -void vp8_horizontal_line_5_3_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_horizontal_line_5_4_scale_c(const unsigned char* source, +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, - unsigned char* dest, + unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c -void vp8_vertical_band_2_1_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_2_1_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c -void vp8_vertical_band_2_1_scale_i_c(unsigned char* source, +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, - unsigned char* dest, + unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_vertical_band_5_3_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_3_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c -void vp8_vertical_band_5_4_scale_c(unsigned char* source, - unsigned int src_pitch, - unsigned char* dest, +void vp8_vertical_band_5_4_scale_c(unsigned char *source, + unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c -void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_borders vpx_extend_frame_borders_c -void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf); +void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c -void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_frame vpx_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc, - struct yv12_buffer_config* dst_ybc); +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, + struct yv12_buffer_config *dst_ybc); #define vpx_yv12_copy_y vpx_yv12_copy_y_c void vpx_scale_rtcd(void);
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index 3539e7ce..b2846be 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids
@@ -290,8 +290,11 @@ "ash/components/resources/ash_components_resources.grd": { "structures": [24250], }, + "ash/public/cpp/resources/ash_public_unscaled_resources.grd": { + "includes": [24260], + }, "ash/resources/ash_resources.grd": { - "structures": [24260], + "structures": [24280], }, "chromecast/browser/cast_browser_resources.grd": {
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl index b1822ab..321a1821 100644 --- a/tools/mb/mb_config.pyl +++ b/tools/mb/mb_config.pyl
@@ -609,6 +609,7 @@ 'fuchsia_x64_cast_audio': 'release_trybot_fuchsia_cast_audio', 'layout_test_leak_detection': 'release_trybot', 'leak_detection_linux': 'release_trybot', + 'linux-blink-heap-incremental-marking': 'debug_trybot_enable_blink_heap_incremental_marking', 'linux-blink-heap-verification-try': 'release_trybot_enable_blink_heap_verification', 'linux-jumbo-rel': 'jumbo_release_bot_minimal_symbols', 'linux_arm': 'release_trybot_arm', @@ -1223,6 +1224,10 @@ 'debug_bot', 'enable_blink_heap_incremental_marking', ], + 'debug_trybot_enable_blink_heap_incremental_marking': [ + 'debug_trybot', 'enable_blink_heap_incremental_marking', + ], + 'debug_bot_fuchsia': [ 'debug_bot', 'fuchsia', ],
diff --git a/tools/metrics/actions/actions.xml b/tools/metrics/actions/actions.xml index 65d571f8..af4be86 100644 --- a/tools/metrics/actions/actions.xml +++ b/tools/metrics/actions/actions.xml
@@ -4133,6 +4133,24 @@ </description> </action> +<action name="ContextualSuggestions.Preference.Disabled"> + <owner>huayinz@chromium.org</owner> + <owner>twellington@chromium.org</owner> + <description> + Android: Contextual suggestions are disabled by a user click on the switch + preference in contextual suggestions settings. + </description> +</action> + +<action name="ContextualSuggestions.Preference.Enabled"> + <owner>huayinz@chromium.org</owner> + <owner>twellington@chromium.org</owner> + <description> + Android: Contextual suggestions are enabled by a user click on the switch + preference in contextual suggestions settings. + </description> +</action> + <action name="CookieBlockingDisabledPerDefault"> <owner>Please list the metric's owners. Add more owner tags as needed.</owner> <description>Please enter the description of this user action.</description>
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index 87bf750f..8399310 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -521,6 +521,11 @@ label="Timeout during installability check, site status unknown"/> </enum> +<enum name="AdIsolatedInfo"> + <int value="0" label="Isolated ad request"/> + <int value="1" label="Non-isolated ad request"/> +</enum> + <enum name="AdSamplerTriggerAction"> <int value="0" label="The trigger was activated"/> <int value="1" label="An ad was found and data was collected"/> @@ -6818,7 +6823,7 @@ <int value="1" label="Recent Tabs"/> <int value="2" label="Downloads"/> <int value="3" label="Bookmarks"/> - <int value="4" label="Physical Web Pages"/> + <int value="4" label="Physical Web Pages (obsolete)"/> <int value="5" label="Foreign Tabs"/> <int value="6" label="Articles"/> </enum> @@ -15207,6 +15212,7 @@ label="ENTERPRISEREPORTINGPRIVATE_UPLOADCHROMEDESKTOPREPORT"/> <int value="1242" label="CECPRIVATE_SENDSTANDBY"/> <int value="1243" label="CECPRIVATE_SENDWAKEUP"/> + <int value="1244" label="WEBSTOREPRIVATE_GETREFERRERCHAIN"/> </enum> <enum name="ExtensionIconState"> @@ -26428,6 +26434,8 @@ <int value="-1416184931" label="TranslateRankerEnforcement:enabled"/> <int value="-1411003295" label="disable-encrypted-media"/> <int value="-1409643943" label="enable-child-account-detection"/> + <int value="-1408869905" + label="AutofillEnforceMinRequiredFieldsForQuery:disabled"/> <int value="-1408288176" label="enable-account-consistency"/> <int value="-1405048637" label="OfflinePagesResourceBasedSnapshot:enabled"/> <int value="-1399753480" label="disable-harfbuzz-rendertext"/> @@ -26468,6 +26476,8 @@ <int value="-1319688939" label="ignore-gpu-blacklist"/> <int value="-1318914924" label="OverflowIconsForMediaControls:enabled"/> <int value="-1314603238" label="ChromeHomePullToRefreshIphAtTop:enabled"/> + <int value="-1311575452" + label="AutofillEnforceMinRequiredFieldsForUpload:disabled"/> <int value="-1311133348" label="VrBrowsingNativeAndroidUi:enabled"/> <int value="-1310737697" label="MaterialDesignSettings:enabled"/> <int value="-1304957199" label="OfflinePagesShowAlternateDinoPage:enabled"/> @@ -26944,6 +26954,8 @@ <int value="-192389983" label="NoStatePrefetch:enabled"/> <int value="-185162926" label="IncreaseInputAudioBufferSize:enabled"/> <int value="-183246373" label="enable-multilingual-spellchecker"/> + <int value="-181590721" + label="AutofillEnforceMinRequiredFieldsForHeuristics:enabled"/> <int value="-181093956" label="ScrollAnchoring:enabled"/> <int value="-174319545" label="BulkPrinters:enabled"/> <int value="-171173736" label="VrBrowsingExperimentalFeatures:disabled"/> @@ -27099,6 +27111,8 @@ <int value="203776499" label="enable-virtual-keyboard-overscroll"/> <int value="218890378" label="ManualSaving:disabled"/> <int value="219117936" label="AllowReaderForAccessibility:enabled"/> + <int value="222184258" + label="AutofillEnforceMinRequiredFieldsForHeuristics:disabled"/> <int value="223662457" label="BackgroundLoadingForDownloads:enabled"/> <int value="237570976" label="CommandLineOnNonRooted:disabled"/> <int value="237964589" @@ -27220,6 +27234,8 @@ <int value="503245473" label="disable-translate-new-ux"/> <int value="504994663" label="GenericSensor:disabled"/> <int value="506680761" label="WebNFC:disabled"/> + <int value="510066229" + label="AutofillEnforceMinRequiredFieldsForQuery:enabled"/> <int value="510814146" label="OfflineBookmarks:enabled"/> <int value="513356954" label="InstantTethering:disabled"/> <int value="513372959" label="ViewsProfileChooser:enabled"/> @@ -27724,6 +27740,8 @@ <int value="1689183477" label="enable-merge-key-char-events"/> <int value="1690837904" label="save-previous-document-resources"/> <int value="1691568199" label="AndroidSpellCheckerNonLowEnd:disabled"/> + <int value="1694766748" + label="AutofillRestrictUnownedFieldsToFormlessCheckout:enabled"/> <int value="1694854500" label="disable-save-password-bubble"/> <int value="1696139514" label="enable-ble-advertising-in-apps"/> <int value="1697189972" label="WebPaymentsSingleAppUiSkip:disabled"/> @@ -27837,6 +27855,8 @@ <int value="1942911276" label="enable-grouped-history"/> <int value="1944156526" label="sync-url"/> <int value="1947350992" label="drop-sync-credential:disabled"/> + <int value="1949019439" + label="AutofillRestrictUnownedFieldsToFormlessCheckout:disabled"/> <int value="1949908940" label="disable-zip-archiver-unpacker"/> <int value="1951466218" label="enable-data-reduction-proxy-lite-page"/> <int value="1955677113" label="trace-export-events-to-etw"/> @@ -27893,6 +27913,8 @@ <int value="2077917024" label="enable-supervised-user-managed-bookmarks-folder"/> <int value="2079672348" label="ExperimentalKeyboardLockUI:disabled"/> + <int value="2084638930" + label="AutofillEnforceMinRequiredFieldsForUpload:enabled"/> <int value="2085186092" label="BulkPrinters:disabled"/> <int value="2085438501" label="ChromeHome:enabled"/> <int value="2089897928" label="enable-audio-focus"/>
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index 5d70cfc2..8f0ded7 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml
@@ -12648,6 +12648,16 @@ </summary> </histogram> +<histogram name="ContextualSuggestions.EnabledState" enum="BooleanEnabled"> + <owner>huayinz@chromium.org</owner> + <owner>twellington@chromium.org</owner> + <summary> + Android: Whether contextual suggestions are enabled. Recorded when the + enabled state changes. Note that this may be recorded multiple times per + session. + </summary> +</histogram> + <histogram name="ContextualSuggestions.Events" enum="ContextualSuggestions.Event"> <owner>donnd@chromium.org</owner> @@ -12694,6 +12704,16 @@ </summary> </histogram> +<histogram name="ContextualSuggestions.Preference.State" enum="BooleanEnabled"> + <owner>huayinz@chromium.org</owner> + <owner>twellington@chromium.org</owner> + <summary> + Android: Whether the user preference for contextual suggestions is enabled. + Recorded on cold start and when the user has changed the preference state. + Note that this may be recorded multiple times per session. + </summary> +</histogram> + <histogram base="true" name="Cookie.AgeFor" units="days"> <owner>mkwst@chromium.org</owner> <owner>tnagel@chromium.org</owner> @@ -14968,6 +14988,15 @@ <summary>Records the result of an attempt to fetch the warmup URL.</summary> </histogram> +<histogram name="DataReductionProxy.WarmupURL.FetchAttemptsBeforeSuccess" + units="count"> + <owner>tbansal@chromium.org</owner> + <summary> + Records the total number of warmup URL (i.e., the probe URL) fetch attempts + that were made before the warmup URL was successfully fetched. + </summary> +</histogram> + <histogram name="DataReductionProxy.WarmupURL.FetchInitiated" units="count"> <owner>tbansal@chromium.org</owner> <summary> @@ -90884,6 +90913,44 @@ </summary> </histogram> +<histogram name="SubresourceFilter.AdDelay.Delay" units="ms"> + <owner>csharrison@chromium.org</owner> + <owner>jkarlin@chromium.org</owner> + <summary> + Logs the delay the ad delay throttle added to a request. Logged for every + subresource request that was delayed. + </summary> +</histogram> + +<histogram name="SubresourceFilter.AdDelay.Delay.Expected" units="ms"> + <owner>csharrison@chromium.org</owner> + <owner>jkarlin@chromium.org</owner> + <summary> + Logs the expected delay the ad delay throttle added to a request. This is + the delay imposed assuming no task queuing delay. Logged for every + subresource request that was delayed. + </summary> +</histogram> + +<histogram name="SubresourceFilter.AdDelay.Delay.Queuing" units="ms"> + <owner>csharrison@chromium.org</owner> + <owner>jkarlin@chromium.org</owner> + <summary> + Logs the task queuing delay the ad delay throttle added to a request. This + is the actual delay minus the expected delay. Logged for every subresource + request that was delayed. + </summary> +</histogram> + +<histogram name="SubresourceFilter.AdDelay.IsolatedInfo" enum="AdIsolatedInfo"> + <owner>csharrison@chromium.org</owner> + <owner>jkarlin@chromium.org</owner> + <summary> + For a given ad request, logs information related to whether it is isolated + from the top-level context. Logged per ad subresource request. + </summary> +</histogram> + <histogram name="SubresourceFilter.AdDelay.SecureInfo" enum="AdSecureInfo"> <owner>csharrison@chromium.org</owner> <owner>jkarlin@chromium.org</owner> @@ -108311,6 +108378,25 @@ <affected-histogram name="DataReductionProxy.LoFi.ImplicitOptOutAction"/> </histogram_suffixes> +<histogram_suffixes + name="DataReductionProxy.WarmupURL.FetchAttemptsBeforeSuccess" + separator="."> + <suffix name="Secure.Core" + label="Records fetch attempts for the first core secure data reduction + proxy"/> + <suffix name="Secure.NonCore" + label="Records fetch attempts for the first non-core secure data + reduction proxy"/> + <suffix name="Insecure.Core" + label="Records fetch attempts for the first core insecure data + reduction proxy"/> + <suffix name="Insecure.NonCore" + label="Records fetch attempts for the first non-core insecure data + reduction proxy"/> + <affected-histogram + name="DataReductionProxy.WarmupURL.FetchAttemptsBeforeSuccess"/> +</histogram_suffixes> + <histogram_suffixes name="DataReductionProxy.WithValidOCL.LoFiOn" separator="."> <obsolete> Deprecated 04/2018.
diff --git a/tools/perf/benchmark.csv b/tools/perf/benchmark.csv index 0840e2517..cc6c4af8 100644 --- a/tools/perf/benchmark.csv +++ b/tools/perf/benchmark.csv
@@ -16,7 +16,6 @@ blink_perf.parser,"jbroman@chromium.org, yukishiino@chromium.org, haraken@chromium.org", blink_perf.shadow_dom,hayato@chromium.org, blink_perf.svg,"kouhei@chromium.org, fs@opera.com", -cc_perftests,enne@chromium.org, components_perftests,csharrison@chromium.org, dromaeo,"jbroman@chromium.org, yukishiino@chromium.org, haraken@chromium.org", dummy_benchmark.histogram_benchmark_1,"eakuefner@chromium.org, simonhatch@chromium.org",
diff --git a/tools/perf/core/perf_data_generator.py b/tools/perf/core/perf_data_generator.py index bc312f06..71fa5a42 100755 --- a/tools/perf/core/perf_data_generator.py +++ b/tools/perf/core/perf_data_generator.py
@@ -134,7 +134,6 @@ 'perf_tests': [ ('tracing_perftests', 'build73-b1--device2'), ('gpu_perftests', 'build73-b1--device2'), - # ('cc_perftests', 'build73-b1--device2'), # crbug.com/721757 ('media_perftests', 'build74-b1--device7'), ('components_perftests', 'build74-b1--device1'), ], @@ -164,7 +163,6 @@ 'perf_tests': [ ('tracing_perftests', 'build13-b1--device2'), ('gpu_perftests', 'build13-b1--device2'), - ('cc_perftests', 'build13-b1--device2'), ('components_perftests', 'build48-b1--device5'), ], 'perf_tests_with_args': [ @@ -194,7 +192,6 @@ 'perf_tests': [ ('tracing_perftests', 'build15-b1--device2'), ('gpu_perftests', 'build16-b1--device2'), - ('cc_perftests', 'build45-b1--device2'), ] } ]) @@ -219,7 +216,6 @@ 'perf_tests': [ ('tracing_perftests', 'build9-b1--device2'), ('gpu_perftests', 'build10-b1--device2'), - ('cc_perftests', 'build49-b1--device2'), ], 'perf_tests_with_args': [ ('angle_perftests', 'build49-b1--device7', ['--shard-timeout=300'], @@ -248,7 +244,6 @@ 'perf_tests': [ ('tracing_perftests', 'build17-b1--device2'), # ('gpu_perftests', 'build18-b1--device2'), https://crbug.com/775219 - # ('cc_perftests', 'build47-b1--device2'), https://crbug.com/736150 ] } ]) @@ -503,7 +498,6 @@ } ]) - return waterfall @@ -899,7 +893,6 @@ 'piman@chromium.org, chrome-gpu-perf-owners@chromium.org', 'Internals>GPU>ANGLE', False), 'net_perftests': BenchmarkMetadata('xunjieli@chromium.org', None, False), - 'cc_perftests': BenchmarkMetadata('enne@chromium.org', None, False), 'gpu_perftests': BenchmarkMetadata( 'reveman@chromium.org, chrome-gpu-perf-owners@chromium.org', 'Internals>GPU', False),
diff --git a/ui/display/display_switches.cc b/ui/display/display_switches.cc index 149a926..880fba6 100644 --- a/ui/display/display_switches.cc +++ b/ui/display/display_switches.cc
@@ -65,20 +65,27 @@ base::FEATURE_ENABLED_BY_DEFAULT}; #if defined(OS_CHROMEOS) +// Enables using the monitor's provided color space information when +// rendering. +// TODO(mcasas): remove this flag http://crbug.com/771345. +const base::Feature kUseMonitorColorSpace{"UseMonitorColorSpace", + base::FEATURE_ENABLED_BY_DEFAULT}; +#endif // OS_CHROMEOS + // Enables the slider in display settings to modify the display zoom/size. // TODO(malaykeshav): Remove this in M68 when the feature has been in stable for // atleast one milestone. constexpr base::Feature kEnableDisplayZoomSetting{ - "EnableDisplayZoomSetting", base::FEATURE_ENABLED_BY_DEFAULT}; - -// Enables using the monitor's provided color space information when rendering. -// TODO(mcasas): remove this flag http://crbug.com/771345. -const base::Feature kUseMonitorColorSpace{"UseMonitorColorSpace", - base::FEATURE_ENABLED_BY_DEFAULT}; + "EnableDisplayZoomSetting", +#if defined(OS_CHROMEOS) + base::FEATURE_ENABLED_BY_DEFAULT +#else + base::FEATURE_DISABLED_BY_DEFAULT +#endif +}; bool IsDisplayZoomSettingEnabled() { return base::FeatureList::IsEnabled(kEnableDisplayZoomSetting); } -#endif // OS_CHROMEOS } // namespace features
diff --git a/ui/display/display_switches.h b/ui/display/display_switches.h index 0a4b2428..f2377204 100644 --- a/ui/display/display_switches.h +++ b/ui/display/display_switches.h
@@ -35,12 +35,13 @@ DISPLAY_EXPORT extern const base::Feature kHighDynamicRange; #if defined(OS_CHROMEOS) -DISPLAY_EXPORT extern const base::Feature kEnableDisplayZoomSetting; DISPLAY_EXPORT extern const base::Feature kUseMonitorColorSpace; +#endif + +DISPLAY_EXPORT extern const base::Feature kEnableDisplayZoomSetting; // Returns true if experimental display zoom setting is enabled. DISPLAY_EXPORT bool IsDisplayZoomSettingEnabled(); -#endif } // namespace features
diff --git a/ui/display/manager/display_manager.cc b/ui/display/manager/display_manager.cc index 6cd5bd1..5301ee42 100644 --- a/ui/display/manager/display_manager.cc +++ b/ui/display/manager/display_manager.cc
@@ -655,11 +655,12 @@ Display::RotationSource::USER); display_info_[display_id].SetRotation(rotation, Display::RotationSource::ACTIVE); - // Just in case the preference file was corrupted. - // TODO(mukai): register |display_modes_| here as well, so the lookup for the - // default mode in GetActiveModeForDisplayId() gets much simpler. - if (0.5f <= ui_scale && ui_scale <= 2.0f) + + if (features::IsDisplayZoomSettingEnabled()) + display_info_[display_id].set_zoom_factor(display_zoom_factor); + else if (0.5f <= ui_scale && ui_scale <= 2.0f) display_info_[display_id].set_configured_ui_scale(ui_scale); + if (overscan_insets) display_info_[display_id].SetOverscanInsets(*overscan_insets); @@ -671,8 +672,6 @@ device_scale_factor); display_modes_[display_id] = mode; } - - display_info_[display_id].set_zoom_factor(display_zoom_factor); } bool DisplayManager::GetActiveModeForDisplayId(int64_t display_id,
diff --git a/ui/message_center/fake_message_center.cc b/ui/message_center/fake_message_center.cc index 7bc0491..94895b3 100644 --- a/ui/message_center/fake_message_center.cc +++ b/ui/message_center/fake_message_center.cc
@@ -124,6 +124,14 @@ return false; } +void FakeMessageCenter::SetHasMessageCenterView(bool has_message_center_view) { + has_message_center_view_ = has_message_center_view; +} + +bool FakeMessageCenter::HasMessageCenterView() const { + return has_message_center_view_; +} + void FakeMessageCenter::RestartPopupTimers() {} void FakeMessageCenter::PausePopupTimers() {}
diff --git a/ui/message_center/fake_message_center.h b/ui/message_center/fake_message_center.h index 0c4ad72..bc4a2b24 100644 --- a/ui/message_center/fake_message_center.h +++ b/ui/message_center/fake_message_center.h
@@ -63,6 +63,8 @@ void EnterQuietModeWithExpire(const base::TimeDelta& expires_in) override; void SetVisibility(Visibility visible) override; bool IsMessageCenterVisible() const override; + void SetHasMessageCenterView(bool has_message_center_view) override; + bool HasMessageCenterView() const override; void RestartPopupTimers() override; void PausePopupTimers() override; const base::string16& GetSystemNotificationAppName() const override; @@ -73,6 +75,7 @@ private: const NotificationList::Notifications empty_notifications_; + bool has_message_center_view_ = true; DISALLOW_COPY_AND_ASSIGN(FakeMessageCenter); };
diff --git a/ui/message_center/message_center.h b/ui/message_center/message_center.h index 493c1454..0d1ebefa 100644 --- a/ui/message_center/message_center.h +++ b/ui/message_center/message_center.h
@@ -175,6 +175,14 @@ // Allows querying the visibility of the center. virtual bool IsMessageCenterVisible() const = 0; + // Informs the MessageCenter whether there's a bubble anchored to a system + // tray which holds notifications. If false, only toasts are shown (e.g. on + // desktop Linux and Windows). When there's no message center view, updated + // notifications will be re-appear as toasts even if they've already been + // shown. + virtual void SetHasMessageCenterView(bool has_message_center_view) = 0; + virtual bool HasMessageCenterView() const = 0; + // UI classes should call this when there is cause to leave popups visible for // longer than the default (for example, when the mouse hovers over a popup). virtual void PausePopupTimers() = 0;
diff --git a/ui/message_center/message_center_impl.cc b/ui/message_center/message_center_impl.cc index b5d9e13..32aeed05 100644 --- a/ui/message_center/message_center_impl.cc +++ b/ui/message_center/message_center_impl.cc
@@ -109,6 +109,16 @@ return visible_; } +void MessageCenterImpl::SetHasMessageCenterView(bool has_message_center_view) { + DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); + has_message_center_view_ = has_message_center_view; +} + +bool MessageCenterImpl::HasMessageCenterView() const { + DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); + return has_message_center_view_; +} + size_t MessageCenterImpl::NotificationCount() const { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); return visible_notifications_.size();
diff --git a/ui/message_center/message_center_impl.h b/ui/message_center/message_center_impl.h index 36270ff..f4d08e0 100644 --- a/ui/message_center/message_center_impl.h +++ b/ui/message_center/message_center_impl.h
@@ -41,6 +41,8 @@ void RemoveNotificationBlocker(NotificationBlocker* blocker) override; void SetVisibility(Visibility visible) override; bool IsMessageCenterVisible() const override; + void SetHasMessageCenterView(bool has_message_center_view) override; + bool HasMessageCenterView() const override; size_t NotificationCount() const override; bool HasPopupNotifications() const override; bool IsQuietMode() const override; @@ -97,6 +99,7 @@ std::vector<NotificationBlocker*> blockers_; bool visible_ = false; + bool has_message_center_view_ = true; base::string16 system_notification_app_name_;
diff --git a/ui/message_center/notification_list.cc b/ui/message_center/notification_list.cc index a461bbf..6d9d5288 100644 --- a/ui/message_center/notification_list.cc +++ b/ui/message_center/notification_list.cc
@@ -96,15 +96,10 @@ if (iter == notifications_.end()) return; - Notification* notification = iter->first.get(); NotificationState state = iter->second; - // Handles priority promotion. If the notification is already dismissed but - // the updated notification has higher priority, it should re-appear as a - // toast. Notifications coming from websites through the Web Notification API - // will always re-appear on update. - if ((notification->priority() < new_notification->priority() || - new_notification->notifier_id().type == NotifierId::WEB_PAGE) && + if ((new_notification->renotify() || + !message_center_->HasMessageCenterView()) && !quiet_mode_) { state = NotificationState(); }
diff --git a/ui/message_center/notification_list_unittest.cc b/ui/message_center/notification_list_unittest.cc index 98ee4f84..0003d18 100644 --- a/ui/message_center/notification_list_unittest.cc +++ b/ui/message_center/notification_list_unittest.cc
@@ -81,7 +81,7 @@ } NotificationList::PopupNotifications GetPopups() { - return notification_list()->GetPopupNotifications(blockers_, NULL); + return notification_list_->GetPopupNotifications(blockers_, NULL); } size_t GetPopupCounts() { @@ -89,33 +89,30 @@ } Notification* GetNotification(const std::string& id) { - auto iter = notification_list()->GetNotification(id); - if (iter == notification_list()->notifications_.end()) + auto iter = notification_list_->GetNotification(id); + if (iter == notification_list_->notifications_.end()) return NULL; return iter->first.get(); } NotificationState GetNotificationState(const std::string& id) { - auto iter = notification_list()->GetNotification(id); - EXPECT_FALSE(iter == notification_list()->notifications_.end()); + auto iter = notification_list_->GetNotification(id); + EXPECT_FALSE(iter == notification_list_->notifications_.end()); return iter->second; } - NotificationList* notification_list() { return notification_list_.get(); } - const NotificationBlockers& blockers() const { return blockers_; } - static const char kIdFormat[]; static const char kTitleFormat[]; static const char kMessageFormat[]; static const char kDisplaySource[]; static const char kExtensionId[]; - private: std::unique_ptr<FakeMessageCenter> message_center_; std::unique_ptr<NotificationList> notification_list_; NotificationBlockers blockers_; size_t counter_; + private: DISALLOW_COPY_AND_ASSIGN(NotificationListTest); }; @@ -136,90 +133,89 @@ const char NotificationListTest::kExtensionId[] = "ext"; TEST_F(NotificationListTest, Basic) { - ASSERT_EQ(0u, notification_list()->NotificationCount(blockers())); + ASSERT_EQ(0u, notification_list_->NotificationCount(blockers_)); std::string id0 = AddNotification(); - EXPECT_EQ(1u, notification_list()->NotificationCount(blockers())); + EXPECT_EQ(1u, notification_list_->NotificationCount(blockers_)); std::string id1 = AddNotification(); - EXPECT_EQ(2u, notification_list()->NotificationCount(blockers())); + EXPECT_EQ(2u, notification_list_->NotificationCount(blockers_)); - EXPECT_TRUE(notification_list()->HasPopupNotifications(blockers())); - EXPECT_TRUE(notification_list()->GetNotificationById(id0)); - EXPECT_TRUE(notification_list()->GetNotificationById(id1)); - EXPECT_FALSE(notification_list()->GetNotificationById(id1 + "foo")); + EXPECT_TRUE(notification_list_->HasPopupNotifications(blockers_)); + EXPECT_TRUE(notification_list_->GetNotificationById(id0)); + EXPECT_TRUE(notification_list_->GetNotificationById(id1)); + EXPECT_FALSE(notification_list_->GetNotificationById(id1 + "foo")); EXPECT_EQ(2u, GetPopupCounts()); - notification_list()->MarkSinglePopupAsShown(id0, true); - notification_list()->MarkSinglePopupAsShown(id1, true); - EXPECT_EQ(2u, notification_list()->NotificationCount(blockers())); + notification_list_->MarkSinglePopupAsShown(id0, true); + notification_list_->MarkSinglePopupAsShown(id1, true); + EXPECT_EQ(2u, notification_list_->NotificationCount(blockers_)); EXPECT_EQ(0u, GetPopupCounts()); - notification_list()->RemoveNotification(id0); - EXPECT_EQ(1u, notification_list()->NotificationCount(blockers())); + notification_list_->RemoveNotification(id0); + EXPECT_EQ(1u, notification_list_->NotificationCount(blockers_)); AddNotification(); - EXPECT_EQ(2u, notification_list()->NotificationCount(blockers())); + EXPECT_EQ(2u, notification_list_->NotificationCount(blockers_)); } TEST_F(NotificationListTest, MessageCenterVisible) { AddNotification(); - EXPECT_EQ(1u, notification_list()->NotificationCount(blockers())); + EXPECT_EQ(1u, notification_list_->NotificationCount(blockers_)); ASSERT_EQ(1u, GetPopupCounts()); // Resets the unread count and popup counts. - notification_list()->SetNotificationsShown(blockers(), NULL); + notification_list_->SetNotificationsShown(blockers_, NULL); ASSERT_EQ(0u, GetPopupCounts()); } TEST_F(NotificationListTest, UpdateNotification) { std::string id0 = AddNotification(); std::string replaced = id0 + "_replaced"; - EXPECT_EQ(1u, notification_list()->NotificationCount(blockers())); + EXPECT_EQ(1u, notification_list_->NotificationCount(blockers_)); std::unique_ptr<Notification> notification(new Notification( NOTIFICATION_TYPE_SIMPLE, replaced, UTF8ToUTF16("newtitle"), UTF8ToUTF16("newbody"), gfx::Image(), UTF8ToUTF16(kDisplaySource), GURL(), NotifierId(NotifierId::APPLICATION, kExtensionId), RichNotificationData(), NULL)); - notification_list()->UpdateNotificationMessage(id0, std::move(notification)); - EXPECT_EQ(1u, notification_list()->NotificationCount(blockers())); + notification_list_->UpdateNotificationMessage(id0, std::move(notification)); + EXPECT_EQ(1u, notification_list_->NotificationCount(blockers_)); const NotificationList::Notifications notifications = - notification_list()->GetVisibleNotifications(blockers()); + notification_list_->GetVisibleNotifications(blockers_); EXPECT_EQ(replaced, (*notifications.begin())->id()); EXPECT_EQ(UTF8ToUTF16("newtitle"), (*notifications.begin())->title()); EXPECT_EQ(UTF8ToUTF16("newbody"), (*notifications.begin())->message()); } -TEST_F(NotificationListTest, UpdateNotificationWithPriority) { +TEST_F(NotificationListTest, UpdateNotificationWithRenotifyAndQuietMode) { for (size_t quiet_mode = 0u; quiet_mode < 2u; ++quiet_mode) { // Set Do Not Disturb mode. - notification_list()->SetQuietMode(static_cast<bool>(quiet_mode)); + notification_list_->SetQuietMode(static_cast<bool>(quiet_mode)); - // Create notification with default priority. + // Create notification. std::string old_id; auto old_notification = MakeNotification(&old_id); - old_notification->set_priority(DEFAULT_PRIORITY); - notification_list()->AddNotification(std::move(old_notification)); - notification_list()->MarkSinglePopupAsShown(old_id, true); - EXPECT_EQ(1u, notification_list()->NotificationCount(blockers())); + notification_list_->AddNotification(std::move(old_notification)); + notification_list_->MarkSinglePopupAsShown(old_id, true); + EXPECT_EQ(1u, notification_list_->NotificationCount(blockers_)); std::string new_id; auto new_notification = MakeNotification(&new_id); - // Set higher priority than one of the previous notification and update. - new_notification->set_priority(HIGH_PRIORITY); - notification_list()->UpdateNotificationMessage(old_id, - std::move(new_notification)); + // Set the renotify flag and update. + new_notification->set_renotify(true); + notification_list_->UpdateNotificationMessage(old_id, + std::move(new_notification)); const NotificationList::Notifications notifications = - notification_list()->GetVisibleNotifications(blockers()); - EXPECT_EQ(1u, notification_list()->NotificationCount(blockers())); + notification_list_->GetVisibleNotifications(blockers_); + EXPECT_EQ(1u, notification_list_->NotificationCount(blockers_)); EXPECT_EQ(new_id, (*notifications.begin())->id()); // Normally, |shown_as_popup| should be reset in order to show the popup // again. - // In quiet mode, |shown_as_popup| should not be reset , as popup should not - // be shown even though the priority is promoted. + // In quiet mode, |shown_as_popup| should not be reset, as popup should not + // be shown even though renotify was set. const NotificationList::PopupNotifications popup_notifications = - notification_list()->GetPopupNotifications(blockers(), nullptr); + notification_list_->GetPopupNotifications(blockers_, nullptr); if (quiet_mode) { ASSERT_EQ(0U, popup_notifications.size()); } else { @@ -238,35 +234,35 @@ NOTIFICATION_TYPE_SIMPLE, "id0", UTF8ToUTF16("title0"), UTF8ToUTF16("message0"), gfx::Image(), UTF8ToUTF16("source0"), GURL(), id0, RichNotificationData(), NULL)); - notification_list()->AddNotification(std::move(notification)); + notification_list_->AddNotification(std::move(notification)); notification.reset(new Notification( NOTIFICATION_TYPE_SIMPLE, "id1", UTF8ToUTF16("title1"), UTF8ToUTF16("message1"), gfx::Image(), UTF8ToUTF16("source0"), GURL(), id0, RichNotificationData(), NULL)); - notification_list()->AddNotification(std::move(notification)); + notification_list_->AddNotification(std::move(notification)); notification.reset(new Notification( NOTIFICATION_TYPE_SIMPLE, "id2", UTF8ToUTF16("title1"), UTF8ToUTF16("message1"), gfx::Image(), UTF8ToUTF16("source1"), GURL(), id0, RichNotificationData(), NULL)); - notification_list()->AddNotification(std::move(notification)); + notification_list_->AddNotification(std::move(notification)); notification.reset(new Notification( NOTIFICATION_TYPE_SIMPLE, "id3", UTF8ToUTF16("title1"), UTF8ToUTF16("message1"), gfx::Image(), UTF8ToUTF16("source2"), GURL(), id1, RichNotificationData(), NULL)); - notification_list()->AddNotification(std::move(notification)); + notification_list_->AddNotification(std::move(notification)); notification.reset(new Notification( NOTIFICATION_TYPE_SIMPLE, "id4", UTF8ToUTF16("title1"), UTF8ToUTF16("message1"), gfx::Image(), UTF8ToUTF16("source2"), GURL(), id2, RichNotificationData(), NULL)); - notification_list()->AddNotification(std::move(notification)); + notification_list_->AddNotification(std::move(notification)); notification.reset(new Notification( NOTIFICATION_TYPE_SIMPLE, "id5", UTF8ToUTF16("title1"), UTF8ToUTF16("message1"), gfx::Image(), UTF8ToUTF16("source2"), GURL(), id3, RichNotificationData(), NULL)); - notification_list()->AddNotification(std::move(notification)); + notification_list_->AddNotification(std::move(notification)); NotificationList::Notifications by_notifier_id = - notification_list()->GetNotificationsByNotifierId(id0); + notification_list_->GetNotificationsByNotifierId(id0); EXPECT_TRUE(IsInNotifications(by_notifier_id, "id0")); EXPECT_TRUE(IsInNotifications(by_notifier_id, "id1")); EXPECT_TRUE(IsInNotifications(by_notifier_id, "id2")); @@ -274,7 +270,7 @@ EXPECT_FALSE(IsInNotifications(by_notifier_id, "id4")); EXPECT_FALSE(IsInNotifications(by_notifier_id, "id5")); - by_notifier_id = notification_list()->GetNotificationsByNotifierId(id1); + by_notifier_id = notification_list_->GetNotificationsByNotifierId(id1); EXPECT_FALSE(IsInNotifications(by_notifier_id, "id0")); EXPECT_FALSE(IsInNotifications(by_notifier_id, "id1")); EXPECT_FALSE(IsInNotifications(by_notifier_id, "id2")); @@ -282,7 +278,7 @@ EXPECT_FALSE(IsInNotifications(by_notifier_id, "id4")); EXPECT_FALSE(IsInNotifications(by_notifier_id, "id5")); - by_notifier_id = notification_list()->GetNotificationsByNotifierId(id2); + by_notifier_id = notification_list_->GetNotificationsByNotifierId(id2); EXPECT_FALSE(IsInNotifications(by_notifier_id, "id0")); EXPECT_FALSE(IsInNotifications(by_notifier_id, "id1")); EXPECT_FALSE(IsInNotifications(by_notifier_id, "id2")); @@ -290,7 +286,7 @@ EXPECT_TRUE(IsInNotifications(by_notifier_id, "id4")); EXPECT_FALSE(IsInNotifications(by_notifier_id, "id5")); - by_notifier_id = notification_list()->GetNotificationsByNotifierId(id3); + by_notifier_id = notification_list_->GetNotificationsByNotifierId(id3); EXPECT_FALSE(IsInNotifications(by_notifier_id, "id0")); EXPECT_FALSE(IsInNotifications(by_notifier_id, "id1")); EXPECT_FALSE(IsInNotifications(by_notifier_id, "id2")); @@ -317,7 +313,7 @@ for (NotificationList::PopupNotifications::const_iterator iter = popups.begin(); iter != popups.end(); ++iter) { - notification_list()->MarkSinglePopupAsShown((*iter)->id(), false); + notification_list_->MarkSinglePopupAsShown((*iter)->id(), false); } popups.clear(); popups = GetPopups(); @@ -326,33 +322,33 @@ } TEST_F(NotificationListTest, Priority) { - ASSERT_EQ(0u, notification_list()->NotificationCount(blockers())); + ASSERT_EQ(0u, notification_list_->NotificationCount(blockers_)); // Default priority has the limit on the number of the popups. for (size_t i = 0; i <= kMaxVisiblePopupNotifications; ++i) AddNotification(); EXPECT_EQ(kMaxVisiblePopupNotifications + 1, - notification_list()->NotificationCount(blockers())); + notification_list_->NotificationCount(blockers_)); EXPECT_EQ(kMaxVisiblePopupNotifications, GetPopupCounts()); // Low priority: not visible to popups. - notification_list()->SetNotificationsShown(blockers(), NULL); + notification_list_->SetNotificationsShown(blockers_, NULL); AddPriorityNotification(LOW_PRIORITY); EXPECT_EQ(kMaxVisiblePopupNotifications + 2, - notification_list()->NotificationCount(blockers())); + notification_list_->NotificationCount(blockers_)); EXPECT_EQ(0u, GetPopupCounts()); // Minimum priority: doesn't update the unread count. AddPriorityNotification(MIN_PRIORITY); EXPECT_EQ(kMaxVisiblePopupNotifications + 3, - notification_list()->NotificationCount(blockers())); + notification_list_->NotificationCount(blockers_)); EXPECT_EQ(0u, GetPopupCounts()); NotificationList::Notifications notifications = - notification_list()->GetVisibleNotifications(blockers()); + notification_list_->GetVisibleNotifications(blockers_); for (NotificationList::Notifications::const_iterator iter = notifications.begin(); iter != notifications.end(); ++iter) { - notification_list()->RemoveNotification((*iter)->id()); + notification_list_->RemoveNotification((*iter)->id()); } // Higher priority: no limits to the number of popups. @@ -361,12 +357,12 @@ for (size_t i = 0; i < kMaxVisiblePopupNotifications * 2; ++i) AddPriorityNotification(MAX_PRIORITY); EXPECT_EQ(kMaxVisiblePopupNotifications * 4, - notification_list()->NotificationCount(blockers())); + notification_list_->NotificationCount(blockers_)); EXPECT_EQ(kMaxVisiblePopupNotifications * 4, GetPopupCounts()); } TEST_F(NotificationListTest, HasPopupsWithPriority) { - ASSERT_EQ(0u, notification_list()->NotificationCount(blockers())); + ASSERT_EQ(0u, notification_list_->NotificationCount(blockers_)); AddPriorityNotification(MIN_PRIORITY); AddPriorityNotification(MAX_PRIORITY); @@ -375,7 +371,7 @@ } TEST_F(NotificationListTest, HasPopupsWithSystemPriority) { - ASSERT_EQ(0u, notification_list()->NotificationCount(blockers())); + ASSERT_EQ(0u, notification_list_->NotificationCount(blockers_)); std::string normal_id = AddPriorityNotification(DEFAULT_PRIORITY); std::string system_id = AddNotification(); @@ -383,47 +379,82 @@ EXPECT_EQ(2u, GetPopupCounts()); - notification_list()->MarkSinglePopupAsDisplayed(normal_id); - notification_list()->MarkSinglePopupAsDisplayed(system_id); + notification_list_->MarkSinglePopupAsDisplayed(normal_id); + notification_list_->MarkSinglePopupAsDisplayed(system_id); - notification_list()->MarkSinglePopupAsShown(normal_id, false); - notification_list()->MarkSinglePopupAsShown(system_id, false); + notification_list_->MarkSinglePopupAsShown(normal_id, false); + notification_list_->MarkSinglePopupAsShown(system_id, false); - notification_list()->SetNotificationsShown(blockers(), NULL); + notification_list_->SetNotificationsShown(blockers_, NULL); EXPECT_EQ(1u, GetPopupCounts()); // Mark as read -- emulation of mouse click. - notification_list()->MarkSinglePopupAsShown(system_id, true); + notification_list_->MarkSinglePopupAsShown(system_id, true); EXPECT_EQ(0u, GetPopupCounts()); } -TEST_F(NotificationListTest, PriorityPromotion) { - std::string id0 = AddPriorityNotification(LOW_PRIORITY); +// Verifies that notification updates will re-show the toast when there is no +// message center view (i.e. the bubble anchored to the status bar). +TEST_F(NotificationListTest, UpdateWithoutMessageCenterView) { + auto run_test = [this](bool has_message_center_view) { + message_center_->SetHasMessageCenterView(has_message_center_view); + std::string id0 = AddNotification(); + std::string replaced = id0 + "_replaced"; + notification_list_->MarkSinglePopupAsShown(id0, false); + EXPECT_EQ(1u, notification_list_->NotificationCount(blockers_)); + EXPECT_EQ(0u, GetPopupCounts()); + + RichNotificationData optional; + std::unique_ptr<Notification> notification(new Notification( + NOTIFICATION_TYPE_SIMPLE, replaced, UTF8ToUTF16("newtitle"), + UTF8ToUTF16("newbody"), gfx::Image(), UTF8ToUTF16(kDisplaySource), + GURL(), NotifierId(NotifierId::APPLICATION, kExtensionId), optional, + NULL)); + notification_list_->UpdateNotificationMessage(id0, std::move(notification)); + EXPECT_EQ(1u, notification_list_->NotificationCount(blockers_)); + EXPECT_EQ(has_message_center_view ? 0U : 1U, GetPopupCounts()); + const NotificationList::Notifications notifications = + notification_list_->GetVisibleNotifications(blockers_); + EXPECT_EQ(replaced, (*notifications.begin())->id()); + EXPECT_EQ(UTF8ToUTF16("newtitle"), (*notifications.begin())->title()); + EXPECT_EQ(UTF8ToUTF16("newbody"), (*notifications.begin())->message()); + + notification_list_->RemoveNotification(replaced); + EXPECT_EQ(0U, + notification_list_->GetVisibleNotifications(blockers_).size()); + }; + + run_test(false); + run_test(true); +} + +TEST_F(NotificationListTest, Renotify) { + std::string id0 = AddNotification(); std::string replaced = id0 + "_replaced"; - EXPECT_EQ(1u, notification_list()->NotificationCount(blockers())); + notification_list_->MarkSinglePopupAsShown(id0, false); + EXPECT_EQ(1u, notification_list_->NotificationCount(blockers_)); EXPECT_EQ(0u, GetPopupCounts()); RichNotificationData optional; - optional.priority = 1; + optional.renotify = true; std::unique_ptr<Notification> notification(new Notification( NOTIFICATION_TYPE_SIMPLE, replaced, UTF8ToUTF16("newtitle"), UTF8ToUTF16("newbody"), gfx::Image(), UTF8ToUTF16(kDisplaySource), GURL(), NotifierId(NotifierId::APPLICATION, kExtensionId), optional, NULL)); - notification_list()->UpdateNotificationMessage(id0, std::move(notification)); - EXPECT_EQ(1u, notification_list()->NotificationCount(blockers())); + notification_list_->UpdateNotificationMessage(id0, std::move(notification)); + EXPECT_EQ(1u, notification_list_->NotificationCount(blockers_)); EXPECT_EQ(1u, GetPopupCounts()); const NotificationList::Notifications notifications = - notification_list()->GetVisibleNotifications(blockers()); + notification_list_->GetVisibleNotifications(blockers_); EXPECT_EQ(replaced, (*notifications.begin())->id()); EXPECT_EQ(UTF8ToUTF16("newtitle"), (*notifications.begin())->title()); EXPECT_EQ(UTF8ToUTF16("newbody"), (*notifications.begin())->message()); - EXPECT_EQ(1, (*notifications.begin())->priority()); } -TEST_F(NotificationListTest, PriorityPromotionWithPopups) { +TEST_F(NotificationListTest, PriorityAndRenotify) { std::string id0 = AddPriorityNotification(LOW_PRIORITY); std::string id1 = AddPriorityNotification(DEFAULT_PRIORITY); EXPECT_EQ(1u, GetPopupCounts()); - notification_list()->MarkSinglePopupAsShown(id1, true); + notification_list_->MarkSinglePopupAsShown(id1, true); EXPECT_EQ(0u, GetPopupCounts()); // id0 promoted to LOW->DEFAULT, it'll appear as toast (popup). @@ -433,9 +464,9 @@ NOTIFICATION_TYPE_SIMPLE, id0, UTF8ToUTF16("newtitle"), UTF8ToUTF16("newbody"), gfx::Image(), UTF8ToUTF16(kDisplaySource), GURL(), NotifierId(NotifierId::APPLICATION, kExtensionId), priority, NULL)); - notification_list()->UpdateNotificationMessage(id0, std::move(notification)); + notification_list_->UpdateNotificationMessage(id0, std::move(notification)); EXPECT_EQ(1u, GetPopupCounts()); - notification_list()->MarkSinglePopupAsShown(id0, true); + notification_list_->MarkSinglePopupAsShown(id0, true); EXPECT_EQ(0u, GetPopupCounts()); // update with no promotion change for id0, it won't appear as a toast. @@ -444,70 +475,28 @@ UTF8ToUTF16("newbody2"), gfx::Image(), UTF8ToUTF16(kDisplaySource), GURL(), NotifierId(NotifierId::APPLICATION, kExtensionId), priority, NULL)); - notification_list()->UpdateNotificationMessage(id0, std::move(notification)); + notification_list_->UpdateNotificationMessage(id0, std::move(notification)); EXPECT_EQ(0u, GetPopupCounts()); - // id1 promoted to DEFAULT->HIGH, it'll appear as toast (popup). + // id1 promoted to DEFAULT->HIGH, it won't reappear as a toast (popup). priority.priority = HIGH_PRIORITY; notification.reset(new Notification( NOTIFICATION_TYPE_SIMPLE, id1, UTF8ToUTF16("newtitle"), UTF8ToUTF16("newbody"), gfx::Image(), UTF8ToUTF16(kDisplaySource), GURL(), NotifierId(NotifierId::APPLICATION, kExtensionId), priority, NULL)); - notification_list()->UpdateNotificationMessage(id1, std::move(notification)); - EXPECT_EQ(1u, GetPopupCounts()); - notification_list()->MarkSinglePopupAsShown(id1, true); + notification_list_->UpdateNotificationMessage(id1, std::move(notification)); EXPECT_EQ(0u, GetPopupCounts()); - // id1 promoted to HIGH->MAX, it'll appear as toast again. - priority.priority = MAX_PRIORITY; + // |renotify| will make it reappear as a toast (popup). + priority.renotify = true; notification.reset(new Notification( - NOTIFICATION_TYPE_SIMPLE, id1, UTF8ToUTF16("newtitle2"), - UTF8ToUTF16("newbody2"), gfx::Image(), UTF8ToUTF16(kDisplaySource), - GURL(), NotifierId(NotifierId::APPLICATION, kExtensionId), priority, - NULL)); - notification_list()->UpdateNotificationMessage(id1, std::move(notification)); + NOTIFICATION_TYPE_SIMPLE, id1, UTF8ToUTF16("newtitle"), + UTF8ToUTF16("newbody"), gfx::Image(), UTF8ToUTF16(kDisplaySource), GURL(), + NotifierId(NotifierId::APPLICATION, kExtensionId), priority, NULL)); + notification_list_->UpdateNotificationMessage(id1, std::move(notification)); EXPECT_EQ(1u, GetPopupCounts()); - notification_list()->MarkSinglePopupAsShown(id1, true); + notification_list_->MarkSinglePopupAsShown(id1, true); EXPECT_EQ(0u, GetPopupCounts()); - - // id1 demoted to MAX->DEFAULT, no appearing as toast. - priority.priority = DEFAULT_PRIORITY; - notification.reset(new Notification( - NOTIFICATION_TYPE_SIMPLE, id1, UTF8ToUTF16("newtitle3"), - UTF8ToUTF16("newbody3"), gfx::Image(), UTF8ToUTF16(kDisplaySource), - GURL(), NotifierId(NotifierId::APPLICATION, kExtensionId), priority, - NULL)); - notification_list()->UpdateNotificationMessage(id1, std::move(notification)); - EXPECT_EQ(0u, GetPopupCounts()); -} - -TEST_F(NotificationListTest, WebNotificationUpdatePromotion) { - std::string notification_id = "replaced-web-notification"; - std::unique_ptr<Notification> original_notification(new Notification( - NOTIFICATION_TYPE_SIMPLE, notification_id, - UTF8ToUTF16("Web Notification"), UTF8ToUTF16("Notification contents"), - gfx::Image(), UTF8ToUTF16(kDisplaySource), GURL(), - NotifierId(GURL("https://example.com/")), RichNotificationData(), NULL)); - - EXPECT_EQ(0u, GetPopupCounts()); - notification_list()->AddNotification(std::move(original_notification)); - EXPECT_EQ(1u, GetPopupCounts()); - - notification_list()->MarkSinglePopupAsShown(notification_id, true); - EXPECT_EQ(0u, GetPopupCounts()); - - std::unique_ptr<Notification> replaced_notification(new Notification( - NOTIFICATION_TYPE_SIMPLE, notification_id, - UTF8ToUTF16("Web Notification Replacement"), - UTF8ToUTF16("New notification contents"), gfx::Image(), - UTF8ToUTF16(kDisplaySource), GURL(), - NotifierId(GURL("https://example.com/")), RichNotificationData(), NULL)); - - // Web Notifications will be re-shown as popups even if their priority didn't - // change, to match the behavior of the Web Notification API. - notification_list()->UpdateNotificationMessage( - notification_id, std::move(replaced_notification)); - EXPECT_EQ(1u, GetPopupCounts()); } TEST_F(NotificationListTest, NotificationOrderAndPriority) { @@ -541,7 +530,7 @@ { // Notifications: high priority comes ealier. const NotificationList::Notifications notifications = - notification_list()->GetVisibleNotifications(blockers()); + notification_list_->GetVisibleNotifications(blockers_); EXPECT_EQ(3u, notifications.size()); NotificationList::Notifications::const_iterator iter = notifications.begin(); @@ -557,23 +546,23 @@ std::string id1 = AddNotification(); std::string id2 = AddNotification(); std::string id3 = AddNotification(); - ASSERT_EQ(3u, notification_list()->NotificationCount(blockers())); + ASSERT_EQ(3u, notification_list_->NotificationCount(blockers_)); ASSERT_EQ(std::min(static_cast<size_t>(3u), kMaxVisiblePopupNotifications), GetPopupCounts()); - notification_list()->MarkSinglePopupAsDisplayed(id1); - notification_list()->MarkSinglePopupAsDisplayed(id2); - notification_list()->MarkSinglePopupAsDisplayed(id3); + notification_list_->MarkSinglePopupAsDisplayed(id1); + notification_list_->MarkSinglePopupAsDisplayed(id2); + notification_list_->MarkSinglePopupAsDisplayed(id3); - notification_list()->MarkSinglePopupAsShown(id2, true); - notification_list()->MarkSinglePopupAsShown(id3, false); - EXPECT_EQ(3u, notification_list()->NotificationCount(blockers())); + notification_list_->MarkSinglePopupAsShown(id2, true); + notification_list_->MarkSinglePopupAsShown(id3, false); + EXPECT_EQ(3u, notification_list_->NotificationCount(blockers_)); EXPECT_EQ(1u, GetPopupCounts()); NotificationList::PopupNotifications popups = GetPopups(); EXPECT_EQ(id1, (*popups.begin())->id()); // The notifications in the NotificationCenter are unaffected by popups shown. NotificationList::Notifications notifications = - notification_list()->GetVisibleNotifications(blockers()); + notification_list_->GetVisibleNotifications(blockers_); NotificationList::Notifications::const_iterator iter = notifications.begin(); EXPECT_EQ(id3, (*iter)->id()); iter++; @@ -585,8 +574,8 @@ TEST_F(NotificationListTest, UpdateAfterMarkedAsShown) { std::string id1 = AddNotification(); std::string id2 = AddNotification(); - notification_list()->MarkSinglePopupAsDisplayed(id1); - notification_list()->MarkSinglePopupAsDisplayed(id2); + notification_list_->MarkSinglePopupAsDisplayed(id1); + notification_list_->MarkSinglePopupAsDisplayed(id2); EXPECT_EQ(2u, GetPopupCounts()); @@ -594,7 +583,7 @@ EXPECT_FALSE(n1_state.shown_as_popup); EXPECT_TRUE(n1_state.is_read); - notification_list()->MarkSinglePopupAsShown(id1, true); + notification_list_->MarkSinglePopupAsShown(id1, true); n1_state = GetNotificationState(id1); EXPECT_TRUE(n1_state.shown_as_popup); @@ -606,7 +595,7 @@ UTF8ToUTF16("newbody"), gfx::Image(), UTF8ToUTF16(kDisplaySource), GURL(), NotifierId(NotifierId::APPLICATION, kExtensionId), RichNotificationData(), NULL)); - notification_list()->UpdateNotificationMessage(id1, std::move(notification)); + notification_list_->UpdateNotificationMessage(id1, std::move(notification)); Notification* n1 = GetNotification(id1); EXPECT_TRUE(n1 == NULL); const NotificationState nr_state = GetNotificationState(replaced); @@ -615,16 +604,16 @@ } TEST_F(NotificationListTest, QuietMode) { - notification_list()->SetQuietMode(true); + notification_list_->SetQuietMode(true); AddNotification(); AddPriorityNotification(HIGH_PRIORITY); AddPriorityNotification(MAX_PRIORITY); - EXPECT_EQ(3u, notification_list()->NotificationCount(blockers())); + EXPECT_EQ(3u, notification_list_->NotificationCount(blockers_)); EXPECT_EQ(0u, GetPopupCounts()); - notification_list()->SetQuietMode(false); + notification_list_->SetQuietMode(false); AddNotification(); - EXPECT_EQ(4u, notification_list()->NotificationCount(blockers())); + EXPECT_EQ(4u, notification_list_->NotificationCount(blockers_)); EXPECT_EQ(1u, GetPopupCounts()); // TODO(mukai): Add test of quiet mode with expiration. @@ -634,19 +623,19 @@ std::string id = AddNotification(); EXPECT_TRUE( - notification_list()->HasNotificationOfType(id, NOTIFICATION_TYPE_SIMPLE)); - EXPECT_FALSE(notification_list()->HasNotificationOfType( + notification_list_->HasNotificationOfType(id, NOTIFICATION_TYPE_SIMPLE)); + EXPECT_FALSE(notification_list_->HasNotificationOfType( id, NOTIFICATION_TYPE_PROGRESS)); std::unique_ptr<Notification> updated_notification( new Notification(NOTIFICATION_TYPE_PROGRESS, id, UTF8ToUTF16("updated"), UTF8ToUTF16("updated"), gfx::Image(), base::string16(), GURL(), NotifierId(), RichNotificationData(), NULL)); - notification_list()->AddNotification(std::move(updated_notification)); + notification_list_->AddNotification(std::move(updated_notification)); EXPECT_FALSE( - notification_list()->HasNotificationOfType(id, NOTIFICATION_TYPE_SIMPLE)); - EXPECT_TRUE(notification_list()->HasNotificationOfType( + notification_list_->HasNotificationOfType(id, NOTIFICATION_TYPE_SIMPLE)); + EXPECT_TRUE(notification_list_->HasNotificationOfType( id, NOTIFICATION_TYPE_PROGRESS)); }
diff --git a/ui/message_center/public/mojo/notification.mojom b/ui/message_center/public/mojo/notification.mojom index 823517c..5edb4301 100644 --- a/ui/message_center/public/mojo/notification.mojom +++ b/ui/message_center/public/mojo/notification.mojom
@@ -62,7 +62,7 @@ bool should_make_spoken_feedback_for_popup_updates; bool pinned; // |vibration_pattern| intentionally omitted - // |renotify| intentionally omitted + bool renotify; // |silent| intentionally omitted mojo_base.mojom.String16 accessible_name; string vector_small_image_id;
diff --git a/ui/message_center/public/mojo/notification_struct_traits.cc b/ui/message_center/public/mojo/notification_struct_traits.cc index 0a51cb6..3be5846 100644 --- a/ui/message_center/public/mojo/notification_struct_traits.cc +++ b/ui/message_center/public/mojo/notification_struct_traits.cc
@@ -117,6 +117,11 @@ } // static +bool RichNotificationDataStructTraits::renotify(const RichNotificationData& r) { + return r.renotify; +} + +// static const base::string16& RichNotificationDataStructTraits::accessible_name( const RichNotificationData& r) { return r.accessible_name; @@ -166,6 +171,7 @@ out->should_make_spoken_feedback_for_popup_updates = data.should_make_spoken_feedback_for_popup_updates(); out->pinned = data.pinned(); + out->renotify = data.renotify(); // Look up the vector icon by ID. This will only work if RegisterVectorIcon // has been called with an appropriate icon.
diff --git a/ui/message_center/public/mojo/notification_struct_traits.h b/ui/message_center/public/mojo/notification_struct_traits.h index 4c35d5f..e2c68cb 100644 --- a/ui/message_center/public/mojo/notification_struct_traits.h +++ b/ui/message_center/public/mojo/notification_struct_traits.h
@@ -176,6 +176,7 @@ static bool should_make_spoken_feedback_for_popup_updates( const message_center::RichNotificationData& r); static bool pinned(const message_center::RichNotificationData& r); + static bool renotify(const message_center::RichNotificationData& r); static const base::string16& accessible_name( const message_center::RichNotificationData& r); static std::string vector_small_image_id(
diff --git a/ui/message_center/public/mojo/struct_traits_unittest.cc b/ui/message_center/public/mojo/struct_traits_unittest.cc index 39e8dca..faefc69 100644 --- a/ui/message_center/public/mojo/struct_traits_unittest.cc +++ b/ui/message_center/public/mojo/struct_traits_unittest.cc
@@ -49,6 +49,8 @@ .should_make_spoken_feedback_for_popup_updates, output.rich_notification_data() .should_make_spoken_feedback_for_popup_updates); + EXPECT_EQ(input.pinned(), output.pinned()); + EXPECT_EQ(input.renotify(), output.renotify()); EXPECT_EQ(input.accessible_name(), output.accessible_name()); EXPECT_EQ(input.accent_color(), output.accent_color()); EXPECT_EQ(input.should_show_settings_button(),
diff --git a/ui/webui/resources/cr_components/chromeos/network/network_config.js b/ui/webui/resources/cr_components/chromeos/network/network_config.js index 009b505..0b6ada22 100644 --- a/ui/webui/resources/cr_components/chromeos/network/network_config.js +++ b/ui/webui/resources/cr_components/chromeos/network/network_config.js
@@ -311,6 +311,7 @@ 'updateIsConfigured_(configProperties_, eapProperties_.*)', 'updateIsConfigured_(configProperties_.WiFi.*)', 'updateIsConfigured_(configProperties_.VPN.*, vpnType_)', + 'updateIsConfigured_(selectedUserCertHash_)', ], /** @const */
