Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(397)

Unified Diff: third_party/openh264/BUILD.gn

Issue 2651183003: Reland of Add assembly for x86 to OpenH264 encoder (Closed)
Patch Set: Rewrite tests for using assembler, don't assemble on msan Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/openh264/BUILD.gn
diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
index 4301abd65e1ad83b9156bd46b2d9b750270be0b8..7b9d4588b80701c517bbba309b3806d9e3627232 100644
--- a/third_party/openh264/BUILD.gn
+++ b/third_party/openh264/BUILD.gn
@@ -2,8 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/sanitizers/sanitizers.gni")
import("//third_party/openh264/openh264_args.gni")
import("//third_party/openh264/openh264_sources.gni")
+import("//third_party/yasm/yasm_assemble.gni")
# Config shared by all openh264 targets.
config("config") {
@@ -28,6 +30,77 @@ config("config") {
}
}
+# YASM assembly is only checked to be working on Windows and Linux.
+# Mac is known to fail certain tests when building, but actual assembly
+# is believed to work.
+# MSAN builds are flaky with assembler. crbug.com/685168
+
+use_assembler = (is_win || is_linux) &&
+ (target_cpu == "x86" || target_cpu == "x64") && !is_msan
+
+# This IF statement will make the targets visible only on specific builds,
+# which will lead to failures on other platforms if accidentally invoked.
+if (use_assembler) {
+ yasm_assemble("openh264_common_yasm") {
+ include_dirs = openh264_common_include_dirs
+ sources = openh264_common_sources_asm_x86
+ if (target_cpu == "x86") {
+ defines = [ "X86_32" ]
+ } else { # x64
+ if (is_mac) {
+ defines = [
+ "PREFIX",
+ "UNIX64",
+ ]
+ } else if (is_win) {
+ defines = [ "WIN64" ]
+ } else if (is_linux) {
+ defines = [ "UNIX64" ]
+ }
+ }
+ }
+
+ yasm_assemble("openh264_processing_yasm") {
+ include_dirs = openh264_processing_include_dirs
+ include_dirs += [ "./src/codec/common/x86" ]
+ sources = openh264_processing_sources_asm_x86
+ if (target_cpu == "x86") {
+ defines = [ "X86_32" ]
+ } else { # x64
+ if (is_mac) {
+ defines = [
+ "PREFIX",
+ "UNIX64",
+ ]
+ } else if (is_win) {
+ defines = [ "WIN64" ]
+ } else if (is_linux) {
+ defines = [ "UNIX64" ]
+ }
+ }
+ }
+
+ yasm_assemble("openh264_encoder_yasm") {
+ include_dirs = openh264_encoder_include_dirs
+ include_dirs += [ "./src/codec/common/x86" ]
+ sources = openh264_encoder_sources_asm_x86
+ if (target_cpu == "x86") {
+ defines = [ "X86_32" ]
+ } else { # x64
+ if (is_mac) {
+ defines = [
+ "PREFIX",
+ "UNIX64",
+ ]
+ } else if (is_win) {
+ defines = [ "WIN64" ]
+ } else if (is_linux) {
+ defines = [ "UNIX64" ]
+ }
+ }
+ }
+} # if (is_win || is_linux)
+
source_set("common") {
sources = openh264_common_sources
include_dirs = openh264_common_include_dirs
@@ -36,6 +109,10 @@ source_set("common") {
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":config" ]
deps = []
+ if (use_assembler) {
+ defines = [ "X86_ASM" ]
+ deps += [ ":openh264_common_yasm" ]
+ }
if (is_android) {
deps += [
# Defines "android_get/setCpu..." functions. The original OpenH264 build
@@ -57,6 +134,10 @@ source_set("processing") {
deps = [
":common",
]
+ if (use_assembler) {
+ defines = [ "X86_ASM" ]
+ deps += [ ":openh264_processing_yasm" ]
+ }
}
source_set("encoder") {
@@ -76,4 +157,8 @@ source_set("encoder") {
":common",
":processing",
]
+ if (use_assembler) {
+ defines = [ "X86_ASM" ]
+ deps += [ ":openh264_encoder_yasm" ]
+ }
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698