Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2310753002: Media Remoting: Data/Control plumbing between renderer and Media Router. (Closed)
Patch Set: Just a REBASE on ToT before commit. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2682 matching lines...) Expand 10 before | Expand all | Expand 10 after
2693 std::unique_ptr<media::RendererFactory> media_renderer_factory( 2693 std::unique_ptr<media::RendererFactory> media_renderer_factory(
2694 new media::DefaultRendererFactory( 2694 new media::DefaultRendererFactory(
2695 media_log, GetDecoderFactory(), 2695 media_log, GetDecoderFactory(),
2696 base::Bind(&RenderThreadImpl::GetGpuFactories, 2696 base::Bind(&RenderThreadImpl::GetGpuFactories,
2697 base::Unretained(render_thread)))); 2697 base::Unretained(render_thread))));
2698 #endif // defined(ENABLE_MOJO_RENDERER) 2698 #endif // defined(ENABLE_MOJO_RENDERER)
2699 2699
2700 if (!url_index_.get() || url_index_->frame() != frame_) 2700 if (!url_index_.get() || url_index_->frame() != frame_)
2701 url_index_.reset(new media::UrlIndex(frame_)); 2701 url_index_.reset(new media::UrlIndex(frame_));
2702 2702
2703 // TODO(miu): In a soon-upcoming change, call GetRemoterFactory()->Create() to
2704 // allow the local media pipeline to receive notifications about when Media
2705 // Remoting can take place. Control logic in/around WebMediaPlayerImpl will
2706 // implement media.mojom.RemotingSource. http://crbug.com/643964
2707
2703 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( 2708 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
2704 frame_, client, encrypted_client, 2709 frame_, client, encrypted_client,
2705 GetWebMediaPlayerDelegate()->AsWeakPtr(), 2710 GetWebMediaPlayerDelegate()->AsWeakPtr(),
2706 std::move(media_renderer_factory), url_index_, params); 2711 std::move(media_renderer_factory), url_index_, params);
2707 2712
2708 #if defined(OS_ANDROID) // WMPI_CAST 2713 #if defined(OS_ANDROID) // WMPI_CAST
2709 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); 2714 media_player->SetMediaPlayerManager(GetMediaPlayerManager());
2710 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); 2715 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor());
2711 #endif 2716 #endif
2712 2717
(...skipping 3490 matching lines...) Expand 10 before | Expand all | Expand 10 after
6203 bool RenderFrameImpl::AreSecureCodecsSupported() { 6208 bool RenderFrameImpl::AreSecureCodecsSupported() {
6204 #if defined(OS_ANDROID) 6209 #if defined(OS_ANDROID)
6205 // Hardware-secure codecs are only supported if secure surfaces are enabled. 6210 // Hardware-secure codecs are only supported if secure surfaces are enabled.
6206 return render_view_->renderer_preferences_ 6211 return render_view_->renderer_preferences_
6207 .use_video_overlay_for_embedded_encrypted_video; 6212 .use_video_overlay_for_embedded_encrypted_video;
6208 #else 6213 #else
6209 return false; 6214 return false;
6210 #endif // defined(OS_ANDROID) 6215 #endif // defined(OS_ANDROID)
6211 } 6216 }
6212 6217
6218 media::mojom::RemoterFactory* RenderFrameImpl::GetRemoterFactory() {
6219 if (!remoter_factory_)
6220 GetRemoteInterfaces()->GetInterface(&remoter_factory_);
6221 return remoter_factory_.get();
6222 }
6223
6213 media::CdmFactory* RenderFrameImpl::GetCdmFactory() { 6224 media::CdmFactory* RenderFrameImpl::GetCdmFactory() {
6214 if (cdm_factory_) 6225 if (cdm_factory_)
6215 return cdm_factory_.get(); 6226 return cdm_factory_.get();
6216 6227
6217 #if defined(ENABLE_MOJO_CDM) 6228 #if defined(ENABLE_MOJO_CDM)
6218 if (UseMojoCdm()) { 6229 if (UseMojoCdm()) {
6219 cdm_factory_.reset(new media::MojoCdmFactory(GetMediaInterfaceProvider())); 6230 cdm_factory_.reset(new media::MojoCdmFactory(GetMediaInterfaceProvider()));
6220 return cdm_factory_.get(); 6231 return cdm_factory_.get();
6221 } 6232 }
6222 #endif // defined(ENABLE_MOJO_CDM) 6233 #endif // defined(ENABLE_MOJO_CDM)
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
6410 // event target. Potentially a Pepper plugin will receive the event. 6421 // event target. Potentially a Pepper plugin will receive the event.
6411 // In order to tell whether a plugin gets the last mouse event and which it 6422 // In order to tell whether a plugin gets the last mouse event and which it
6412 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6423 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6413 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6424 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6414 // |pepper_last_mouse_event_target_|. 6425 // |pepper_last_mouse_event_target_|.
6415 pepper_last_mouse_event_target_ = nullptr; 6426 pepper_last_mouse_event_target_ = nullptr;
6416 #endif 6427 #endif
6417 } 6428 }
6418 6429
6419 } // namespace content 6430 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698