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

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

Issue 1531073002: Revert of Unit test for WebMediaPlayerMS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 095f54897faea41db2be02ed3b4ff7dab498fdf9..198878f0cb682a4f96e49874288ac1f282fab7d5 100644
--- a/content/renderer/media/webmediaplayer_ms_compositor.cc
+++ b/content/renderer/media/webmediaplayer_ms_compositor.cc
@@ -108,8 +108,7 @@
const blink::WebMediaStream web_stream(
blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url));
blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
- if (!web_stream.isNull())
- web_stream.videoTracks(video_tracks);
+ web_stream.videoTracks(video_tracks);
const bool remote_video =
video_tracks.size() && video_tracks[0].source().remote();
@@ -372,19 +371,4 @@
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))));
- }
-}
-
-} // namespace content
+}
« no previous file with comments | « content/renderer/media/webmediaplayer_ms_compositor.h ('k') | content/renderer/media/webmediaplayer_ms_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698