Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

Side by Side Diff: content/renderer/media/webmediaplayer_ms.cc

Issue 2358903002: Change WebMediaPlayerMS layers transparency dynamically (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_rotation.h" 28 #include "media/base/video_rotation.h"
29 #include "media/base/video_types.h"
29 #include "media/blink/webmediaplayer_util.h" 30 #include "media/blink/webmediaplayer_util.h"
30 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" 31 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
31 #include "third_party/WebKit/public/platform/WebMediaPlayerSource.h" 32 #include "third_party/WebKit/public/platform/WebMediaPlayerSource.h"
32 #include "third_party/WebKit/public/platform/WebRect.h" 33 #include "third_party/WebKit/public/platform/WebRect.h"
33 #include "third_party/WebKit/public/platform/WebSize.h" 34 #include "third_party/WebKit/public/platform/WebSize.h"
34 35
35 namespace content { 36 namespace content {
36 37
37 WebMediaPlayerMS::WebMediaPlayerMS( 38 WebMediaPlayerMS::WebMediaPlayerMS(
38 blink::WebFrame* frame, 39 blink::WebFrame* frame,
39 blink::WebMediaPlayerClient* client, 40 blink::WebMediaPlayerClient* client,
40 base::WeakPtr<media::WebMediaPlayerDelegate> delegate, 41 base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
41 media::MediaLog* media_log, 42 media::MediaLog* media_log,
42 std::unique_ptr<MediaStreamRendererFactory> factory, 43 std::unique_ptr<MediaStreamRendererFactory> factory,
43 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, 44 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
44 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 45 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
45 const scoped_refptr<base::TaskRunner>& worker_task_runner, 46 const scoped_refptr<base::TaskRunner>& worker_task_runner,
46 media::GpuVideoAcceleratorFactories* gpu_factories, 47 media::GpuVideoAcceleratorFactories* gpu_factories,
47 const blink::WebString& sink_id, 48 const blink::WebString& sink_id,
48 const blink::WebSecurityOrigin& security_origin) 49 const blink::WebSecurityOrigin& security_origin)
49 : frame_(frame), 50 : frame_(frame),
50 network_state_(WebMediaPlayer::NetworkStateEmpty), 51 network_state_(WebMediaPlayer::NetworkStateEmpty),
51 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), 52 ready_state_(WebMediaPlayer::ReadyStateHaveNothing),
52 buffered_(static_cast<size_t>(0)), 53 buffered_(static_cast<size_t>(0)),
53 client_(client), 54 client_(client),
54 delegate_(delegate), 55 delegate_(delegate),
55 delegate_id_(0), 56 delegate_id_(0),
57 last_frame_opaque_(true),
56 paused_(true), 58 paused_(true),
57 render_frame_suspended_(false), 59 render_frame_suspended_(false),
58 received_first_frame_(false), 60 received_first_frame_(false),
59 video_rotation_(media::VIDEO_ROTATION_0), 61 video_rotation_(media::VIDEO_ROTATION_0),
60 media_log_(media_log), 62 media_log_(media_log),
61 renderer_factory_(std::move(factory)), 63 renderer_factory_(std::move(factory)),
62 media_task_runner_(media_task_runner), 64 media_task_runner_(media_task_runner),
63 worker_task_runner_(worker_task_runner), 65 worker_task_runner_(worker_task_runner),
64 gpu_factories_(gpu_factories), 66 gpu_factories_(gpu_factories),
65 compositor_task_runner_(compositor_task_runner), 67 compositor_task_runner_(compositor_task_runner),
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 // Only configure opacity on changes, since marking it as transparent is
523 // expensive, see https://crbug.com/647886.
524 if (video_weblayer_ && 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
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
OLDNEW
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.h ('k') | content/renderer/media/webmediaplayer_ms_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698