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

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: Roll DEPS to fix cros, rebase. 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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 'base/media_client.h', 315 'base/media_client.h',
316 'base/media_file_checker.cc', 316 'base/media_file_checker.cc',
317 'base/media_file_checker.h', 317 'base/media_file_checker.h',
318 'base/media_keys.cc', 318 'base/media_keys.cc',
319 'base/media_keys.h', 319 'base/media_keys.h',
320 'base/media_log.cc', 320 'base/media_log.cc',
321 'base/media_log.h', 321 'base/media_log.h',
322 'base/media_log_event.h', 322 'base/media_log_event.h',
323 'base/media_permission.cc', 323 'base/media_permission.cc',
324 'base/media_permission.h', 324 'base/media_permission.h',
325 'base/media_posix.cc',
326 'base/media_switches.cc', 325 'base/media_switches.cc',
327 'base/media_switches.h', 326 'base/media_switches.h',
328 'base/media_win.cc',
329 'base/mime_util.cc', 327 'base/mime_util.cc',
330 'base/mime_util.h', 328 'base/mime_util.h',
331 'base/moving_average.cc', 329 'base/moving_average.cc',
332 'base/moving_average.h', 330 'base/moving_average.h',
333 'base/multi_channel_resampler.cc', 331 'base/multi_channel_resampler.cc',
334 'base/multi_channel_resampler.h', 332 'base/multi_channel_resampler.h',
335 'base/pipeline.cc', 333 'base/pipeline.cc',
336 'base/pipeline.h', 334 'base/pipeline.h',
337 'base/pipeline_status.h', 335 'base/pipeline_status.h',
338 'base/player_tracker.cc', 336 'base/player_tracker.cc',
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 ], 612 ],
615 }, { # media_use_ffmpeg==0 613 }, { # media_use_ffmpeg==0
616 # Exclude the sources that depend on ffmpeg. 614 # Exclude the sources that depend on ffmpeg.
617 'sources!': [ 615 'sources!': [
618 'base/audio_video_metadata_extractor.cc', 616 'base/audio_video_metadata_extractor.cc',
619 'base/audio_video_metadata_extractor.h', 617 'base/audio_video_metadata_extractor.h',
620 'base/container_names.cc', 618 'base/container_names.cc',
621 'base/container_names.h', 619 'base/container_names.h',
622 'base/media_file_checker.cc', 620 'base/media_file_checker.cc',
623 'base/media_file_checker.h', 621 'base/media_file_checker.h',
624 'base/media_posix.cc',
625 'ffmpeg/ffmpeg_common.cc', 622 'ffmpeg/ffmpeg_common.cc',
626 'ffmpeg/ffmpeg_common.h', 623 'ffmpeg/ffmpeg_common.h',
627 'filters/audio_file_reader.cc', 624 'filters/audio_file_reader.cc',
628 'filters/audio_file_reader.h', 625 'filters/audio_file_reader.h',
629 'filters/blocking_url_protocol.cc', 626 'filters/blocking_url_protocol.cc',
630 'filters/blocking_url_protocol.h', 627 'filters/blocking_url_protocol.h',
631 'filters/ffmpeg_aac_bitstream_converter.cc', 628 'filters/ffmpeg_aac_bitstream_converter.cc',
632 'filters/ffmpeg_aac_bitstream_converter.h', 629 'filters/ffmpeg_aac_bitstream_converter.h',
633 'filters/ffmpeg_audio_decoder.cc', 630 'filters/ffmpeg_audio_decoder.cc',
634 'filters/ffmpeg_audio_decoder.h', 631 'filters/ffmpeg_audio_decoder.h',
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 ['OS=="android"', { 680 ['OS=="android"', {
684 'dependencies': [ 681 'dependencies': [
685 'media_android_jni_headers', 682 'media_android_jni_headers',
686 'media_java', 683 'media_java',
687 'player_android', 684 'player_android',
688 'video_capture_android_jni_headers', 685 'video_capture_android_jni_headers',
689 ], 686 ],
690 'sources': [ 687 'sources': [
691 'base/media.cc', 688 'base/media.cc',
692 'base/media.h', 689 'base/media.h',
693 'base/media_stub.cc',
694 ], 690 ],
695 'sources!': [ 691 'sources!': [
696 'filters/opus_audio_decoder.cc', 692 'filters/opus_audio_decoder.cc',
697 'filters/opus_audio_decoder.h', 693 'filters/opus_audio_decoder.h',
698 'renderers/default_renderer_factory.cc', 694 'renderers/default_renderer_factory.cc',
699 'renderers/default_renderer_factory.h', 695 'renderers/default_renderer_factory.h',
700 ], 696 ],
701 'defines': [ 697 'defines': [
702 'DISABLE_USER_INPUT_MONITOR', 698 'DISABLE_USER_INPUT_MONITOR',
703 ], 699 ],
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 'filters/ffmpeg_aac_bitstream_converter_unittest.cc', 1242 'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
1247 'filters/ffmpeg_demuxer_unittest.cc', 1243 'filters/ffmpeg_demuxer_unittest.cc',
1248 'filters/ffmpeg_glue_unittest.cc', 1244 'filters/ffmpeg_glue_unittest.cc',
1249 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 1245 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
1250 'filters/ffmpeg_video_decoder_unittest.cc', 1246 'filters/ffmpeg_video_decoder_unittest.cc',
1251 'filters/in_memory_url_protocol_unittest.cc', 1247 'filters/in_memory_url_protocol_unittest.cc',
1252 'test/pipeline_integration_test.cc', 1248 'test/pipeline_integration_test.cc',
1253 'test/pipeline_integration_test_base.cc', 1249 'test/pipeline_integration_test_base.cc',
1254 ], 1250 ],
1255 }], 1251 }],
1256 ['os_posix==1 and OS!="mac"', { 1252 ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_libra ry" and win_use_allocator_shim==1)', {
1257 'conditions': [ 1253 'conditions': [
1258 ['use_allocator!="none"', { 1254 ['use_allocator!="none"', {
1259 'dependencies': [ 1255 'dependencies': [
1260 '../base/allocator/allocator.gyp:allocator', 1256 '../base/allocator/allocator.gyp:allocator',
1261 ], 1257 ],
1262 }], 1258 }],
1263 ], 1259 ],
1264 }], 1260 }],
1265 ['OS=="android"', { 1261 ['OS=="android"', {
1266 'dependencies': [ 1262 'dependencies': [
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after
1952 'dependencies': [ 1948 'dependencies': [
1953 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1949 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1954 ], 1950 ],
1955 }], 1951 }],
1956 ], 1952 ],
1957 }, 1953 },
1958 ], 1954 ],
1959 }], 1955 }],
1960 ], 1956 ],
1961 } 1957 }
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