| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 44675a041983f9c1fbc6f394ecb1c78d3a6834be..d976201891d373de08a3e45d63fdf659d8f7f864 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -281,7 +281,7 @@
|
|
|
| #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
|
| #include "content/renderer/image_downloader/single_image_downloader.h" // nogncheck
|
| -#include "media/remoting/adaptive_renderer_factory.h" // nogncheck
|
| +#include "media/remoting/courier_renderer_factory.h" // nogncheck
|
| #include "media/remoting/remoting_cdm_controller.h" // nogncheck
|
| #include "media/remoting/remoting_cdm_factory.h" // nogncheck
|
| #include "media/remoting/renderer_controller.h" // nogncheck
|
| @@ -2961,11 +2961,20 @@ blink::WebMediaPlayer* RenderFrameImpl::CreateMediaPlayer(
|
|
|
| #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
|
| auto* const remoting_controller_ptr = remoting_controller.get();
|
| - media_renderer_factory =
|
| - base::MakeUnique<media::remoting::AdaptiveRendererFactory>(
|
| - std::move(media_renderer_factory), std::move(remoting_controller));
|
|
|
| - factory_type = media::RendererFactorySelector::FactoryType::ADAPTIVE;
|
| + auto courier_factory =
|
| + base::MakeUnique<media::remoting::CourierRendererFactory>(
|
| + std::move(remoting_controller));
|
| +
|
| + // base::Unretained is safe here because |factory_selector_| owns
|
| + // |courier_factory|.
|
| + factory_selector->SetUseCourierCB(base::Bind(
|
| + &media::remoting::CourierRendererFactory::ShouldCreateCourierRenderer,
|
| + base::Unretained(courier_factory.get())));
|
| +
|
| + factory_selector->AddFactory(
|
| + media::RendererFactorySelector::FactoryType::COURIER,
|
| + std::move(courier_factory));
|
| #endif
|
|
|
| if (!url_index_.get() || url_index_->frame() != frame_)
|
|
|