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

Side by Side Diff: media/media.gyp

Issue 253923002: Fix InMemoryUrlProtocol available_bytes computation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Exclude unittest on Android Created 6 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 | Annotate | Revision Log
« no previous file with comments | « media/filters/in_memory_url_protocol_unittest.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) 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 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 'filters/ffmpeg_audio_decoder.cc', 567 'filters/ffmpeg_audio_decoder.cc',
568 'filters/ffmpeg_audio_decoder.h', 568 'filters/ffmpeg_audio_decoder.h',
569 'filters/ffmpeg_demuxer.cc', 569 'filters/ffmpeg_demuxer.cc',
570 'filters/ffmpeg_demuxer.h', 570 'filters/ffmpeg_demuxer.h',
571 'filters/ffmpeg_glue.cc', 571 'filters/ffmpeg_glue.cc',
572 'filters/ffmpeg_glue.h', 572 'filters/ffmpeg_glue.h',
573 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', 573 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
574 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', 574 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
575 'filters/ffmpeg_video_decoder.cc', 575 'filters/ffmpeg_video_decoder.cc',
576 'filters/ffmpeg_video_decoder.h', 576 'filters/ffmpeg_video_decoder.h',
577 'filters/in_memory_url_protocol.cc',
578 'filters/in_memory_url_protocol.h',
577 ], 579 ],
578 }], 580 }],
579 ['media_use_libvpx==1', { 581 ['media_use_libvpx==1', {
580 'dependencies': [ 582 'dependencies': [
581 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', 583 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
582 ], 584 ],
583 }, { # media_use_libvpx==0 585 }, { # media_use_libvpx==0
584 'direct_dependent_settings': { 586 'direct_dependent_settings': {
585 'defines': [ 587 'defines': [
586 'MEDIA_DISABLE_LIBVPX', 588 'MEDIA_DISABLE_LIBVPX',
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
1030 'filters/fake_video_decoder_unittest.cc', 1032 'filters/fake_video_decoder_unittest.cc',
1031 'filters/ffmpeg_audio_decoder_unittest.cc', 1033 'filters/ffmpeg_audio_decoder_unittest.cc',
1032 'filters/ffmpeg_demuxer_unittest.cc', 1034 'filters/ffmpeg_demuxer_unittest.cc',
1033 'filters/ffmpeg_glue_unittest.cc', 1035 'filters/ffmpeg_glue_unittest.cc',
1034 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 1036 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
1035 'filters/ffmpeg_video_decoder_unittest.cc', 1037 'filters/ffmpeg_video_decoder_unittest.cc',
1036 'filters/file_data_source_unittest.cc', 1038 'filters/file_data_source_unittest.cc',
1037 'filters/h264_bit_reader_unittest.cc', 1039 'filters/h264_bit_reader_unittest.cc',
1038 'filters/h264_parser_unittest.cc', 1040 'filters/h264_parser_unittest.cc',
1039 'filters/h264_to_annex_b_bitstream_converter_unittest.cc', 1041 'filters/h264_to_annex_b_bitstream_converter_unittest.cc',
1042 'filters/in_memory_url_protocol_unittest.cc',
1040 'filters/opus_audio_decoder_unittest.cc', 1043 'filters/opus_audio_decoder_unittest.cc',
1041 'filters/pipeline_integration_test.cc', 1044 'filters/pipeline_integration_test.cc',
1042 'filters/pipeline_integration_test_base.cc', 1045 'filters/pipeline_integration_test_base.cc',
1043 'filters/skcanvas_video_renderer_unittest.cc', 1046 'filters/skcanvas_video_renderer_unittest.cc',
1044 'filters/source_buffer_stream_unittest.cc', 1047 'filters/source_buffer_stream_unittest.cc',
1045 'filters/video_decoder_selector_unittest.cc', 1048 'filters/video_decoder_selector_unittest.cc',
1046 'filters/video_frame_scheduler_impl_unittest.cc', 1049 'filters/video_frame_scheduler_impl_unittest.cc',
1047 'filters/video_frame_scheduler_unittest.cc', 1050 'filters/video_frame_scheduler_unittest.cc',
1048 'filters/video_frame_stream_unittest.cc', 1051 'filters/video_frame_stream_unittest.cc',
1049 'filters/video_renderer_impl_unittest.cc', 1052 'filters/video_renderer_impl_unittest.cc',
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
1110 'audio/audio_input_volume_unittest.cc', 1113 'audio/audio_input_volume_unittest.cc',
1111 'base/container_names_unittest.cc', 1114 'base/container_names_unittest.cc',
1112 'ffmpeg/ffmpeg_common_unittest.cc', 1115 'ffmpeg/ffmpeg_common_unittest.cc',
1113 'filters/audio_file_reader_unittest.cc', 1116 'filters/audio_file_reader_unittest.cc',
1114 'filters/blocking_url_protocol_unittest.cc', 1117 'filters/blocking_url_protocol_unittest.cc',
1115 'filters/ffmpeg_audio_decoder_unittest.cc', 1118 'filters/ffmpeg_audio_decoder_unittest.cc',
1116 'filters/ffmpeg_demuxer_unittest.cc', 1119 'filters/ffmpeg_demuxer_unittest.cc',
1117 'filters/ffmpeg_glue_unittest.cc', 1120 'filters/ffmpeg_glue_unittest.cc',
1118 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 1121 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
1119 'filters/ffmpeg_video_decoder_unittest.cc', 1122 'filters/ffmpeg_video_decoder_unittest.cc',
1123 'filters/in_memory_url_protocol_unittest.cc',
1120 'filters/opus_audio_decoder_unittest.cc', 1124 'filters/opus_audio_decoder_unittest.cc',
1121 'filters/pipeline_integration_test.cc', 1125 'filters/pipeline_integration_test.cc',
1122 'filters/pipeline_integration_test_base.cc', 1126 'filters/pipeline_integration_test_base.cc',
1123 ], 1127 ],
1124 'conditions': [ 1128 'conditions': [
1125 ['gtest_target_type=="shared_library"', { 1129 ['gtest_target_type=="shared_library"', {
1126 'dependencies': [ 1130 'dependencies': [
1127 '../testing/android/native_test.gyp:native_test_native_code', 1131 '../testing/android/native_test.gyp:native_test_native_code',
1128 'player_android', 1132 'player_android',
1129 ], 1133 ],
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
1689 ], 1693 ],
1690 }], 1694 }],
1691 ], 1695 ],
1692 }], 1696 }],
1693 ], 1697 ],
1694 }, 1698 },
1695 ], 1699 ],
1696 }], 1700 }],
1697 ], 1701 ],
1698 } 1702 }
OLDNEW
« no previous file with comments | « media/filters/in_memory_url_protocol_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698