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

Side by Side Diff: media/base/BUILD.gn

Issue 1152053004: Remove a few _sse2 targets now that we build with -msse2 everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: drunk Created 5 years, 6 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 unified diff | Download patch
« no previous file with comments | « cc/cc.gyp ('k') | media/media.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/arm.gni") 6 import("//build/config/arm.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//build/config/linux/pkg_config.gni") 9 import("//build/config/linux/pkg_config.gni")
10 import("//media/media_options.gni") 10 import("//media/media_options.gni")
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 265
266 # Required by video_frame.cc. 266 # Required by video_frame.cc.
267 libs = [ "CoreVideo.framework" ] 267 libs = [ "CoreVideo.framework" ]
268 } else if (is_win) { 268 } else if (is_win) {
269 sources += [ "user_input_monitor_win.cc" ] 269 sources += [ "user_input_monitor_win.cc" ]
270 } else { 270 } else {
271 defines += [ "DISABLE_USER_INPUT_MONITOR" ] 271 defines += [ "DISABLE_USER_INPUT_MONITOR" ]
272 } 272 }
273 273
274 if (current_cpu == "x86" || current_cpu == "x64") { 274 if (current_cpu == "x86" || current_cpu == "x64") {
275 sources += [ "simd/convert_yuv_to_rgb_x86.cc" ] 275 sources += [
276 deps += [ 276 "simd/convert_rgb_to_yuv_sse2.cc",
277 ":media_yasm", 277 "simd/convert_rgb_to_yuv_ssse3.cc",
278 ":media_sse2", 278 "simd/convert_yuv_to_rgb_x86.cc",
279 "simd/filter_yuv_sse2.cc",
279 ] 280 ]
281 deps += [ ":media_yasm" ]
280 } 282 }
281 283
282 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 284 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
283 285
284 if (is_linux || is_win) { 286 if (is_linux || is_win) {
285 sources += [ 287 sources += [
286 "keyboard_event_counter.cc", 288 "keyboard_event_counter.cc",
287 "keyboard_event_counter.h", 289 "keyboard_event_counter.h",
288 ] 290 ]
289 } 291 }
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 if (media_use_ffmpeg) { 459 if (media_use_ffmpeg) {
458 sources += [ "demuxer_perftest.cc" ] 460 sources += [ "demuxer_perftest.cc" ]
459 } 461 }
460 462
461 if (is_android) { 463 if (is_android) {
462 deps += [ "//ui/gl" ] 464 deps += [ "//ui/gl" ]
463 } 465 }
464 } 466 }
465 467
466 if (current_cpu == "x86" || current_cpu == "x64") { 468 if (current_cpu == "x86" || current_cpu == "x64") {
467 source_set("media_sse2") {
468 sources = [
469 "simd/convert_rgb_to_yuv_sse2.cc",
470 "simd/convert_rgb_to_yuv_ssse3.cc",
471 "simd/filter_yuv_sse2.cc",
472 ]
473 configs += [
474 "//media:media_config",
475 "//media:media_implementation",
476 ]
477 if (!is_win) {
478 cflags = [ "-msse2" ]
479 }
480 }
481
482 import("//third_party/yasm/yasm_assemble.gni") 469 import("//third_party/yasm/yasm_assemble.gni")
483 yasm_assemble("media_yasm") { 470 yasm_assemble("media_yasm") {
484 sources = [ 471 sources = [
485 "simd/convert_rgb_to_yuv_ssse3.asm", 472 "simd/convert_rgb_to_yuv_ssse3.asm",
486 "simd/convert_yuv_to_rgb_sse.asm", 473 "simd/convert_yuv_to_rgb_sse.asm",
487 "simd/convert_yuva_to_argb_mmx.asm", 474 "simd/convert_yuva_to_argb_mmx.asm",
488 "simd/empty_register_state_mmx.asm", 475 "simd/empty_register_state_mmx.asm",
489 "simd/linear_scale_yuv_to_rgb_mmx.asm", 476 "simd/linear_scale_yuv_to_rgb_mmx.asm",
490 "simd/linear_scale_yuv_to_rgb_sse.asm", 477 "simd/linear_scale_yuv_to_rgb_sse.asm",
491 "simd/scale_yuv_to_rgb_mmx.asm", 478 "simd/scale_yuv_to_rgb_mmx.asm",
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 if (is_posix) { 519 if (is_posix) {
533 yasm_flags += [ "-DELF" ] 520 yasm_flags += [ "-DELF" ]
534 if (current_cpu == "x64") { 521 if (current_cpu == "x64") {
535 # TODO(ajwong): Why isn't this true in mac? 522 # TODO(ajwong): Why isn't this true in mac?
536 yasm_flags += [ "-DPIC" ] 523 yasm_flags += [ "-DPIC" ]
537 } 524 }
538 } 525 }
539 } 526 }
540 } 527 }
541 } 528 }
OLDNEW
« no previous file with comments | « cc/cc.gyp ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698