Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index 0a3f4a49b0fde1eb45fdc30269bab368b577a2b3..64831cca7b260d10b6fc23ba7f758d63cb37baa4 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -396,6 +396,8 @@ |
'base/yuv_convert.h', |
'base/wall_clock_time_source.cc', |
'base/wall_clock_time_source.h', |
+ 'blink/skcanvas_video_renderer.cc', |
+ 'blink/skcanvas_video_renderer.h', |
'cdm/aes_decryptor.cc', |
'cdm/aes_decryptor.h', |
'cdm/default_cdm_factory.cc', |
@@ -417,8 +419,6 @@ |
'filters/audio_file_reader.h', |
'filters/audio_renderer_algorithm.cc', |
'filters/audio_renderer_algorithm.h', |
- 'filters/audio_renderer_impl.cc', |
- 'filters/audio_renderer_impl.h', |
'filters/blocking_url_protocol.cc', |
'filters/blocking_url_protocol.h', |
'filters/chunk_demuxer.cc', |
@@ -436,8 +436,6 @@ |
'filters/decrypting_demuxer_stream.h', |
'filters/decrypting_video_decoder.cc', |
'filters/decrypting_video_decoder.h', |
- 'filters/default_renderer_factory.cc', |
- 'filters/default_renderer_factory.h', |
'filters/default_media_permission.cc', |
'filters/default_media_permission.h', |
'filters/ffmpeg_audio_decoder.cc', |
@@ -467,10 +465,6 @@ |
'filters/jpeg_parser.h', |
'filters/opus_audio_decoder.cc', |
'filters/opus_audio_decoder.h', |
- 'filters/renderer_impl.cc', |
- 'filters/renderer_impl.h', |
- 'filters/skcanvas_video_renderer.cc', |
- 'filters/skcanvas_video_renderer.h', |
'filters/source_buffer_range.cc', |
'filters/source_buffer_range.h', |
'filters/source_buffer_stream.cc', |
@@ -482,8 +476,6 @@ |
'filters/video_frame_scheduler_impl.h', |
'filters/video_frame_scheduler_proxy.cc', |
'filters/video_frame_scheduler_proxy.h', |
- 'filters/video_renderer_impl.cc', |
- 'filters/video_renderer_impl.h', |
'filters/vp8_bool_decoder.cc', |
'filters/vp8_bool_decoder.h', |
'filters/vp8_parser.cc', |
@@ -524,6 +516,14 @@ |
'midi/usb_midi_output_stream.h', |
'ozone/media_ozone_platform.cc', |
'ozone/media_ozone_platform.h', |
+ 'renderers/audio_renderer_impl.cc', |
+ 'renderers/audio_renderer_impl.h', |
+ 'renderers/default_renderer_factory.cc', |
+ 'renderers/default_renderer_factory.h', |
+ 'renderers/renderer_impl.cc', |
+ 'renderers/renderer_impl.h', |
+ 'renderers/video_renderer_impl.cc', |
+ 'renderers/video_renderer_impl.h', |
'video/capture/android/video_capture_device_android.cc', |
'video/capture/android/video_capture_device_android.h', |
'video/capture/android/video_capture_device_factory_android.cc', |
@@ -1204,15 +1204,15 @@ |
'base/video_util_unittest.cc', |
'base/wall_clock_time_source_unittest.cc', |
'base/yuv_convert_unittest.cc', |
+ 'blink/skcanvas_video_renderer_unittest.cc', |
'cdm/aes_decryptor_unittest.cc', |
'cdm/json_web_key_unittest.cc', |
'ffmpeg/ffmpeg_common_unittest.cc', |
'filters/audio_clock_unittest.cc', |
'filters/audio_decoder_unittest.cc', |
'filters/audio_decoder_selector_unittest.cc', |
- 'filters/audio_file_reader_unittest.cc', |
'filters/audio_renderer_algorithm_unittest.cc', |
wolenetz
2015/02/24 00:04:13
nit: this is misplaced in alphabetical order now.
|
- 'filters/audio_renderer_impl_unittest.cc', |
+ 'filters/audio_file_reader_unittest.cc', |
'filters/blocking_url_protocol_unittest.cc', |
'filters/chunk_demuxer_unittest.cc', |
'filters/decrypting_audio_decoder_unittest.cc', |
@@ -1233,14 +1233,11 @@ |
'filters/h264_parser_unittest.cc', |
'filters/in_memory_url_protocol_unittest.cc', |
'filters/jpeg_parser_unittest.cc', |
- 'filters/renderer_impl_unittest.cc', |
- 'filters/skcanvas_video_renderer_unittest.cc', |
'filters/source_buffer_stream_unittest.cc', |
'filters/video_decoder_selector_unittest.cc', |
'filters/video_frame_scheduler_impl_unittest.cc', |
'filters/video_frame_scheduler_unittest.cc', |
'filters/video_frame_stream_unittest.cc', |
- 'filters/video_renderer_impl_unittest.cc', |
'filters/vp8_bool_decoder_unittest.cc', |
'filters/vp8_parser_unittest.cc', |
'midi/midi_manager_unittest.cc', |
@@ -1250,6 +1247,9 @@ |
'midi/usb_midi_descriptor_parser_unittest.cc', |
'midi/usb_midi_input_stream_unittest.cc', |
'midi/usb_midi_output_stream_unittest.cc', |
+ 'renderers/audio_renderer_impl_unittest.cc', |
+ 'renderers/renderer_impl_unittest.cc', |
+ 'renderers/video_renderer_impl_unittest.cc', |
'video/capture/fake_video_capture_device_unittest.cc', |
'video/capture/video_capture_device_unittest.cc', |
'video/h264_poc_unittest.cc', |