| OLD | NEW |
| 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/media/webmediaplayer_ms.h" | 5 #include "content/renderer/media/webmediaplayer_ms.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| 11 | 11 |
| 12 #include "base/bind.h" | 12 #include "base/bind.h" |
| 13 #include "base/callback.h" | 13 #include "base/callback.h" |
| 14 #include "build/build_config.h" | 14 #include "build/build_config.h" |
| 15 #include "cc/blink/web_layer_impl.h" | 15 #include "cc/blink/web_layer_impl.h" |
| 16 #include "cc/layers/video_frame_provider_client_impl.h" | 16 #include "cc/layers/video_frame_provider_client_impl.h" |
| 17 #include "cc/layers/video_layer.h" | 17 #include "cc/layers/video_layer.h" |
| 18 #include "content/common/gpu/client/context_provider_command_buffer.h" | 18 #include "content/common/gpu/client/context_provider_command_buffer.h" |
| 19 #include "content/public/renderer/media_stream_audio_renderer.h" | 19 #include "content/public/renderer/media_stream_audio_renderer.h" |
| 20 #include "content/public/renderer/media_stream_renderer_factory.h" | 20 #include "content/public/renderer/media_stream_renderer_factory.h" |
| 21 #include "content/public/renderer/media_stream_video_renderer.h" | 21 #include "content/public/renderer/media_stream_video_renderer.h" |
| 22 #include "content/renderer/media/web_media_element_source_utils.h" | 22 #include "content/renderer/media/web_media_element_source_utils.h" |
| 23 #include "content/renderer/media/webmediaplayer_ms_compositor.h" | 23 #include "content/renderer/media/webmediaplayer_ms_compositor.h" |
| 24 #include "content/renderer/render_frame_impl.h" | 24 #include "content/renderer/render_frame_impl.h" |
| 25 #include "content/renderer/render_thread_impl.h" | 25 #include "content/renderer/render_thread_impl.h" |
| 26 #include "media/base/media_log.h" | 26 #include "media/base/media_log.h" |
| 27 #include "media/base/video_frame.h" | 27 #include "media/base/video_frame.h" |
| 28 #include "media/base/video_types.h" |
| 28 #include "media/blink/webmediaplayer_util.h" | 29 #include "media/blink/webmediaplayer_util.h" |
| 29 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" | 30 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" |
| 30 #include "third_party/WebKit/public/platform/WebMediaPlayerSource.h" | 31 #include "third_party/WebKit/public/platform/WebMediaPlayerSource.h" |
| 31 #include "third_party/WebKit/public/platform/WebRect.h" | 32 #include "third_party/WebKit/public/platform/WebRect.h" |
| 32 #include "third_party/WebKit/public/platform/WebSize.h" | 33 #include "third_party/WebKit/public/platform/WebSize.h" |
| 33 | 34 |
| 34 namespace content { | 35 namespace content { |
| 35 | 36 |
| 36 WebMediaPlayerMS::WebMediaPlayerMS( | 37 WebMediaPlayerMS::WebMediaPlayerMS( |
| 37 blink::WebFrame* frame, | 38 blink::WebFrame* frame, |
| 38 blink::WebMediaPlayerClient* client, | 39 blink::WebMediaPlayerClient* client, |
| 39 base::WeakPtr<media::WebMediaPlayerDelegate> delegate, | 40 base::WeakPtr<media::WebMediaPlayerDelegate> delegate, |
| 40 media::MediaLog* media_log, | 41 media::MediaLog* media_log, |
| 41 std::unique_ptr<MediaStreamRendererFactory> factory, | 42 std::unique_ptr<MediaStreamRendererFactory> factory, |
| 42 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, | 43 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, |
| 43 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 44 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 44 const scoped_refptr<base::TaskRunner>& worker_task_runner, | 45 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
| 45 media::GpuVideoAcceleratorFactories* gpu_factories, | 46 media::GpuVideoAcceleratorFactories* gpu_factories, |
| 46 const blink::WebString& sink_id, | 47 const blink::WebString& sink_id, |
| 47 const blink::WebSecurityOrigin& security_origin) | 48 const blink::WebSecurityOrigin& security_origin) |
| 48 : frame_(frame), | 49 : frame_(frame), |
| 49 network_state_(WebMediaPlayer::NetworkStateEmpty), | 50 network_state_(WebMediaPlayer::NetworkStateEmpty), |
| 50 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), | 51 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), |
| 51 buffered_(static_cast<size_t>(0)), | 52 buffered_(static_cast<size_t>(0)), |
| 52 client_(client), | 53 client_(client), |
| 53 delegate_(delegate), | 54 delegate_(delegate), |
| 54 delegate_id_(0), | 55 delegate_id_(0), |
| 56 last_frame_opaque_(true), |
| 55 paused_(true), | 57 paused_(true), |
| 56 render_frame_suspended_(false), | 58 render_frame_suspended_(false), |
| 57 received_first_frame_(false), | 59 received_first_frame_(false), |
| 58 media_log_(media_log), | 60 media_log_(media_log), |
| 59 renderer_factory_(std::move(factory)), | 61 renderer_factory_(std::move(factory)), |
| 60 media_task_runner_(media_task_runner), | 62 media_task_runner_(media_task_runner), |
| 61 worker_task_runner_(worker_task_runner), | 63 worker_task_runner_(worker_task_runner), |
| 62 gpu_factories_(gpu_factories), | 64 gpu_factories_(gpu_factories), |
| 63 compositor_task_runner_(compositor_task_runner), | 65 compositor_task_runner_(compositor_task_runner), |
| 64 initial_audio_output_device_id_(sink_id.utf8()), | 66 initial_audio_output_device_id_(sink_id.utf8()), |
| (...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 return; | 485 return; |
| 484 | 486 |
| 485 base::TimeTicks render_time; | 487 base::TimeTicks render_time; |
| 486 if (frame->metadata()->GetTimeTicks(media::VideoFrameMetadata::REFERENCE_TIME, | 488 if (frame->metadata()->GetTimeTicks(media::VideoFrameMetadata::REFERENCE_TIME, |
| 487 &render_time)) { | 489 &render_time)) { |
| 488 TRACE_EVENT1("webrtc", "WebMediaPlayerMS::OnFrameAvailable", | 490 TRACE_EVENT1("webrtc", "WebMediaPlayerMS::OnFrameAvailable", |
| 489 "Ideal Render Instant", render_time.ToInternalValue()); | 491 "Ideal Render Instant", render_time.ToInternalValue()); |
| 490 } else { | 492 } else { |
| 491 TRACE_EVENT0("webrtc", "WebMediaPlayerMS::OnFrameAvailable"); | 493 TRACE_EVENT0("webrtc", "WebMediaPlayerMS::OnFrameAvailable"); |
| 492 } | 494 } |
| 495 const bool is_opaque = media::IsOpaque(frame->format()); |
| 493 | 496 |
| 494 if (!received_first_frame_) { | 497 if (!received_first_frame_) { |
| 495 received_first_frame_ = true; | 498 received_first_frame_ = true; |
| 499 last_frame_opaque_ = is_opaque; |
| 496 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); | 500 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); |
| 497 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); | 501 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); |
| 498 | 502 |
| 499 if (video_frame_provider_.get()) { | 503 if (video_frame_provider_.get()) { |
| 500 video_weblayer_.reset(new cc_blink::WebLayerImpl( | 504 video_weblayer_.reset(new cc_blink::WebLayerImpl( |
| 501 cc::VideoLayer::Create(compositor_.get(), media::VIDEO_ROTATION_0))); | 505 cc::VideoLayer::Create(compositor_.get(), media::VIDEO_ROTATION_0))); |
| 502 video_weblayer_->layer()->SetContentsOpaque(false); | 506 video_weblayer_->layer()->SetContentsOpaque(is_opaque); |
| 503 video_weblayer_->SetContentsOpaqueIsFixed(true); | 507 video_weblayer_->SetContentsOpaqueIsFixed(true); |
| 504 get_client()->setWebLayer(video_weblayer_.get()); | 508 get_client()->setWebLayer(video_weblayer_.get()); |
| 505 } | 509 } |
| 506 } | 510 } |
| 507 | 511 |
| 512 // Only configure opacity on changes, since marking it as transparent is |
| 513 // expensive, see https://crbug.com/647886. |
| 514 if (video_weblayer_ && last_frame_opaque_ != is_opaque) { |
| 515 last_frame_opaque_ = is_opaque; |
| 516 video_weblayer_->layer()->SetContentsOpaque(is_opaque); |
| 517 } |
| 518 |
| 508 compositor_->EnqueueFrame(frame); | 519 compositor_->EnqueueFrame(frame); |
| 509 } | 520 } |
| 510 | 521 |
| 511 void WebMediaPlayerMS::RepaintInternal() { | 522 void WebMediaPlayerMS::RepaintInternal() { |
| 512 DVLOG(1) << __FUNCTION__; | 523 DVLOG(1) << __FUNCTION__; |
| 513 DCHECK(thread_checker_.CalledOnValidThread()); | 524 DCHECK(thread_checker_.CalledOnValidThread()); |
| 514 get_client()->repaint(); | 525 get_client()->repaint(); |
| 515 } | 526 } |
| 516 | 527 |
| 517 void WebMediaPlayerMS::OnSourceError() { | 528 void WebMediaPlayerMS::OnSourceError() { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 541 void WebMediaPlayerMS::ResetCanvasCache() { | 552 void WebMediaPlayerMS::ResetCanvasCache() { |
| 542 DCHECK(thread_checker_.CalledOnValidThread()); | 553 DCHECK(thread_checker_.CalledOnValidThread()); |
| 543 video_renderer_.ResetCache(); | 554 video_renderer_.ResetCache(); |
| 544 } | 555 } |
| 545 | 556 |
| 546 void WebMediaPlayerMS::TriggerResize() { | 557 void WebMediaPlayerMS::TriggerResize() { |
| 547 get_client()->sizeChanged(); | 558 get_client()->sizeChanged(); |
| 548 } | 559 } |
| 549 | 560 |
| 550 } // namespace content | 561 } // namespace content |
| OLD | NEW |