summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorralphl@chromium.org <ralphl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-06 20:27:51 +0000
committerralphl@chromium.org <ralphl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-06 20:27:51 +0000
commitea8395df79a1585f765946a002676cf2bf1c65c5 (patch)
tree3bd886fe009ab4f9591aef43a4982504a39d6c1f /chrome/renderer
parentf6ea4733ac52a29238825efcfe07d9b7a33a63d0 (diff)
downloadchromium_src-ea8395df79a1585f765946a002676cf2bf1c65c5.zip
chromium_src-ea8395df79a1585f765946a002676cf2bf1c65c5.tar.gz
chromium_src-ea8395df79a1585f765946a002676cf2bf1c65c5.tar.bz2
Pipeline_Impl was modified to properly render a stream that has video but no audio. A unit test accompanies the change.
Note that one minor other change was snuck in with this change. The data_source_impl.cc had a TODO to set a more specific error when a read failed. Because I was already updating the pipeline error enum, I added the error code, changed the call to host_->Error(), and removed the TODO. Review URL: http://codereview.chromium.org/39170 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/media/data_source_impl.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/renderer/media/data_source_impl.cc b/chrome/renderer/media/data_source_impl.cc
index 5e97a80..96a253b 100644
--- a/chrome/renderer/media/data_source_impl.cc
+++ b/chrome/renderer/media/data_source_impl.cc
@@ -153,9 +153,7 @@ void DataSourceImpl::OnReadFileStream(uint8* data, size_t size) {
// be called. Since the file handle is asynchronous, return value other
// than ERROR_IO_PENDING is an error.
if (stream_->Read(c_data, size, &read_callback_) != net::ERR_IO_PENDING) {
- // TODO(hclam): change to PipelineError::PIPELINE_ERROR_READ once ralphl
- // gets the new pipeline CL checked in.
- host_->Error(media::PIPELINE_ERROR_NETWORK);
+ host_->Error(media::PIPELINE_ERROR_READ);
}
}
}