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

Side by Side Diff: media/media.gyp

Issue 8417019: Simplify VideoDecodeEngine interface by making everything synchronous. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup++ Created 9 years, 1 month 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
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 },
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 'filters/bitstream_converter_unittest.cc', 589 'filters/bitstream_converter_unittest.cc',
590 'filters/chunk_demuxer_unittest.cc', 590 'filters/chunk_demuxer_unittest.cc',
591 'filters/ffmpeg_audio_decoder_unittest.cc', 591 'filters/ffmpeg_audio_decoder_unittest.cc',
592 'filters/ffmpeg_demuxer_unittest.cc', 592 'filters/ffmpeg_demuxer_unittest.cc',
593 'filters/ffmpeg_glue_unittest.cc', 593 'filters/ffmpeg_glue_unittest.cc',
594 'filters/ffmpeg_h264_bitstream_converter_unittest.cc', 594 'filters/ffmpeg_h264_bitstream_converter_unittest.cc',
595 'filters/ffmpeg_video_decoder_unittest.cc', 595 'filters/ffmpeg_video_decoder_unittest.cc',
596 'filters/file_data_source_unittest.cc', 596 'filters/file_data_source_unittest.cc',
597 'filters/video_renderer_base_unittest.cc', 597 'filters/video_renderer_base_unittest.cc',
598 'video/capture/video_capture_device_unittest.cc', 598 'video/capture/video_capture_device_unittest.cc',
599 'video/ffmpeg_video_decode_engine_unittest.cc',
600 'webm/cluster_builder.cc', 599 'webm/cluster_builder.cc',
601 'webm/cluster_builder.h', 600 'webm/cluster_builder.h',
602 ], 601 ],
603 'conditions': [ 602 'conditions': [
604 ['os_posix==1 and OS!="mac"', { 603 ['os_posix==1 and OS!="mac"', {
605 'conditions': [ 604 'conditions': [
606 ['linux_use_tcmalloc==1', { 605 ['linux_use_tcmalloc==1', {
607 'dependencies': [ 606 'dependencies': [
608 '../base/allocator/allocator.gyp:allocator', 607 '../base/allocator/allocator.gyp:allocator',
609 ], 608 ],
610 }], 609 }],
611 ], 610 ],
612 }], 611 }],
613 ['OS=="android"', { 612 ['OS=="android"', {
614 'dependencies!': [ 613 'dependencies!': [
615 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 614 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
616 ], 615 ],
617 'sources!': [ 616 'sources!': [
618 'ffmpeg/ffmpeg_common_unittest.cc', 617 'ffmpeg/ffmpeg_common_unittest.cc',
619 'filters/ffmpeg_audio_decoder_unittest.cc', 618 'filters/ffmpeg_audio_decoder_unittest.cc',
620 'filters/bitstream_converter_unittest.cc', 619 'filters/bitstream_converter_unittest.cc',
621 'filters/chunk_demuxer_unittest.cc', 620 'filters/chunk_demuxer_unittest.cc',
622 'filters/ffmpeg_demuxer_unittest.cc', 621 'filters/ffmpeg_demuxer_unittest.cc',
623 'filters/ffmpeg_glue_unittest.cc', 622 'filters/ffmpeg_glue_unittest.cc',
624 'filters/ffmpeg_h264_bitstream_converter_unittest.cc', 623 'filters/ffmpeg_h264_bitstream_converter_unittest.cc',
625 'filters/ffmpeg_video_decoder_unittest.cc', 624 'filters/ffmpeg_video_decoder_unittest.cc',
626 'video/ffmpeg_video_decode_engine_unittest.cc',
627 ], 625 ],
628 }], 626 }],
629 [ 'target_arch=="ia32" or target_arch=="x64"', { 627 [ 'target_arch=="ia32" or target_arch=="x64"', {
630 'sources': [ 628 'sources': [
631 'base/simd/convert_rgb_to_yuv_unittest.cc', 629 'base/simd/convert_rgb_to_yuv_unittest.cc',
632 ], 630 ],
633 }], 631 }],
634 ], 632 ],
635 }, 633 },
636 { 634 {
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 879 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
882 ], 880 ],
883 'sources': [ 881 'sources': [
884 'tools/media_bench/media_bench.cc', 882 'tools/media_bench/media_bench.cc',
885 ], 883 ],
886 }, 884 },
887 ], 885 ],
888 }] 886 }]
889 ], 887 ],
890 } 888 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698