summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webmediaplayer_impl.cc
diff options
context:
space:
mode:
authorkylep@chromium.org <kylep@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-31 00:17:08 +0000
committerkylep@chromium.org <kylep@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-31 00:17:08 +0000
commit9c4e77ab10f059f1178394da4ae76bce2a4fc9e7 (patch)
treec9bfa2a1898a4dce6b481662349445168d7703a1 /webkit/glue/webmediaplayer_impl.cc
parent90b906d983a1faeb890e134ff3f3e8f6b7fdfaae (diff)
downloadchromium_src-9c4e77ab10f059f1178394da4ae76bce2a4fc9e7.zip
chromium_src-9c4e77ab10f059f1178394da4ae76bce2a4fc9e7.tar.gz
chromium_src-9c4e77ab10f059f1178394da4ae76bce2a4fc9e7.tar.bz2
Change to WebMediaPlayerImpl incorrectly translated some pipeline errors.
BUG=16738 TEST=run the media LayoutTests Review URL: http://codereview.chromium.org/159669 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.cc')
-rw-r--r--webkit/glue/webmediaplayer_impl.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index 8ab1f29..0d96865 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -432,21 +432,21 @@ void WebMediaPlayerImpl::OnPipelineError() {
case media::PIPELINE_ERROR_INITIALIZATION_FAILED:
case media::PIPELINE_ERROR_REQUIRED_FILTER_MISSING:
case media::PIPELINE_ERROR_COULD_NOT_RENDER:
+ case media::PIPELINE_ERROR_URL_NOT_FOUND:
+ case media::PIPELINE_ERROR_NETWORK:
+ case media::PIPELINE_ERROR_READ:
+ case media::DEMUXER_ERROR_COULD_NOT_OPEN:
+ case media::DEMUXER_ERROR_COULD_NOT_PARSE:
+ case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
+ case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD:
// Format error.
SetNetworkState(WebMediaPlayer::FormatError);
break;
- case media::PIPELINE_ERROR_URL_NOT_FOUND:
- case media::PIPELINE_ERROR_NETWORK:
case media::PIPELINE_ERROR_DECODE:
case media::PIPELINE_ERROR_ABORT:
case media::PIPELINE_ERROR_OUT_OF_MEMORY:
- case media::PIPELINE_ERROR_READ:
case media::PIPELINE_ERROR_AUDIO_HARDWARE:
- case media::DEMUXER_ERROR_COULD_NOT_OPEN:
- case media::DEMUXER_ERROR_COULD_NOT_PARSE:
- case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
- case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD:
// Decode error.
SetNetworkState(WebMediaPlayer::DecodeError);
break;