OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "webkit/media/webmediaplayer_impl.h" | 5 #include "webkit/media/webmediaplayer_impl.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" | 28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" |
29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
30 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" | 30 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" |
31 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" | 31 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" |
32 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" | 32 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
33 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" | 33 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" |
34 #include "v8/include/v8.h" | 34 #include "v8/include/v8.h" |
35 #include "webkit/media/buffered_data_source.h" | 35 #include "webkit/media/buffered_data_source.h" |
36 #include "webkit/media/filter_helpers.h" | 36 #include "webkit/media/filter_helpers.h" |
37 #include "webkit/media/webmediaplayer_delegate.h" | 37 #include "webkit/media/webmediaplayer_delegate.h" |
| 38 #include "webkit/media/webmediaplayer_params.h" |
38 #include "webkit/media/webmediaplayer_proxy.h" | 39 #include "webkit/media/webmediaplayer_proxy.h" |
39 #include "webkit/media/webmediaplayer_util.h" | 40 #include "webkit/media/webmediaplayer_util.h" |
40 #include "webkit/media/webvideoframe_impl.h" | 41 #include "webkit/media/webvideoframe_impl.h" |
41 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h" | 42 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h" |
42 | 43 |
43 using WebKit::WebCanvas; | 44 using WebKit::WebCanvas; |
44 using WebKit::WebMediaPlayer; | 45 using WebKit::WebMediaPlayer; |
45 using WebKit::WebRect; | 46 using WebKit::WebRect; |
46 using WebKit::WebSize; | 47 using WebKit::WebSize; |
47 using WebKit::WebString; | 48 using WebKit::WebString; |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 | 114 |
114 static void LogMediaSourceError(const scoped_refptr<media::MediaLog>& media_log, | 115 static void LogMediaSourceError(const scoped_refptr<media::MediaLog>& media_log, |
115 const std::string& error) { | 116 const std::string& error) { |
116 media_log->AddEvent(media_log->CreateMediaSourceErrorEvent(error)); | 117 media_log->AddEvent(media_log->CreateMediaSourceErrorEvent(error)); |
117 } | 118 } |
118 | 119 |
119 WebMediaPlayerImpl::WebMediaPlayerImpl( | 120 WebMediaPlayerImpl::WebMediaPlayerImpl( |
120 WebKit::WebFrame* frame, | 121 WebKit::WebFrame* frame, |
121 WebKit::WebMediaPlayerClient* client, | 122 WebKit::WebMediaPlayerClient* client, |
122 base::WeakPtr<WebMediaPlayerDelegate> delegate, | 123 base::WeakPtr<WebMediaPlayerDelegate> delegate, |
123 media::FilterCollection* collection, | 124 const WebMediaPlayerParams& params) |
124 WebKit::WebAudioSourceProvider* audio_source_provider, | |
125 media::AudioRendererSink* audio_renderer_sink, | |
126 media::MessageLoopFactory* message_loop_factory, | |
127 MediaStreamClient* media_stream_client, | |
128 media::MediaLog* media_log) | |
129 : frame_(frame), | 125 : frame_(frame), |
130 network_state_(WebMediaPlayer::NetworkStateEmpty), | 126 network_state_(WebMediaPlayer::NetworkStateEmpty), |
131 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), | 127 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), |
132 main_loop_(MessageLoop::current()), | 128 main_loop_(MessageLoop::current()), |
133 filter_collection_(collection), | 129 filter_collection_(new media::FilterCollection()), |
134 message_loop_factory_(message_loop_factory), | 130 media_thread_("MediaPipeline"), |
135 paused_(true), | 131 paused_(true), |
136 seeking_(false), | 132 seeking_(false), |
137 playback_rate_(0.0f), | 133 playback_rate_(0.0f), |
138 pending_seek_(false), | 134 pending_seek_(false), |
139 pending_seek_seconds_(0.0f), | 135 pending_seek_seconds_(0.0f), |
140 client_(client), | 136 client_(client), |
141 proxy_(new WebMediaPlayerProxy(main_loop_->message_loop_proxy(), this)), | 137 proxy_(new WebMediaPlayerProxy(main_loop_->message_loop_proxy(), this)), |
142 delegate_(delegate), | 138 delegate_(delegate), |
143 media_stream_client_(media_stream_client), | 139 media_stream_client_(params.media_stream_client()), |
144 media_log_(media_log), | 140 media_log_(params.media_log()), |
145 accelerated_compositing_reported_(false), | 141 accelerated_compositing_reported_(false), |
146 incremented_externally_allocated_memory_(false), | 142 incremented_externally_allocated_memory_(false), |
147 audio_source_provider_(audio_source_provider), | 143 audio_source_provider_(params.audio_source_provider()), |
148 audio_renderer_sink_(audio_renderer_sink), | |
149 is_local_source_(false), | 144 is_local_source_(false), |
150 supports_save_(true), | 145 supports_save_(true), |
151 starting_(false) { | 146 starting_(false) { |
152 media_log_->AddEvent( | 147 media_log_->AddEvent( |
153 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); | 148 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); |
154 | 149 |
155 scoped_refptr<base::MessageLoopProxy> pipeline_message_loop = | 150 CHECK(media_thread_.Start()); |
156 message_loop_factory_->GetMessageLoop( | 151 pipeline_ = new media::Pipeline( |
157 media::MessageLoopFactory::kPipeline); | 152 media_thread_.message_loop_proxy(), media_log_); |
158 pipeline_ = new media::Pipeline(pipeline_message_loop, media_log_); | |
159 | 153 |
160 // Let V8 know we started new thread if we did not did it yet. | 154 // Let V8 know we started new thread if we did not do it yet. |
161 // Made separate task to avoid deletion of player currently being created. | 155 // Made separate task to avoid deletion of player currently being created. |
162 // Also, delaying GC until after player starts gets rid of starting lag -- | 156 // Also, delaying GC until after player starts gets rid of starting lag -- |
163 // collection happens in parallel with playing. | 157 // collection happens in parallel with playing. |
164 // | 158 // |
165 // TODO(enal): remove when we get rid of per-audio-stream thread. | 159 // TODO(enal): remove when we get rid of per-audio-stream thread. |
166 MessageLoop::current()->PostTask( | 160 MessageLoop::current()->PostTask( |
167 FROM_HERE, | 161 FROM_HERE, |
168 base::Bind(&WebMediaPlayerImpl::IncrementExternallyAllocatedMemory, | 162 base::Bind(&WebMediaPlayerImpl::IncrementExternallyAllocatedMemory, |
169 AsWeakPtr())); | 163 AsWeakPtr())); |
170 | 164 |
171 // Also we want to be notified of |main_loop_| destruction. | 165 // Also we want to be notified of |main_loop_| destruction. |
172 main_loop_->AddDestructionObserver(this); | 166 main_loop_->AddDestructionObserver(this); |
173 | 167 |
174 media::SetDecryptorReadyCB set_decryptor_ready_cb; | 168 media::SetDecryptorReadyCB set_decryptor_ready_cb; |
175 if (WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled()) { | 169 if (WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled()) { |
176 decryptor_.reset(new ProxyDecryptor( | 170 decryptor_.reset(new ProxyDecryptor( |
177 client, | 171 client, |
178 frame, | 172 frame, |
179 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyAdded), | 173 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyAdded), |
180 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyError), | 174 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyError), |
181 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyMessage), | 175 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyMessage), |
182 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey))); | 176 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey))); |
183 set_decryptor_ready_cb = base::Bind(&ProxyDecryptor::SetDecryptorReadyCB, | 177 set_decryptor_ready_cb = base::Bind(&ProxyDecryptor::SetDecryptorReadyCB, |
184 base::Unretained(decryptor_.get())); | 178 base::Unretained(decryptor_.get())); |
185 } | 179 } |
186 | 180 |
| 181 // Create the GPU video decoder if factories were provided. |
| 182 if (params.gpu_factories()) { |
| 183 filter_collection_->GetVideoDecoders()->push_back( |
| 184 new media::GpuVideoDecoder( |
| 185 media_thread_.message_loop_proxy(), |
| 186 params.gpu_factories())); |
| 187 } |
| 188 |
187 // Create default video renderer. | 189 // Create default video renderer. |
188 scoped_refptr<media::VideoRendererBase> video_renderer = | 190 scoped_refptr<media::VideoRendererBase> video_renderer = |
189 new media::VideoRendererBase( | 191 new media::VideoRendererBase( |
190 pipeline_message_loop, | 192 media_thread_.message_loop_proxy(), |
191 set_decryptor_ready_cb, | 193 set_decryptor_ready_cb, |
192 base::Bind(&WebMediaPlayerProxy::Repaint, proxy_), | 194 base::Bind(&WebMediaPlayerProxy::Repaint, proxy_), |
193 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque), | 195 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque), |
194 true); | 196 true); |
195 filter_collection_->AddVideoRenderer(video_renderer); | 197 filter_collection_->AddVideoRenderer(video_renderer); |
196 proxy_->set_frame_provider(video_renderer); | 198 proxy_->set_frame_provider(video_renderer); |
197 | 199 |
198 // Create default audio renderer using the null sink if no sink was provided. | 200 // Create default audio renderer using the null sink if no sink was provided. |
| 201 scoped_refptr<media::AudioRendererSink> audio_renderer_sink = |
| 202 params.audio_renderer_sink(); |
199 if (!audio_renderer_sink) | 203 if (!audio_renderer_sink) |
200 audio_renderer_sink = new media::NullAudioSink(); | 204 audio_renderer_sink = new media::NullAudioSink(); |
201 | 205 |
202 filter_collection_->AddAudioRenderer(new media::AudioRendererImpl( | 206 filter_collection_->AddAudioRenderer(new media::AudioRendererImpl( |
203 audio_renderer_sink, set_decryptor_ready_cb)); | 207 audio_renderer_sink, set_decryptor_ready_cb)); |
204 } | 208 } |
205 | 209 |
206 WebMediaPlayerImpl::~WebMediaPlayerImpl() { | 210 WebMediaPlayerImpl::~WebMediaPlayerImpl() { |
207 DCHECK_EQ(main_loop_, MessageLoop::current()); | 211 DCHECK_EQ(main_loop_, MessageLoop::current()); |
208 Destroy(); | 212 Destroy(); |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 UMA_HISTOGRAM_ENUMERATION("Media.URLScheme", URLScheme(gurl), kMaxURLScheme); | 264 UMA_HISTOGRAM_ENUMERATION("Media.URLScheme", URLScheme(gurl), kMaxURLScheme); |
261 | 265 |
262 // Handle any volume/preload changes that occured before load(). | 266 // Handle any volume/preload changes that occured before load(). |
263 setVolume(GetClient()->volume()); | 267 setVolume(GetClient()->volume()); |
264 setPreload(GetClient()->preload()); | 268 setPreload(GetClient()->preload()); |
265 | 269 |
266 SetNetworkState(WebMediaPlayer::NetworkStateLoading); | 270 SetNetworkState(WebMediaPlayer::NetworkStateLoading); |
267 SetReadyState(WebMediaPlayer::ReadyStateHaveNothing); | 271 SetReadyState(WebMediaPlayer::ReadyStateHaveNothing); |
268 media_log_->AddEvent(media_log_->CreateLoadEvent(url.spec())); | 272 media_log_->AddEvent(media_log_->CreateLoadEvent(url.spec())); |
269 | 273 |
270 scoped_refptr<base::MessageLoopProxy> message_loop = | |
271 message_loop_factory_->GetMessageLoop( | |
272 media::MessageLoopFactory::kPipeline); | |
273 | |
274 // Media streams pipelines can start immediately. | 274 // Media streams pipelines can start immediately. |
275 if (BuildMediaStreamCollection(url, media_stream_client_, | 275 if (BuildMediaStreamCollection(url, media_stream_client_, |
276 message_loop, | 276 media_thread_.message_loop_proxy(), |
277 filter_collection_.get())) { | 277 filter_collection_.get())) { |
278 supports_save_ = false; | 278 supports_save_ = false; |
279 StartPipeline(); | 279 StartPipeline(); |
280 return; | 280 return; |
281 } | 281 } |
282 | 282 |
283 // Media source pipelines can start immediately. | 283 // Media source pipelines can start immediately. |
284 if (!url.isEmpty() && url == GetClient()->sourceURL()) { | 284 if (!url.isEmpty() && url == GetClient()->sourceURL()) { |
285 chunk_demuxer_ = new media::ChunkDemuxer( | 285 chunk_demuxer_ = new media::ChunkDemuxer( |
286 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened), | 286 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened), |
287 BIND_TO_RENDER_LOOP_2(&WebMediaPlayerImpl::OnNeedKey, "", ""), | 287 BIND_TO_RENDER_LOOP_2(&WebMediaPlayerImpl::OnNeedKey, "", ""), |
288 base::Bind(&LogMediaSourceError, media_log_)); | 288 base::Bind(&LogMediaSourceError, media_log_)); |
289 | 289 |
290 BuildMediaSourceCollection(chunk_demuxer_, | 290 BuildMediaSourceCollection(chunk_demuxer_, |
291 message_loop, | 291 media_thread_.message_loop_proxy(), |
292 filter_collection_.get()); | 292 filter_collection_.get()); |
293 supports_save_ = false; | 293 supports_save_ = false; |
294 StartPipeline(); | 294 StartPipeline(); |
295 return; | 295 return; |
296 } | 296 } |
297 | 297 |
298 // Otherwise it's a regular request which requires resolving the URL first. | 298 // Otherwise it's a regular request which requires resolving the URL first. |
299 proxy_->set_data_source( | 299 proxy_->set_data_source( |
300 new BufferedDataSource(main_loop_, frame_, media_log_, | 300 new BufferedDataSource(main_loop_, frame_, media_log_, |
301 base::Bind(&WebMediaPlayerImpl::NotifyDownloading, | 301 base::Bind(&WebMediaPlayerImpl::NotifyDownloading, |
302 AsWeakPtr()))); | 302 AsWeakPtr()))); |
303 proxy_->data_source()->Initialize( | 303 proxy_->data_source()->Initialize( |
304 url, static_cast<BufferedResourceLoader::CORSMode>(cors_mode), | 304 url, static_cast<BufferedResourceLoader::CORSMode>(cors_mode), |
305 base::Bind( | 305 base::Bind( |
306 &WebMediaPlayerImpl::DataSourceInitialized, | 306 &WebMediaPlayerImpl::DataSourceInitialized, |
307 AsWeakPtr(), gurl)); | 307 AsWeakPtr(), gurl)); |
308 | 308 |
309 is_local_source_ = !gurl.SchemeIs("http") && !gurl.SchemeIs("https"); | 309 is_local_source_ = !gurl.SchemeIs("http") && !gurl.SchemeIs("https"); |
310 | 310 |
311 BuildDefaultCollection(proxy_->data_source(), | 311 BuildDefaultCollection(proxy_->data_source(), |
312 message_loop, | 312 media_thread_.message_loop_proxy(), |
313 filter_collection_.get()); | 313 filter_collection_.get()); |
314 } | 314 } |
315 | 315 |
316 void WebMediaPlayerImpl::cancelLoad() { | 316 void WebMediaPlayerImpl::cancelLoad() { |
317 DCHECK_EQ(main_loop_, MessageLoop::current()); | 317 DCHECK_EQ(main_loop_, MessageLoop::current()); |
318 } | 318 } |
319 | 319 |
320 void WebMediaPlayerImpl::play() { | 320 void WebMediaPlayerImpl::play() { |
321 DCHECK_EQ(main_loop_, MessageLoop::current()); | 321 DCHECK_EQ(main_loop_, MessageLoop::current()); |
322 | 322 |
(...skipping 864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1187 pipeline_->Stop(base::Bind( | 1187 pipeline_->Stop(base::Bind( |
1188 &base::WaitableEvent::Signal, base::Unretained(&waiter))); | 1188 &base::WaitableEvent::Signal, base::Unretained(&waiter))); |
1189 waiter.Wait(); | 1189 waiter.Wait(); |
1190 | 1190 |
1191 // Let V8 know we are not using extra resources anymore. | 1191 // Let V8 know we are not using extra resources anymore. |
1192 if (incremented_externally_allocated_memory_) { | 1192 if (incremented_externally_allocated_memory_) { |
1193 v8::V8::AdjustAmountOfExternalAllocatedMemory(-kPlayerExtraMemory); | 1193 v8::V8::AdjustAmountOfExternalAllocatedMemory(-kPlayerExtraMemory); |
1194 incremented_externally_allocated_memory_ = false; | 1194 incremented_externally_allocated_memory_ = false; |
1195 } | 1195 } |
1196 | 1196 |
1197 message_loop_factory_.reset(); | 1197 media_thread_.Stop(); |
1198 | 1198 |
1199 // And then detach the proxy, it may live on the render thread for a little | 1199 // And then detach the proxy, it may live on the render thread for a little |
1200 // longer until all the tasks are finished. | 1200 // longer until all the tasks are finished. |
1201 if (proxy_) { | 1201 if (proxy_) { |
1202 proxy_->Detach(); | 1202 proxy_->Detach(); |
1203 proxy_ = NULL; | 1203 proxy_ = NULL; |
1204 } | 1204 } |
1205 } | 1205 } |
1206 | 1206 |
1207 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { | 1207 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { |
1208 DCHECK_EQ(main_loop_, MessageLoop::current()); | 1208 DCHECK_EQ(main_loop_, MessageLoop::current()); |
1209 DCHECK(client_); | 1209 DCHECK(client_); |
1210 return client_; | 1210 return client_; |
1211 } | 1211 } |
1212 | 1212 |
1213 WebKit::WebAudioSourceProvider* WebMediaPlayerImpl::audioSourceProvider() { | 1213 WebKit::WebAudioSourceProvider* WebMediaPlayerImpl::audioSourceProvider() { |
1214 return audio_source_provider_; | 1214 return audio_source_provider_; |
1215 } | 1215 } |
1216 | 1216 |
1217 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { | 1217 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { |
1218 DCHECK_EQ(main_loop_, MessageLoop::current()); | 1218 DCHECK_EQ(main_loop_, MessageLoop::current()); |
1219 incremented_externally_allocated_memory_ = true; | 1219 incremented_externally_allocated_memory_ = true; |
1220 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); | 1220 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); |
1221 } | 1221 } |
1222 | 1222 |
1223 } // namespace webkit_media | 1223 } // namespace webkit_media |
OLD | NEW |