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

Side by Side Diff: media/media.gyp

Issue 11953017: Revert 177842. This doesn't build in standalone webkit builds: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/filters/vpx_video_decoder.cc ('k') | webkit/media/filter_helpers.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
11 'use_cras%': 0, 11 'use_cras%': 0,
12 'conditions': [ 12 'conditions': [
13 ['OS == "android" or OS == "ios"', { 13 ['OS == "android" or OS == "ios"', {
14 # Android and iOS don't use ffmpeg. 14 # Android and iOS don't use ffmpeg.
15 'use_ffmpeg%': 0, 15 'use_ffmpeg%': 0,
16 # Android and iOS don't use libvpx.
17 'use_libvpx%': 0,
18 }, { # 'OS != "android" and OS != "ios"' 16 }, { # 'OS != "android" and OS != "ios"'
19 'use_ffmpeg%': 1, 17 'use_ffmpeg%': 1,
20 'use_libvpx%': 1,
21 }], 18 }],
22 ], 19 ],
23 }, 20 },
24 'targets': [ 21 'targets': [
25 { 22 {
26 'target_name': 'media', 23 'target_name': 'media',
27 'type': '<(component)', 24 'type': '<(component)',
28 'dependencies': [ 25 'dependencies': [
29 '../base/base.gyp:base', 26 '../base/base.gyp:base',
30 '../build/temp_gyp/googleurl.gyp:googleurl', 27 '../build/temp_gyp/googleurl.gyp:googleurl',
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 'filters/skcanvas_video_renderer.cc', 306 'filters/skcanvas_video_renderer.cc',
310 'filters/skcanvas_video_renderer.h', 307 'filters/skcanvas_video_renderer.h',
311 'filters/source_buffer_stream.cc', 308 'filters/source_buffer_stream.cc',
312 'filters/source_buffer_stream.h', 309 'filters/source_buffer_stream.h',
313 'filters/video_decoder_selector.cc', 310 'filters/video_decoder_selector.cc',
314 'filters/video_decoder_selector.h', 311 'filters/video_decoder_selector.h',
315 'filters/video_frame_generator.cc', 312 'filters/video_frame_generator.cc',
316 'filters/video_frame_generator.h', 313 'filters/video_frame_generator.h',
317 'filters/video_renderer_base.cc', 314 'filters/video_renderer_base.cc',
318 'filters/video_renderer_base.h', 315 'filters/video_renderer_base.h',
319 'filters/vpx_video_decoder.cc',
320 'filters/vpx_video_decoder.h',
321 'video/capture/fake_video_capture_device.cc', 316 'video/capture/fake_video_capture_device.cc',
322 'video/capture/fake_video_capture_device.h', 317 'video/capture/fake_video_capture_device.h',
323 'video/capture/linux/video_capture_device_linux.cc', 318 'video/capture/linux/video_capture_device_linux.cc',
324 'video/capture/linux/video_capture_device_linux.h', 319 'video/capture/linux/video_capture_device_linux.h',
325 'video/capture/mac/video_capture_device_mac.h', 320 'video/capture/mac/video_capture_device_mac.h',
326 'video/capture/mac/video_capture_device_mac.mm', 321 'video/capture/mac/video_capture_device_mac.mm',
327 'video/capture/mac/video_capture_device_qtkit_mac.h', 322 'video/capture/mac/video_capture_device_qtkit_mac.h',
328 'video/capture/mac/video_capture_device_qtkit_mac.mm', 323 'video/capture/mac/video_capture_device_qtkit_mac.mm',
329 'video/capture/video_capture.h', 324 'video/capture/video_capture.h',
330 'video/capture/video_capture_device.h', 325 'video/capture/video_capture_device.h',
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', 406 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
412 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', 407 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
413 'filters/ffmpeg_video_decoder.cc', 408 'filters/ffmpeg_video_decoder.cc',
414 'filters/ffmpeg_video_decoder.h', 409 'filters/ffmpeg_video_decoder.h',
415 'webm/webm_cluster_parser.cc', 410 'webm/webm_cluster_parser.cc',
416 'webm/webm_cluster_parser.h', 411 'webm/webm_cluster_parser.h',
417 'webm/webm_stream_parser.cc', 412 'webm/webm_stream_parser.cc',
418 'webm/webm_stream_parser.h', 413 'webm/webm_stream_parser.h',
419 ], 414 ],
420 }], 415 }],
421 ['use_libvpx == 1', {
422 'dependencies': [
423 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
424 ],
425 }, { # use_libvpx == 0
426 # Exclude the sources that depend on libvpx.
427 'sources!': [
428 'filters/vpx_video_decoder.cc',
429 'filters/vpx_video_decoder.h',
430 ],
431 }],
432 ['OS == "ios"', { 416 ['OS == "ios"', {
433 'includes': [ 417 'includes': [
434 # For shared_memory_support_sources variable. 418 # For shared_memory_support_sources variable.
435 'shared_memory_support.gypi', 419 'shared_memory_support.gypi',
436 ], 420 ],
437 'sources': [ 421 'sources': [
438 'base/media_stub.cc', 422 'base/media_stub.cc',
439 # These sources are normally built via a dependency on the 423 # These sources are normally built via a dependency on the
440 # shared_memory_support target, but that target is not built on iOS. 424 # shared_memory_support target, but that target is not built on iOS.
441 # Instead, directly build only the files that are needed for iOS. 425 # Instead, directly build only the files that are needed for iOS.
(...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after
1382 'media', 1366 'media',
1383 ], 1367 ],
1384 'sources': [ 1368 'sources': [
1385 'tools/media_bench/media_bench.cc', 1369 'tools/media_bench/media_bench.cc',
1386 ], 1370 ],
1387 }, 1371 },
1388 ], 1372 ],
1389 }] 1373 }]
1390 ], 1374 ],
1391 } 1375 }
OLDNEW
« no previous file with comments | « media/filters/vpx_video_decoder.cc ('k') | webkit/media/filter_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698