1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
From 1eb5924e774f09914f69ba23a964e2d25edbac49 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Thu, 9 Jul 2015 00:53:02 -0700
Subject: [PATCH 05/14] Media: Build VaapiPictureWayland as part of Media.
This is temporary, so we can avoid gl circular dependency. Eventually,
we want to be as aligned as possible with upstream Media solution and need
to figure out how we could use upstream VaapiWrapper.
---
content/content_common.gypi | 51 ++++++++++++++++++++++++++++-----------------
1 file changed, 32 insertions(+), 19 deletions(-)
Index: dev.xenial/content/content_common.gypi
===================================================================
--- dev.xenial.orig/content/content_common.gypi
+++ dev.xenial/content/content_common.gypi
@@ -869,7 +869,7 @@
},
],
}],
- ['chromeos==1', {
+ ['chromeos==1 or use_ozone==1', {
'sources': [
'common/gpu/media/accelerated_video_decoder.h',
'common/gpu/media/h264_decoder.cc',
@@ -925,7 +925,7 @@
'common/gpu/media/tegra_v4l2_device.h',
],
}],
- ['target_arch != "arm" and chromeos == 1', {
+ ['target_arch != "arm" and use_ozone == 1', {
'dependencies': [
'../media/media.gyp:media',
'../third_party/libyuv/libyuv.gyp:libyuv',
@@ -936,18 +936,19 @@
'common/gpu/media/vaapi_jpeg_decode_accelerator.h',
'common/gpu/media/vaapi_jpeg_decoder.cc',
'common/gpu/media/vaapi_jpeg_decoder.h',
- 'common/gpu/media/vaapi_picture.cc',
- 'common/gpu/media/vaapi_picture.h',
'common/gpu/media/vaapi_video_decode_accelerator.cc',
'common/gpu/media/vaapi_video_decode_accelerator.h',
- 'common/gpu/media/vaapi_video_encode_accelerator.cc',
- 'common/gpu/media/vaapi_video_encode_accelerator.h',
- 'common/gpu/media/vaapi_wrapper.cc',
- 'common/gpu/media/vaapi_wrapper.h',
+ '<(DEPTH)/ozone/media/vaapi_picture.cc',
+ '<(DEPTH)/ozone/media/vaapi_picture.h',
+ '<(DEPTH)/ozone/media/vaapi_picture_wayland.cc',
+ '<(DEPTH)/ozone/media/vaapi_picture_wayland.h',
+ '<(DEPTH)/ozone/media/vaapi_wrapper.cc',
+ '<(DEPTH)/ozone/media/vaapi_wrapper.h',
],
'conditions': [
['use_x11 == 1', {
'variables': {
+ 'extra_header': 'common/gpu/media/va_stub_header.fragment',
'sig_files': [
'common/gpu/media/va.sigs',
'common/gpu/media/va_x11.sigs',
@@ -958,21 +959,33 @@
'common/gpu/media/vaapi_tfp_picture.h',
],
}, {
- 'variables': {
- 'sig_files': [
- 'common/gpu/media/va.sigs',
- 'common/gpu/media/va_drm.sigs',
- ],
- },
- 'sources': [
- 'common/gpu/media/vaapi_drm_picture.cc',
- 'common/gpu/media/vaapi_drm_picture.h',
- ],
+ 'conditions': [
+ ['ozone_platform_wayland == 1', {
+ 'variables': {
+ 'extra_header': '../ozone/media/va_wayland_stub_header.fragment',
+ 'sig_files': [
+ 'common/gpu/media/va.sigs',
+ '../ozone/media/va_wayland.sigs',
+ ],
+ },
+ }, {
+ 'variables': {
+ 'extra_header': 'common/gpu/media/va_stub_header.fragment',
+ 'sig_files': [
+ 'common/gpu/media/va.sigs',
+ 'common/gpu/media/va_drm.sigs',
+ ],
+ },
+ 'sources': [
+ 'common/gpu/media/vaapi_drm_picture.cc',
+ 'common/gpu/media/vaapi_drm_picture.h',
+ ],
+ }],
+ ]
}],
],
'variables': {
'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
- 'extra_header': 'common/gpu/media/va_stub_header.fragment',
'outfile_type': 'posix_stubs',
'stubs_filename_root': 'va_stubs',
'project_path': 'content/common/gpu/media',
|