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

Side by Side Diff: media/media.gyp

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling DEPS to pick up ffmpeg GYP changes Created 5 years, 6 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) 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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 'base/media_client.h', 320 'base/media_client.h',
321 'base/media_file_checker.cc', 321 'base/media_file_checker.cc',
322 'base/media_file_checker.h', 322 'base/media_file_checker.h',
323 'base/media_keys.cc', 323 'base/media_keys.cc',
324 'base/media_keys.h', 324 'base/media_keys.h',
325 'base/media_log.cc', 325 'base/media_log.cc',
326 'base/media_log.h', 326 'base/media_log.h',
327 'base/media_log_event.h', 327 'base/media_log_event.h',
328 'base/media_permission.cc', 328 'base/media_permission.cc',
329 'base/media_permission.h', 329 'base/media_permission.h',
330 'base/media_posix.cc',
331 'base/media_switches.cc', 330 'base/media_switches.cc',
332 'base/media_switches.h', 331 'base/media_switches.h',
333 'base/media_win.cc',
334 'base/mime_util.cc', 332 'base/mime_util.cc',
335 'base/mime_util.h', 333 'base/mime_util.h',
336 'base/moving_average.cc', 334 'base/moving_average.cc',
337 'base/moving_average.h', 335 'base/moving_average.h',
338 'base/multi_channel_resampler.cc', 336 'base/multi_channel_resampler.cc',
339 'base/multi_channel_resampler.h', 337 'base/multi_channel_resampler.h',
340 'base/pipeline.cc', 338 'base/pipeline.cc',
341 'base/pipeline.h', 339 'base/pipeline.h',
342 'base/pipeline_status.h', 340 'base/pipeline_status.h',
343 'base/player_tracker.cc', 341 'base/player_tracker.cc',
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 ], 619 ],
622 }, { # media_use_ffmpeg==0 620 }, { # media_use_ffmpeg==0
623 # Exclude the sources that depend on ffmpeg. 621 # Exclude the sources that depend on ffmpeg.
624 'sources!': [ 622 'sources!': [
625 'base/audio_video_metadata_extractor.cc', 623 'base/audio_video_metadata_extractor.cc',
626 'base/audio_video_metadata_extractor.h', 624 'base/audio_video_metadata_extractor.h',
627 'base/container_names.cc', 625 'base/container_names.cc',
628 'base/container_names.h', 626 'base/container_names.h',
629 'base/media_file_checker.cc', 627 'base/media_file_checker.cc',
630 'base/media_file_checker.h', 628 'base/media_file_checker.h',
631 'base/media_posix.cc',
632 'ffmpeg/ffmpeg_common.cc', 629 'ffmpeg/ffmpeg_common.cc',
633 'ffmpeg/ffmpeg_common.h', 630 'ffmpeg/ffmpeg_common.h',
634 'filters/audio_file_reader.cc', 631 'filters/audio_file_reader.cc',
635 'filters/audio_file_reader.h', 632 'filters/audio_file_reader.h',
636 'filters/blocking_url_protocol.cc', 633 'filters/blocking_url_protocol.cc',
637 'filters/blocking_url_protocol.h', 634 'filters/blocking_url_protocol.h',
638 'filters/ffmpeg_aac_bitstream_converter.cc', 635 'filters/ffmpeg_aac_bitstream_converter.cc',
639 'filters/ffmpeg_aac_bitstream_converter.h', 636 'filters/ffmpeg_aac_bitstream_converter.h',
640 'filters/ffmpeg_audio_decoder.cc', 637 'filters/ffmpeg_audio_decoder.cc',
641 'filters/ffmpeg_audio_decoder.h', 638 'filters/ffmpeg_audio_decoder.h',
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 ['OS=="android"', { 687 ['OS=="android"', {
691 'dependencies': [ 688 'dependencies': [
692 'media_android_jni_headers', 689 'media_android_jni_headers',
693 'media_java', 690 'media_java',
694 'player_android', 691 'player_android',
695 'video_capture_android_jni_headers', 692 'video_capture_android_jni_headers',
696 ], 693 ],
697 'sources': [ 694 'sources': [
698 'base/media.cc', 695 'base/media.cc',
699 'base/media.h', 696 'base/media.h',
700 'base/media_stub.cc',
701 ], 697 ],
702 'sources!': [ 698 'sources!': [
703 'filters/opus_audio_decoder.cc', 699 'filters/opus_audio_decoder.cc',
704 'filters/opus_audio_decoder.h', 700 'filters/opus_audio_decoder.h',
705 'renderers/default_renderer_factory.cc', 701 'renderers/default_renderer_factory.cc',
706 'renderers/default_renderer_factory.h', 702 'renderers/default_renderer_factory.h',
707 ], 703 ],
708 'defines': [ 704 'defines': [
709 'DISABLE_USER_INPUT_MONITOR', 705 'DISABLE_USER_INPUT_MONITOR',
710 ], 706 ],
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
1250 'filters/ffmpeg_aac_bitstream_converter_unittest.cc', 1246 'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
1251 'filters/ffmpeg_demuxer_unittest.cc', 1247 'filters/ffmpeg_demuxer_unittest.cc',
1252 'filters/ffmpeg_glue_unittest.cc', 1248 'filters/ffmpeg_glue_unittest.cc',
1253 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 1249 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
1254 'filters/ffmpeg_video_decoder_unittest.cc', 1250 'filters/ffmpeg_video_decoder_unittest.cc',
1255 'filters/in_memory_url_protocol_unittest.cc', 1251 'filters/in_memory_url_protocol_unittest.cc',
1256 'test/pipeline_integration_test.cc', 1252 'test/pipeline_integration_test.cc',
1257 'test/pipeline_integration_test_base.cc', 1253 'test/pipeline_integration_test_base.cc',
1258 ], 1254 ],
1259 }], 1255 }],
1260 ['os_posix==1 and OS!="mac"', { 1256 ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_libra ry" and win_use_allocator_shim==1)', {
1261 'conditions': [ 1257 'conditions': [
1262 ['use_allocator!="none"', { 1258 ['use_allocator!="none"', {
1263 'dependencies': [ 1259 'dependencies': [
1264 '../base/allocator/allocator.gyp:allocator', 1260 '../base/allocator/allocator.gyp:allocator',
1265 ], 1261 ],
1266 }], 1262 }],
1267 ], 1263 ],
1268 }], 1264 }],
1269 ['OS=="android"', { 1265 ['OS=="android"', {
1270 'dependencies': [ 1266 'dependencies': [
(...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after
1971 'dependencies': [ 1967 'dependencies': [
1972 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1968 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1973 ], 1969 ],
1974 }], 1970 }],
1975 ], 1971 ],
1976 }, 1972 },
1977 ], 1973 ],
1978 }], 1974 }],
1979 ], 1975 ],
1980 } 1976 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698