Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index a2617822a592585e7e701d7341e6b3c0abfbfbdb..f132bd61fa21630a4ea34b59e55961c35fe52cf1 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -396,6 +396,8 @@ |
'base/wall_clock_time_source.h', |
'base/yuv_convert.cc', |
'base/yuv_convert.h', |
+ 'blink/skcanvas_video_renderer.cc', |
+ 'blink/skcanvas_video_renderer.h', |
'cdm/aes_decryptor.cc', |
'cdm/aes_decryptor.h', |
'cdm/cenc_utils.cc', |
@@ -419,8 +421,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', |
@@ -440,8 +440,6 @@ |
'filters/decrypting_video_decoder.h', |
'filters/default_media_permission.cc', |
'filters/default_media_permission.h', |
- 'filters/default_renderer_factory.cc', |
- 'filters/default_renderer_factory.h', |
'filters/ffmpeg_audio_decoder.cc', |
'filters/ffmpeg_audio_decoder.h', |
'filters/ffmpeg_bitstream_converter.h', |
@@ -469,10 +467,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', |
@@ -484,8 +478,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', |
@@ -551,6 +543,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', |
@@ -712,10 +712,10 @@ |
'base/media_stub.cc', |
], |
'sources!': [ |
- 'filters/default_renderer_factory.cc', |
- 'filters/default_renderer_factory.h', |
'filters/opus_audio_decoder.cc', |
'filters/opus_audio_decoder.h', |
+ 'renderers/default_renderer_factory.cc', |
+ 'renderers/default_renderer_factory.h', |
], |
'conditions': [ |
['android_webview_build==0', { |
@@ -1206,6 +1206,7 @@ |
'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/cenc_utils_unittest.cc', |
'cdm/json_web_key_unittest.cc', |
@@ -1215,7 +1216,6 @@ |
'filters/audio_decoder_unittest.cc', |
'filters/audio_file_reader_unittest.cc', |
'filters/audio_renderer_algorithm_unittest.cc', |
- 'filters/audio_renderer_impl_unittest.cc', |
'filters/blocking_url_protocol_unittest.cc', |
'filters/chunk_demuxer_unittest.cc', |
'filters/decrypting_audio_decoder_unittest.cc', |
@@ -1236,14 +1236,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', |
'formats/common/offset_byte_queue_unittest.cc', |
@@ -1265,6 +1262,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', |
'test/pipeline_integration_test.cc', |
'test/pipeline_integration_test_base.cc', |
'video/capture/fake_video_capture_device_unittest.cc', |