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

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

Issue 2006113002: Allow hw secured codecs on chromecast (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: New flag, new key system property Created 4 years, 6 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 #include "media/audio/audio_output_device.h" 136 #include "media/audio/audio_output_device.h"
137 #include "media/base/audio_renderer_mixer_input.h" 137 #include "media/base/audio_renderer_mixer_input.h"
138 #include "media/base/cdm_factory.h" 138 #include "media/base/cdm_factory.h"
139 #include "media/base/decoder_factory.h" 139 #include "media/base/decoder_factory.h"
140 #include "media/base/media.h" 140 #include "media/base/media.h"
141 #include "media/base/media_log.h" 141 #include "media/base/media_log.h"
142 #include "media/base/media_switches.h" 142 #include "media/base/media_switches.h"
143 #include "media/blink/url_index.h" 143 #include "media/blink/url_index.h"
144 #include "media/blink/webencryptedmediaclient_impl.h" 144 #include "media/blink/webencryptedmediaclient_impl.h"
145 #include "media/blink/webmediaplayer_impl.h" 145 #include "media/blink/webmediaplayer_impl.h"
146 #include "media/media_features.h"
146 #include "media/renderers/gpu_video_accelerator_factories.h" 147 #include "media/renderers/gpu_video_accelerator_factories.h"
147 #include "mojo/common/url_type_converters.h" 148 #include "mojo/common/url_type_converters.h"
148 #include "mojo/edk/js/core.h" 149 #include "mojo/edk/js/core.h"
149 #include "mojo/edk/js/support.h" 150 #include "mojo/edk/js/support.h"
150 #include "net/base/data_url.h" 151 #include "net/base/data_url.h"
151 #include "net/base/net_errors.h" 152 #include "net/base/net_errors.h"
152 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 153 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
153 #include "net/http/http_util.h" 154 #include "net/http/http_util.h"
154 #include "storage/common/data_element.h" 155 #include "storage/common/data_element.h"
155 #include "third_party/WebKit/public/platform/URLConversion.h" 156 #include "third_party/WebKit/public/platform/URLConversion.h"
(...skipping 5870 matching lines...) Expand 10 before | Expand all | Expand 10 after
6026 if (!media_interface_provider_) { 6027 if (!media_interface_provider_) {
6027 media_interface_provider_.reset(new MediaInterfaceProvider(base::Bind( 6028 media_interface_provider_.reset(new MediaInterfaceProvider(base::Bind(
6028 &RenderFrameImpl::ConnectToApplication, base::Unretained(this)))); 6029 &RenderFrameImpl::ConnectToApplication, base::Unretained(this))));
6029 } 6030 }
6030 6031
6031 return media_interface_provider_.get(); 6032 return media_interface_provider_.get();
6032 } 6033 }
6033 #endif // defined(ENABLE_MOJO_MEDIA) 6034 #endif // defined(ENABLE_MOJO_MEDIA)
6034 6035
6035 bool RenderFrameImpl::AreSecureCodecsSupported() { 6036 bool RenderFrameImpl::AreSecureCodecsSupported() {
6036 #if defined(OS_ANDROID) 6037 return render_view_->renderer_preferences_.hw_secure_codec_allowed;
6037 // Hardware-secure codecs are only supported if secure surfaces are enabled.
6038 return render_view_->renderer_preferences_
6039 .use_video_overlay_for_embedded_encrypted_video;
6040 #else
6041 return false;
6042 #endif // defined(OS_ANDROID)
6043 } 6038 }
6044 6039
6045 media::CdmFactory* RenderFrameImpl::GetCdmFactory() { 6040 media::CdmFactory* RenderFrameImpl::GetCdmFactory() {
6046 if (cdm_factory_) 6041 if (cdm_factory_)
6047 return cdm_factory_.get(); 6042 return cdm_factory_.get();
6048 6043
6049 #if defined(ENABLE_MOJO_CDM) 6044 #if defined(ENABLE_MOJO_CDM)
6050 if (UseMojoCdm()) { 6045 if (UseMojoCdm()) {
6051 cdm_factory_.reset(new media::MojoCdmFactory(GetMediaInterfaceProvider())); 6046 cdm_factory_.reset(new media::MojoCdmFactory(GetMediaInterfaceProvider()));
6052 return cdm_factory_.get(); 6047 return cdm_factory_.get();
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
6204 // event target. Potentially a Pepper plugin will receive the event. 6199 // event target. Potentially a Pepper plugin will receive the event.
6205 // In order to tell whether a plugin gets the last mouse event and which it 6200 // In order to tell whether a plugin gets the last mouse event and which it
6206 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6201 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6207 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6202 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6208 // |pepper_last_mouse_event_target_|. 6203 // |pepper_last_mouse_event_target_|.
6209 pepper_last_mouse_event_target_ = nullptr; 6204 pepper_last_mouse_event_target_ = nullptr;
6210 #endif 6205 #endif
6211 } 6206 }
6212 6207
6213 } // namespace content 6208 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698