Refactor ChunkDemuxer code so all source state is in a SourceState class.

media/filters/chunk_demuxer.h

 // Copyright (c) 2012 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 <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/synchronization/lock.h"
 #include "media/base/byte_queue.h"
 #include "media/base/demuxer.h"
 #include "media/base/ranges.h"
 #include "media/base/stream_parser.h"
 #include "media/filters/source_buffer_stream.h"
 
 namespace media {
 
 class ChunkDemuxerStream;
+class SourceState;

[scherkus (not reviewing), 2013/04/05 18:58:26]

A->Z

[acolwell GONE FROM CHROMIUM, 2013/04/05 19:14:37]

Done.

 class FFmpegURLProtocol;
 
 // Demuxer implementation that allows chunks of media data to be passed
 // from JavaScript to the media stack.
 class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
  public:
   enum Status {
     kOk,              // ID added w/o error.
     kNotSupported,    // Type specified is not supported.
     kReachedIdLimit,  // Reached ID limit. We can't handle any more IDs.
@@ skipping 89 matching lines @@
   // data.
   void ReportError_Locked(PipelineStatus error);
 
   // Returns true if any stream has seeked to a time without buffered data.
   bool IsSeekPending_Locked() const;
 
   // Returns true if all streams can successfully call EndOfStream,
   // false if any can not.
   bool CanEndOfStream_Locked() const;
 
-  // StreamParser callbacks.
-  void OnStreamParserInitDone(bool success, base::TimeDelta duration);
+  // SourceState callbacks.
+  void OnSourceInitDone(bool success, base::TimeDelta duration);
   bool OnNewConfigs(bool has_audio, bool has_video,
                     const AudioDecoderConfig& audio_config,
                     const VideoDecoderConfig& video_config);
   bool OnAudioBuffers(const StreamParser::BufferQueue& buffers);
   bool OnVideoBuffers(const StreamParser::BufferQueue& buffers);
   bool OnNeedKey(const std::string& type,
                  scoped_array<uint8> init_data,
                  int init_data_size);
   void OnNewMediaSegment(const std::string& source_id,
                          base::TimeDelta start_timestamp);
-  void OnEndOfMediaSegment(const std::string& source_id);
 
   // Computes the intersection between the video & audio
   // buffered ranges.
   Ranges<base::TimeDelta> ComputeIntersection() const;
 
   // Applies |time_offset| to the timestamps of |buffers|.
   void AdjustBufferTimestamps(const StreamParser::BufferQueue& buffers,
                               base::TimeDelta timestamp_offset);
 
   // Returns true if |source_id| is valid, false otherwise.
@@ skipping 35 matching lines @@
 
   base::TimeDelta duration_;
 
   // The duration passed to the last SetDuration(). If
   // SetDuration() is never called or an AppendData() call or
   // a EndOfStream() call changes |duration_|, then this
   // variable is set to < 0 to indicate that the |duration_| represents
   // the actual duration instead of a user specified value.
   double user_specified_duration_;
 
-  typedef std::map<std::string, StreamParser*> StreamParserMap;
-  StreamParserMap stream_parser_map_;
-
-  // Contains state belonging to a source id.
-  struct SourceInfo {
-    base::TimeDelta timestamp_offset;
-    bool can_update_offset;
-  };
-  typedef std::map<std::string, SourceInfo> SourceInfoMap;
-  SourceInfoMap source_info_map_;
+  typedef std::map<std::string, SourceState*> SourceStateMap;
+  SourceStateMap source_state_map_;
 
   // Used to ensure that (1) config data matches the type and codec provided in
   // AddId(), (2) only 1 audio and 1 video sources are added, and (3) ids may be
   // removed with RemoveID() but can not be re-added (yet).
   std::string source_id_audio_;
   std::string source_id_video_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_