diff options
22 files changed, 33 insertions, 33 deletions
diff --git a/content/public/renderer/DEPS b/content/public/renderer/DEPS index f78d4a3..b80961c 100644 --- a/content/public/renderer/DEPS +++ b/content/public/renderer/DEPS @@ -1,7 +1,7 @@ include_rules = [ "+content/public/child", "+media/base", - "+media/filters", + "+media/renderers", "+media/video", "+v8/include/v8.h", ] diff --git a/content/public/renderer/video_encode_accelerator.cc b/content/public/renderer/video_encode_accelerator.cc index a8ad12b..b1ac143 100644 --- a/content/public/renderer/video_encode_accelerator.cc +++ b/content/public/renderer/video_encode_accelerator.cc @@ -7,7 +7,7 @@ #include "base/task_runner_util.h" #include "content/common/gpu/client/gpu_video_encode_accelerator_host.h" #include "content/renderer/render_thread_impl.h" -#include "media/filters/gpu_video_accelerator_factories.h" +#include "media/renderers/gpu_video_accelerator_factories.h" namespace content { diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.h b/content/renderer/media/renderer_gpu_video_accelerator_factories.h index 26ebf6d..6398ad6 100644 --- a/content/renderer/media/renderer_gpu_video_accelerator_factories.h +++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.h @@ -13,7 +13,7 @@ #include "base/synchronization/waitable_event.h" #include "content/child/thread_safe_sender.h" #include "content/common/content_export.h" -#include "media/filters/gpu_video_accelerator_factories.h" +#include "media/renderers/gpu_video_accelerator_factories.h" #include "ui/gfx/geometry/size.h" namespace base { diff --git a/content/renderer/media/rtc_video_decoder.cc b/content/renderer/media/rtc_video_decoder.cc index 300832b..a2a8cea 100644 --- a/content/renderer/media/rtc_video_decoder.cc +++ b/content/renderer/media/rtc_video_decoder.cc @@ -16,7 +16,7 @@ #include "content/renderer/media/native_handle_impl.h" #include "gpu/command_buffer/common/mailbox_holder.h" #include "media/base/bind_to_current_loop.h" -#include "media/filters/gpu_video_accelerator_factories.h" +#include "media/renderers/gpu_video_accelerator_factories.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/webrtc/common_video/interface/texture_video_frame.h" #include "third_party/webrtc/system_wrappers/interface/ref_count.h" diff --git a/content/renderer/media/rtc_video_decoder_factory.cc b/content/renderer/media/rtc_video_decoder_factory.cc index f59a38f..52e80a8 100644 --- a/content/renderer/media/rtc_video_decoder_factory.cc +++ b/content/renderer/media/rtc_video_decoder_factory.cc @@ -7,7 +7,7 @@ #include "base/location.h" #include "base/memory/scoped_ptr.h" #include "content/renderer/media/rtc_video_decoder.h" -#include "media/filters/gpu_video_accelerator_factories.h" +#include "media/renderers/gpu_video_accelerator_factories.h" namespace content { diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc index dcb9c4f..2b4c9c6 100644 --- a/content/renderer/media/rtc_video_decoder_unittest.cc +++ b/content/renderer/media/rtc_video_decoder_unittest.cc @@ -8,7 +8,7 @@ #include "base/threading/thread.h" #include "content/renderer/media/rtc_video_decoder.h" #include "media/base/gmock_callback_support.h" -#include "media/filters/mock_gpu_video_accelerator_factories.h" +#include "media/renderers/mock_gpu_video_accelerator_factories.h" #include "media/video/mock_video_decode_accelerator.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/renderer/media/rtc_video_encoder.cc b/content/renderer/media/rtc_video_encoder.cc index 85da0c0..44c9107 100644 --- a/content/renderer/media/rtc_video_encoder.cc +++ b/content/renderer/media/rtc_video_encoder.cc @@ -15,8 +15,8 @@ #include "media/base/bitstream_buffer.h" #include "media/base/video_frame.h" #include "media/base/video_util.h" -#include "media/filters/gpu_video_accelerator_factories.h" #include "media/filters/h264_parser.h" +#include "media/renderers/gpu_video_accelerator_factories.h" #include "media/video/video_encode_accelerator.h" #include "third_party/webrtc/system_wrappers/interface/tick_util.h" diff --git a/content/renderer/media/rtc_video_encoder_factory.cc b/content/renderer/media/rtc_video_encoder_factory.cc index 8518512..147ce36 100644 --- a/content/renderer/media/rtc_video_encoder_factory.cc +++ b/content/renderer/media/rtc_video_encoder_factory.cc @@ -8,7 +8,7 @@ #include "content/common/gpu/client/gpu_video_encode_accelerator_host.h" #include "content/public/common/content_switches.h" #include "content/renderer/media/rtc_video_encoder.h" -#include "media/filters/gpu_video_accelerator_factories.h" +#include "media/renderers/gpu_video_accelerator_factories.h" #include "media/video/video_encode_accelerator.h" namespace content { diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc index d9f485b..d37e2d9 100644 --- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc +++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc @@ -36,7 +36,7 @@ #include "content/renderer/render_thread_impl.h" #include "content/renderer/render_view_impl.h" #include "jingle/glue/thread_wrapper.h" -#include "media/filters/gpu_video_accelerator_factories.h" +#include "media/renderers/gpu_video_accelerator_factories.h" #include "third_party/WebKit/public/platform/WebMediaConstraints.h" #include "third_party/WebKit/public/platform/WebMediaStream.h" #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" diff --git a/content/renderer/pepper/pepper_video_encoder_host.cc b/content/renderer/pepper/pepper_video_encoder_host.cc index bacbfe0..e476cb6 100644 --- a/content/renderer/pepper/pepper_video_encoder_host.cc +++ b/content/renderer/pepper/pepper_video_encoder_host.cc @@ -14,7 +14,7 @@ #include "content/renderer/render_thread_impl.h" #include "media/base/bind_to_current_loop.h" #include "media/base/video_frame.h" -#include "media/filters/gpu_video_accelerator_factories.h" +#include "media/renderers/gpu_video_accelerator_factories.h" #include "media/video/video_encode_accelerator.h" #include "ppapi/c/pp_codecs.h" #include "ppapi/c/pp_errors.h" diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index 1d19432..bceb2b5 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -108,7 +108,7 @@ #include "media/blink/webencryptedmediaclient_impl.h" #include "media/blink/webmediaplayer_impl.h" #include "media/blink/webmediaplayer_params.h" -#include "media/filters/gpu_video_accelerator_factories.h" +#include "media/renderers/gpu_video_accelerator_factories.h" #include "net/base/data_url.h" #include "net/base/net_errors.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index a5d7e58..43d8566 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -116,7 +116,7 @@ #include "ipc/mojo/ipc_channel_mojo.h" #include "media/base/audio_hardware_config.h" #include "media/base/media.h" -#include "media/filters/gpu_video_accelerator_factories.h" +#include "media/renderers/gpu_video_accelerator_factories.h" #include "mojo/common/common_type_converters.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index c121919..85116e6 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -102,8 +102,8 @@ #include "content/renderer/websharedworker_proxy.h" #include "media/audio/audio_output_device.h" #include "media/base/media_switches.h" -#include "media/filters/gpu_video_accelerator_factories.h" #include "media/renderers/audio_renderer_impl.h" +#include "media/renderers/gpu_video_accelerator_factories.h" #include "net/base/data_url.h" #include "net/base/escape.h" #include "net/base/net_errors.h" diff --git a/media/BUILD.gn b/media/BUILD.gn index 8b6cc692..477fe60 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -120,8 +120,6 @@ component("media") { "filters/file_data_source.h", "filters/frame_processor.cc", "filters/frame_processor.h", - "filters/gpu_video_accelerator_factories.cc", - "filters/gpu_video_accelerator_factories.h", "filters/h264_bit_reader.cc", "filters/h264_bit_reader.h", "filters/h264_parser.cc", @@ -198,6 +196,8 @@ component("media") { "midi/usb_midi_output_stream.h", "renderers/audio_renderer_impl.cc", "renderers/audio_renderer_impl.h", + "renderers/gpu_video_accelerator_factories.cc", + "renderers/gpu_video_accelerator_factories.h", "renderers/renderer_impl.cc", "renderers/renderer_impl.h", "renderers/video_renderer_impl.cc", @@ -711,10 +711,10 @@ source_set("test_support") { sources = [ "filters/clockless_video_frame_scheduler.cc", "filters/clockless_video_frame_scheduler.h", - "filters/mock_gpu_video_accelerator_factories.cc", - "filters/mock_gpu_video_accelerator_factories.h", "filters/test_video_frame_scheduler.cc", "filters/test_video_frame_scheduler.h", + "renderers/mock_gpu_video_accelerator_factories.cc", + "renderers/mock_gpu_video_accelerator_factories.h", "video/mock_video_decode_accelerator.cc", "video/mock_video_decode_accelerator.h", ] diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc index b634a5c..703cb20 100644 --- a/media/filters/gpu_video_decoder.cc +++ b/media/filters/gpu_video_decoder.cc @@ -21,7 +21,7 @@ #include "media/base/pipeline.h" #include "media/base/pipeline_status.h" #include "media/base/video_decoder_config.h" -#include "media/filters/gpu_video_accelerator_factories.h" +#include "media/renderers/gpu_video_accelerator_factories.h" #include "third_party/skia/include/core/SkBitmap.h" namespace media { diff --git a/media/media.gyp b/media/media.gyp index 69c0164..3f95cc8 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -456,8 +456,6 @@ 'filters/file_data_source.h', 'filters/frame_processor.cc', 'filters/frame_processor.h', - 'filters/gpu_video_accelerator_factories.cc', - 'filters/gpu_video_accelerator_factories.h', 'filters/gpu_video_decoder.cc', 'filters/gpu_video_decoder.h', 'filters/h264_bit_reader.cc', @@ -550,6 +548,8 @@ 'renderers/audio_renderer_impl.h', 'renderers/default_renderer_factory.cc', 'renderers/default_renderer_factory.h', + 'renderers/gpu_video_accelerator_factories.cc', + 'renderers/gpu_video_accelerator_factories.h', 'renderers/renderer_impl.cc', 'renderers/renderer_impl.h', 'renderers/video_renderer_impl.cc', @@ -1494,10 +1494,10 @@ 'base/test_helpers.h', 'filters/clockless_video_frame_scheduler.cc', 'filters/clockless_video_frame_scheduler.h', - 'filters/mock_gpu_video_accelerator_factories.cc', - 'filters/mock_gpu_video_accelerator_factories.h', 'filters/test_video_frame_scheduler.cc', 'filters/test_video_frame_scheduler.h', + 'renderers/mock_gpu_video_accelerator_factories.cc', + 'renderers/mock_gpu_video_accelerator_factories.h', 'video/mock_video_decode_accelerator.cc', 'video/mock_video_decode_accelerator.h', ], diff --git a/media/renderers/default_renderer_factory.cc b/media/renderers/default_renderer_factory.cc index 8f701b3..ba56001 100644 --- a/media/renderers/default_renderer_factory.cc +++ b/media/renderers/default_renderer_factory.cc @@ -10,10 +10,10 @@ #include "media/filters/ffmpeg_audio_decoder.h" #include "media/filters/ffmpeg_video_decoder.h" #endif -#include "media/filters/gpu_video_accelerator_factories.h" #include "media/filters/gpu_video_decoder.h" #include "media/filters/opus_audio_decoder.h" #include "media/renderers/audio_renderer_impl.h" +#include "media/renderers/gpu_video_accelerator_factories.h" #include "media/renderers/renderer_impl.h" #include "media/renderers/video_renderer_impl.h" #if !defined(MEDIA_DISABLE_LIBVPX) diff --git a/media/filters/gpu_video_accelerator_factories.cc b/media/renderers/gpu_video_accelerator_factories.cc index f9f5660..caea121 100644 --- a/media/filters/gpu_video_accelerator_factories.cc +++ b/media/renderers/gpu_video_accelerator_factories.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/filters/gpu_video_accelerator_factories.h" +#include "media/renderers/gpu_video_accelerator_factories.h" namespace media { diff --git a/media/filters/gpu_video_accelerator_factories.h b/media/renderers/gpu_video_accelerator_factories.h index 03494d0..0d99fd7 100644 --- a/media/filters/gpu_video_accelerator_factories.h +++ b/media/renderers/gpu_video_accelerator_factories.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MEDIA_FILTERS_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ -#define MEDIA_FILTERS_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ +#ifndef MEDIA_RENDERERS_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ +#define MEDIA_RENDERERS_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ #include <vector> @@ -75,4 +75,4 @@ class MEDIA_EXPORT GpuVideoAcceleratorFactories } // namespace media -#endif // MEDIA_FILTERS_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ +#endif // MEDIA_RENDERERS_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ diff --git a/media/filters/mock_gpu_video_accelerator_factories.cc b/media/renderers/mock_gpu_video_accelerator_factories.cc index 1c4465a..c9f7824 100644 --- a/media/filters/mock_gpu_video_accelerator_factories.cc +++ b/media/renderers/mock_gpu_video_accelerator_factories.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/filters/mock_gpu_video_accelerator_factories.h" +#include "media/renderers/mock_gpu_video_accelerator_factories.h" namespace media { diff --git a/media/filters/mock_gpu_video_accelerator_factories.h b/media/renderers/mock_gpu_video_accelerator_factories.h index 7e14939..85b1b3d 100644 --- a/media/filters/mock_gpu_video_accelerator_factories.h +++ b/media/renderers/mock_gpu_video_accelerator_factories.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MEDIA_FILTERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ -#define MEDIA_FILTERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ +#ifndef MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ +#define MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" -#include "media/filters/gpu_video_accelerator_factories.h" +#include "media/renderers/gpu_video_accelerator_factories.h" #include "media/video/video_decode_accelerator.h" #include "media/video/video_encode_accelerator.h" #include "testing/gmock/include/gmock/gmock.h" @@ -58,4 +58,4 @@ class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories { } // namespace media -#endif // MEDIA_FILTERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ +#endif // MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ diff --git a/mojo/services/html_viewer/webmediaplayer_factory.cc b/mojo/services/html_viewer/webmediaplayer_factory.cc index a5729dd..0b73a98 100644 --- a/mojo/services/html_viewer/webmediaplayer_factory.cc +++ b/mojo/services/html_viewer/webmediaplayer_factory.cc @@ -17,10 +17,10 @@ #include "media/blink/webmediaplayer_impl.h" #include "media/blink/webmediaplayer_params.h" #include "media/cdm/default_cdm_factory.h" -#include "media/filters/gpu_video_accelerator_factories.h" #include "media/mojo/interfaces/media_renderer.mojom.h" #include "media/mojo/services/mojo_renderer_factory.h" #include "media/renderers/default_renderer_factory.h" +#include "media/renderers/gpu_video_accelerator_factories.h" #include "third_party/mojo/src/mojo/public/cpp/application/connect.h" #include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" |