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

Side by Side Diff: media/media.gyp

Issue 941633004: Moved renderer implementation from media/filters/ to media/renderers/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed android build Created 5 years, 10 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
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 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 'base/video_frame_pool.h', 389 'base/video_frame_pool.h',
390 'base/video_renderer.cc', 390 'base/video_renderer.cc',
391 'base/video_renderer.h', 391 'base/video_renderer.h',
392 'base/video_rotation.h', 392 'base/video_rotation.h',
393 'base/video_util.cc', 393 'base/video_util.cc',
394 'base/video_util.h', 394 'base/video_util.h',
395 'base/wall_clock_time_source.cc', 395 'base/wall_clock_time_source.cc',
396 'base/wall_clock_time_source.h', 396 'base/wall_clock_time_source.h',
397 'base/yuv_convert.cc', 397 'base/yuv_convert.cc',
398 'base/yuv_convert.h', 398 'base/yuv_convert.h',
399 'blink/skcanvas_video_renderer.cc',
400 'blink/skcanvas_video_renderer.h',
399 'cdm/aes_decryptor.cc', 401 'cdm/aes_decryptor.cc',
400 'cdm/aes_decryptor.h', 402 'cdm/aes_decryptor.h',
401 'cdm/cenc_utils.cc', 403 'cdm/cenc_utils.cc',
402 'cdm/cenc_utils.h', 404 'cdm/cenc_utils.h',
403 'cdm/default_cdm_factory.cc', 405 'cdm/default_cdm_factory.cc',
404 'cdm/default_cdm_factory.h', 406 'cdm/default_cdm_factory.h',
405 'cdm/json_web_key.cc', 407 'cdm/json_web_key.cc',
406 'cdm/json_web_key.h', 408 'cdm/json_web_key.h',
407 'cdm/key_system_names.cc', 409 'cdm/key_system_names.cc',
408 'cdm/key_system_names.h', 410 'cdm/key_system_names.h',
409 'cdm/player_tracker_impl.cc', 411 'cdm/player_tracker_impl.cc',
410 'cdm/player_tracker_impl.h', 412 'cdm/player_tracker_impl.h',
411 'cdm/proxy_decryptor.cc', 413 'cdm/proxy_decryptor.cc',
412 'cdm/proxy_decryptor.h', 414 'cdm/proxy_decryptor.h',
413 'ffmpeg/ffmpeg_common.cc', 415 'ffmpeg/ffmpeg_common.cc',
414 'ffmpeg/ffmpeg_common.h', 416 'ffmpeg/ffmpeg_common.h',
415 'ffmpeg/ffmpeg_deleters.h', 417 'ffmpeg/ffmpeg_deleters.h',
416 'filters/audio_clock.cc', 418 'filters/audio_clock.cc',
417 'filters/audio_clock.h', 419 'filters/audio_clock.h',
418 'filters/audio_file_reader.cc', 420 'filters/audio_file_reader.cc',
419 'filters/audio_file_reader.h', 421 'filters/audio_file_reader.h',
420 'filters/audio_renderer_algorithm.cc', 422 'filters/audio_renderer_algorithm.cc',
421 'filters/audio_renderer_algorithm.h', 423 'filters/audio_renderer_algorithm.h',
422 'filters/audio_renderer_impl.cc',
423 'filters/audio_renderer_impl.h',
424 'filters/blocking_url_protocol.cc', 424 'filters/blocking_url_protocol.cc',
425 'filters/blocking_url_protocol.h', 425 'filters/blocking_url_protocol.h',
426 'filters/chunk_demuxer.cc', 426 'filters/chunk_demuxer.cc',
427 'filters/chunk_demuxer.h', 427 'filters/chunk_demuxer.h',
428 'filters/context_3d.h', 428 'filters/context_3d.h',
429 'filters/decoder_selector.cc', 429 'filters/decoder_selector.cc',
430 'filters/decoder_selector.h', 430 'filters/decoder_selector.h',
431 'filters/decoder_stream.cc', 431 'filters/decoder_stream.cc',
432 'filters/decoder_stream.h', 432 'filters/decoder_stream.h',
433 'filters/decoder_stream_traits.cc', 433 'filters/decoder_stream_traits.cc',
434 'filters/decoder_stream_traits.h', 434 'filters/decoder_stream_traits.h',
435 'filters/decrypting_audio_decoder.cc', 435 'filters/decrypting_audio_decoder.cc',
436 'filters/decrypting_audio_decoder.h', 436 'filters/decrypting_audio_decoder.h',
437 'filters/decrypting_demuxer_stream.cc', 437 'filters/decrypting_demuxer_stream.cc',
438 'filters/decrypting_demuxer_stream.h', 438 'filters/decrypting_demuxer_stream.h',
439 'filters/decrypting_video_decoder.cc', 439 'filters/decrypting_video_decoder.cc',
440 'filters/decrypting_video_decoder.h', 440 'filters/decrypting_video_decoder.h',
441 'filters/default_media_permission.cc', 441 'filters/default_media_permission.cc',
442 'filters/default_media_permission.h', 442 'filters/default_media_permission.h',
443 'filters/default_renderer_factory.cc',
444 'filters/default_renderer_factory.h',
445 'filters/ffmpeg_audio_decoder.cc', 443 'filters/ffmpeg_audio_decoder.cc',
446 'filters/ffmpeg_audio_decoder.h', 444 'filters/ffmpeg_audio_decoder.h',
447 'filters/ffmpeg_bitstream_converter.h', 445 'filters/ffmpeg_bitstream_converter.h',
448 'filters/ffmpeg_demuxer.cc', 446 'filters/ffmpeg_demuxer.cc',
449 'filters/ffmpeg_demuxer.h', 447 'filters/ffmpeg_demuxer.h',
450 'filters/ffmpeg_glue.cc', 448 'filters/ffmpeg_glue.cc',
451 'filters/ffmpeg_glue.h', 449 'filters/ffmpeg_glue.h',
452 'filters/ffmpeg_video_decoder.cc', 450 'filters/ffmpeg_video_decoder.cc',
453 'filters/ffmpeg_video_decoder.h', 451 'filters/ffmpeg_video_decoder.h',
454 'filters/file_data_source.cc', 452 'filters/file_data_source.cc',
455 'filters/file_data_source.h', 453 'filters/file_data_source.h',
456 'filters/frame_processor.cc', 454 'filters/frame_processor.cc',
457 'filters/frame_processor.h', 455 'filters/frame_processor.h',
458 'filters/gpu_video_accelerator_factories.cc', 456 'filters/gpu_video_accelerator_factories.cc',
459 'filters/gpu_video_accelerator_factories.h', 457 'filters/gpu_video_accelerator_factories.h',
460 'filters/gpu_video_decoder.cc', 458 'filters/gpu_video_decoder.cc',
461 'filters/gpu_video_decoder.h', 459 'filters/gpu_video_decoder.h',
462 'filters/h264_bit_reader.cc', 460 'filters/h264_bit_reader.cc',
463 'filters/h264_bit_reader.h', 461 'filters/h264_bit_reader.h',
464 'filters/h264_parser.cc', 462 'filters/h264_parser.cc',
465 'filters/h264_parser.h', 463 'filters/h264_parser.h',
466 'filters/in_memory_url_protocol.cc', 464 'filters/in_memory_url_protocol.cc',
467 'filters/in_memory_url_protocol.h', 465 'filters/in_memory_url_protocol.h',
468 'filters/jpeg_parser.cc', 466 'filters/jpeg_parser.cc',
469 'filters/jpeg_parser.h', 467 'filters/jpeg_parser.h',
470 'filters/opus_audio_decoder.cc', 468 'filters/opus_audio_decoder.cc',
471 'filters/opus_audio_decoder.h', 469 'filters/opus_audio_decoder.h',
472 'filters/renderer_impl.cc',
473 'filters/renderer_impl.h',
474 'filters/skcanvas_video_renderer.cc',
475 'filters/skcanvas_video_renderer.h',
476 'filters/source_buffer_range.cc', 470 'filters/source_buffer_range.cc',
477 'filters/source_buffer_range.h', 471 'filters/source_buffer_range.h',
478 'filters/source_buffer_stream.cc', 472 'filters/source_buffer_stream.cc',
479 'filters/source_buffer_stream.h', 473 'filters/source_buffer_stream.h',
480 'filters/stream_parser_factory.cc', 474 'filters/stream_parser_factory.cc',
481 'filters/stream_parser_factory.h', 475 'filters/stream_parser_factory.h',
482 'filters/video_frame_scheduler.h', 476 'filters/video_frame_scheduler.h',
483 'filters/video_frame_scheduler_impl.cc', 477 'filters/video_frame_scheduler_impl.cc',
484 'filters/video_frame_scheduler_impl.h', 478 'filters/video_frame_scheduler_impl.h',
485 'filters/video_frame_scheduler_proxy.cc', 479 'filters/video_frame_scheduler_proxy.cc',
486 'filters/video_frame_scheduler_proxy.h', 480 'filters/video_frame_scheduler_proxy.h',
487 'filters/video_renderer_impl.cc',
488 'filters/video_renderer_impl.h',
489 'filters/vp8_bool_decoder.cc', 481 'filters/vp8_bool_decoder.cc',
490 'filters/vp8_bool_decoder.h', 482 'filters/vp8_bool_decoder.h',
491 'filters/vp8_parser.cc', 483 'filters/vp8_parser.cc',
492 'filters/vp8_parser.h', 484 'filters/vp8_parser.h',
493 'filters/vpx_video_decoder.cc', 485 'filters/vpx_video_decoder.cc',
494 'filters/vpx_video_decoder.h', 486 'filters/vpx_video_decoder.h',
495 'filters/webvtt_util.h', 487 'filters/webvtt_util.h',
496 'filters/wsola_internals.cc', 488 'filters/wsola_internals.cc',
497 'filters/wsola_internals.h', 489 'filters/wsola_internals.h',
498 'formats/common/offset_byte_queue.cc', 490 'formats/common/offset_byte_queue.cc',
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 'midi/usb_midi_device_android.h', 536 'midi/usb_midi_device_android.h',
545 'midi/usb_midi_device_factory_android.cc', 537 'midi/usb_midi_device_factory_android.cc',
546 'midi/usb_midi_device_factory_android.h', 538 'midi/usb_midi_device_factory_android.h',
547 'midi/usb_midi_input_stream.cc', 539 'midi/usb_midi_input_stream.cc',
548 'midi/usb_midi_input_stream.h', 540 'midi/usb_midi_input_stream.h',
549 'midi/usb_midi_jack.h', 541 'midi/usb_midi_jack.h',
550 'midi/usb_midi_output_stream.cc', 542 'midi/usb_midi_output_stream.cc',
551 'midi/usb_midi_output_stream.h', 543 'midi/usb_midi_output_stream.h',
552 'ozone/media_ozone_platform.cc', 544 'ozone/media_ozone_platform.cc',
553 'ozone/media_ozone_platform.h', 545 'ozone/media_ozone_platform.h',
546 'renderers/audio_renderer_impl.cc',
547 'renderers/audio_renderer_impl.h',
548 'renderers/default_renderer_factory.cc',
549 'renderers/default_renderer_factory.h',
550 'renderers/renderer_impl.cc',
551 'renderers/renderer_impl.h',
552 'renderers/video_renderer_impl.cc',
553 'renderers/video_renderer_impl.h',
554 'video/capture/android/video_capture_device_android.cc', 554 'video/capture/android/video_capture_device_android.cc',
555 'video/capture/android/video_capture_device_android.h', 555 'video/capture/android/video_capture_device_android.h',
556 'video/capture/android/video_capture_device_factory_android.cc', 556 'video/capture/android/video_capture_device_factory_android.cc',
557 'video/capture/android/video_capture_device_factory_android.h', 557 'video/capture/android/video_capture_device_factory_android.h',
558 'video/capture/fake_video_capture_device.cc', 558 'video/capture/fake_video_capture_device.cc',
559 'video/capture/fake_video_capture_device.h', 559 'video/capture/fake_video_capture_device.h',
560 'video/capture/fake_video_capture_device_factory.cc', 560 'video/capture/fake_video_capture_device_factory.cc',
561 'video/capture/fake_video_capture_device_factory.h', 561 'video/capture/fake_video_capture_device_factory.h',
562 'video/capture/file_video_capture_device.cc', 562 'video/capture/file_video_capture_device.cc',
563 'video/capture/file_video_capture_device.h', 563 'video/capture/file_video_capture_device.h',
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 'media_android_jni_headers', 705 'media_android_jni_headers',
706 'player_android', 706 'player_android',
707 'video_capture_android_jni_headers', 707 'video_capture_android_jni_headers',
708 ], 708 ],
709 'sources': [ 709 'sources': [
710 'base/media.cc', 710 'base/media.cc',
711 'base/media.h', 711 'base/media.h',
712 'base/media_stub.cc', 712 'base/media_stub.cc',
713 ], 713 ],
714 'sources!': [ 714 'sources!': [
715 'filters/default_renderer_factory.cc',
716 'filters/default_renderer_factory.h',
717 'filters/opus_audio_decoder.cc', 715 'filters/opus_audio_decoder.cc',
718 'filters/opus_audio_decoder.h', 716 'filters/opus_audio_decoder.h',
717 'renderers/default_renderer_factory.cc',
718 'renderers/default_renderer_factory.h',
719 ], 719 ],
720 'conditions': [ 720 'conditions': [
721 ['android_webview_build==0', { 721 ['android_webview_build==0', {
722 'dependencies': [ 722 'dependencies': [
723 'media_java', 723 'media_java',
724 ], 724 ],
725 }], 725 }],
726 ], 726 ],
727 'defines': [ 727 'defines': [
728 'DISABLE_USER_INPUT_MONITOR', 728 'DISABLE_USER_INPUT_MONITOR',
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 'base/text_renderer_unittest.cc', 1199 'base/text_renderer_unittest.cc',
1200 'base/time_delta_interpolator_unittest.cc', 1200 'base/time_delta_interpolator_unittest.cc',
1201 'base/user_input_monitor_unittest.cc', 1201 'base/user_input_monitor_unittest.cc',
1202 'base/vector_math_testing.h', 1202 'base/vector_math_testing.h',
1203 'base/vector_math_unittest.cc', 1203 'base/vector_math_unittest.cc',
1204 'base/video_frame_pool_unittest.cc', 1204 'base/video_frame_pool_unittest.cc',
1205 'base/video_frame_unittest.cc', 1205 'base/video_frame_unittest.cc',
1206 'base/video_util_unittest.cc', 1206 'base/video_util_unittest.cc',
1207 'base/wall_clock_time_source_unittest.cc', 1207 'base/wall_clock_time_source_unittest.cc',
1208 'base/yuv_convert_unittest.cc', 1208 'base/yuv_convert_unittest.cc',
1209 'blink/skcanvas_video_renderer_unittest.cc',
1209 'cdm/aes_decryptor_unittest.cc', 1210 'cdm/aes_decryptor_unittest.cc',
1210 'cdm/cenc_utils_unittest.cc', 1211 'cdm/cenc_utils_unittest.cc',
1211 'cdm/json_web_key_unittest.cc', 1212 'cdm/json_web_key_unittest.cc',
1212 'ffmpeg/ffmpeg_common_unittest.cc', 1213 'ffmpeg/ffmpeg_common_unittest.cc',
1213 'filters/audio_clock_unittest.cc', 1214 'filters/audio_clock_unittest.cc',
1214 'filters/audio_decoder_selector_unittest.cc', 1215 'filters/audio_decoder_selector_unittest.cc',
1215 'filters/audio_decoder_unittest.cc', 1216 'filters/audio_decoder_unittest.cc',
1216 'filters/audio_file_reader_unittest.cc', 1217 'filters/audio_file_reader_unittest.cc',
1217 'filters/audio_renderer_algorithm_unittest.cc', 1218 'filters/audio_renderer_algorithm_unittest.cc',
1218 'filters/audio_renderer_impl_unittest.cc',
1219 'filters/blocking_url_protocol_unittest.cc', 1219 'filters/blocking_url_protocol_unittest.cc',
1220 'filters/chunk_demuxer_unittest.cc', 1220 'filters/chunk_demuxer_unittest.cc',
1221 'filters/decrypting_audio_decoder_unittest.cc', 1221 'filters/decrypting_audio_decoder_unittest.cc',
1222 'filters/decrypting_demuxer_stream_unittest.cc', 1222 'filters/decrypting_demuxer_stream_unittest.cc',
1223 'filters/decrypting_video_decoder_unittest.cc', 1223 'filters/decrypting_video_decoder_unittest.cc',
1224 'filters/fake_demuxer_stream.cc', 1224 'filters/fake_demuxer_stream.cc',
1225 'filters/fake_demuxer_stream.h', 1225 'filters/fake_demuxer_stream.h',
1226 'filters/fake_demuxer_stream_unittest.cc', 1226 'filters/fake_demuxer_stream_unittest.cc',
1227 'filters/fake_video_decoder.cc', 1227 'filters/fake_video_decoder.cc',
1228 'filters/fake_video_decoder.h', 1228 'filters/fake_video_decoder.h',
1229 'filters/fake_video_decoder_unittest.cc', 1229 'filters/fake_video_decoder_unittest.cc',
1230 'filters/ffmpeg_demuxer_unittest.cc', 1230 'filters/ffmpeg_demuxer_unittest.cc',
1231 'filters/ffmpeg_glue_unittest.cc', 1231 'filters/ffmpeg_glue_unittest.cc',
1232 'filters/ffmpeg_video_decoder_unittest.cc', 1232 'filters/ffmpeg_video_decoder_unittest.cc',
1233 'filters/file_data_source_unittest.cc', 1233 'filters/file_data_source_unittest.cc',
1234 'filters/frame_processor_unittest.cc', 1234 'filters/frame_processor_unittest.cc',
1235 'filters/h264_bit_reader_unittest.cc', 1235 'filters/h264_bit_reader_unittest.cc',
1236 'filters/h264_parser_unittest.cc', 1236 'filters/h264_parser_unittest.cc',
1237 'filters/in_memory_url_protocol_unittest.cc', 1237 'filters/in_memory_url_protocol_unittest.cc',
1238 'filters/jpeg_parser_unittest.cc', 1238 'filters/jpeg_parser_unittest.cc',
1239 'filters/renderer_impl_unittest.cc',
1240 'filters/skcanvas_video_renderer_unittest.cc',
1241 'filters/source_buffer_stream_unittest.cc', 1239 'filters/source_buffer_stream_unittest.cc',
1242 'filters/video_decoder_selector_unittest.cc', 1240 'filters/video_decoder_selector_unittest.cc',
1243 'filters/video_frame_scheduler_impl_unittest.cc', 1241 'filters/video_frame_scheduler_impl_unittest.cc',
1244 'filters/video_frame_scheduler_unittest.cc', 1242 'filters/video_frame_scheduler_unittest.cc',
1245 'filters/video_frame_stream_unittest.cc', 1243 'filters/video_frame_stream_unittest.cc',
1246 'filters/video_renderer_impl_unittest.cc',
1247 'filters/vp8_bool_decoder_unittest.cc', 1244 'filters/vp8_bool_decoder_unittest.cc',
1248 'filters/vp8_parser_unittest.cc', 1245 'filters/vp8_parser_unittest.cc',
1249 'formats/common/offset_byte_queue_unittest.cc', 1246 'formats/common/offset_byte_queue_unittest.cc',
1250 'formats/webm/cluster_builder.cc', 1247 'formats/webm/cluster_builder.cc',
1251 'formats/webm/cluster_builder.h', 1248 'formats/webm/cluster_builder.h',
1252 'formats/webm/opus_packet_builder.cc', 1249 'formats/webm/opus_packet_builder.cc',
1253 'formats/webm/opus_packet_builder.h', 1250 'formats/webm/opus_packet_builder.h',
1254 'formats/webm/tracks_builder.cc', 1251 'formats/webm/tracks_builder.cc',
1255 'formats/webm/tracks_builder.h', 1252 'formats/webm/tracks_builder.h',
1256 'formats/webm/webm_cluster_parser_unittest.cc', 1253 'formats/webm/webm_cluster_parser_unittest.cc',
1257 'formats/webm/webm_content_encodings_client_unittest.cc', 1254 'formats/webm/webm_content_encodings_client_unittest.cc',
1258 'formats/webm/webm_parser_unittest.cc', 1255 'formats/webm/webm_parser_unittest.cc',
1259 'formats/webm/webm_tracks_parser_unittest.cc', 1256 'formats/webm/webm_tracks_parser_unittest.cc',
1260 'formats/webm/webm_webvtt_parser_unittest.cc', 1257 'formats/webm/webm_webvtt_parser_unittest.cc',
1261 'midi/midi_manager_unittest.cc', 1258 'midi/midi_manager_unittest.cc',
1262 'midi/midi_manager_usb_unittest.cc', 1259 'midi/midi_manager_usb_unittest.cc',
1263 'midi/midi_message_queue_unittest.cc', 1260 'midi/midi_message_queue_unittest.cc',
1264 'midi/midi_message_util_unittest.cc', 1261 'midi/midi_message_util_unittest.cc',
1265 'midi/usb_midi_descriptor_parser_unittest.cc', 1262 'midi/usb_midi_descriptor_parser_unittest.cc',
1266 'midi/usb_midi_input_stream_unittest.cc', 1263 'midi/usb_midi_input_stream_unittest.cc',
1267 'midi/usb_midi_output_stream_unittest.cc', 1264 'midi/usb_midi_output_stream_unittest.cc',
1265 'renderers/audio_renderer_impl_unittest.cc',
1266 'renderers/renderer_impl_unittest.cc',
1267 'renderers/video_renderer_impl_unittest.cc',
1268 'test/pipeline_integration_test.cc', 1268 'test/pipeline_integration_test.cc',
1269 'test/pipeline_integration_test_base.cc', 1269 'test/pipeline_integration_test_base.cc',
1270 'video/capture/fake_video_capture_device_unittest.cc', 1270 'video/capture/fake_video_capture_device_unittest.cc',
1271 'video/capture/video_capture_device_unittest.cc', 1271 'video/capture/video_capture_device_unittest.cc',
1272 'video/h264_poc_unittest.cc', 1272 'video/h264_poc_unittest.cc',
1273 ], 1273 ],
1274 'include_dirs': [ 1274 'include_dirs': [
1275 # Needed by media_drm_bridge.cc. 1275 # Needed by media_drm_bridge.cc.
1276 '<(SHARED_INTERMEDIATE_DIR)', 1276 '<(SHARED_INTERMEDIATE_DIR)',
1277 ], 1277 ],
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
1931 '../build/isolate.gypi', 1931 '../build/isolate.gypi',
1932 ], 1932 ],
1933 'sources': [ 1933 'sources': [
1934 'media_unittests.isolate', 1934 'media_unittests.isolate',
1935 ], 1935 ],
1936 }, 1936 },
1937 ], 1937 ],
1938 }], 1938 }],
1939 ], 1939 ],
1940 } 1940 }
OLDNEW
« no previous file with comments | « media/filters/video_renderer_impl_unittest.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698