Chromium Code Reviews| Index: content/renderer/media/webmediaplayer_ms_compositor.cc |
| diff --git a/content/renderer/media/webmediaplayer_ms_compositor.cc b/content/renderer/media/webmediaplayer_ms_compositor.cc |
| index 198878f0cb682a4f96e49874288ac1f282fab7d5..13593c368b14811c1e2535f0dd0be7bdf6182390 100644 |
| --- a/content/renderer/media/webmediaplayer_ms_compositor.cc |
| +++ b/content/renderer/media/webmediaplayer_ms_compositor.cc |
| @@ -108,7 +108,8 @@ WebMediaPlayerMSCompositor::WebMediaPlayerMSCompositor( |
| const blink::WebMediaStream web_stream( |
| blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); |
| blink::WebVector<blink::WebMediaStreamTrack> video_tracks; |
| - web_stream.videoTracks(video_tracks); |
| + if (!web_stream.isNull()) |
| + web_stream.videoTracks(video_tracks); |
| const bool remote_video = |
| video_tracks.size() && video_tracks[0].source().remote(); |
| @@ -371,4 +372,18 @@ void WebMediaPlayerMSCompositor::SetCurrentFrame( |
| main_message_loop_->PostTask( |
| FROM_HERE, base::Bind(&WebMediaPlayerMS::ResetCanvasCache, player_)); |
| } |
| + |
| +void WebMediaPlayerMSCompositor::SetAlgorithmEnabledForTesting( |
| + bool algorithm_enabled) { |
| + if (!algorithm_enabled) { |
| + rendering_frame_buffer_.reset(); |
| + return; |
| + } |
| + |
| + if (!rendering_frame_buffer_) { |
| + rendering_frame_buffer_.reset(new media::VideoRendererAlgorithm( |
| + base::Bind(&WebMediaPlayerMSCompositor::MapTimestampsToRenderTimeTicks, |
| + base::Unretained(this)))); |
| + } |
| +} |
| } |
|
mcasas
2015/11/04 22:20:30
This is missing a
// namespace content
(it was
qiangchen
2015/11/06 19:14:57
Done.
|