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

Unified Diff: content/renderer/media/webmediaplayer_ms_compositor.cc

Issue 1417533006: Unit test for WebMediaPlayerMS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and merge some classes together Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
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.

Powered by Google App Engine
This is Rietveld 408576698