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

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

Issue 2859993002: Refactor WebMediaPlayerMSCompositor::ReplaceCurrentFrameWithACopy() logic (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « no previous file | content/renderer/media/webmediaplayer_ms_compositor.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 CORSMode /*cors_mode*/) { 218 CORSMode /*cors_mode*/) {
219 DVLOG(1) << __func__; 219 DVLOG(1) << __func__;
220 DCHECK(thread_checker_.CalledOnValidThread()); 220 DCHECK(thread_checker_.CalledOnValidThread());
221 221
222 // TODO(acolwell): Change this to DCHECK_EQ(load_type, LoadTypeMediaStream) 222 // TODO(acolwell): Change this to DCHECK_EQ(load_type, LoadTypeMediaStream)
223 // once Blink-side changes land. 223 // once Blink-side changes land.
224 DCHECK_NE(load_type, kLoadTypeMediaSource); 224 DCHECK_NE(load_type, kLoadTypeMediaSource);
225 blink::WebMediaStream web_stream = 225 blink::WebMediaStream web_stream =
226 GetWebMediaStreamFromWebMediaPlayerSource(source); 226 GetWebMediaStreamFromWebMediaPlayerSource(source);
227 227
228 compositor_ = new WebMediaPlayerMSCompositor(compositor_task_runner_, 228 compositor_ = new WebMediaPlayerMSCompositor(
229 web_stream, AsWeakPtr()); 229 compositor_task_runner_, io_task_runner_, web_stream, AsWeakPtr());
230 230
231 SetNetworkState(WebMediaPlayer::kNetworkStateLoading); 231 SetNetworkState(WebMediaPlayer::kNetworkStateLoading);
232 SetReadyState(WebMediaPlayer::kReadyStateHaveNothing); 232 SetReadyState(WebMediaPlayer::kReadyStateHaveNothing);
233 std::string stream_id = 233 std::string stream_id =
234 web_stream.IsNull() ? std::string() : web_stream.Id().Utf8(); 234 web_stream.IsNull() ? std::string() : web_stream.Id().Utf8();
235 media_log_->AddEvent(media_log_->CreateLoadEvent(stream_id)); 235 media_log_->AddEvent(media_log_->CreateLoadEvent(stream_id));
236 236
237 frame_deliverer_.reset(new WebMediaPlayerMS::FrameDeliverer( 237 frame_deliverer_.reset(new WebMediaPlayerMS::FrameDeliverer(
238 AsWeakPtr(), 238 AsWeakPtr(),
239 base::Bind(&WebMediaPlayerMSCompositor::EnqueueFrame, compositor_))); 239 base::Bind(&WebMediaPlayerMSCompositor::EnqueueFrame, compositor_)));
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 void WebMediaPlayerMS::ResetCanvasCache() { 713 void WebMediaPlayerMS::ResetCanvasCache() {
714 DCHECK(thread_checker_.CalledOnValidThread()); 714 DCHECK(thread_checker_.CalledOnValidThread());
715 video_renderer_.ResetCache(); 715 video_renderer_.ResetCache();
716 } 716 }
717 717
718 void WebMediaPlayerMS::TriggerResize() { 718 void WebMediaPlayerMS::TriggerResize() {
719 get_client()->SizeChanged(); 719 get_client()->SizeChanged();
720 } 720 }
721 721
722 } // namespace content 722 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/webmediaplayer_ms_compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698