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

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: more removals 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
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | no next file » | 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 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 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 'defines': [ 503 'defines': [
504 'MEDIA_DISABLE_LIBVPX', 504 'MEDIA_DISABLE_LIBVPX',
505 ], 505 ],
506 }, 506 },
507 # Exclude the sources that depend on libvpx. 507 # Exclude the sources that depend on libvpx.
508 'sources!': [ 508 'sources!': [
509 'filters/vpx_video_decoder.cc', 509 'filters/vpx_video_decoder.cc',
510 'filters/vpx_video_decoder.h', 510 'filters/vpx_video_decoder.h',
511 ], 511 ],
512 }], 512 }],
513 ['use_system_ffmpeg == 1', {
514 'cflags': [
515 '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
516 '--code "#define __STDC_CONSTANT_MACROS\n'
517 '#include <libavcodec/avcodec.h>\n'
518 'int test() { return AV_CODEC_ID_OPUS; }" '
519 '--on-failure -DCHROMIUM_OMIT_AV_CODEC_ID_OPUS=1)',
520
521 '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
522 '--code "#define __STDC_CONSTANT_MACROS\n'
523 '#include <libavcodec/avcodec.h>\n'
524 'int test() { return AV_CODEC_ID_VP9; }" '
525 '--on-failure -DCHROMIUM_OMIT_AV_CODEC_ID_VP9=1)',
526
527 '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
528 '--code "#define __STDC_CONSTANT_MACROS\n'
529 '#include <libavcodec/avcodec.h>\n'
530 'int test() { struct AVFrame frame;\n'
531 'return av_frame_get_channels(&frame); }" '
532 '--on-failure -DCHROMIUM_NO_AVFRAME_CHANNELS=1)',
533 ],
534 }],
535 ['OS == "ios"', { 513 ['OS == "ios"', {
536 'includes': [ 514 'includes': [
537 # For shared_memory_support_sources variable. 515 # For shared_memory_support_sources variable.
538 'shared_memory_support.gypi', 516 'shared_memory_support.gypi',
539 ], 517 ],
540 'sources': [ 518 'sources': [
541 'base/media_stub.cc', 519 'base/media_stub.cc',
542 # These sources are normally built via a dependency on the 520 # These sources are normally built via a dependency on the
543 # shared_memory_support target, but that target is not built on iOS. 521 # shared_memory_support target, but that target is not built on iOS.
544 # Instead, directly build only the files that are needed for iOS. 522 # Instead, directly build only the files that are needed for iOS.
(...skipping 1184 matching lines...) Expand 10 before | Expand all | Expand 10 after
1729 ], 1707 ],
1730 'sources': [ 1708 'sources': [
1731 'base/simd/sinc_resampler_sse.cc', 1709 'base/simd/sinc_resampler_sse.cc',
1732 'base/simd/vector_math_sse.cc', 1710 'base/simd/vector_math_sse.cc',
1733 ], 1711 ],
1734 }, # end of target media_sse 1712 }, # end of target media_sse
1735 ], 1713 ],
1736 }], 1714 }],
1737 ], 1715 ],
1738 } 1716 }
OLDNEW
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698