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/Platform/chromium/public/WebVideoFrame.h" |
19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.
h" | 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.
h" |
21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
| 23 #include "webkit/compositor_bindings/web_layer_impl.h" |
22 #include "webkit/media/media_stream_audio_renderer.h" | 24 #include "webkit/media/media_stream_audio_renderer.h" |
23 #include "webkit/media/media_stream_client.h" | 25 #include "webkit/media/media_stream_client.h" |
24 #include "webkit/media/video_frame_provider.h" | 26 #include "webkit/media/video_frame_provider.h" |
25 #include "webkit/media/webmediaplayer_delegate.h" | 27 #include "webkit/media/webmediaplayer_delegate.h" |
26 #include "webkit/media/webmediaplayer_util.h" | 28 #include "webkit/media/webmediaplayer_util.h" |
27 #include "webkit/media/webvideoframe_impl.h" | 29 #include "webkit/media/webvideoframe_impl.h" |
28 | 30 |
29 using WebKit::WebCanvas; | 31 using WebKit::WebCanvas; |
30 using WebKit::WebMediaPlayer; | 32 using WebKit::WebMediaPlayer; |
31 using WebKit::WebRect; | 33 using WebKit::WebRect; |
(...skipping 10 matching lines...) Expand all Loading... |
42 : frame_(frame), | 44 : frame_(frame), |
43 network_state_(WebMediaPlayer::NetworkStateEmpty), | 45 network_state_(WebMediaPlayer::NetworkStateEmpty), |
44 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), | 46 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), |
45 buffered_(static_cast<size_t>(1)), | 47 buffered_(static_cast<size_t>(1)), |
46 client_(client), | 48 client_(client), |
47 delegate_(delegate), | 49 delegate_(delegate), |
48 media_stream_client_(media_stream_client), | 50 media_stream_client_(media_stream_client), |
49 paused_(true), | 51 paused_(true), |
50 current_frame_used_(false), | 52 current_frame_used_(false), |
51 pending_repaint_(false), | 53 pending_repaint_(false), |
| 54 video_frame_provider_client_(NULL), |
52 received_first_frame_(false), | 55 received_first_frame_(false), |
53 sequence_started_(false), | 56 sequence_started_(false), |
54 total_frame_count_(0), | 57 total_frame_count_(0), |
55 dropped_frame_count_(0), | 58 dropped_frame_count_(0), |
56 media_log_(media_log) { | 59 media_log_(media_log) { |
57 DVLOG(1) << "WebMediaPlayerMS::ctor"; | 60 DVLOG(1) << "WebMediaPlayerMS::ctor"; |
58 DCHECK(media_stream_client); | 61 DCHECK(media_stream_client); |
59 media_log_->AddEvent( | 62 media_log_->AddEvent( |
60 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); | 63 media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED)); |
61 } | 64 } |
62 | 65 |
63 WebMediaPlayerMS::~WebMediaPlayerMS() { | 66 WebMediaPlayerMS::~WebMediaPlayerMS() { |
64 DVLOG(1) << "WebMediaPlayerMS::dtor"; | 67 DVLOG(1) << "WebMediaPlayerMS::dtor"; |
65 DCHECK(thread_checker_.CalledOnValidThread()); | 68 DCHECK(thread_checker_.CalledOnValidThread()); |
| 69 |
| 70 #ifdef REMOVE_WEBVIDEOFRAME |
| 71 SetVideoFrameProviderClient(NULL); |
| 72 GetClient()->setWebLayer(NULL); |
| 73 #endif |
| 74 |
66 if (video_frame_provider_) { | 75 if (video_frame_provider_) { |
67 video_frame_provider_->Stop(); | 76 video_frame_provider_->Stop(); |
68 } | 77 } |
69 | 78 |
70 if (audio_renderer_) { | 79 if (audio_renderer_) { |
71 if (audio_renderer_->IsLocalRenderer()) { | 80 if (audio_renderer_->IsLocalRenderer()) { |
72 audio_renderer_->Stop(); | 81 audio_renderer_->Stop(); |
73 } else if (!paused_) { | 82 } else if (!paused_) { |
74 // The |audio_renderer_| can be shared by multiple remote streams, and | 83 // The |audio_renderer_| can be shared by multiple remote streams, and |
75 // it will be stopped when WebRtcAudioDeviceImpl goes away. So we simply | 84 // it will be stopped when WebRtcAudioDeviceImpl goes away. So we simply |
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
351 NOTIMPLEMENTED(); | 360 NOTIMPLEMENTED(); |
352 return 0; | 361 return 0; |
353 } | 362 } |
354 | 363 |
355 unsigned WebMediaPlayerMS::videoDecodedByteCount() const { | 364 unsigned WebMediaPlayerMS::videoDecodedByteCount() const { |
356 DCHECK(thread_checker_.CalledOnValidThread()); | 365 DCHECK(thread_checker_.CalledOnValidThread()); |
357 NOTIMPLEMENTED(); | 366 NOTIMPLEMENTED(); |
358 return 0; | 367 return 0; |
359 } | 368 } |
360 | 369 |
| 370 #ifndef REMOVE_WEBVIDEOFRAME |
361 WebKit::WebVideoFrame* WebMediaPlayerMS::getCurrentFrame() { | 371 WebKit::WebVideoFrame* WebMediaPlayerMS::getCurrentFrame() { |
362 DVLOG(3) << "WebMediaPlayerMS::getCurrentFrame"; | 372 DVLOG(3) << "WebMediaPlayerMS::getCurrentFrame"; |
363 base::AutoLock auto_lock(current_frame_lock_); | 373 base::AutoLock auto_lock(current_frame_lock_); |
364 DCHECK(!pending_repaint_); | 374 DCHECK(!pending_repaint_); |
365 if (current_frame_.get()) { | 375 if (current_frame_.get()) { |
366 pending_repaint_ = true; | 376 pending_repaint_ = true; |
367 current_frame_used_ = true; | 377 current_frame_used_ = true; |
368 return new webkit_media::WebVideoFrameImpl(current_frame_); | 378 return new webkit_media::WebVideoFrameImpl(current_frame_); |
369 } | 379 } |
370 return NULL; | 380 return NULL; |
371 } | 381 } |
372 | 382 |
373 void WebMediaPlayerMS::putCurrentFrame( | 383 void WebMediaPlayerMS::putCurrentFrame( |
374 WebKit::WebVideoFrame* web_video_frame) { | 384 WebKit::WebVideoFrame* web_video_frame) { |
375 DVLOG(3) << "WebMediaPlayerMS::putCurrentFrame"; | 385 DVLOG(3) << "WebMediaPlayerMS::putCurrentFrame"; |
376 base::AutoLock auto_lock(current_frame_lock_); | 386 base::AutoLock auto_lock(current_frame_lock_); |
377 DCHECK(pending_repaint_); | 387 DCHECK(pending_repaint_); |
378 pending_repaint_ = false; | 388 pending_repaint_ = false; |
379 if (web_video_frame) { | 389 if (web_video_frame) { |
380 delete web_video_frame; | 390 delete web_video_frame; |
381 } | 391 } |
382 } | 392 } |
| 393 #else |
| 394 void WebMediaPlayerMS::SetVideoFrameProviderClient( |
| 395 cc::VideoFrameProvider::Client* client) { |
| 396 // This is called from both the main renderer thread and the compositor |
| 397 // thread (when the main thread is blocked). |
| 398 if (video_frame_provider_client_) |
| 399 video_frame_provider_client_->StopUsingProvider(); |
| 400 video_frame_provider_client_ = client; |
| 401 } |
| 402 |
| 403 scoped_refptr<media::VideoFrame> WebMediaPlayerMS::GetCurrentFrame() { |
| 404 DVLOG(3) << "WebMediaPlayerMS::GetCurrentFrame"; |
| 405 base::AutoLock auto_lock(current_frame_lock_); |
| 406 DCHECK(!pending_repaint_); |
| 407 if (!current_frame_) |
| 408 return NULL; |
| 409 pending_repaint_ = true; |
| 410 current_frame_used_ = true; |
| 411 return current_frame_; |
| 412 } |
| 413 |
| 414 void WebMediaPlayerMS::PutCurrentFrame( |
| 415 const scoped_refptr<media::VideoFrame>& frame) { |
| 416 DVLOG(3) << "WebMediaPlayerMS::PutCurrentFrame"; |
| 417 DCHECK(pending_repaint_); |
| 418 pending_repaint_ = false; |
| 419 } |
| 420 #endif |
383 | 421 |
384 void WebMediaPlayerMS::OnFrameAvailable( | 422 void WebMediaPlayerMS::OnFrameAvailable( |
385 const scoped_refptr<media::VideoFrame>& frame) { | 423 const scoped_refptr<media::VideoFrame>& frame) { |
386 DVLOG(3) << "WebMediaPlayerMS::OnFrameAvailable"; | 424 DVLOG(3) << "WebMediaPlayerMS::OnFrameAvailable"; |
387 DCHECK(thread_checker_.CalledOnValidThread()); | 425 DCHECK(thread_checker_.CalledOnValidThread()); |
388 ++total_frame_count_; | 426 ++total_frame_count_; |
389 if (!received_first_frame_) { | 427 if (!received_first_frame_) { |
390 received_first_frame_ = true; | 428 received_first_frame_ = true; |
391 { | 429 { |
392 base::AutoLock auto_lock(current_frame_lock_); | 430 base::AutoLock auto_lock(current_frame_lock_); |
393 DCHECK(!current_frame_used_); | 431 DCHECK(!current_frame_used_); |
394 current_frame_ = | 432 current_frame_ = |
395 media::VideoFrame::CreateBlackFrame(frame->natural_size()); | 433 media::VideoFrame::CreateBlackFrame(frame->natural_size()); |
396 } | 434 } |
397 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); | 435 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); |
398 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); | 436 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); |
399 GetClient()->sizeChanged(); | 437 GetClient()->sizeChanged(); |
| 438 |
| 439 #ifdef REMOVE_WEBVIDEOFRAME |
| 440 if (video_frame_provider_ && GetClient()->needsWebLayerForVideo()) { |
| 441 video_weblayer_.reset( |
| 442 new webkit::WebLayerImpl(cc::VideoLayer::Create(this))); |
| 443 GetClient()->setWebLayer(video_weblayer_.get()); |
| 444 } |
| 445 #endif |
400 } | 446 } |
401 | 447 |
402 // Do not update |current_frame_| when paused. | 448 // Do not update |current_frame_| when paused. |
403 if (paused_) | 449 if (paused_) |
404 return; | 450 return; |
405 | 451 |
406 if (!sequence_started_) { | 452 if (!sequence_started_) { |
407 sequence_started_ = true; | 453 sequence_started_ = true; |
408 start_time_ = frame->GetTimestamp(); | 454 start_time_ = frame->GetTimestamp(); |
409 } | 455 } |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 GetClient()->readyStateChanged(); | 498 GetClient()->readyStateChanged(); |
453 } | 499 } |
454 | 500 |
455 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { | 501 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { |
456 DCHECK(thread_checker_.CalledOnValidThread()); | 502 DCHECK(thread_checker_.CalledOnValidThread()); |
457 DCHECK(client_); | 503 DCHECK(client_); |
458 return client_; | 504 return client_; |
459 } | 505 } |
460 | 506 |
461 } // namespace webkit_media | 507 } // namespace webkit_media |
OLD | NEW |