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

Side by Side Diff: media/media.gyp

Issue 8718014: Upstream: Media implementation for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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
« media/base/test_data_util.cc ('K') | « media/base/test_data_util.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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 }, 10 },
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'media', 13 'target_name': 'media',
14 'type': '<(component)', 14 'type': '<(component)',
15 'dependencies': [ 15 'dependencies': [
16 'yuv_convert', 16 'yuv_convert',
17 '../base/base.gyp:base', 17 '../base/base.gyp:base',
18 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 18 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
19 '../build/temp_gyp/googleurl.gyp:googleurl', 19 '../build/temp_gyp/googleurl.gyp:googleurl',
20 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
21 '../third_party/openmax/openmax.gyp:il', 20 '../third_party/openmax/openmax.gyp:il',
22 '../ui/ui.gyp:ui', 21 '../ui/ui.gyp:ui',
23 ], 22 ],
24 'defines': [ 23 'defines': [
25 'MEDIA_IMPLEMENTATION', 24 'MEDIA_IMPLEMENTATION',
26 ], 25 ],
27 'include_dirs': [ 26 'include_dirs': [
28 '..', 27 '..',
29 ], 28 ],
30 'sources': [ 29 'sources': [
(...skipping 11 matching lines...) Expand all
42 'audio/audio_output_controller.cc', 41 'audio/audio_output_controller.cc',
43 'audio/audio_output_controller.h', 42 'audio/audio_output_controller.h',
44 'audio/audio_output_dispatcher.cc', 43 'audio/audio_output_dispatcher.cc',
45 'audio/audio_output_dispatcher.h', 44 'audio/audio_output_dispatcher.h',
46 'audio/audio_output_proxy.cc', 45 'audio/audio_output_proxy.cc',
47 'audio/audio_output_proxy.h', 46 'audio/audio_output_proxy.h',
48 'audio/audio_parameters.cc', 47 'audio/audio_parameters.cc',
49 'audio/audio_parameters.h', 48 'audio/audio_parameters.h',
50 'audio/audio_util.cc', 49 'audio/audio_util.cc',
51 'audio/audio_util.h', 50 'audio/audio_util.h',
51 'audio/android/audio_manager_android.cc',
52 'audio/android/audio_manager_android.h',
53 'audio/android/audio_track_output_android.cc',
54 'audio/android/audio_track_output_android.h',
52 'audio/fake_audio_input_stream.cc', 55 'audio/fake_audio_input_stream.cc',
53 'audio/fake_audio_input_stream.h', 56 'audio/fake_audio_input_stream.h',
54 'audio/fake_audio_output_stream.cc', 57 'audio/fake_audio_output_stream.cc',
55 'audio/fake_audio_output_stream.h', 58 'audio/fake_audio_output_stream.h',
56 'audio/linux/audio_manager_linux.cc', 59 'audio/linux/audio_manager_linux.cc',
57 'audio/linux/audio_manager_linux.h', 60 'audio/linux/audio_manager_linux.h',
58 'audio/linux/alsa_input.cc', 61 'audio/linux/alsa_input.cc',
59 'audio/linux/alsa_input.h', 62 'audio/linux/alsa_input.h',
60 'audio/linux/alsa_output.cc', 63 'audio/linux/alsa_output.cc',
61 'audio/linux/alsa_output.h', 64 'audio/linux/alsa_output.h',
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 'base/filter_collection.cc', 124 'base/filter_collection.cc',
122 'base/filter_collection.h', 125 'base/filter_collection.h',
123 'base/filter_factories.cc', 126 'base/filter_factories.cc',
124 'base/filter_factories.h', 127 'base/filter_factories.h',
125 'base/filter_host.h', 128 'base/filter_host.h',
126 'base/filters.cc', 129 'base/filters.cc',
127 'base/filters.h', 130 'base/filters.h',
128 'base/h264_bitstream_converter.cc', 131 'base/h264_bitstream_converter.cc',
129 'base/h264_bitstream_converter.h', 132 'base/h264_bitstream_converter.h',
130 'base/media.h', 133 'base/media.h',
134 'base/media_android.cc',
131 'base/media_export.h', 135 'base/media_export.h',
132 'base/media_log.cc', 136 'base/media_log.cc',
133 'base/media_log.h', 137 'base/media_log.h',
134 'base/media_log_event.h', 138 'base/media_log_event.h',
135 'base/media_posix.cc', 139 'base/media_posix.cc',
136 'base/media_switches.cc', 140 'base/media_switches.cc',
137 'base/media_switches.h', 141 'base/media_switches.h',
138 'base/media_win.cc', 142 'base/media_win.cc',
139 'base/message_loop_factory.cc', 143 'base/message_loop_factory.cc',
140 'base/message_loop_factory.h', 144 'base/message_loop_factory.h',
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 'webm/webm_tracks_parser.h', 257 'webm/webm_tracks_parser.h',
254 ], 258 ],
255 'direct_dependent_settings': { 259 'direct_dependent_settings': {
256 'include_dirs': [ 260 'include_dirs': [
257 '..', 261 '..',
258 ], 262 ],
259 }, 263 },
260 'conditions': [ 264 'conditions': [
261 # Android doesn't use ffmpeg, so make the dependency conditional 265 # Android doesn't use ffmpeg, so make the dependency conditional
262 # and exclude the sources which depend on ffmpeg. 266 # and exclude the sources which depend on ffmpeg.
263 ['OS=="android"', { 267 ['OS!="android"', {
scherkus (not reviewing) 2011/11/29 20:00:28 nit: spaces around operators here + below
michaelbai 2011/11/30 17:20:34 Done.
264 'dependencies!': [ 268 'dependencies': [
265 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 269 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
266 ], 270 ],
271 }],
272 ['OS=="android"', {
267 'sources!': [ 273 'sources!': [
268 'base/media_posix.cc', 274 'base/media_posix.cc',
269 'ffmpeg/ffmpeg_common.cc', 275 'ffmpeg/ffmpeg_common.cc',
270 'ffmpeg/ffmpeg_common.h', 276 'ffmpeg/ffmpeg_common.h',
271 'ffmpeg/file_protocol.cc', 277 'ffmpeg/file_protocol.cc',
272 'ffmpeg/file_protocol.h', 278 'ffmpeg/file_protocol.h',
273 'filters/audio_file_reader.cc', 279 'filters/audio_file_reader.cc',
274 'filters/audio_file_reader.h', 280 'filters/audio_file_reader.h',
275 'filters/bitstream_converter.cc', 281 'filters/bitstream_converter.cc',
276 'filters/bitstream_converter.h', 282 'filters/bitstream_converter.h',
(...skipping 11 matching lines...) Expand all
288 'filters/ffmpeg_h264_bitstream_converter.cc', 294 'filters/ffmpeg_h264_bitstream_converter.cc',
289 'filters/ffmpeg_h264_bitstream_converter.h', 295 'filters/ffmpeg_h264_bitstream_converter.h',
290 'filters/ffmpeg_glue.cc', 296 'filters/ffmpeg_glue.cc',
291 'filters/ffmpeg_glue.h', 297 'filters/ffmpeg_glue.h',
292 'filters/ffmpeg_video_decoder.cc', 298 'filters/ffmpeg_video_decoder.cc',
293 'filters/ffmpeg_video_decoder.h', 299 'filters/ffmpeg_video_decoder.h',
294 'video/ffmpeg_video_decode_engine.cc', 300 'video/ffmpeg_video_decode_engine.cc',
295 'video/ffmpeg_video_decode_engine.h', 301 'video/ffmpeg_video_decode_engine.h',
296 ], 302 ],
297 }], 303 }],
304 # The below 'android' condition were added temporarily and should be
305 # removed in downstream, because there is no Java environment setup in
306 # upstream yet.
307 ['OS=="android"', {
308 'sources!':[
309 'audio/android/audio_track_output_android.cc',
310 ],
311 'sources':[
312 'audio/android/audio_track_output_stub_android.cc',
313 ],
314 }],
298 ['OS=="linux" or OS=="freebsd" or OS=="solaris"', { 315 ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
299 'link_settings': { 316 'link_settings': {
300 'libraries': [ 317 'libraries': [
301 '-lasound', 318 '-lasound',
302 ], 319 ],
303 }, 320 },
304 }], 321 }],
305 ['OS=="openbsd"', { 322 ['OS=="openbsd"', {
306 'sources/': [ ['exclude', '/alsa_' ], 323 'sources/': [ ['exclude', '/alsa_' ],
307 ['exclude', '/audio_manager_linux' ] ], 324 ['exclude', '/audio_manager_linux' ] ],
(...skipping 22 matching lines...) Expand all
330 'defines': [ 347 'defines': [
331 'USE_PULSEAUDIO', 348 'USE_PULSEAUDIO',
332 ], 349 ],
333 }, { # else: use_pulseaudio == 0 350 }, { # else: use_pulseaudio == 0
334 'sources!': [ 351 'sources!': [
335 'audio/pulse/pulse_output.cc', 352 'audio/pulse/pulse_output.cc',
336 'audio/pulse/pulse_output.h', 353 'audio/pulse/pulse_output.h',
337 ], 354 ],
338 }], 355 }],
339 ], 356 ],
357 }],
358 ['os_posix == 1 and OS != "android"', {
359 # Video capture isn't supported in Android yet.
340 'sources!': [ 360 'sources!': [
341 'video/capture/video_capture_device_dummy.cc', 361 'video/capture/video_capture_device_dummy.cc',
342 'video/capture/video_capture_device_dummy.h', 362 'video/capture/video_capture_device_dummy.h',
343 ], 363 ],
344 }], 364 }],
345 ['OS=="mac"', { 365 ['OS=="mac"', {
346 'link_settings': { 366 'link_settings': {
347 'libraries': [ 367 'libraries': [
348 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 368 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
349 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 369 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 'base/simd/yuv_to_rgb_table.h', 462 'base/simd/yuv_to_rgb_table.h',
443 ], 463 ],
444 'conditions': [ 464 'conditions': [
445 [ 'target_arch == "x64"', { 465 [ 'target_arch == "x64"', {
446 # Source files optimized for X64 systems. 466 # Source files optimized for X64 systems.
447 'sources': [ 467 'sources': [
448 'base/simd/linear_scale_yuv_to_rgb_mmx_x64.asm', 468 'base/simd/linear_scale_yuv_to_rgb_mmx_x64.asm',
449 'base/simd/scale_yuv_to_rgb_sse2_x64.asm', 469 'base/simd/scale_yuv_to_rgb_sse2_x64.asm',
450 ], 470 ],
451 }], 471 }],
452 [ 'os_posix == 1 and OS != "mac"', { 472 [ 'os_posix == 1 and OS != "mac" and OS != "android"', {
453 'cflags': [ 473 'cflags': [
454 '-msse2', 474 '-msse2',
455 '-msse3', 475 '-msse3',
456 '-mssse3', 476 '-mssse3',
457 ], 477 ],
458 }], 478 }],
459 [ 'OS == "openbsd"', { 479 [ 'OS == "openbsd"', {
460 # OpenBSD's gcc (4.2.1) does not support -mssse3 480 # OpenBSD's gcc (4.2.1) does not support -mssse3
461 'cflags!': [ 481 'cflags!': [
462 '-mssse3', 482 '-mssse3',
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 'type': 'executable', 566 'type': 'executable',
547 'dependencies': [ 567 'dependencies': [
548 'media', 568 'media',
549 'media_test_support', 569 'media_test_support',
550 'yuv_convert', 570 'yuv_convert',
551 '../base/base.gyp:base', 571 '../base/base.gyp:base',
552 '../base/base.gyp:base_i18n', 572 '../base/base.gyp:base_i18n',
553 '../base/base.gyp:test_support_base', 573 '../base/base.gyp:test_support_base',
554 '../testing/gmock.gyp:gmock', 574 '../testing/gmock.gyp:gmock',
555 '../testing/gtest.gyp:gtest', 575 '../testing/gtest.gyp:gtest',
556 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
557 '../ui/ui.gyp:ui', 576 '../ui/ui.gyp:ui',
558 ], 577 ],
559 'sources': [ 578 'sources': [
560 'audio/audio_input_controller_unittest.cc', 579 'audio/audio_input_controller_unittest.cc',
561 'audio/audio_input_device_unittest.cc', 580 'audio/audio_input_device_unittest.cc',
562 'audio/audio_input_unittest.cc', 581 'audio/audio_input_unittest.cc',
563 'audio/audio_output_controller_unittest.cc', 582 'audio/audio_output_controller_unittest.cc',
564 'audio/audio_output_proxy_unittest.cc', 583 'audio/audio_output_proxy_unittest.cc',
565 'audio/audio_parameters_unittest.cc', 584 'audio/audio_parameters_unittest.cc',
566 'audio/audio_util_unittest.cc', 585 'audio/audio_util_unittest.cc',
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 ['os_posix==1 and OS!="mac"', { 629 ['os_posix==1 and OS!="mac"', {
611 'conditions': [ 630 'conditions': [
612 ['linux_use_tcmalloc==1', { 631 ['linux_use_tcmalloc==1', {
613 'dependencies': [ 632 'dependencies': [
614 '../base/allocator/allocator.gyp:allocator', 633 '../base/allocator/allocator.gyp:allocator',
615 ], 634 ],
616 }], 635 }],
617 ], 636 ],
618 }], 637 }],
619 ['OS=="android"', { 638 ['OS=="android"', {
620 'dependencies!': [
621 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
622 ],
623 'sources!': [ 639 'sources!': [
624 'ffmpeg/ffmpeg_common_unittest.cc', 640 'ffmpeg/ffmpeg_common_unittest.cc',
625 'filters/ffmpeg_audio_decoder_unittest.cc', 641 'filters/ffmpeg_audio_decoder_unittest.cc',
626 'filters/bitstream_converter_unittest.cc', 642 'filters/bitstream_converter_unittest.cc',
627 'filters/chunk_demuxer_unittest.cc', 643 'filters/chunk_demuxer_unittest.cc',
628 'filters/ffmpeg_demuxer_unittest.cc', 644 'filters/ffmpeg_demuxer_unittest.cc',
629 'filters/ffmpeg_glue_unittest.cc', 645 'filters/ffmpeg_glue_unittest.cc',
630 'filters/ffmpeg_h264_bitstream_converter_unittest.cc', 646 'filters/ffmpeg_h264_bitstream_converter_unittest.cc',
631 'filters/ffmpeg_video_decoder_unittest.cc', 647 'filters/ffmpeg_video_decoder_unittest.cc',
632 ], 648 ],
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 'libraries': [ 807 'libraries': [
792 '-lGL', 808 '-lGL',
793 '-ldl', 809 '-ldl',
794 ], 810 ],
795 'sources': [ 811 'sources': [
796 'tools/tile_render_bench/tile_render_bench.cc', 812 'tools/tile_render_bench/tile_render_bench.cc',
797 ], 813 ],
798 }, 814 },
799 ], 815 ],
800 }], 816 }],
801 ['os_posix == 1 and OS != "mac"', { 817 ['os_posix == 1 and OS != "mac" and OS != "android"', {
802 'targets': [ 818 'targets': [
803 { 819 {
804 'target_name': 'player_x11', 820 'target_name': 'player_x11',
805 'type': 'executable', 821 'type': 'executable',
806 'dependencies': [ 822 'dependencies': [
807 'media', 823 'media',
808 'yuv_convert', 824 'yuv_convert',
809 '../base/base.gyp:base', 825 '../base/base.gyp:base',
810 '../ui/gfx/gl/gl.gyp:gl', 826 '../ui/gfx/gl/gl.gyp:gl',
811 ], 827 ],
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 902 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
887 ], 903 ],
888 'sources': [ 904 'sources': [
889 'tools/media_bench/media_bench.cc', 905 'tools/media_bench/media_bench.cc',
890 ], 906 ],
891 }, 907 },
892 ], 908 ],
893 }] 909 }]
894 ], 910 ],
895 } 911 }
OLDNEW
« media/base/test_data_util.cc ('K') | « media/base/test_data_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698