Update WebMClusterParser to compute durations for all StreamParserBuffers.

media/webm/webm_cluster_parser.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_WEBM_WEBM_CLUSTER_PARSER_H_
 #define MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_
 
 #include <deque>
 #include <string>
 
@@ skipping 20 matching lines @@
   // Resets the parser state so it can accept a new cluster.
   void Reset();
 
   // Parses a WebM cluster element in |buf|.
   //
   // Returns -1 if the parse fails.
   // Returns 0 if more data is needed.
   // Returns the number of bytes parsed on success.
   int Parse(const uint8* buf, int size);
 
-  const BufferQueue& audio_buffers() const { return audio_buffers_; }
-  const BufferQueue& video_buffers() const { return video_buffers_; }
+  const BufferQueue& audio_buffers() const { return audio_.buffers(); }
+  const BufferQueue& video_buffers() const { return video_.buffers(); }
 
  private:
+  // Helper class that manages per-track state.
+  class Track {
+   public:
+    Track(int track_num, base::TimeDelta default_duration);
+    ~Track();
+
+    int track_num() const { return track_num_; }
+    const BufferQueue& buffers() const { return buffers_; }
+
+    bool AddBuffer(const scoped_refptr<StreamParserBuffer>& buffer);
+
+    // Clears all buffer state.
+    void Reset();
+
+    // Clears only the |buffers_|.
+    void ClearBufferQueue();
+
+   private:
+    int track_num_;
+    base::TimeDelta default_duration_;
+    BufferQueue buffers_;
+    scoped_refptr<StreamParserBuffer> delayed_buffer_;
+  };
+
   // WebMParserClient methods.
   virtual WebMParserClient* OnListStart(int id) OVERRIDE;
   virtual bool OnListEnd(int id) OVERRIDE;
   virtual bool OnUInt(int id, int64 val) OVERRIDE;
   virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE;
 
   bool ParseBlock(const uint8* buf, int size, int duration);
   bool OnBlock(int track_num, int timecode, int duration, int flags,
                const uint8* data, int size);
 
   double timecode_multiplier_;  // Multiplier used to convert timecodes into
                                 // microseconds.
-  int audio_track_num_;
-  base::TimeDelta audio_default_duration_;
-  int video_track_num_;
-  base::TimeDelta  video_default_duration_;
   scoped_array<uint8> video_encryption_key_id_;
   int video_encryption_key_id_size_;
 
   WebMListParser parser_;
 
   int64 last_block_timecode_;
   scoped_array<uint8> block_data_;
   int block_data_size_;
   int64 block_duration_;
 
   int64 cluster_timecode_;
-  BufferQueue audio_buffers_;
-  BufferQueue video_buffers_;
+
+  Track audio_;
+  Track video_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_