| OLD | NEW |
| 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 Loading... |
| 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, LoadTypeMediaSource); | 224 DCHECK_NE(load_type, LoadTypeMediaSource); |
| 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_, web_stream, AsWeakPtr(), media_log_); |
| 230 | 230 |
| 231 SetNetworkState(WebMediaPlayer::NetworkStateLoading); | 231 SetNetworkState(WebMediaPlayer::NetworkStateLoading); |
| 232 SetReadyState(WebMediaPlayer::ReadyStateHaveNothing); | 232 SetReadyState(WebMediaPlayer::ReadyStateHaveNothing); |
| 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 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 700 void WebMediaPlayerMS::ResetCanvasCache() { | 700 void WebMediaPlayerMS::ResetCanvasCache() { |
| 701 DCHECK(thread_checker_.CalledOnValidThread()); | 701 DCHECK(thread_checker_.CalledOnValidThread()); |
| 702 video_renderer_.ResetCache(); | 702 video_renderer_.ResetCache(); |
| 703 } | 703 } |
| 704 | 704 |
| 705 void WebMediaPlayerMS::TriggerResize() { | 705 void WebMediaPlayerMS::TriggerResize() { |
| 706 get_client()->sizeChanged(); | 706 get_client()->sizeChanged(); |
| 707 } | 707 } |
| 708 | 708 |
| 709 } // namespace content | 709 } // namespace content |
| OLD | NEW |