Chromium Code Reviews| 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" |
| (...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 425 void WebMediaPlayerMS::OnFrameAvailable( | 425 void WebMediaPlayerMS::OnFrameAvailable( |
| 426 const scoped_refptr<media::VideoFrame>& frame) { | 426 const scoped_refptr<media::VideoFrame>& frame) { |
| 427 DVLOG(3) << "WebMediaPlayerMS::OnFrameAvailable"; | 427 DVLOG(3) << "WebMediaPlayerMS::OnFrameAvailable"; |
| 428 DCHECK(thread_checker_.CalledOnValidThread()); | 428 DCHECK(thread_checker_.CalledOnValidThread()); |
| 429 ++total_frame_count_; | 429 ++total_frame_count_; |
| 430 if (!received_first_frame_) { | 430 if (!received_first_frame_) { |
| 431 received_first_frame_ = true; | 431 received_first_frame_ = true; |
| 432 { | 432 { |
| 433 base::AutoLock auto_lock(current_frame_lock_); | 433 base::AutoLock auto_lock(current_frame_lock_); |
| 434 DCHECK(!current_frame_used_); | 434 DCHECK(!current_frame_used_); |
| 435 current_frame_ = | 435 current_frame_ = media::VideoFrame::CreateEmptyFrame(); |
| 436 media::VideoFrame::CreateBlackFrame(frame->natural_size()); | 436 // gpu_video_decoder may return CreateEmptyFrame() which is 0x0. |
| 437 // media::VideoFrame::CreateBlackFrame(frame->natural_size()); | |
|
Ami GONE FROM CHROMIUM
2013/04/26 00:42:05
I'm not sure what this is about
wuchengli
2013/05/08 15:58:56
As discussed in email, |current_frame| is simply s
| |
| 437 } | 438 } |
| 438 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); | 439 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); |
| 439 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); | 440 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); |
| 440 GetClient()->sizeChanged(); | 441 GetClient()->sizeChanged(); |
| 441 | 442 |
| 442 if (video_frame_provider_ && GetClient()->needsWebLayerForVideo()) { | 443 if (video_frame_provider_ && GetClient()->needsWebLayerForVideo()) { |
| 443 video_weblayer_.reset( | 444 video_weblayer_.reset( |
| 444 new webkit::WebLayerImpl(cc::VideoLayer::Create(this))); | 445 new webkit::WebLayerImpl(cc::VideoLayer::Create(this))); |
| 445 GetClient()->setWebLayer(video_weblayer_.get()); | 446 GetClient()->setWebLayer(video_weblayer_.get()); |
| 446 } | 447 } |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 499 GetClient()->readyStateChanged(); | 500 GetClient()->readyStateChanged(); |
| 500 } | 501 } |
| 501 | 502 |
| 502 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { | 503 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { |
| 503 DCHECK(thread_checker_.CalledOnValidThread()); | 504 DCHECK(thread_checker_.CalledOnValidThread()); |
| 504 DCHECK(client_); | 505 DCHECK(client_); |
| 505 return client_; | 506 return client_; |
| 506 } | 507 } |
| 507 | 508 |
| 508 } // namespace webkit_media | 509 } // namespace webkit_media |
| OLD | NEW |