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

Side by Side Diff: media/media.gyp

Issue 14659007: Remove use_system_ffmpeg-related logic from media and other mainline gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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
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 cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 'defines': [ 502 'defines': [
503 'MEDIA_DISABLE_LIBVPX', 503 'MEDIA_DISABLE_LIBVPX',
504 ], 504 ],
505 }, 505 },
506 # Exclude the sources that depend on libvpx. 506 # Exclude the sources that depend on libvpx.
507 'sources!': [ 507 'sources!': [
508 'filters/vpx_video_decoder.cc', 508 'filters/vpx_video_decoder.cc',
509 'filters/vpx_video_decoder.h', 509 'filters/vpx_video_decoder.h',
510 ], 510 ],
511 }], 511 }],
512 ['use_system_ffmpeg == 1', {
513 'cflags': [
514 '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
515 '--code "#define __STDC_CONSTANT_MACROS\n'
516 '#include <libavcodec/avcodec.h>\n'
517 'int test() { return AV_CODEC_ID_OPUS; }" '
518 '--on-failure -DCHROMIUM_OMIT_AV_CODEC_ID_OPUS=1)',
519
520 '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
521 '--code "#define __STDC_CONSTANT_MACROS\n'
522 '#include <libavcodec/avcodec.h>\n'
523 'int test() { return AV_CODEC_ID_VP9; }" '
524 '--on-failure -DCHROMIUM_OMIT_AV_CODEC_ID_VP9=1)',
525
526 '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
527 '--code "#define __STDC_CONSTANT_MACROS\n'
528 '#include <libavcodec/avcodec.h>\n'
529 'int test() { struct AVFrame frame;\n'
530 'return av_frame_get_channels(&frame); }" '
531 '--on-failure -DCHROMIUM_NO_AVFRAME_CHANNELS=1)',
532 ],
533 }],
534 ['OS == "ios"', { 512 ['OS == "ios"', {
535 'includes': [ 513 'includes': [
536 # For shared_memory_support_sources variable. 514 # For shared_memory_support_sources variable.
537 'shared_memory_support.gypi', 515 'shared_memory_support.gypi',
538 ], 516 ],
539 'sources': [ 517 'sources': [
540 'base/media_stub.cc', 518 'base/media_stub.cc',
541 # These sources are normally built via a dependency on the 519 # These sources are normally built via a dependency on the
542 # shared_memory_support target, but that target is not built on iOS. 520 # shared_memory_support target, but that target is not built on iOS.
543 # Instead, directly build only the files that are needed for iOS. 521 # Instead, directly build only the files that are needed for iOS.
(...skipping 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after
1723 ], 1701 ],
1724 'sources': [ 1702 'sources': [
1725 'base/simd/sinc_resampler_sse.cc', 1703 'base/simd/sinc_resampler_sse.cc',
1726 'base/simd/vector_math_sse.cc', 1704 'base/simd/vector_math_sse.cc',
1727 ], 1705 ],
1728 }, # end of target media_sse 1706 }, # end of target media_sse
1729 ], 1707 ],
1730 }], 1708 }],
1731 ], 1709 ],
1732 } 1710 }
OLDNEW
« build/linux/unbundle/ffmpeg.gyp ('K') | « media/ffmpeg/ffmpeg_common.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698