Index: webkit/media/webmediaplayer_impl.cc |
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc |
index af054e92652d0288516b48e441fcb07549fc551b..2bc613be4bf97787033d8585bb64092b276b963c 100644 |
--- a/webkit/media/webmediaplayer_impl.cc |
+++ b/webkit/media/webmediaplayer_impl.cc |
@@ -221,7 +221,7 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url) { |
if (BuildMediaStreamCollection(url, media_stream_client_, |
message_loop_factory_.get(), |
filter_collection_.get())) { |
- StartPipeline(gurl); |
+ StartPipeline(); |
return; |
} |
@@ -229,7 +229,7 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url) { |
if (BuildMediaSourceCollection(url, GetClient()->sourceURL(), proxy_, |
message_loop_factory_.get(), |
filter_collection_.get())) { |
- StartPipeline(gurl); |
+ StartPipeline(); |
return; |
} |
@@ -824,17 +824,21 @@ void WebMediaPlayerImpl::DataSourceInitialized( |
return; |
} |
+ // TODO(scherkus): this is leftover from removing DemuxerFactory -- instead |
+ // our DataSource should report this information. See http://crbug.com/120426 |
+ bool local_source = !gurl.SchemeIs("http") && !gurl.SchemeIs("https"); |
+ |
BuildDefaultCollection(proxy_->data_source(), |
+ local_source, |
message_loop_factory_.get(), |
filter_collection_.get()); |
- StartPipeline(gurl); |
+ StartPipeline(); |
} |
-void WebMediaPlayerImpl::StartPipeline(const GURL& gurl) { |
+void WebMediaPlayerImpl::StartPipeline() { |
started_ = true; |
pipeline_->Start( |
filter_collection_.Pass(), |
- gurl.spec(), |
base::Bind(&WebMediaPlayerProxy::PipelineEndedCallback, proxy_.get()), |
base::Bind(&WebMediaPlayerProxy::PipelineErrorCallback, proxy_.get()), |
base::Bind(&WebMediaPlayerProxy::NetworkEventCallback, proxy_.get()), |