Make ChunkDemuxer error handling more consistent and robust.

media/filters/chunk_demuxer.h

 // 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.
 
 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
 
 #include <list>
 
 #include "base/synchronization/lock.h"
@@ skipping 23 matching lines @@
   virtual void Seek(base::TimeDelta time, const FilterStatusCB&  cb);
   virtual void OnAudioRendererDisabled();
   virtual void SetPreload(Preload preload);
 
   // Demuxer implementation.
   virtual scoped_refptr<DemuxerStream> GetStream(DemuxerStream::Type type);
   virtual base::TimeDelta GetStartTime() const;
 
   // Methods used by an external object to control this demuxer.
   void FlushData();
+
+  // Appends media data to the stream. Returns false if this method
+  // is called in an invalid state.
   bool AppendData(const uint8* data, unsigned length);
   void EndOfStream(PipelineStatus status);
   bool HasEnded();
   void Shutdown();
 
  private:
   enum State {
     WAITING_FOR_INIT,
     INITIALIZING,
     INITIALIZED,
     ENDED,
-    INIT_ERROR,
+    PARSE_ERROR,
     SHUTDOWN,
   };
 
   void ChangeState(State new_state);
 
   // Parses a buffer that contains an INFO & TRACKS element. Returns false if
   // the parse fails. This method handles calling & clearing |init_cb_|
   // before it returns.
   bool ParseInfoAndTracks_Locked(const uint8* data, int size);
 
   // Generates an AVFormatContext for the INFO & TRACKS elements contained
   // in |data|. Returns NULL if parsing |data| fails.
   AVFormatContext* CreateFormatContext(const uint8* data, int size);
 
   // Sets up |audio_| & |video_| DemuxerStreams based on the data in
   // |format_context_|. Returns false if no valid audio or video stream were
   // found.
   bool SetupStreams();
 
   // Parse a buffer that was passed to AppendData(). |data| is expected to
   // contain one or more WebM Clusters. Returns false if parsing the data fails.
   bool ParseAndAppendData_Locked(const uint8* data, int length);
 
-  // Called when initialization fails. Handles calling & clearing init_cb_.
-  void InitFailed_Locked();
+  // Reports an error and puts the demuxer in a state where it won't accept more
+  // data.
+  void ReportError_Locked(PipelineStatus error);
 
   base::Lock lock_;
   State state_;
 
   ChunkDemuxerClient* client_;
   PipelineStatusCB init_cb_;
   FilterStatusCB seek_cb_;
 
   scoped_refptr<ChunkDemuxerStream> audio_;
   scoped_refptr<ChunkDemuxerStream> video_;
@@ skipping 18 matching lines @@
   // Should a Seek() call wait for more data before calling the
   // callback.
   bool seek_waits_for_data_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_