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

Side by Side Diff: webrtc/media/media.gyp

Issue 1715883002: Remove DeviceManager and DeviceInfo. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 10 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
OLDNEW
1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 'base/videocapturerfactory.h', 69 'base/videocapturerfactory.h',
70 'base/videocommon.cc', 70 'base/videocommon.cc',
71 'base/videocommon.h', 71 'base/videocommon.h',
72 'base/videoframe.cc', 72 'base/videoframe.cc',
73 'base/videoframe.h', 73 'base/videoframe.h',
74 'base/videoframefactory.cc', 74 'base/videoframefactory.cc',
75 'base/videoframefactory.h', 75 'base/videoframefactory.h',
76 'base/videorenderer.h', 76 'base/videorenderer.h',
77 'base/yuvframegenerator.cc', 77 'base/yuvframegenerator.cc',
78 'base/yuvframegenerator.h', 78 'base/yuvframegenerator.h',
79 'devices/deviceinfo.h',
80 'devices/devicemanager.cc',
81 'devices/devicemanager.h',
82 'devices/dummydevicemanager.h',
83 'devices/videorendererfactory.h', 79 'devices/videorendererfactory.h',
84 'engine/nullwebrtcvideoengine.h', 80 'engine/nullwebrtcvideoengine.h',
85 'engine/simulcast.cc', 81 'engine/simulcast.cc',
86 'engine/simulcast.h', 82 'engine/simulcast.h',
87 'engine/webrtccommon.h', 83 'engine/webrtccommon.h',
88 'engine/webrtcmediaengine.cc', 84 'engine/webrtcmediaengine.cc',
89 'engine/webrtcmediaengine.h', 85 'engine/webrtcmediaengine.h',
90 'engine/webrtcmediaengine.cc', 86 'engine/webrtcmediaengine.cc',
91 'engine/webrtcvideocapturer.cc', 87 'engine/webrtcvideocapturer.cc',
92 'engine/webrtcvideocapturer.h', 88 'engine/webrtcvideocapturer.h',
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 }, 151 },
156 'dependencies': [ 152 'dependencies': [
157 '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_im pl', 153 '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_im pl',
158 '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_imp l', 154 '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_imp l',
159 ], 155 ],
160 }], 156 }],
161 ['OS=="linux"', { 157 ['OS=="linux"', {
162 'sources': [ 158 'sources': [
163 'devices/libudevsymboltable.cc', 159 'devices/libudevsymboltable.cc',
164 'devices/libudevsymboltable.h', 160 'devices/libudevsymboltable.h',
165 'devices/linuxdeviceinfo.cc',
166 'devices/linuxdevicemanager.cc',
167 'devices/linuxdevicemanager.h',
168 'devices/v4llookup.cc', 161 'devices/v4llookup.cc',
169 'devices/v4llookup.h', 162 'devices/v4llookup.h',
170 ], 163 ],
171 'conditions': [ 164 'conditions': [
172 ['use_gtk==1', { 165 ['use_gtk==1', {
173 'sources': [ 166 'sources': [
174 'devices/gtkvideorenderer.cc', 167 'devices/gtkvideorenderer.cc',
175 'devices/gtkvideorenderer.h', 168 'devices/gtkvideorenderer.h',
176 ], 169 ],
177 'cflags': [ 170 'cflags': [
178 '<!@(pkg-config --cflags gobject-2.0 gthread-2.0 gtk+-2.0)', 171 '<!@(pkg-config --cflags gobject-2.0 gthread-2.0 gtk+-2.0)',
179 ], 172 ],
180 }], 173 }],
181 ], 174 ],
182 'include_dirs': [ 175 'include_dirs': [
183 'third_party/libudev' 176 'third_party/libudev'
184 ], 177 ],
185 'libraries': [ 178 'libraries': [
186 '-lrt', 179 '-lrt',
187 ], 180 ],
188 }], 181 }],
189 ['OS=="win"', { 182 ['OS=="win"', {
190 'sources': [ 183 'sources': [
191 'devices/gdivideorenderer.cc', 184 'devices/gdivideorenderer.cc',
192 'devices/gdivideorenderer.h', 185 'devices/gdivideorenderer.h',
193 'devices/win32deviceinfo.cc',
194 'devices/win32devicemanager.cc',
195 'devices/win32devicemanager.h',
196 ], 186 ],
197 'msvs_settings': { 187 'msvs_settings': {
198 'VCLibrarianTool': { 188 'VCLibrarianTool': {
199 'AdditionalDependencies': [ 189 'AdditionalDependencies': [
200 'd3d9.lib', 190 'd3d9.lib',
201 'gdi32.lib', 191 'gdi32.lib',
202 'strmiids.lib', 192 'strmiids.lib',
203 'winmm.lib', 193 'winmm.lib',
204 ], 194 ],
205 }, 195 },
206 }, 196 },
207 }], 197 }],
208 ['OS=="mac"', { 198 ['OS=="mac"', {
209 'sources': [
210 'devices/macdeviceinfo.cc',
211 'devices/macdevicemanager.cc',
212 'devices/macdevicemanager.h',
213 'devices/macdevicemanagermm.mm',
214 ],
215 'conditions': [ 199 'conditions': [
216 ['target_arch=="ia32"', { 200 ['target_arch=="ia32"', {
217 'sources': [ 201 'sources': [
218 'devices/carbonvideorenderer.cc', 202 'devices/carbonvideorenderer.cc',
219 'devices/carbonvideorenderer.h', 203 'devices/carbonvideorenderer.h',
220 ], 204 ],
221 'link_settings': { 205 'link_settings': {
222 'xcode_settings': { 206 'xcode_settings': {
223 'OTHER_LDFLAGS': [ 207 'OTHER_LDFLAGS': [
224 '-framework Carbon', 208 '-framework Carbon',
225 ], 209 ],
226 }, 210 },
227 }, 211 },
228 }], 212 }],
229 ], 213 ],
230 'xcode_settings': {
231 'WARNING_CFLAGS': [
232 # TODO(ronghuawu): Update macdevicemanager.cc to stop using
233 # deprecated functions and remove this flag.
234 '-Wno-deprecated-declarations',
235 ],
236 # Disable partial availability warning to prevent errors
237 # in macdevicemanagermm.mm using AVFoundation.
238 # https://code.google.com/p/webrtc/issues/detail?id=4695
239 'WARNING_CFLAGS!': ['-Wpartial-availability'],
240 },
241 'link_settings': { 214 'link_settings': {
242 'xcode_settings': { 215 'xcode_settings': {
243 'OTHER_LDFLAGS': [ 216 'OTHER_LDFLAGS': [
244 '-weak_framework AVFoundation', 217 '-weak_framework AVFoundation',
245 '-framework Cocoa', 218 '-framework Cocoa',
246 '-framework CoreAudio', 219 '-framework CoreAudio',
247 '-framework CoreVideo', 220 '-framework CoreVideo',
248 '-framework OpenGL', 221 '-framework OpenGL',
249 '-framework QTKit', 222 '-framework QTKit',
250 ], 223 ],
251 }, 224 },
252 }, 225 },
253 }], 226 }],
254 ['OS=="ios"', {
255 'sources': [
256 'devices/mobiledevicemanager.cc',
257 ],
258 'include_dirs': [
259 # TODO(sjlee) Remove when vp8 is building for iOS. vp8 pulls in
260 # libjpeg which pulls in libyuv which currently disabled.
261 '../../third_party/libyuv/include',
262 ],
263 # TODO(kjellander): Make the code compile without disabling these.
264 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
265 'cflags': [
266 '-Wno-unused-const-variable',
267 ],
268 'xcode_settings': {
269 'WARNING_CFLAGS': [
270 '-Wno-unused-const-variable',
271 ],
272 },
273 }],
274 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { 227 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
275 'defines': [ 228 'defines': [
276 'CARBON_DEPRECATED=YES', 229 'CARBON_DEPRECATED=YES',
277 ], 230 ],
278 }], 231 }],
279 ['OS=="android"', {
280 'sources': [
281 'devices/mobiledevicemanager.cc',
282 ],
283 }],
284 ], 232 ],
285 }, # target rtc_media 233 }, # target rtc_media
286 ], # targets. 234 ], # targets.
287 } 235 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698