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

Side by Side Diff: media/media.gyp

Issue 11234071: Moved SkCanvasVideoRenderer to media/filters. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added MEDIA_EXPORT. Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « media/filters/skcanvas_video_renderer_unittest.cc ('k') | skia/config/win/stdint.h » ('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 PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
11 'use_cras%': 0, 11 'use_cras%': 0,
12 'conditions': [ 12 'conditions': [
13 ['OS == "android" or OS == "ios"', { 13 ['OS == "android" or OS == "ios"', {
14 # Android and iOS don't use ffmpeg. 14 # Android and iOS don't use ffmpeg.
15 'use_ffmpeg%': 0, 15 'use_ffmpeg%': 0,
16 }, { # 'OS != "android" and OS != "ios"' 16 }, { # 'OS != "android" and OS != "ios"'
17 'use_ffmpeg%': 1, 17 'use_ffmpeg%': 1,
18 }], 18 }],
19 ], 19 ],
20 }, 20 },
21 'targets': [ 21 'targets': [
22 { 22 {
23 'target_name': 'media', 23 'target_name': 'media',
24 'type': '<(component)', 24 'type': '<(component)',
25 'dependencies': [ 25 'dependencies': [
26 '../base/base.gyp:base', 26 '../base/base.gyp:base',
27 '../build/temp_gyp/googleurl.gyp:googleurl', 27 '../build/temp_gyp/googleurl.gyp:googleurl',
28 '../crypto/crypto.gyp:crypto', 28 '../crypto/crypto.gyp:crypto',
29 '../skia/skia.gyp:skia',
29 '../ui/ui.gyp:ui', 30 '../ui/ui.gyp:ui',
30 ], 31 ],
31 'defines': [ 32 'defines': [
32 'MEDIA_IMPLEMENTATION', 33 'MEDIA_IMPLEMENTATION',
33 ], 34 ],
34 'include_dirs': [ 35 'include_dirs': [
35 '..', 36 '..',
36 ], 37 ],
37 'sources': [ 38 'sources': [
38 'audio/android/audio_manager_android.cc', 39 'audio/android/audio_manager_android.cc',
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 'filters/ffmpeg_video_decoder.cc', 272 'filters/ffmpeg_video_decoder.cc',
272 'filters/ffmpeg_video_decoder.h', 273 'filters/ffmpeg_video_decoder.h',
273 'filters/file_data_source.cc', 274 'filters/file_data_source.cc',
274 'filters/file_data_source.h', 275 'filters/file_data_source.h',
275 'filters/gpu_video_decoder.cc', 276 'filters/gpu_video_decoder.cc',
276 'filters/gpu_video_decoder.h', 277 'filters/gpu_video_decoder.h',
277 'filters/h264_to_annex_b_bitstream_converter.cc', 278 'filters/h264_to_annex_b_bitstream_converter.cc',
278 'filters/h264_to_annex_b_bitstream_converter.h', 279 'filters/h264_to_annex_b_bitstream_converter.h',
279 'filters/in_memory_url_protocol.cc', 280 'filters/in_memory_url_protocol.cc',
280 'filters/in_memory_url_protocol.h', 281 'filters/in_memory_url_protocol.h',
282 'filters/skcanvas_video_renderer.cc',
283 'filters/skcanvas_video_renderer.h',
281 'filters/source_buffer_stream.cc', 284 'filters/source_buffer_stream.cc',
282 'filters/source_buffer_stream.h', 285 'filters/source_buffer_stream.h',
283 'filters/video_frame_generator.cc', 286 'filters/video_frame_generator.cc',
284 'filters/video_frame_generator.h', 287 'filters/video_frame_generator.h',
285 'filters/video_renderer_base.cc', 288 'filters/video_renderer_base.cc',
286 'filters/video_renderer_base.h', 289 'filters/video_renderer_base.h',
287 'video/capture/fake_video_capture_device.cc', 290 'video/capture/fake_video_capture_device.cc',
288 'video/capture/fake_video_capture_device.h', 291 'video/capture/fake_video_capture_device.h',
289 'video/capture/linux/video_capture_device_linux.cc', 292 'video/capture/linux/video_capture_device_linux.cc',
290 'video/capture/linux/video_capture_device_linux.h', 293 'video/capture/linux/video_capture_device_linux.h',
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 ], 427 ],
425 'link_settings': { 428 'link_settings': {
426 'libraries': [ 429 'libraries': [
427 '-lOpenSLES', 430 '-lOpenSLES',
428 ], 431 ],
429 }, 432 },
430 }], 433 }],
431 # A simple WebM encoder for animated avatars on ChromeOS. 434 # A simple WebM encoder for animated avatars on ChromeOS.
432 ['chromeos==1', { 435 ['chromeos==1', {
433 'dependencies': [ 436 'dependencies': [
434 '../skia/skia.gyp:skia',
435 '../third_party/libvpx/libvpx.gyp:libvpx', 437 '../third_party/libvpx/libvpx.gyp:libvpx',
436 '../third_party/libyuv/libyuv.gyp:libyuv', 438 '../third_party/libyuv/libyuv.gyp:libyuv',
437 ], 439 ],
438 'sources': [ 440 'sources': [
439 'webm/chromeos/ebml_writer.cc', 441 'webm/chromeos/ebml_writer.cc',
440 'webm/chromeos/ebml_writer.h', 442 'webm/chromeos/ebml_writer.h',
441 'webm/chromeos/webm_encoder.cc', 443 'webm/chromeos/webm_encoder.cc',
442 'webm/chromeos/webm_encoder.h', 444 'webm/chromeos/webm_encoder.h',
443 ], 445 ],
444 }], 446 }],
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 }, 581 },
580 { 582 {
581 'target_name': 'media_unittests', 583 'target_name': 'media_unittests',
582 'type': '<(gtest_target_type)', 584 'type': '<(gtest_target_type)',
583 'dependencies': [ 585 'dependencies': [
584 'media', 586 'media',
585 'media_test_support', 587 'media_test_support',
586 '../base/base.gyp:base', 588 '../base/base.gyp:base',
587 '../base/base.gyp:base_i18n', 589 '../base/base.gyp:base_i18n',
588 '../base/base.gyp:test_support_base', 590 '../base/base.gyp:test_support_base',
591 '../skia/skia.gyp:skia',
589 '../testing/gmock.gyp:gmock', 592 '../testing/gmock.gyp:gmock',
590 '../testing/gtest.gyp:gtest', 593 '../testing/gtest.gyp:gtest',
591 '../ui/ui.gyp:ui', 594 '../ui/ui.gyp:ui',
592 ], 595 ],
593 'sources': [ 596 'sources': [
594 'audio/async_socket_io_handler_unittest.cc', 597 'audio/async_socket_io_handler_unittest.cc',
595 'audio/audio_input_controller_unittest.cc', 598 'audio/audio_input_controller_unittest.cc',
596 'audio/audio_input_device_unittest.cc', 599 'audio/audio_input_device_unittest.cc',
597 'audio/audio_input_unittest.cc', 600 'audio/audio_input_unittest.cc',
598 'audio/audio_input_volume_unittest.cc', 601 'audio/audio_input_volume_unittest.cc',
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 'filters/ffmpeg_audio_decoder_unittest.cc', 653 'filters/ffmpeg_audio_decoder_unittest.cc',
651 'filters/ffmpeg_decoder_unittest.h', 654 'filters/ffmpeg_decoder_unittest.h',
652 'filters/ffmpeg_demuxer_unittest.cc', 655 'filters/ffmpeg_demuxer_unittest.cc',
653 'filters/ffmpeg_glue_unittest.cc', 656 'filters/ffmpeg_glue_unittest.cc',
654 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 657 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
655 'filters/ffmpeg_video_decoder_unittest.cc', 658 'filters/ffmpeg_video_decoder_unittest.cc',
656 'filters/file_data_source_unittest.cc', 659 'filters/file_data_source_unittest.cc',
657 'filters/h264_to_annex_b_bitstream_converter_unittest.cc', 660 'filters/h264_to_annex_b_bitstream_converter_unittest.cc',
658 'filters/pipeline_integration_test.cc', 661 'filters/pipeline_integration_test.cc',
659 'filters/pipeline_integration_test_base.cc', 662 'filters/pipeline_integration_test_base.cc',
663 'filters/skcanvas_video_renderer_unittest.cc',
660 'filters/source_buffer_stream_unittest.cc', 664 'filters/source_buffer_stream_unittest.cc',
661 'filters/video_renderer_base_unittest.cc', 665 'filters/video_renderer_base_unittest.cc',
662 'video/capture/video_capture_device_unittest.cc', 666 'video/capture/video_capture_device_unittest.cc',
663 'webm/cluster_builder.cc', 667 'webm/cluster_builder.cc',
664 'webm/cluster_builder.h', 668 'webm/cluster_builder.h',
665 'webm/webm_cluster_parser_unittest.cc', 669 'webm/webm_cluster_parser_unittest.cc',
666 'webm/webm_content_encodings_client_unittest.cc', 670 'webm/webm_content_encodings_client_unittest.cc',
667 'webm/webm_parser_unittest.cc', 671 'webm/webm_parser_unittest.cc',
668 ], 672 ],
669 'conditions': [ 673 'conditions': [
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
1311 'media', 1315 'media',
1312 ], 1316 ],
1313 'sources': [ 1317 'sources': [
1314 'tools/media_bench/media_bench.cc', 1318 'tools/media_bench/media_bench.cc',
1315 ], 1319 ],
1316 }, 1320 },
1317 ], 1321 ],
1318 }] 1322 }]
1319 ], 1323 ],
1320 } 1324 }
OLDNEW
« no previous file with comments | « media/filters/skcanvas_video_renderer_unittest.cc ('k') | skia/config/win/stdint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698