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

Side by Side Diff: media/media.gyp

Issue 1179953006: [Merge to M44] Chromium changes to statically link ffmpeg. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
Patch Set: 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
« no previous file with comments | « media/filters/ffmpeg_glue.cc ('k') | media/media_nacl.gyp » ('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 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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 'base/media_client.h', 319 'base/media_client.h',
320 'base/media_file_checker.cc', 320 'base/media_file_checker.cc',
321 'base/media_file_checker.h', 321 'base/media_file_checker.h',
322 'base/media_keys.cc', 322 'base/media_keys.cc',
323 'base/media_keys.h', 323 'base/media_keys.h',
324 'base/media_log.cc', 324 'base/media_log.cc',
325 'base/media_log.h', 325 'base/media_log.h',
326 'base/media_log_event.h', 326 'base/media_log_event.h',
327 'base/media_permission.cc', 327 'base/media_permission.cc',
328 'base/media_permission.h', 328 'base/media_permission.h',
329 'base/media_posix.cc',
330 'base/media_switches.cc', 329 'base/media_switches.cc',
331 'base/media_switches.h', 330 'base/media_switches.h',
332 'base/media_win.cc',
333 'base/moving_average.cc', 331 'base/moving_average.cc',
334 'base/moving_average.h', 332 'base/moving_average.h',
335 'base/multi_channel_resampler.cc', 333 'base/multi_channel_resampler.cc',
336 'base/multi_channel_resampler.h', 334 'base/multi_channel_resampler.h',
337 'base/pipeline.cc', 335 'base/pipeline.cc',
338 'base/pipeline.h', 336 'base/pipeline.h',
339 'base/pipeline_status.h', 337 'base/pipeline_status.h',
340 'base/player_tracker.cc', 338 'base/player_tracker.cc',
341 'base/player_tracker.h', 339 'base/player_tracker.h',
342 'base/ranges.cc', 340 'base/ranges.cc',
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 ], 614 ],
617 }, { # media_use_ffmpeg==0 615 }, { # media_use_ffmpeg==0
618 # Exclude the sources that depend on ffmpeg. 616 # Exclude the sources that depend on ffmpeg.
619 'sources!': [ 617 'sources!': [
620 'base/audio_video_metadata_extractor.cc', 618 'base/audio_video_metadata_extractor.cc',
621 'base/audio_video_metadata_extractor.h', 619 'base/audio_video_metadata_extractor.h',
622 'base/container_names.cc', 620 'base/container_names.cc',
623 'base/container_names.h', 621 'base/container_names.h',
624 'base/media_file_checker.cc', 622 'base/media_file_checker.cc',
625 'base/media_file_checker.h', 623 'base/media_file_checker.h',
626 'base/media_posix.cc',
627 'ffmpeg/ffmpeg_common.cc', 624 'ffmpeg/ffmpeg_common.cc',
628 'ffmpeg/ffmpeg_common.h', 625 'ffmpeg/ffmpeg_common.h',
629 'filters/audio_file_reader.cc', 626 'filters/audio_file_reader.cc',
630 'filters/audio_file_reader.h', 627 'filters/audio_file_reader.h',
631 'filters/blocking_url_protocol.cc', 628 'filters/blocking_url_protocol.cc',
632 'filters/blocking_url_protocol.h', 629 'filters/blocking_url_protocol.h',
633 'filters/ffmpeg_aac_bitstream_converter.cc', 630 'filters/ffmpeg_aac_bitstream_converter.cc',
634 'filters/ffmpeg_aac_bitstream_converter.h', 631 'filters/ffmpeg_aac_bitstream_converter.h',
635 'filters/ffmpeg_audio_decoder.cc', 632 'filters/ffmpeg_audio_decoder.cc',
636 'filters/ffmpeg_audio_decoder.h', 633 'filters/ffmpeg_audio_decoder.h',
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 ['OS=="android"', { 682 ['OS=="android"', {
686 'dependencies': [ 683 'dependencies': [
687 'media_android_jni_headers', 684 'media_android_jni_headers',
688 'media_java', 685 'media_java',
689 'player_android', 686 'player_android',
690 'video_capture_android_jni_headers', 687 'video_capture_android_jni_headers',
691 ], 688 ],
692 'sources': [ 689 'sources': [
693 'base/media.cc', 690 'base/media.cc',
694 'base/media.h', 691 'base/media.h',
695 'base/media_stub.cc',
696 ], 692 ],
697 'sources!': [ 693 'sources!': [
698 'filters/opus_audio_decoder.cc', 694 'filters/opus_audio_decoder.cc',
699 'filters/opus_audio_decoder.h', 695 'filters/opus_audio_decoder.h',
700 'renderers/default_renderer_factory.cc', 696 'renderers/default_renderer_factory.cc',
701 'renderers/default_renderer_factory.h', 697 'renderers/default_renderer_factory.h',
702 ], 698 ],
703 'defines': [ 699 'defines': [
704 'DISABLE_USER_INPUT_MONITOR', 700 'DISABLE_USER_INPUT_MONITOR',
705 ], 701 ],
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 'filters/ffmpeg_aac_bitstream_converter_unittest.cc', 1240 'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
1245 'filters/ffmpeg_demuxer_unittest.cc', 1241 'filters/ffmpeg_demuxer_unittest.cc',
1246 'filters/ffmpeg_glue_unittest.cc', 1242 'filters/ffmpeg_glue_unittest.cc',
1247 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 1243 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
1248 'filters/ffmpeg_video_decoder_unittest.cc', 1244 'filters/ffmpeg_video_decoder_unittest.cc',
1249 'filters/in_memory_url_protocol_unittest.cc', 1245 'filters/in_memory_url_protocol_unittest.cc',
1250 'test/pipeline_integration_test.cc', 1246 'test/pipeline_integration_test.cc',
1251 'test/pipeline_integration_test_base.cc', 1247 'test/pipeline_integration_test_base.cc',
1252 ], 1248 ],
1253 }], 1249 }],
1254 ['os_posix==1 and OS!="mac"', { 1250 ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_libra ry" and win_use_allocator_shim==1)', {
1255 'conditions': [ 1251 'conditions': [
1256 ['use_allocator!="none"', { 1252 ['use_allocator!="none"', {
1257 'dependencies': [ 1253 'dependencies': [
1258 '../base/allocator/allocator.gyp:allocator', 1254 '../base/allocator/allocator.gyp:allocator',
1259 ], 1255 ],
1260 }], 1256 }],
1261 ], 1257 ],
1262 }], 1258 }],
1263 ['OS=="android"', { 1259 ['OS=="android"', {
1264 'dependencies': [ 1260 'dependencies': [
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
1958 '../build/isolate.gypi', 1954 '../build/isolate.gypi',
1959 ], 1955 ],
1960 'sources': [ 1956 'sources': [
1961 'audio_unittests.isolate', 1957 'audio_unittests.isolate',
1962 ], 1958 ],
1963 }, 1959 },
1964 ], 1960 ],
1965 }], 1961 }],
1966 ], 1962 ],
1967 } 1963 }
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_glue.cc ('k') | media/media_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698