summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webmediaplayer_impl.cc
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-23 16:59:52 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-23 16:59:52 +0000
commit6a1b224cac50ee395704c1062a0d040b0c235199 (patch)
treee1e988d83284a19c154074bac738e4e9a12c7b72 /webkit/glue/webmediaplayer_impl.cc
parenta4a38c187a9f6b4a8db72d28b0e812467279a196 (diff)
downloadchromium_src-6a1b224cac50ee395704c1062a0d040b0c235199.zip
chromium_src-6a1b224cac50ee395704c1062a0d040b0c235199.tar.gz
chromium_src-6a1b224cac50ee395704c1062a0d040b0c235199.tar.bz2
Refactor PipelineImpl to use CompositeFilter to manage Filter state transitions.
BUG=54110 TEST=media_unittests CompositeFilterTest.* Review URL: http://codereview.chromium.org/5744002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.cc')
-rw-r--r--webkit/glue/webmediaplayer_impl.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index 4a64b0f..005c7cf 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -737,6 +737,8 @@ void WebMediaPlayerImpl::OnPipelineError() {
case media::PIPELINE_ERROR_ABORT:
case media::PIPELINE_ERROR_OUT_OF_MEMORY:
case media::PIPELINE_ERROR_AUDIO_HARDWARE:
+ case media::PIPELINE_ERROR_OPERATION_PENDING:
+ case media::PIPELINE_ERROR_INVALID_STATE:
// Decode error.
SetNetworkState(WebMediaPlayer::DecodeError);
break;