Index: webkit/media/webmediaplayer_impl.cc |
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc |
index 22c24d3be8932abb4ba3db6bc2e1225817503bc2..5f18bd706cf4ac8aad96ee950bf96a0b45179774 100644 |
--- a/webkit/media/webmediaplayer_impl.cc |
+++ b/webkit/media/webmediaplayer_impl.cc |
@@ -291,9 +291,14 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url) { |
} |
// TODO(wjia): add audio decoder handling when it's available. |
- if (has_video || has_audio) |
+ if (has_video || has_audio) { |
+ // TODO(vrk/wjia): Setting "true" for is_local is under the assumption |
+ // that the MediaStream represents a local webcam. This will need to |
+ // change in the future when GetVideoDecoder is no longer hardcoded to |
+ // only return CaptureVideoDecoders. |
filter_collection_->SetDemuxerFactory( |
- new media::DummyDemuxerFactory(has_video, has_audio)); |
+ new media::DummyDemuxerFactory(has_video, has_audio, true)); |
+ } |
} |
// Handle any volume changes that occured before load(). |
@@ -746,7 +751,7 @@ void WebMediaPlayerImpl::OnPipelineInitialize(PipelineStatus status) { |
is_accelerated_compositing_active_); |
} |
- if (pipeline_->IsLoaded()) |
+ if (pipeline_->IsLocalSource()) |
SetNetworkState(WebKit::WebMediaPlayer::Loaded); |
SetReadyState(WebKit::WebMediaPlayer::HaveMetadata); |