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

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

Issue 712463004: media: Support MojoRendererService in the browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased and Cleaned. Created 6 years 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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 #include "content/renderer/v8_value_converter_impl.h" 94 #include "content/renderer/v8_value_converter_impl.h"
95 #include "content/renderer/websharedworker_proxy.h" 95 #include "content/renderer/websharedworker_proxy.h"
96 #include "gin/modules/module_registry.h" 96 #include "gin/modules/module_registry.h"
97 #include "media/base/audio_renderer_mixer_input.h" 97 #include "media/base/audio_renderer_mixer_input.h"
98 #include "media/base/media_log.h" 98 #include "media/base/media_log.h"
99 #include "media/blink/webcontentdecryptionmodule_impl.h" 99 #include "media/blink/webcontentdecryptionmodule_impl.h"
100 #include "media/blink/webmediaplayer_impl.h" 100 #include "media/blink/webmediaplayer_impl.h"
101 #include "media/blink/webmediaplayer_params.h" 101 #include "media/blink/webmediaplayer_params.h"
102 #include "media/filters/default_renderer_factory.h" 102 #include "media/filters/default_renderer_factory.h"
103 #include "media/filters/gpu_video_accelerator_factories.h" 103 #include "media/filters/gpu_video_accelerator_factories.h"
104 #include "media/mojo/interfaces/media_renderer.mojom.h"
105 #include "media/mojo/services/mojo_renderer_factory.h"
104 #include "mojo/edk/js/core.h" 106 #include "mojo/edk/js/core.h"
105 #include "mojo/edk/js/support.h" 107 #include "mojo/edk/js/support.h"
106 #include "net/base/data_url.h" 108 #include "net/base/data_url.h"
107 #include "net/base/net_errors.h" 109 #include "net/base/net_errors.h"
108 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 110 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
109 #include "net/http/http_util.h" 111 #include "net/http/http_util.h"
110 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h" 112 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h"
111 #include "third_party/WebKit/public/platform/WebString.h" 113 #include "third_party/WebKit/public/platform/WebString.h"
112 #include "third_party/WebKit/public/platform/WebURL.h" 114 #include "third_party/WebKit/public/platform/WebURL.h"
113 #include "third_party/WebKit/public/platform/WebURLError.h" 115 #include "third_party/WebKit/public/platform/WebURLError.h"
(...skipping 1637 matching lines...) Expand 10 before | Expand all | Expand 10 after
1751 return CreatePlugin(frame, info, params_to_use, POWER_SAVER_MODE_ESSENTIAL); 1753 return CreatePlugin(frame, info, params_to_use, POWER_SAVER_MODE_ESSENTIAL);
1752 #else 1754 #else
1753 return NULL; 1755 return NULL;
1754 #endif // defined(ENABLE_PLUGINS) 1756 #endif // defined(ENABLE_PLUGINS)
1755 } 1757 }
1756 1758
1757 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( 1759 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
1758 blink::WebLocalFrame* frame, 1760 blink::WebLocalFrame* frame,
1759 const blink::WebURL& url, 1761 const blink::WebURL& url,
1760 blink::WebMediaPlayerClient* client) { 1762 blink::WebMediaPlayerClient* client) {
1761 return createMediaPlayer(frame, url, client, NULL); 1763 return createMediaPlayer(frame, url, client, nullptr);
1762 } 1764 }
1763 1765
1764 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( 1766 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
1765 blink::WebLocalFrame* frame, 1767 blink::WebLocalFrame* frame,
1766 const blink::WebURL& url, 1768 const blink::WebURL& url,
1767 blink::WebMediaPlayerClient* client, 1769 blink::WebMediaPlayerClient* client,
1768 blink::WebContentDecryptionModule* initial_cdm) { 1770 blink::WebContentDecryptionModule* initial_cdm) {
1769 #if defined(VIDEO_HOLE) 1771 #if defined(VIDEO_HOLE)
1770 if (!contains_media_player_) { 1772 if (!contains_media_player_) {
1771 render_view_->RegisterVideoHoleFrame(this); 1773 render_view_->RegisterVideoHoleFrame(this);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1805 1807
1806 scoped_ptr<media::RendererFactory> media_renderer_factory = 1808 scoped_ptr<media::RendererFactory> media_renderer_factory =
1807 GetContentClient()->renderer()->CreateMediaRendererFactory(this); 1809 GetContentClient()->renderer()->CreateMediaRendererFactory(this);
1808 1810
1809 if (!media_renderer_factory.get()) { 1811 if (!media_renderer_factory.get()) {
1810 media_renderer_factory.reset(new media::DefaultRendererFactory( 1812 media_renderer_factory.reset(new media::DefaultRendererFactory(
1811 media_log, render_thread->GetGpuFactories(), 1813 media_log, render_thread->GetGpuFactories(),
1812 *render_thread->GetAudioHardwareConfig())); 1814 *render_thread->GetAudioHardwareConfig()));
1813 } 1815 }
1814 1816
1817 media_renderer_factory.reset(new media::MojoRendererFactory(
1818 base::Bind(&ServiceRegistry::ConnectToRemoteService<mojo::MediaRenderer>,
1819 base::Unretained(GetServiceRegistry()))));
xhwang 2014/12/15 21:32:30 ditto, we need a way (flag or ifdef) to figure out
1820
1815 return new media::WebMediaPlayerImpl( 1821 return new media::WebMediaPlayerImpl(
1816 frame, client, weak_factory_.GetWeakPtr(), media_renderer_factory.Pass(), 1822 frame, client, weak_factory_.GetWeakPtr(), media_renderer_factory.Pass(),
1817 cdm_factory.Pass(), params); 1823 cdm_factory.Pass(), params);
1818 #endif // defined(OS_ANDROID) 1824 #endif // defined(OS_ANDROID)
1819 } 1825 }
1820 1826
1821 blink::WebContentDecryptionModule* 1827 blink::WebContentDecryptionModule*
1822 RenderFrameImpl::createContentDecryptionModule( 1828 RenderFrameImpl::createContentDecryptionModule(
1823 blink::WebLocalFrame* frame, 1829 blink::WebLocalFrame* frame,
1824 const blink::WebSecurityOrigin& security_origin, 1830 const blink::WebSecurityOrigin& security_origin,
(...skipping 2464 matching lines...) Expand 10 before | Expand all | Expand 10 after
4289 4295
4290 #if defined(ENABLE_BROWSER_CDMS) 4296 #if defined(ENABLE_BROWSER_CDMS)
4291 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4297 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4292 if (!cdm_manager_) 4298 if (!cdm_manager_)
4293 cdm_manager_ = new RendererCdmManager(this); 4299 cdm_manager_ = new RendererCdmManager(this);
4294 return cdm_manager_; 4300 return cdm_manager_;
4295 } 4301 }
4296 #endif // defined(ENABLE_BROWSER_CDMS) 4302 #endif // defined(ENABLE_BROWSER_CDMS)
4297 4303
4298 } // namespace content 4304 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698