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_ms.h" | 5 #include "webkit/media/webmediaplayer_ms.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
| 13 #include "cc/layers/video_layer.h" |
13 #include "media/base/media_log.h" | 14 #include "media/base/media_log.h" |
14 #include "media/base/video_frame.h" | 15 #include "media/base/video_frame.h" |
15 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" | 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" |
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" | 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" | 18 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" |
18 #include "third_party/WebKit/Source/Platform/chromium/public/WebVideoFrame.h" | |
19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.
h" | 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.
h" |
21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
| 22 #include "webkit/compositor_bindings/web_layer_impl.h" |
22 #include "webkit/media/media_stream_audio_renderer.h" | 23 #include "webkit/media/media_stream_audio_renderer.h" |
23 #include "webkit/media/media_stream_client.h" | 24 #include "webkit/media/media_stream_client.h" |
24 #include "webkit/media/video_frame_provider.h" | 25 #include "webkit/media/video_frame_provider.h" |
25 #include "webkit/media/webmediaplayer_delegate.h" | 26 #include "webkit/media/webmediaplayer_delegate.h" |
26 #include "webkit/media/webmediaplayer_util.h" | 27 #include "webkit/media/webmediaplayer_util.h" |
27 #include "webkit/media/webvideoframe_impl.h" | |
28 | 28 |
29 using WebKit::WebCanvas; | 29 using WebKit::WebCanvas; |
30 using WebKit::WebMediaPlayer; | 30 using WebKit::WebMediaPlayer; |
31 using WebKit::WebRect; | 31 using WebKit::WebRect; |
32 using WebKit::WebSize; | 32 using WebKit::WebSize; |
33 | 33 |
34 namespace webkit_media { | 34 namespace webkit_media { |
35 | 35 |
36 WebMediaPlayerMS::WebMediaPlayerMS( | 36 WebMediaPlayerMS::WebMediaPlayerMS( |
37 WebKit::WebFrame* frame, | 37 WebKit::WebFrame* frame, |
38 WebKit::WebMediaPlayerClient* client, | 38 WebKit::WebMediaPlayerClient* client, |
39 base::WeakPtr<WebMediaPlayerDelegate> delegate, | 39 base::WeakPtr<WebMediaPlayerDelegate> delegate, |
40 MediaStreamClient* media_stream_client, | 40 MediaStreamClient* media_stream_client, |
41 media::MediaLog* media_log) | 41 media::MediaLog* media_log) |
42 : frame_(frame), | 42 : frame_(frame), |
43 network_state_(WebMediaPlayer::NetworkStateEmpty), | 43 network_state_(WebMediaPlayer::NetworkStateEmpty), |
44 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), | 44 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), |
45 buffered_(static_cast<size_t>(1)), | 45 buffered_(static_cast<size_t>(1)), |
46 client_(client), | 46 client_(client), |
47 delegate_(delegate), | 47 delegate_(delegate), |
48 media_stream_client_(media_stream_client), | 48 media_stream_client_(media_stream_client), |
49 paused_(true), | 49 paused_(true), |
50 current_frame_used_(false), | 50 current_frame_used_(false), |
51 pending_repaint_(false), | 51 pending_repaint_(false), |
| 52 video_frame_provider_client_(NULL), |
52 received_first_frame_(false), | 53 received_first_frame_(false), |
53 sequence_started_(false), | 54 sequence_started_(false), |
54 total_frame_count_(0), | 55 total_frame_count_(0), |
55 dropped_frame_count_(0), | 56 dropped_frame_count_(0), |
56 media_log_(media_log) { | 57 media_log_(media_log) { |
57 DVLOG(1) << "WebMediaPlayerMS::ctor"; | 58 DVLOG(1) << "WebMediaPlayerMS::ctor"; |
58 DCHECK(media_stream_client); | 59 DCHECK(media_stream_client); |
59 media_log_->AddEvent( | 60 media_log_->AddEvent( |
60 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); | 61 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); |
61 } | 62 } |
62 | 63 |
63 WebMediaPlayerMS::~WebMediaPlayerMS() { | 64 WebMediaPlayerMS::~WebMediaPlayerMS() { |
64 DVLOG(1) << "WebMediaPlayerMS::dtor"; | 65 DVLOG(1) << "WebMediaPlayerMS::dtor"; |
65 DCHECK(thread_checker_.CalledOnValidThread()); | 66 DCHECK(thread_checker_.CalledOnValidThread()); |
66 if (video_frame_provider_) { | 67 |
| 68 SetVideoFrameProviderClient(NULL); |
| 69 GetClient()->setWebLayer(NULL); |
| 70 |
| 71 if (video_frame_provider_) |
67 video_frame_provider_->Stop(); | 72 video_frame_provider_->Stop(); |
68 } | |
69 | 73 |
70 if (audio_renderer_) { | 74 if (audio_renderer_) { |
71 if (audio_renderer_->IsLocalRenderer()) { | 75 if (audio_renderer_->IsLocalRenderer()) { |
72 audio_renderer_->Stop(); | 76 audio_renderer_->Stop(); |
73 } else if (!paused_) { | 77 } else if (!paused_) { |
74 // The |audio_renderer_| can be shared by multiple remote streams, and | 78 // The |audio_renderer_| can be shared by multiple remote streams, and |
75 // it will be stopped when WebRtcAudioDeviceImpl goes away. So we simply | 79 // it will be stopped when WebRtcAudioDeviceImpl goes away. So we simply |
76 // pause the |audio_renderer_| here to avoid re-creating the | 80 // pause the |audio_renderer_| here to avoid re-creating the |
77 // |audio_renderer_|. | 81 // |audio_renderer_|. |
78 audio_renderer_->Pause(); | 82 audio_renderer_->Pause(); |
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
351 NOTIMPLEMENTED(); | 355 NOTIMPLEMENTED(); |
352 return 0; | 356 return 0; |
353 } | 357 } |
354 | 358 |
355 unsigned WebMediaPlayerMS::videoDecodedByteCount() const { | 359 unsigned WebMediaPlayerMS::videoDecodedByteCount() const { |
356 DCHECK(thread_checker_.CalledOnValidThread()); | 360 DCHECK(thread_checker_.CalledOnValidThread()); |
357 NOTIMPLEMENTED(); | 361 NOTIMPLEMENTED(); |
358 return 0; | 362 return 0; |
359 } | 363 } |
360 | 364 |
361 WebKit::WebVideoFrame* WebMediaPlayerMS::getCurrentFrame() { | 365 void WebMediaPlayerMS::SetVideoFrameProviderClient( |
| 366 cc::VideoFrameProvider::Client* client) { |
| 367 // This is called from both the main renderer thread and the compositor |
| 368 // thread (when the main thread is blocked). |
| 369 if (video_frame_provider_client_) |
| 370 video_frame_provider_client_->StopUsingProvider(); |
| 371 video_frame_provider_client_ = client; |
| 372 } |
| 373 |
| 374 scoped_refptr<media::VideoFrame> WebMediaPlayerMS::GetCurrentFrame() { |
362 DVLOG(3) << "WebMediaPlayerMS::getCurrentFrame"; | 375 DVLOG(3) << "WebMediaPlayerMS::getCurrentFrame"; |
363 base::AutoLock auto_lock(current_frame_lock_); | 376 base::AutoLock auto_lock(current_frame_lock_); |
364 DCHECK(!pending_repaint_); | 377 DCHECK(!pending_repaint_); |
365 if (current_frame_.get()) { | 378 if (!current_frame_) |
366 pending_repaint_ = true; | 379 return NULL; |
367 current_frame_used_ = true; | 380 pending_repaint_ = true; |
368 return new webkit_media::WebVideoFrameImpl(current_frame_); | 381 current_frame_used_ = true; |
369 } | 382 return current_frame_; |
370 return NULL; | |
371 } | 383 } |
372 | 384 |
373 void WebMediaPlayerMS::putCurrentFrame( | 385 void WebMediaPlayerMS::PutCurrentFrame( |
374 WebKit::WebVideoFrame* web_video_frame) { | 386 const scoped_refptr<media::VideoFrame>& frame) { |
375 DVLOG(3) << "WebMediaPlayerMS::putCurrentFrame"; | 387 DVLOG(3) << "WebMediaPlayerMS::putCurrentFrame"; |
376 base::AutoLock auto_lock(current_frame_lock_); | 388 base::AutoLock auto_lock(current_frame_lock_); |
377 DCHECK(pending_repaint_); | 389 DCHECK(pending_repaint_); |
378 pending_repaint_ = false; | 390 pending_repaint_ = false; |
379 if (web_video_frame) { | |
380 delete web_video_frame; | |
381 } | |
382 } | 391 } |
383 | 392 |
384 void WebMediaPlayerMS::OnFrameAvailable( | 393 void WebMediaPlayerMS::OnFrameAvailable( |
385 const scoped_refptr<media::VideoFrame>& frame) { | 394 const scoped_refptr<media::VideoFrame>& frame) { |
386 DVLOG(3) << "WebMediaPlayerMS::OnFrameAvailable"; | 395 DVLOG(3) << "WebMediaPlayerMS::OnFrameAvailable"; |
387 DCHECK(thread_checker_.CalledOnValidThread()); | 396 DCHECK(thread_checker_.CalledOnValidThread()); |
388 ++total_frame_count_; | 397 ++total_frame_count_; |
389 if (!received_first_frame_) { | 398 if (!received_first_frame_) { |
390 received_first_frame_ = true; | 399 received_first_frame_ = true; |
391 { | 400 { |
392 base::AutoLock auto_lock(current_frame_lock_); | 401 base::AutoLock auto_lock(current_frame_lock_); |
393 DCHECK(!current_frame_used_); | 402 DCHECK(!current_frame_used_); |
394 current_frame_ = | 403 current_frame_ = |
395 media::VideoFrame::CreateBlackFrame(frame->natural_size()); | 404 media::VideoFrame::CreateBlackFrame(frame->natural_size()); |
396 } | 405 } |
397 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); | 406 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); |
398 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); | 407 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); |
399 GetClient()->sizeChanged(); | 408 GetClient()->sizeChanged(); |
| 409 |
| 410 if (video_frame_provider_) { |
| 411 video_weblayer_.reset( |
| 412 new webkit::WebLayerImpl(cc::VideoLayer::Create(this))); |
| 413 GetClient()->setWebLayer(video_weblayer_.get()); |
| 414 } |
400 } | 415 } |
401 | 416 |
402 // Do not update |current_frame_| when paused. | 417 // Do not update |current_frame_| when paused. |
403 if (paused_) | 418 if (paused_) |
404 return; | 419 return; |
405 | 420 |
406 if (!sequence_started_) { | 421 if (!sequence_started_) { |
407 sequence_started_ = true; | 422 sequence_started_ = true; |
408 start_time_ = frame->GetTimestamp(); | 423 start_time_ = frame->GetTimestamp(); |
409 } | 424 } |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 GetClient()->readyStateChanged(); | 467 GetClient()->readyStateChanged(); |
453 } | 468 } |
454 | 469 |
455 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { | 470 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { |
456 DCHECK(thread_checker_.CalledOnValidThread()); | 471 DCHECK(thread_checker_.CalledOnValidThread()); |
457 DCHECK(client_); | 472 DCHECK(client_); |
458 return client_; | 473 return client_; |
459 } | 474 } |
460 | 475 |
461 } // namespace webkit_media | 476 } // namespace webkit_media |
OLD | NEW |