Make ChunkDemuxer error handling more consistent and robust.

webkit/glue/webmediaplayer_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 
 #include "base/callback.h"
@@ skipping 823 matching lines @@
   DCHECK(MessageLoop::current() == main_loop_);
   return proxy_->DemuxerAppend(data, length);
 }
 
 void WebMediaPlayerImpl::sourceEndOfStream(
     WebKit::WebMediaPlayer::EndOfStreamStatus status) {
   DCHECK(MessageLoop::current() == main_loop_);
   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;
     case WebKit::WebMediaPlayer::EosDecodeError:
       pipeline_status = media::PIPELINE_ERROR_DECODE;
       break;
     default:
       NOTIMPLEMENTED();
   }
 
@@ skipping 64 matching lines @@
   }
 }
 
 void WebMediaPlayerImpl::OnPipelineError(PipelineStatus error) {
   DCHECK(MessageLoop::current() == main_loop_);
   switch (error) {
     case media::PIPELINE_OK:
       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:
     case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
     case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD:
     case media::DATASOURCE_ERROR_URL_NOT_SUPPORTED:
       // Format error.
       SetNetworkState(WebMediaPlayer::FormatError);
       break;
 
@@ skipping 84 matching lines @@
   }
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_glue