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

Side by Side Diff: media/media.gyp

Issue 12713004: Add Chromium-side changes for MediaSource::isTypeSupported() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Exclude StreamParserFactory for Android Created 7 years, 9 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
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 'conditions': [ 10 'conditions': [
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 'filters/h264_to_annex_b_bitstream_converter.cc', 317 'filters/h264_to_annex_b_bitstream_converter.cc',
318 'filters/h264_to_annex_b_bitstream_converter.h', 318 'filters/h264_to_annex_b_bitstream_converter.h',
319 'filters/in_memory_url_protocol.cc', 319 'filters/in_memory_url_protocol.cc',
320 'filters/in_memory_url_protocol.h', 320 'filters/in_memory_url_protocol.h',
321 'filters/opus_audio_decoder.cc', 321 'filters/opus_audio_decoder.cc',
322 'filters/opus_audio_decoder.h', 322 'filters/opus_audio_decoder.h',
323 'filters/skcanvas_video_renderer.cc', 323 'filters/skcanvas_video_renderer.cc',
324 'filters/skcanvas_video_renderer.h', 324 'filters/skcanvas_video_renderer.h',
325 'filters/source_buffer_stream.cc', 325 'filters/source_buffer_stream.cc',
326 'filters/source_buffer_stream.h', 326 'filters/source_buffer_stream.h',
327 'filters/stream_parser_factory.cc',
328 'filters/stream_parser_factory.h',
327 'filters/video_decoder_selector.cc', 329 'filters/video_decoder_selector.cc',
328 'filters/video_decoder_selector.h', 330 'filters/video_decoder_selector.h',
329 'filters/video_renderer_base.cc', 331 'filters/video_renderer_base.cc',
330 'filters/video_renderer_base.h', 332 'filters/video_renderer_base.h',
331 'filters/vpx_video_decoder.cc', 333 'filters/vpx_video_decoder.cc',
332 'filters/vpx_video_decoder.h', 334 'filters/vpx_video_decoder.h',
333 'video/capture/android/video_capture_device_android.cc', 335 'video/capture/android/video_capture_device_android.cc',
334 'video/capture/android/video_capture_device_android.h', 336 'video/capture/android/video_capture_device_android.h',
335 'video/capture/fake_video_capture_device.cc', 337 'video/capture/fake_video_capture_device.cc',
336 'video/capture/fake_video_capture_device.h', 338 'video/capture/fake_video_capture_device.h',
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 'filters/ffmpeg_audio_decoder.cc', 461 'filters/ffmpeg_audio_decoder.cc',
460 'filters/ffmpeg_audio_decoder.h', 462 'filters/ffmpeg_audio_decoder.h',
461 'filters/ffmpeg_demuxer.cc', 463 'filters/ffmpeg_demuxer.cc',
462 'filters/ffmpeg_demuxer.h', 464 'filters/ffmpeg_demuxer.h',
463 'filters/ffmpeg_glue.cc', 465 'filters/ffmpeg_glue.cc',
464 'filters/ffmpeg_glue.h', 466 'filters/ffmpeg_glue.h',
465 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', 467 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
466 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', 468 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
467 'filters/ffmpeg_video_decoder.cc', 469 'filters/ffmpeg_video_decoder.cc',
468 'filters/ffmpeg_video_decoder.h', 470 'filters/ffmpeg_video_decoder.h',
471 'filters/stream_parser_factory.cc',
472 'filters/stream_parser_factory.h',
469 'webm/webm_cluster_parser.cc', 473 'webm/webm_cluster_parser.cc',
470 'webm/webm_cluster_parser.h', 474 'webm/webm_cluster_parser.h',
471 'webm/webm_stream_parser.cc', 475 'webm/webm_stream_parser.cc',
472 'webm/webm_stream_parser.h', 476 'webm/webm_stream_parser.h',
473 ], 477 ],
474 }], 478 }],
475 ['media_use_libvpx == 1', { 479 ['media_use_libvpx == 1', {
476 'dependencies': [ 480 'dependencies': [
477 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', 481 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
478 ], 482 ],
(...skipping 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after
1616 ], 1620 ],
1617 'sources': [ 1621 'sources': [
1618 'base/simd/sinc_resampler_sse.cc', 1622 'base/simd/sinc_resampler_sse.cc',
1619 'base/simd/vector_math_sse.cc', 1623 'base/simd/vector_math_sse.cc',
1620 ], 1624 ],
1621 }, # end of target media_sse 1625 }, # end of target media_sse
1622 ], 1626 ],
1623 }], 1627 }],
1624 ], 1628 ],
1625 } 1629 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698