MSE: Populate WebM missing duration with DefaultDuration, derived, or default

media/formats/webm/webm_cluster_parser.h

 // Copyright 2014 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_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
 #define MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 10 matching lines @@
 namespace media {
 
 class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
  public:
   typedef StreamParser::TrackId TrackId;
 
  private:
   // Helper class that manages per-track state.
   class Track {
    public:
-    Track(int track_num, bool is_video);
+    Track(int track_num, bool is_video, base::TimeDelta default_duration);
     ~Track();
 
     int track_num() const { return track_num_; }
     const std::deque<scoped_refptr<StreamParserBuffer> >& buffers() const {
       return buffers_;
     }
 
+    // If |last_added_buffer_missing_duration_| is set, updates its duration
+    // relative to |buffer|'s timestamp, and adds it to |buffers_| and unsets
+    // |last_added_buffer_missing_duration_|. Then, if |buffer| is missing
+    // duration, saves |buffer| into |last_added_buffer_missing_duration_|, or
+    // otherwise adds |buffer| to |buffers_|.
     bool AddBuffer(const scoped_refptr<StreamParserBuffer>& buffer);
 
-    // Clears all buffer state.
+    // If |last_added_buffer_missing_duration_| is set, updates its duration
+    // to be the first non-kNoTimestamp() value of |default_duration_|,
+    // |estimated_next_frame_duration_|, or an arbitrary default, then adds it
+    // to |buffers_| and unsets |last_added_buffer_missing_duration_|. (This
+    // method helps stream parser emit all buffers in a media segment before
+    // signaling end of segment.)
+    void ApplyDurationDefaultOrEstimateIfNeeded();
+
+    // Clears all buffer state, except a possibly held-aside buffer that is
+    // missing duration.
     void Reset();
 
+    // Clears all buffer state, including any possibly held-aside buffer that
+    // was missing duration.
+    void Flush();
+
     // Helper function used to inspect block data to determine if the
     // block is a keyframe.
     // |data| contains the bytes in the block.
     // |size| indicates the number of bytes in |data|.
     bool IsKeyframe(const uint8* data, int size) const;
 
    private:
     int track_num_;
     std::deque<scoped_refptr<StreamParserBuffer> > buffers_;
     bool is_video_;
+    scoped_refptr<StreamParserBuffer> last_added_buffer_missing_duration_;
+
+    // If kNoTimestamp(), then |estimated_next_frame_duration_| will be used.
+    base::TimeDelta default_duration_;
+    // If kNoTimestamp(), then a default value will be used. This estimate is
+    // the maximum duration seen or derived so far for this track, and is valid
+    // only if |default_duration_| is kNoTimestamp().
+    base::TimeDelta estimated_next_frame_duration_;
   };
 
   typedef std::map<int, Track> TextTrackMap;
 
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
   typedef std::map<TrackId, const BufferQueue> TextBufferQueueMap;
 
   WebMClusterParser(int64 timecode_scale,
                     int audio_track_num,
+                    base::TimeDelta audio_default_duration,
                     int video_track_num,
+                    base::TimeDelta video_default_duration,
                     const WebMTracksParser::TextTracks& text_tracks,
                     const std::set<int64>& ignored_tracks,
                     const std::string& audio_encryption_key_id,
                     const std::string& video_encryption_key_id,
                     const LogCB& log_cb);
   virtual ~WebMClusterParser();
 
   // 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);
 
   base::TimeDelta cluster_start_time() const { return cluster_start_time_; }
-  const BufferQueue& audio_buffers() const { return audio_.buffers(); }
-  const BufferQueue& video_buffers() const { return video_.buffers(); }
+
+  // Get the buffers resulting from Parse().
+  // If the parse reached the end of cluster and the last buffer was held aside
+  // due to missing duration, the buffer is given an estimated duration and
+  // included in the result.
+  const BufferQueue& GetAudioBuffers();
+  const BufferQueue& GetVideoBuffers();
 
   // Constructs and returns a subset of |text_track_map_| containing only
   // tracks with non-empty buffer queues produced by the last Parse().
   // The returned map is cleared by Parse() or Reset() and updated by the next
   // call to GetTextBuffers().
   const TextBufferQueueMap& GetTextBuffers();
 
   // Returns true if the last Parse() call stopped at the end of a cluster.
   bool cluster_ended() const { return cluster_ended_; }
 
@@ skipping 51 matching lines @@
   TextBufferQueueMap text_buffers_map_;
 
   LogCB log_cb_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_