Chromium Code Reviews| 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_content_type.h" | 26 #include "media/base/media_content_type.h" |
| 27 #include "media/base/media_log.h" | 27 #include "media/base/media_log.h" |
| 28 #include "media/base/video_frame.h" | 28 #include "media/base/video_frame.h" |
| 29 #include "media/base/video_rotation.h" | 29 #include "media/base/video_rotation.h" |
| 30 #include "media/base/video_types.h" | |
| 30 #include "media/blink/webmediaplayer_util.h" | 31 #include "media/blink/webmediaplayer_util.h" |
| 31 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" | 32 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" |
| 32 #include "third_party/WebKit/public/platform/WebMediaPlayerSource.h" | 33 #include "third_party/WebKit/public/platform/WebMediaPlayerSource.h" |
| 33 #include "third_party/WebKit/public/platform/WebRect.h" | 34 #include "third_party/WebKit/public/platform/WebRect.h" |
| 34 #include "third_party/WebKit/public/platform/WebSize.h" | 35 #include "third_party/WebKit/public/platform/WebSize.h" |
| 35 | 36 |
| 36 namespace content { | 37 namespace content { |
| 37 | 38 |
| 38 WebMediaPlayerMS::WebMediaPlayerMS( | 39 WebMediaPlayerMS::WebMediaPlayerMS( |
| 39 blink::WebFrame* frame, | 40 blink::WebFrame* frame, |
| 40 blink::WebMediaPlayerClient* client, | 41 blink::WebMediaPlayerClient* client, |
| 41 base::WeakPtr<media::WebMediaPlayerDelegate> delegate, | 42 base::WeakPtr<media::WebMediaPlayerDelegate> delegate, |
| 42 media::MediaLog* media_log, | 43 media::MediaLog* media_log, |
| 43 std::unique_ptr<MediaStreamRendererFactory> factory, | 44 std::unique_ptr<MediaStreamRendererFactory> factory, |
| 44 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, | 45 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, |
| 45 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 46 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 46 const scoped_refptr<base::TaskRunner>& worker_task_runner, | 47 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
| 47 media::GpuVideoAcceleratorFactories* gpu_factories, | 48 media::GpuVideoAcceleratorFactories* gpu_factories, |
| 48 const blink::WebString& sink_id, | 49 const blink::WebString& sink_id, |
| 49 const blink::WebSecurityOrigin& security_origin) | 50 const blink::WebSecurityOrigin& security_origin) |
| 50 : frame_(frame), | 51 : frame_(frame), |
| 51 network_state_(WebMediaPlayer::NetworkStateEmpty), | 52 network_state_(WebMediaPlayer::NetworkStateEmpty), |
| 52 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), | 53 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), |
| 53 buffered_(static_cast<size_t>(0)), | 54 buffered_(static_cast<size_t>(0)), |
| 54 client_(client), | 55 client_(client), |
| 55 delegate_(delegate), | 56 delegate_(delegate), |
| 56 delegate_id_(0), | 57 delegate_id_(0), |
| 58 last_frame_opaque_(true), | |
| 57 paused_(true), | 59 paused_(true), |
| 58 render_frame_suspended_(false), | 60 render_frame_suspended_(false), |
| 59 received_first_frame_(false), | 61 received_first_frame_(false), |
| 60 video_rotation_(media::VIDEO_ROTATION_0), | 62 video_rotation_(media::VIDEO_ROTATION_0), |
| 61 media_log_(media_log), | 63 media_log_(media_log), |
| 62 renderer_factory_(std::move(factory)), | 64 renderer_factory_(std::move(factory)), |
| 63 media_task_runner_(media_task_runner), | 65 media_task_runner_(media_task_runner), |
| 64 worker_task_runner_(worker_task_runner), | 66 worker_task_runner_(worker_task_runner), |
| 65 gpu_factories_(gpu_factories), | 67 gpu_factories_(gpu_factories), |
| 66 compositor_task_runner_(compositor_task_runner), | 68 compositor_task_runner_(compositor_task_runner), |
| (...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 490 return; | 492 return; |
| 491 | 493 |
| 492 base::TimeTicks render_time; | 494 base::TimeTicks render_time; |
| 493 if (frame->metadata()->GetTimeTicks(media::VideoFrameMetadata::REFERENCE_TIME, | 495 if (frame->metadata()->GetTimeTicks(media::VideoFrameMetadata::REFERENCE_TIME, |
| 494 &render_time)) { | 496 &render_time)) { |
| 495 TRACE_EVENT1("webrtc", "WebMediaPlayerMS::OnFrameAvailable", | 497 TRACE_EVENT1("webrtc", "WebMediaPlayerMS::OnFrameAvailable", |
| 496 "Ideal Render Instant", render_time.ToInternalValue()); | 498 "Ideal Render Instant", render_time.ToInternalValue()); |
| 497 } else { | 499 } else { |
| 498 TRACE_EVENT0("webrtc", "WebMediaPlayerMS::OnFrameAvailable"); | 500 TRACE_EVENT0("webrtc", "WebMediaPlayerMS::OnFrameAvailable"); |
| 499 } | 501 } |
| 502 const bool is_opaque = media::IsOpaque(frame->format()); | |
| 500 | 503 |
| 501 if (!received_first_frame_) { | 504 if (!received_first_frame_) { |
| 502 received_first_frame_ = true; | 505 received_first_frame_ = true; |
| 506 last_frame_opaque_ = is_opaque; | |
| 503 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); | 507 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); |
| 504 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); | 508 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); |
| 505 | 509 |
| 506 if (video_frame_provider_.get()) { | 510 if (video_frame_provider_.get()) { |
| 507 ignore_result(frame->metadata()->GetRotation( | 511 ignore_result(frame->metadata()->GetRotation( |
| 508 media::VideoFrameMetadata::ROTATION, &video_rotation_)); | 512 media::VideoFrameMetadata::ROTATION, &video_rotation_)); |
| 509 | 513 |
| 510 video_weblayer_.reset(new cc_blink::WebLayerImpl( | 514 video_weblayer_.reset(new cc_blink::WebLayerImpl( |
| 511 cc::VideoLayer::Create(compositor_.get(), video_rotation_))); | 515 cc::VideoLayer::Create(compositor_.get(), video_rotation_))); |
| 512 video_weblayer_->layer()->SetContentsOpaque(false); | 516 video_weblayer_->layer()->SetContentsOpaque(is_opaque); |
| 513 video_weblayer_->SetContentsOpaqueIsFixed(true); | 517 video_weblayer_->SetContentsOpaqueIsFixed(true); |
| 514 get_client()->setWebLayer(video_weblayer_.get()); | 518 get_client()->setWebLayer(video_weblayer_.get()); |
| 515 } | 519 } |
| 516 } | 520 } |
| 517 | 521 |
| 522 // Change layer's transparency dynamically with incoming frames. | |
|
mcasas
2016/09/20 00:35:14
Maybe add a comment here e.g.
"...only configure o
emircan
2016/09/20 03:00:06
Done.
| |
| 523 if (video_frame_provider_.get() && video_weblayer_ && | |
|
mcasas
2016/09/20 00:35:14
Isn't video_frame_provider_.get() redundant?
It is
emircan
2016/09/20 03:00:06
Done.
| |
| 524 last_frame_opaque_ != is_opaque) { | |
| 525 last_frame_opaque_ = is_opaque; | |
| 526 video_weblayer_->layer()->SetContentsOpaque(is_opaque); | |
| 527 } | |
| 528 | |
| 518 compositor_->EnqueueFrame(frame); | 529 compositor_->EnqueueFrame(frame); |
| 519 } | 530 } |
| 520 | 531 |
| 521 void WebMediaPlayerMS::RepaintInternal() { | 532 void WebMediaPlayerMS::RepaintInternal() { |
| 522 DVLOG(1) << __func__; | 533 DVLOG(1) << __func__; |
| 523 DCHECK(thread_checker_.CalledOnValidThread()); | 534 DCHECK(thread_checker_.CalledOnValidThread()); |
| 524 get_client()->repaint(); | 535 get_client()->repaint(); |
| 525 } | 536 } |
| 526 | 537 |
| 527 void WebMediaPlayerMS::OnSourceError() { | 538 void WebMediaPlayerMS::OnSourceError() { |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 551 void WebMediaPlayerMS::ResetCanvasCache() { | 562 void WebMediaPlayerMS::ResetCanvasCache() { |
| 552 DCHECK(thread_checker_.CalledOnValidThread()); | 563 DCHECK(thread_checker_.CalledOnValidThread()); |
| 553 video_renderer_.ResetCache(); | 564 video_renderer_.ResetCache(); |
| 554 } | 565 } |
| 555 | 566 |
| 556 void WebMediaPlayerMS::TriggerResize() { | 567 void WebMediaPlayerMS::TriggerResize() { |
| 557 get_client()->sizeChanged(); | 568 get_client()->sizeChanged(); |
| 558 } | 569 } |
| 559 | 570 |
| 560 } // namespace content | 571 } // namespace content |
| OLD | NEW |