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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/common/BUILD.gn

Issue 1882373004: Migrate content/common/gpu/media code to media/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Squash and rebase Created 4 years, 8 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
« content/DEPS ('K') | « content/DEPS ('k') | content/common/common.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/BUILD.gn
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 721df2d2ffff5ad02470ac8cfefa9fe9f6a2f107..2a59883430a832b068859ac30f56da596561376a 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -11,120 +11,6 @@ if (is_mac) {
import("//build/config/mac/mac_sdk.gni")
}
-if (is_chromeos && current_cpu != "arm") {
- action("libva_generate_stubs") {
- extra_header = "gpu/media/va_stub_header.fragment"
-
- script = "../../tools/generate_stubs/generate_stubs.py"
- sources = [
- "gpu/media/va.sigs",
- ]
- inputs = [
- extra_header,
- ]
- if (use_x11) {
- sources += [ "gpu/media/va_x11.sigs" ]
- }
- if (use_ozone) {
- sources += [ "gpu/media/va_drm.sigs" ]
- }
- stubs_filename_root = "va_stubs"
-
- outputs = [
- "$target_gen_dir/gpu/media/$stubs_filename_root.cc",
- "$target_gen_dir/gpu/media/$stubs_filename_root.h",
- ]
- args = [
- "-i",
- rebase_path("$target_gen_dir/gpu/media", root_build_dir),
- "-o",
- rebase_path("$target_gen_dir/gpu/media", root_build_dir),
- "-t",
- "posix_stubs",
- "-e",
- rebase_path(extra_header, root_build_dir),
- "-s",
- stubs_filename_root,
- "-p",
- "content/common/gpu/media",
- ]
-
- args += rebase_path(sources, root_build_dir)
- }
-}
-
-if (is_chromeos && use_v4lplugin) {
- action("libv4l2_generate_stubs") {
- extra_header = "gpu/media/v4l2_stub_header.fragment"
-
- script = "../../tools/generate_stubs/generate_stubs.py"
- sources = [
- "gpu/media/v4l2.sig",
- ]
- inputs = [
- extra_header,
- ]
- stubs_filename_root = "v4l2_stubs"
-
- outputs = [
- "$target_gen_dir/gpu/media/$stubs_filename_root.cc",
- "$target_gen_dir/gpu/media/$stubs_filename_root.h",
- ]
- args = [
- "-i",
- rebase_path("$target_gen_dir/gpu/media", root_build_dir),
- "-o",
- rebase_path("$target_gen_dir/gpu/media", root_build_dir),
- "-t",
- "posix_stubs",
- "-e",
- rebase_path(extra_header, root_build_dir),
- "-s",
- stubs_filename_root,
- "-p",
- "content/common/gpu/media",
- ]
-
- args += rebase_path(sources, root_build_dir)
- }
-}
-
-if (is_mac) {
- action("libvt_generate_stubs") {
- extra_header = "gpu/media/vt_stubs_header.fragment"
-
- script = "../../tools/generate_stubs/generate_stubs.py"
- sources = [
- "gpu/media/vt.sig",
- ]
- inputs = [
- extra_header,
- ]
- stubs_filename_root = "vt_stubs"
-
- outputs = [
- "$target_gen_dir/gpu/media/$stubs_filename_root.cc",
- "$target_gen_dir/gpu/media/$stubs_filename_root.h",
- ]
- args = [
- "-i",
- rebase_path("$target_gen_dir/gpu/media", root_build_dir),
- "-o",
- rebase_path("$target_gen_dir/gpu/media", root_build_dir),
- "-t",
- "posix_stubs",
- "-e",
- rebase_path(extra_header, root_build_dir),
- "-s",
- stubs_filename_root,
- "-p",
- "content/common/gpu/media",
- ]
-
- args += rebase_path(sources, root_build_dir)
- }
-}
-
source_set("common") {
# Targets external to content should always link to the public API.
# In addition, targets outside of the content component (shell and tests)
@@ -167,10 +53,6 @@ source_set("common") {
"//gpu/command_buffer/service",
"//gpu/ipc/client",
"//gpu/ipc/common",
-
- # TODO(markdittmer): This should be removed once content/common/gpu/media
- # is refactored into media/ipc.
- "//gpu/ipc/service",
"//gpu/skia_bindings",
"//ipc",
"//ipc/mojo",
@@ -223,33 +105,7 @@ source_set("common") {
}
if (is_mac) {
- sources += [
- "gpu/media/vt_mac.h",
- "gpu/media/vt_video_decode_accelerator_mac.cc",
- "gpu/media/vt_video_decode_accelerator_mac.h",
- "gpu/media/vt_video_encode_accelerator_mac.cc",
- "gpu/media/vt_video_encode_accelerator_mac.h",
- ] + get_target_outputs(":libvt_generate_stubs")
-
- deps += [
- ":libvt_generate_stubs",
- "//content:resources",
- "//content/app/resources",
- "//sandbox/mac:seatbelt",
- "//third_party/WebKit/public:image_resources",
- "//third_party/WebKit/public:resources",
- "//ui/accelerated_widget_mac",
- ]
- lib_dirs = [ "$mac_sdk_path/usr/lib" ]
- libs += [
- "AVFoundation.framework",
- "CoreMedia.framework",
- "CoreVideo.framework",
- "IOSurface.framework",
- "OpenGL.framework",
- "QuartzCore.framework",
- "sandbox",
- ]
+ deps += [ "//sandbox/mac:seatbelt" ]
}
if (is_android) {
@@ -312,153 +168,6 @@ source_set("common") {
]
}
- if (is_android) {
- sources += [
- "gpu/media/android_copying_backing_strategy.cc",
- "gpu/media/android_copying_backing_strategy.h",
- "gpu/media/android_deferred_rendering_backing_strategy.cc",
- "gpu/media/android_deferred_rendering_backing_strategy.h",
- "gpu/media/android_video_decode_accelerator.cc",
- "gpu/media/android_video_decode_accelerator.h",
- "gpu/media/avda_codec_image.cc",
- "gpu/media/avda_codec_image.h",
- "gpu/media/avda_return_on_failure.h",
- "gpu/media/avda_shared_state.cc",
- "gpu/media/avda_shared_state.h",
- "gpu/media/avda_state_provider.h",
- ]
-
- if (enable_webrtc) {
- deps += [ "//third_party/libyuv" ]
- sources += [
- "gpu/media/android_video_encode_accelerator.cc",
- "gpu/media/android_video_encode_accelerator.h",
- ]
- }
-
- if (mojo_media_host == "gpu") {
- deps += [ "//media/mojo/services:cdm_service" ]
- }
- }
-
- if (is_chromeos) {
- sources += [
- "gpu/media/accelerated_video_decoder.h",
- "gpu/media/h264_decoder.cc",
- "gpu/media/h264_decoder.h",
- "gpu/media/h264_dpb.cc",
- "gpu/media/h264_dpb.h",
- "gpu/media/vp8_decoder.cc",
- "gpu/media/vp8_decoder.h",
- "gpu/media/vp8_picture.cc",
- "gpu/media/vp8_picture.h",
- "gpu/media/vp9_decoder.cc",
- "gpu/media/vp9_decoder.h",
- "gpu/media/vp9_picture.cc",
- "gpu/media/vp9_picture.h",
- ]
- if (use_v4lplugin) {
- defines += [ "USE_LIBV4L2" ]
- sources += get_target_outputs(":libv4l2_generate_stubs")
- deps += [ ":libv4l2_generate_stubs" ]
- }
- if (use_v4l2_codec) {
- defines += [ "USE_V4L2_CODEC" ]
- deps += [ "//third_party/libyuv" ]
- sources += [
- "gpu/media/generic_v4l2_device.cc",
- "gpu/media/generic_v4l2_device.h",
- "gpu/media/v4l2_device.cc",
- "gpu/media/v4l2_device.h",
- "gpu/media/v4l2_image_processor.cc",
- "gpu/media/v4l2_image_processor.h",
- "gpu/media/v4l2_jpeg_decode_accelerator.cc",
- "gpu/media/v4l2_jpeg_decode_accelerator.h",
- "gpu/media/v4l2_slice_video_decode_accelerator.cc",
- "gpu/media/v4l2_slice_video_decode_accelerator.h",
- "gpu/media/v4l2_video_decode_accelerator.cc",
- "gpu/media/v4l2_video_decode_accelerator.h",
- "gpu/media/v4l2_video_encode_accelerator.cc",
- "gpu/media/v4l2_video_encode_accelerator.h",
- ]
- libs = [
- "EGL",
- "GLESv2",
- ]
- }
- if (current_cpu == "arm") {
- sources += [
- "gpu/media/tegra_v4l2_device.cc",
- "gpu/media/tegra_v4l2_device.h",
- ]
- }
- if (current_cpu != "arm") {
- sources += [
- "gpu/media/va_surface.h",
- "gpu/media/vaapi_jpeg_decode_accelerator.cc",
- "gpu/media/vaapi_jpeg_decode_accelerator.h",
- "gpu/media/vaapi_jpeg_decoder.cc",
- "gpu/media/vaapi_jpeg_decoder.h",
- "gpu/media/vaapi_picture.cc",
- "gpu/media/vaapi_picture.h",
- "gpu/media/vaapi_video_decode_accelerator.cc",
- "gpu/media/vaapi_video_decode_accelerator.h",
- "gpu/media/vaapi_video_encode_accelerator.cc",
- "gpu/media/vaapi_video_encode_accelerator.h",
- "gpu/media/vaapi_wrapper.cc",
- "gpu/media/vaapi_wrapper.h",
- ] + get_target_outputs(":libva_generate_stubs")
- configs += [
- "//third_party/libva:libva_config",
- "//third_party/libyuv:libyuv_config",
- ]
- deps += [
- ":libva_generate_stubs",
- "//media",
- "//third_party/libyuv",
- ]
- if (use_x11) {
- sources += [
- "gpu/media/vaapi_tfp_picture.cc",
- "gpu/media/vaapi_tfp_picture.h",
- ]
- }
- if (use_ozone) {
- sources += [
- "gpu/media/vaapi_drm_picture.cc",
- "gpu/media/vaapi_drm_picture.h",
- ]
- }
- }
- }
-
- if (is_win) {
- sources += [
- "gpu/media/dxva_video_decode_accelerator_win.cc",
- "gpu/media/dxva_video_decode_accelerator_win.h",
- ]
- configs += [ "//third_party/khronos:khronos_headers" ]
- deps += [ "//ui/gl" ]
- libs += [
- "d3d9.lib",
- "d3d11.lib",
- "dxva2.lib",
- "strmiids.lib",
- "mf.lib",
- "mfplat.lib",
- "mfuuid.lib",
- ]
- ldflags += [
- "/DELAYLOAD:d3d9.dll",
- "/DELAYLOAD:d3d11.dll",
- "/DELAYLOAD:dxva2.dll",
- "/DELAYLOAD:mf.dll",
- "/DELAYLOAD:mfplat.dll",
- ]
-
- # TODO(GYP): extract_xinput action.
- }
-
if (!is_win || !use_aura) {
sources -= [ "cursors/webcursor_aurawin.cc" ]
}
« content/DEPS ('K') | « content/DEPS ('k') | content/common/common.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698