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

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: fix for CaptureVideoDecoder 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
« no previous file with comments | « media/filters/video_renderer_base_unittest.cc ('k') | media/video/ffmpeg_video_decode_engine.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) 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 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 'filters/bitstream_converter_unittest.cc', 590 'filters/bitstream_converter_unittest.cc',
591 'filters/chunk_demuxer_unittest.cc', 591 'filters/chunk_demuxer_unittest.cc',
592 'filters/ffmpeg_audio_decoder_unittest.cc', 592 'filters/ffmpeg_audio_decoder_unittest.cc',
593 'filters/ffmpeg_demuxer_unittest.cc', 593 'filters/ffmpeg_demuxer_unittest.cc',
594 'filters/ffmpeg_glue_unittest.cc', 594 'filters/ffmpeg_glue_unittest.cc',
595 'filters/ffmpeg_h264_bitstream_converter_unittest.cc', 595 'filters/ffmpeg_h264_bitstream_converter_unittest.cc',
596 'filters/ffmpeg_video_decoder_unittest.cc', 596 'filters/ffmpeg_video_decoder_unittest.cc',
597 'filters/file_data_source_unittest.cc', 597 'filters/file_data_source_unittest.cc',
598 'filters/video_renderer_base_unittest.cc', 598 'filters/video_renderer_base_unittest.cc',
599 'video/capture/video_capture_device_unittest.cc', 599 'video/capture/video_capture_device_unittest.cc',
600 'video/ffmpeg_video_decode_engine_unittest.cc',
601 'webm/cluster_builder.cc', 600 'webm/cluster_builder.cc',
602 'webm/cluster_builder.h', 601 'webm/cluster_builder.h',
603 ], 602 ],
604 'conditions': [ 603 'conditions': [
605 ['os_posix==1 and OS!="mac"', { 604 ['os_posix==1 and OS!="mac"', {
606 'conditions': [ 605 'conditions': [
607 ['linux_use_tcmalloc==1', { 606 ['linux_use_tcmalloc==1', {
608 'dependencies': [ 607 'dependencies': [
609 '../base/allocator/allocator.gyp:allocator', 608 '../base/allocator/allocator.gyp:allocator',
610 ], 609 ],
611 }], 610 }],
612 ], 611 ],
613 }], 612 }],
614 ['OS=="android"', { 613 ['OS=="android"', {
615 'dependencies!': [ 614 'dependencies!': [
616 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 615 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
617 ], 616 ],
618 'sources!': [ 617 'sources!': [
619 'ffmpeg/ffmpeg_common_unittest.cc', 618 'ffmpeg/ffmpeg_common_unittest.cc',
620 'filters/ffmpeg_audio_decoder_unittest.cc', 619 'filters/ffmpeg_audio_decoder_unittest.cc',
621 'filters/bitstream_converter_unittest.cc', 620 'filters/bitstream_converter_unittest.cc',
622 'filters/chunk_demuxer_unittest.cc', 621 'filters/chunk_demuxer_unittest.cc',
623 'filters/ffmpeg_demuxer_unittest.cc', 622 'filters/ffmpeg_demuxer_unittest.cc',
624 'filters/ffmpeg_glue_unittest.cc', 623 'filters/ffmpeg_glue_unittest.cc',
625 'filters/ffmpeg_h264_bitstream_converter_unittest.cc', 624 'filters/ffmpeg_h264_bitstream_converter_unittest.cc',
626 'filters/ffmpeg_video_decoder_unittest.cc', 625 'filters/ffmpeg_video_decoder_unittest.cc',
627 'video/ffmpeg_video_decode_engine_unittest.cc',
628 ], 626 ],
629 }], 627 }],
630 [ 'target_arch=="ia32" or target_arch=="x64"', { 628 [ 'target_arch=="ia32" or target_arch=="x64"', {
631 'sources': [ 629 'sources': [
632 'base/simd/convert_rgb_to_yuv_unittest.cc', 630 'base/simd/convert_rgb_to_yuv_unittest.cc',
633 ], 631 ],
634 }], 632 }],
635 ], 633 ],
636 }, 634 },
637 { 635 {
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 880 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
883 ], 881 ],
884 'sources': [ 882 'sources': [
885 'tools/media_bench/media_bench.cc', 883 'tools/media_bench/media_bench.cc',
886 ], 884 ],
887 }, 885 },
888 ], 886 ],
889 }] 887 }]
890 ], 888 ],
891 } 889 }
OLDNEW
« no previous file with comments | « media/filters/video_renderer_base_unittest.cc ('k') | media/video/ffmpeg_video_decode_engine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698