| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "webkit/media/webmediaplayer_impl.h" | 5 #include "webkit/media/webmediaplayer_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 main_loop_, frame_, media_log_, base::Bind( | 269 main_loop_, frame_, media_log_, base::Bind( |
| 270 &WebMediaPlayerImpl::NotifyDownloading, AsWeakPtr())); | 270 &WebMediaPlayerImpl::NotifyDownloading, AsWeakPtr())); |
| 271 data_source_->Initialize( | 271 data_source_->Initialize( |
| 272 url, static_cast<BufferedResourceLoader::CORSMode>(cors_mode), | 272 url, static_cast<BufferedResourceLoader::CORSMode>(cors_mode), |
| 273 base::Bind( | 273 base::Bind( |
| 274 &WebMediaPlayerImpl::DataSourceInitialized, | 274 &WebMediaPlayerImpl::DataSourceInitialized, |
| 275 AsWeakPtr(), gurl)); | 275 AsWeakPtr(), gurl)); |
| 276 | 276 |
| 277 is_local_source_ = !gurl.SchemeIs("http") && !gurl.SchemeIs("https"); | 277 is_local_source_ = !gurl.SchemeIs("http") && !gurl.SchemeIs("https"); |
| 278 | 278 |
| 279 BuildDefaultCollection(data_source_, | 279 BuildDefaultCollection( |
| 280 media_thread_.message_loop_proxy(), | 280 data_source_, |
| 281 filter_collection_.get()); | 281 media_thread_.message_loop_proxy(), |
| 282 filter_collection_.get(), |
| 283 BIND_TO_RENDER_LOOP_2(&WebMediaPlayerImpl::OnNeedKey, "", "")); |
| 282 } | 284 } |
| 283 | 285 |
| 284 void WebMediaPlayerImpl::load(const WebKit::WebURL& url, | 286 void WebMediaPlayerImpl::load(const WebKit::WebURL& url, |
| 285 WebKit::WebMediaSource* media_source, | 287 WebKit::WebMediaSource* media_source, |
| 286 CORSMode cors_mode) { | 288 CORSMode cors_mode) { |
| 287 scoped_ptr<WebKit::WebMediaSource> ms(media_source); | 289 scoped_ptr<WebKit::WebMediaSource> ms(media_source); |
| 288 LoadSetup(url); | 290 LoadSetup(url); |
| 289 | 291 |
| 290 // Media source pipelines can start immediately. | 292 // Media source pipelines can start immediately. |
| 291 chunk_demuxer_ = new media::ChunkDemuxer( | 293 chunk_demuxer_ = new media::ChunkDemuxer( |
| (...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1158 | 1160 |
| 1159 if (pending_repaint_) | 1161 if (pending_repaint_) |
| 1160 return; | 1162 return; |
| 1161 | 1163 |
| 1162 pending_repaint_ = true; | 1164 pending_repaint_ = true; |
| 1163 main_loop_->PostTask(FROM_HERE, base::Bind( | 1165 main_loop_->PostTask(FROM_HERE, base::Bind( |
| 1164 &WebMediaPlayerImpl::Repaint, AsWeakPtr())); | 1166 &WebMediaPlayerImpl::Repaint, AsWeakPtr())); |
| 1165 } | 1167 } |
| 1166 | 1168 |
| 1167 } // namespace webkit_media | 1169 } // namespace webkit_media |
| OLD | NEW |