| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION) | 274 BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION) |
| 275 #include "media/renderers/default_renderer_factory.h" // nogncheck | 275 #include "media/renderers/default_renderer_factory.h" // nogncheck |
| 276 #endif | 276 #endif |
| 277 | 277 |
| 278 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER) | 278 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER) |
| 279 #include "media/mojo/clients/mojo_decoder_factory.h" // nogncheck | 279 #include "media/mojo/clients/mojo_decoder_factory.h" // nogncheck |
| 280 #endif | 280 #endif |
| 281 | 281 |
| 282 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) | 282 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
| 283 #include "content/renderer/image_downloader/single_image_downloader.h" // nognc
heck | 283 #include "content/renderer/image_downloader/single_image_downloader.h" // nognc
heck |
| 284 #include "media/remoting/adaptive_renderer_factory.h" // nogncheck | 284 #include "media/remoting/courier_renderer_factory.h" // nogncheck |
| 285 #include "media/remoting/remoting_cdm_controller.h" // nogncheck | 285 #include "media/remoting/remoting_cdm_controller.h" // nogncheck |
| 286 #include "media/remoting/remoting_cdm_factory.h" // nogncheck | 286 #include "media/remoting/remoting_cdm_factory.h" // nogncheck |
| 287 #include "media/remoting/renderer_controller.h" // nogncheck | 287 #include "media/remoting/renderer_controller.h" // nogncheck |
| 288 #include "media/remoting/shared_session.h" // nogncheck | 288 #include "media/remoting/shared_session.h" // nogncheck |
| 289 #include "media/remoting/sink_availability_observer.h" // nogncheck | 289 #include "media/remoting/sink_availability_observer.h" // nogncheck |
| 290 #endif | 290 #endif |
| 291 | 291 |
| 292 using base::Time; | 292 using base::Time; |
| 293 using base::TimeDelta; | 293 using base::TimeDelta; |
| 294 using blink::WebCachePolicy; | 294 using blink::WebCachePolicy; |
| (...skipping 2659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2954 media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>( | 2954 media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>( |
| 2955 media_log, GetDecoderFactory(), | 2955 media_log, GetDecoderFactory(), |
| 2956 base::Bind(&RenderThreadImpl::GetGpuFactories, | 2956 base::Bind(&RenderThreadImpl::GetGpuFactories, |
| 2957 base::Unretained(render_thread))); | 2957 base::Unretained(render_thread))); |
| 2958 | 2958 |
| 2959 factory_type = media::RendererFactorySelector::FactoryType::DEFAULT; | 2959 factory_type = media::RendererFactorySelector::FactoryType::DEFAULT; |
| 2960 #endif // defined(ENABLE_MOJO_RENDERER) | 2960 #endif // defined(ENABLE_MOJO_RENDERER) |
| 2961 | 2961 |
| 2962 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2962 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
| 2963 auto* const remoting_controller_ptr = remoting_controller.get(); | 2963 auto* const remoting_controller_ptr = remoting_controller.get(); |
| 2964 media_renderer_factory = | |
| 2965 base::MakeUnique<media::remoting::AdaptiveRendererFactory>( | |
| 2966 std::move(media_renderer_factory), std::move(remoting_controller)); | |
| 2967 | 2964 |
| 2968 factory_type = media::RendererFactorySelector::FactoryType::ADAPTIVE; | 2965 auto courier_factory = |
| 2966 base::MakeUnique<media::remoting::CourierRendererFactory>( |
| 2967 std::move(remoting_controller)); |
| 2968 |
| 2969 // base::Unretained is safe here because |factory_selector_| owns |
| 2970 // |courier_factory|. |
| 2971 factory_selector->SetUseCourierCB(base::Bind( |
| 2972 &media::remoting::CourierRendererFactory::ShouldCreateCourierRenderer, |
| 2973 base::Unretained(courier_factory.get()))); |
| 2974 |
| 2975 factory_selector->AddFactory( |
| 2976 media::RendererFactorySelector::FactoryType::COURIER, |
| 2977 std::move(courier_factory)); |
| 2969 #endif | 2978 #endif |
| 2970 | 2979 |
| 2971 if (!url_index_.get() || url_index_->frame() != frame_) | 2980 if (!url_index_.get() || url_index_->frame() != frame_) |
| 2972 url_index_.reset(new media::UrlIndex(frame_)); | 2981 url_index_.reset(new media::UrlIndex(frame_)); |
| 2973 | 2982 |
| 2974 factory_selector->AddFactory(factory_type, std::move(media_renderer_factory)); | 2983 factory_selector->AddFactory(factory_type, std::move(media_renderer_factory)); |
| 2975 factory_selector->SetBaseFactoryType(factory_type); | 2984 factory_selector->SetBaseFactoryType(factory_type); |
| 2976 | 2985 |
| 2977 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( | 2986 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( |
| 2978 frame_, client, encrypted_client, GetWebMediaPlayerDelegate(), | 2987 frame_, client, encrypted_client, GetWebMediaPlayerDelegate(), |
| (...skipping 4029 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7008 policy(info.default_policy), | 7017 policy(info.default_policy), |
| 7009 replaces_current_history_item(info.replaces_current_history_item), | 7018 replaces_current_history_item(info.replaces_current_history_item), |
| 7010 history_navigation_in_new_child_frame( | 7019 history_navigation_in_new_child_frame( |
| 7011 info.is_history_navigation_in_new_child_frame), | 7020 info.is_history_navigation_in_new_child_frame), |
| 7012 client_redirect(info.is_client_redirect), | 7021 client_redirect(info.is_client_redirect), |
| 7013 cache_disabled(info.is_cache_disabled), | 7022 cache_disabled(info.is_cache_disabled), |
| 7014 form(info.form), | 7023 form(info.form), |
| 7015 source_location(info.source_location) {} | 7024 source_location(info.source_location) {} |
| 7016 | 7025 |
| 7017 } // namespace content | 7026 } // namespace content |
| OLD | NEW |