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

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

Issue 2770253004: Log out-of-order frames in chrome://media-internals. (Closed)
Patch Set: Include timestamps in the log. Created 3 years, 9 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_compositor.h" 5 #include "content/renderer/media/webmediaplayer_ms_compositor.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/hash.h" 11 #include "base/hash.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "cc/paint/paint_surface.h" 14 #include "cc/paint/paint_surface.h"
15 #include "content/renderer/media/webmediaplayer_ms.h" 15 #include "content/renderer/media/webmediaplayer_ms.h"
16 #include "content/renderer/render_thread_impl.h" 16 #include "content/renderer/render_thread_impl.h"
17 #include "media/base/media_log.h"
17 #include "media/base/media_switches.h" 18 #include "media/base/media_switches.h"
18 #include "media/base/video_frame.h" 19 #include "media/base/video_frame.h"
19 #include "media/base/video_util.h" 20 #include "media/base/video_util.h"
20 #include "media/filters/video_renderer_algorithm.h" 21 #include "media/filters/video_renderer_algorithm.h"
21 #include "media/renderers/skcanvas_video_renderer.h" 22 #include "media/renderers/skcanvas_video_renderer.h"
22 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h" 23 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
23 #include "skia/ext/platform_canvas.h" 24 #include "skia/ext/platform_canvas.h"
24 #include "third_party/WebKit/public/platform/WebMediaStream.h" 25 #include "third_party/WebKit/public/platform/WebMediaStream.h"
25 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 26 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
26 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 27 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 // Transfer metadata keys. 123 // Transfer metadata keys.
123 new_frame->metadata()->MergeMetadataFrom(frame->metadata()); 124 new_frame->metadata()->MergeMetadataFrom(frame->metadata());
124 return new_frame; 125 return new_frame;
125 } 126 }
126 127
127 } // anonymous namespace 128 } // anonymous namespace
128 129
129 WebMediaPlayerMSCompositor::WebMediaPlayerMSCompositor( 130 WebMediaPlayerMSCompositor::WebMediaPlayerMSCompositor(
130 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, 131 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
131 const blink::WebMediaStream& web_stream, 132 const blink::WebMediaStream& web_stream,
132 const base::WeakPtr<WebMediaPlayerMS>& player) 133 const base::WeakPtr<WebMediaPlayerMS>& player,
134 scoped_refptr<media::MediaLog> media_log)
133 : compositor_task_runner_(compositor_task_runner), 135 : compositor_task_runner_(compositor_task_runner),
134 player_(player), 136 player_(player),
137 media_log_(std::move(media_log)),
135 video_frame_provider_client_(nullptr), 138 video_frame_provider_client_(nullptr),
136 current_frame_used_by_compositor_(false), 139 current_frame_used_by_compositor_(false),
137 last_render_length_(base::TimeDelta::FromSecondsD(1.0 / 60.0)), 140 last_render_length_(base::TimeDelta::FromSecondsD(1.0 / 60.0)),
138 total_frame_count_(0), 141 total_frame_count_(0),
139 dropped_frame_count_(0), 142 dropped_frame_count_(0),
140 stopped_(true) { 143 stopped_(true) {
141 main_message_loop_ = base::MessageLoop::current(); 144 main_message_loop_ = base::MessageLoop::current();
142 io_thread_checker_.DetachFromThread(); 145 io_thread_checker_.DetachFromThread();
143 146
144 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; 147 blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
145 if (!web_stream.isNull()) 148 if (!web_stream.isNull())
146 web_stream.videoTracks(video_tracks); 149 web_stream.videoTracks(video_tracks);
147 150
148 const bool remote_video = 151 const bool remote_video =
149 video_tracks.size() && video_tracks[0].source().remote(); 152 video_tracks.size() && video_tracks[0].source().remote();
150 153
151 if (remote_video && !base::CommandLine::ForCurrentProcess()->HasSwitch( 154 if (remote_video && !base::CommandLine::ForCurrentProcess()->HasSwitch(
152 switches::kDisableRTCSmoothnessAlgorithm)) { 155 switches::kDisableRTCSmoothnessAlgorithm)) {
153 base::AutoLock auto_lock(current_frame_lock_); 156 base::AutoLock auto_lock(current_frame_lock_);
154 rendering_frame_buffer_.reset(new media::VideoRendererAlgorithm( 157 rendering_frame_buffer_.reset(new media::VideoRendererAlgorithm(
155 base::Bind(&WebMediaPlayerMSCompositor::MapTimestampsToRenderTimeTicks, 158 base::Bind(&WebMediaPlayerMSCompositor::MapTimestampsToRenderTimeTicks,
156 base::Unretained(this)))); 159 base::Unretained(this)),
160 media_log_));
157 } 161 }
158 162
159 // Just for logging purpose. 163 // Just for logging purpose.
160 std::string stream_id = 164 std::string stream_id =
161 web_stream.isNull() ? std::string() : web_stream.id().utf8(); 165 web_stream.isNull() ? std::string() : web_stream.id().utf8();
162 const uint32_t hash_value = base::Hash(stream_id); 166 const uint32_t hash_value = base::Hash(stream_id);
163 serial_ = (hash_value << 1) | (remote_video ? 1 : 0); 167 serial_ = (hash_value << 1) | (remote_video ? 1 : 0);
164 } 168 }
165 169
166 WebMediaPlayerMSCompositor::~WebMediaPlayerMSCompositor() { 170 WebMediaPlayerMSCompositor::~WebMediaPlayerMSCompositor() {
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 void WebMediaPlayerMSCompositor::SetAlgorithmEnabledForTesting( 455 void WebMediaPlayerMSCompositor::SetAlgorithmEnabledForTesting(
452 bool algorithm_enabled) { 456 bool algorithm_enabled) {
453 if (!algorithm_enabled) { 457 if (!algorithm_enabled) {
454 rendering_frame_buffer_.reset(); 458 rendering_frame_buffer_.reset();
455 return; 459 return;
456 } 460 }
457 461
458 if (!rendering_frame_buffer_) { 462 if (!rendering_frame_buffer_) {
459 rendering_frame_buffer_.reset(new media::VideoRendererAlgorithm( 463 rendering_frame_buffer_.reset(new media::VideoRendererAlgorithm(
460 base::Bind(&WebMediaPlayerMSCompositor::MapTimestampsToRenderTimeTicks, 464 base::Bind(&WebMediaPlayerMSCompositor::MapTimestampsToRenderTimeTicks,
461 base::Unretained(this)))); 465 base::Unretained(this)),
466 media_log_));
462 } 467 }
463 } 468 }
464 469
465 } // namespace content 470 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698