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

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: Updating media library initialize calls Created 5 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
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/mime_util.cc', 331 'base/mime_util.cc',
334 'base/mime_util.h', 332 'base/mime_util.h',
335 'base/moving_average.cc', 333 'base/moving_average.cc',
336 'base/moving_average.h', 334 'base/moving_average.h',
337 'base/multi_channel_resampler.cc', 335 'base/multi_channel_resampler.cc',
338 'base/multi_channel_resampler.h', 336 'base/multi_channel_resampler.h',
339 'base/pipeline.cc', 337 'base/pipeline.cc',
340 'base/pipeline.h', 338 'base/pipeline.h',
341 'base/pipeline_status.h', 339 'base/pipeline_status.h',
342 'base/player_tracker.cc', 340 'base/player_tracker.cc',
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 ], 616 ],
619 }, { # media_use_ffmpeg==0 617 }, { # media_use_ffmpeg==0
620 # Exclude the sources that depend on ffmpeg. 618 # Exclude the sources that depend on ffmpeg.
621 'sources!': [ 619 'sources!': [
622 'base/audio_video_metadata_extractor.cc', 620 'base/audio_video_metadata_extractor.cc',
623 'base/audio_video_metadata_extractor.h', 621 'base/audio_video_metadata_extractor.h',
624 'base/container_names.cc', 622 'base/container_names.cc',
625 'base/container_names.h', 623 'base/container_names.h',
626 'base/media_file_checker.cc', 624 'base/media_file_checker.cc',
627 'base/media_file_checker.h', 625 'base/media_file_checker.h',
628 'base/media_posix.cc',
629 'ffmpeg/ffmpeg_common.cc', 626 'ffmpeg/ffmpeg_common.cc',
630 'ffmpeg/ffmpeg_common.h', 627 'ffmpeg/ffmpeg_common.h',
631 'filters/audio_file_reader.cc', 628 'filters/audio_file_reader.cc',
632 'filters/audio_file_reader.h', 629 'filters/audio_file_reader.h',
633 'filters/blocking_url_protocol.cc', 630 'filters/blocking_url_protocol.cc',
634 'filters/blocking_url_protocol.h', 631 'filters/blocking_url_protocol.h',
635 'filters/ffmpeg_aac_bitstream_converter.cc', 632 'filters/ffmpeg_aac_bitstream_converter.cc',
636 'filters/ffmpeg_aac_bitstream_converter.h', 633 'filters/ffmpeg_aac_bitstream_converter.h',
637 'filters/ffmpeg_audio_decoder.cc', 634 'filters/ffmpeg_audio_decoder.cc',
638 'filters/ffmpeg_audio_decoder.h', 635 'filters/ffmpeg_audio_decoder.h',
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 ['OS=="android"', { 684 ['OS=="android"', {
688 'dependencies': [ 685 'dependencies': [
689 'media_android_jni_headers', 686 'media_android_jni_headers',
690 'media_java', 687 'media_java',
691 'player_android', 688 'player_android',
692 'video_capture_android_jni_headers', 689 'video_capture_android_jni_headers',
693 ], 690 ],
694 'sources': [ 691 'sources': [
695 'base/media.cc', 692 'base/media.cc',
696 'base/media.h', 693 'base/media.h',
697 'base/media_stub.cc',
698 ], 694 ],
699 'sources!': [ 695 'sources!': [
700 'filters/opus_audio_decoder.cc', 696 'filters/opus_audio_decoder.cc',
701 'filters/opus_audio_decoder.h', 697 'filters/opus_audio_decoder.h',
702 'renderers/default_renderer_factory.cc', 698 'renderers/default_renderer_factory.cc',
703 'renderers/default_renderer_factory.h', 699 'renderers/default_renderer_factory.h',
704 ], 700 ],
705 'defines': [ 701 'defines': [
706 'DISABLE_USER_INPUT_MONITOR', 702 'DISABLE_USER_INPUT_MONITOR',
707 ], 703 ],
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
1247 'filters/ffmpeg_aac_bitstream_converter_unittest.cc', 1243 'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
1248 'filters/ffmpeg_demuxer_unittest.cc', 1244 'filters/ffmpeg_demuxer_unittest.cc',
1249 'filters/ffmpeg_glue_unittest.cc', 1245 'filters/ffmpeg_glue_unittest.cc',
1250 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 1246 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
1251 'filters/ffmpeg_video_decoder_unittest.cc', 1247 'filters/ffmpeg_video_decoder_unittest.cc',
1252 'filters/in_memory_url_protocol_unittest.cc', 1248 'filters/in_memory_url_protocol_unittest.cc',
1253 'test/pipeline_integration_test.cc', 1249 'test/pipeline_integration_test.cc',
1254 'test/pipeline_integration_test_base.cc', 1250 'test/pipeline_integration_test_base.cc',
1255 ], 1251 ],
1256 }], 1252 }],
1257 ['os_posix==1 and OS!="mac"', { 1253 ['(os_posix==1 and OS!="mac") or OS=="win"', {
1258 'conditions': [ 1254 'conditions': [
1259 ['use_allocator!="none"', { 1255 ['use_allocator!="none"', {
1260 'dependencies': [ 1256 'dependencies': [
1261 '../base/allocator/allocator.gyp:allocator', 1257 '../base/allocator/allocator.gyp:allocator',
1262 ], 1258 ],
1263 }], 1259 }],
1264 ], 1260 ],
1265 }], 1261 }],
1266 ['OS=="android"', { 1262 ['OS=="android"', {
1267 'dependencies': [ 1263 'dependencies': [
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
1961 '../build/isolate.gypi', 1957 '../build/isolate.gypi',
1962 ], 1958 ],
1963 'sources': [ 1959 'sources': [
1964 'audio_unittests.isolate', 1960 'audio_unittests.isolate',
1965 ], 1961 ],
1966 }, 1962 },
1967 ], 1963 ],
1968 }], 1964 }],
1969 ], 1965 ],
1970 } 1966 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698