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

Side by Side Diff: media/media.gyp

Issue 11410052: Refactor FFmpegURLProtocol code from FFmpegDemuxer into BlockingUrlProtocol. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android Created 8 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) 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.
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 'crypto/aes_decryptor.cc', 248 'crypto/aes_decryptor.cc',
249 'crypto/aes_decryptor.h', 249 'crypto/aes_decryptor.h',
250 'ffmpeg/ffmpeg_common.cc', 250 'ffmpeg/ffmpeg_common.cc',
251 'ffmpeg/ffmpeg_common.h', 251 'ffmpeg/ffmpeg_common.h',
252 'filters/audio_file_reader.cc', 252 'filters/audio_file_reader.cc',
253 'filters/audio_file_reader.h', 253 'filters/audio_file_reader.h',
254 'filters/audio_renderer_algorithm.cc', 254 'filters/audio_renderer_algorithm.cc',
255 'filters/audio_renderer_algorithm.h', 255 'filters/audio_renderer_algorithm.h',
256 'filters/audio_renderer_impl.cc', 256 'filters/audio_renderer_impl.cc',
257 'filters/audio_renderer_impl.h', 257 'filters/audio_renderer_impl.h',
258 'filters/blocking_url_protocol.cc',
259 'filters/blocking_url_protocol.h',
258 'filters/chunk_demuxer.cc', 260 'filters/chunk_demuxer.cc',
259 'filters/chunk_demuxer.h', 261 'filters/chunk_demuxer.h',
260 'filters/decrypting_audio_decoder.cc', 262 'filters/decrypting_audio_decoder.cc',
261 'filters/decrypting_audio_decoder.h', 263 'filters/decrypting_audio_decoder.h',
262 'filters/decrypting_video_decoder.cc', 264 'filters/decrypting_video_decoder.cc',
263 'filters/decrypting_video_decoder.h', 265 'filters/decrypting_video_decoder.h',
264 'filters/dummy_demuxer.cc', 266 'filters/dummy_demuxer.cc',
265 'filters/dummy_demuxer.h', 267 'filters/dummy_demuxer.h',
266 'filters/ffmpeg_audio_decoder.cc', 268 'filters/ffmpeg_audio_decoder.cc',
267 'filters/ffmpeg_audio_decoder.h', 269 'filters/ffmpeg_audio_decoder.h',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 }, { # use_ffmpeg == 0 362 }, { # use_ffmpeg == 0
361 # Exclude the sources that depend on ffmpeg. 363 # Exclude the sources that depend on ffmpeg.
362 'sources!': [ 364 'sources!': [
363 'base/media_posix.cc', 365 'base/media_posix.cc',
364 'ffmpeg/ffmpeg_common.cc', 366 'ffmpeg/ffmpeg_common.cc',
365 'ffmpeg/ffmpeg_common.h', 367 'ffmpeg/ffmpeg_common.h',
366 'filters/audio_file_reader.cc', 368 'filters/audio_file_reader.cc',
367 'filters/audio_file_reader.h', 369 'filters/audio_file_reader.h',
368 'filters/chunk_demuxer.cc', 370 'filters/chunk_demuxer.cc',
369 'filters/chunk_demuxer.h', 371 'filters/chunk_demuxer.h',
372 'filters/blocking_url_protocol.cc',
373 'filters/blocking_url_protocol.h',
370 'filters/ffmpeg_audio_decoder.cc', 374 'filters/ffmpeg_audio_decoder.cc',
371 'filters/ffmpeg_audio_decoder.h', 375 'filters/ffmpeg_audio_decoder.h',
372 'filters/ffmpeg_demuxer.cc', 376 'filters/ffmpeg_demuxer.cc',
373 'filters/ffmpeg_demuxer.h', 377 'filters/ffmpeg_demuxer.h',
374 'filters/ffmpeg_glue.cc', 378 'filters/ffmpeg_glue.cc',
375 'filters/ffmpeg_glue.h', 379 'filters/ffmpeg_glue.h',
376 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', 380 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
377 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', 381 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
378 'filters/ffmpeg_video_decoder.cc', 382 'filters/ffmpeg_video_decoder.cc',
379 'filters/ffmpeg_video_decoder.h', 383 'filters/ffmpeg_video_decoder.h',
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 'base/test_data_util.h', 646 'base/test_data_util.h',
643 'base/vector_math_testing.h', 647 'base/vector_math_testing.h',
644 'base/vector_math_unittest.cc', 648 'base/vector_math_unittest.cc',
645 'base/video_frame_unittest.cc', 649 'base/video_frame_unittest.cc',
646 'base/video_util_unittest.cc', 650 'base/video_util_unittest.cc',
647 'base/yuv_convert_unittest.cc', 651 'base/yuv_convert_unittest.cc',
648 'crypto/aes_decryptor_unittest.cc', 652 'crypto/aes_decryptor_unittest.cc',
649 'ffmpeg/ffmpeg_common_unittest.cc', 653 'ffmpeg/ffmpeg_common_unittest.cc',
650 'filters/audio_renderer_algorithm_unittest.cc', 654 'filters/audio_renderer_algorithm_unittest.cc',
651 'filters/audio_renderer_impl_unittest.cc', 655 'filters/audio_renderer_impl_unittest.cc',
656 'filters/blocking_url_protocol_unittest.cc',
652 'filters/chunk_demuxer_unittest.cc', 657 'filters/chunk_demuxer_unittest.cc',
653 'filters/decrypting_audio_decoder_unittest.cc', 658 'filters/decrypting_audio_decoder_unittest.cc',
654 'filters/decrypting_video_decoder_unittest.cc', 659 'filters/decrypting_video_decoder_unittest.cc',
655 'filters/ffmpeg_audio_decoder_unittest.cc', 660 'filters/ffmpeg_audio_decoder_unittest.cc',
656 'filters/ffmpeg_decoder_unittest.h', 661 'filters/ffmpeg_decoder_unittest.h',
657 'filters/ffmpeg_demuxer_unittest.cc', 662 'filters/ffmpeg_demuxer_unittest.cc',
658 'filters/ffmpeg_glue_unittest.cc', 663 'filters/ffmpeg_glue_unittest.cc',
659 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 664 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
660 'filters/ffmpeg_video_decoder_unittest.cc', 665 'filters/ffmpeg_video_decoder_unittest.cc',
661 'filters/file_data_source_unittest.cc', 666 'filters/file_data_source_unittest.cc',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 ['include', '^base/mock_reader\\.h$'], 713 ['include', '^base/mock_reader\\.h$'],
709 ['include', '^base/run_all_unittests\\.cc$'], 714 ['include', '^base/run_all_unittests\\.cc$'],
710 ], 715 ],
711 }], 716 }],
712 ['OS=="android"', { 717 ['OS=="android"', {
713 'sources!': [ 718 'sources!': [
714 'audio/audio_input_volume_unittest.cc', 719 'audio/audio_input_volume_unittest.cc',
715 'base/test_data_util.cc', 720 'base/test_data_util.cc',
716 'base/test_data_util.h', 721 'base/test_data_util.h',
717 'ffmpeg/ffmpeg_common_unittest.cc', 722 'ffmpeg/ffmpeg_common_unittest.cc',
723 'filters/blocking_url_protocol_unittest.cc',
718 'filters/chunk_demuxer_unittest.cc', 724 'filters/chunk_demuxer_unittest.cc',
719 'filters/ffmpeg_audio_decoder_unittest.cc', 725 'filters/ffmpeg_audio_decoder_unittest.cc',
720 'filters/ffmpeg_demuxer_unittest.cc', 726 'filters/ffmpeg_demuxer_unittest.cc',
721 'filters/ffmpeg_glue_unittest.cc', 727 'filters/ffmpeg_glue_unittest.cc',
722 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 728 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
723 'filters/ffmpeg_video_decoder_unittest.cc', 729 'filters/ffmpeg_video_decoder_unittest.cc',
724 'filters/pipeline_integration_test.cc', 730 'filters/pipeline_integration_test.cc',
725 'filters/pipeline_integration_test_base.cc', 731 'filters/pipeline_integration_test_base.cc',
726 'mp4/mp4_stream_parser_unittest.cc', 732 'mp4/mp4_stream_parser_unittest.cc',
727 'webm/webm_cluster_parser_unittest.cc', 733 'webm/webm_cluster_parser_unittest.cc',
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
1320 'media', 1326 'media',
1321 ], 1327 ],
1322 'sources': [ 1328 'sources': [
1323 'tools/media_bench/media_bench.cc', 1329 'tools/media_bench/media_bench.cc',
1324 ], 1330 ],
1325 }, 1331 },
1326 ], 1332 ],
1327 }] 1333 }]
1328 ], 1334 ],
1329 } 1335 }
OLDNEW
« media/filters/blocking_url_protocol.cc ('K') | « media/filters/file_data_source.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698