Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Unified Diff: webkit/glue/webmediaplayer_impl.cc

Issue 7538027: Make ChunkDemuxer error handling more consistent and robust. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unittests. Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/glue/webmediaplayer_impl.cc
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index 76a99093b2c8c518153216cc69a39ab826d2bde8..ba3eedb608d899c6baa0caa2bc969742e0595766 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -841,6 +841,8 @@ void WebMediaPlayerImpl::sourceEndOfStream(
media::PipelineStatus pipeline_status = media::PIPELINE_OK;
switch(status) {
+ case WebKit::WebMediaPlayer::EosNoError:
+ break;
case WebKit::WebMediaPlayer::EosNetworkError:
pipeline_status = media::PIPELINE_ERROR_NETWORK;
break;
@@ -925,11 +927,14 @@ void WebMediaPlayerImpl::OnPipelineError(PipelineStatus error) {
LOG(DFATAL) << "PIPELINE_OK isn't an error!";
break;
+ case media::PIPELINE_ERROR_NETWORK:
+ SetNetworkState(WebMediaPlayer::NetworkError);
+ break;
+
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:
« media/filters/chunk_demuxer_unittest.cc ('K') | « media/filters/chunk_demuxer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698