Fix MSE GC, make it less aggressive, more spec-compliant

media/filters/source_buffer_stream.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.
 
 // SourceBufferStream is a data structure that stores media Buffers in ranges.
 // Buffers can be appended out of presentation order. Buffers are retrieved by
 // seeking to the desired start point and calling GetNextBuffer(). Buffers are
 // returned in sequential presentation order.
 
 #ifndef MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_
@@ skipping 72 matching lines @@
   // Removes buffers between |start| and |end| according to the steps
   // in the "Coded Frame Removal Algorithm" in the Media Source
   // Extensions Spec.
   // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#sourcebuffer-coded-frame-removal
   //
   // |duration| is the current duration of the presentation. It is
   // required by the computation outlined in the spec.
   void Remove(base::TimeDelta start, base::TimeDelta end,
               base::TimeDelta duration);
 
+  // Frees up space if the SourceBufferStream is taking up too much memory.
+  // |media_time| is current playback position.
+  bool GarbageCollectIfNeeded(DecodeTimestamp media_time,
+                              size_t newDataSize);
+
   // Changes the SourceBufferStream's state so that it will start returning
   // buffers starting from the closest keyframe before |timestamp|.
   void Seek(base::TimeDelta timestamp);
 
   // Returns true if the SourceBufferStream has seeked to a time without
   // buffered data and is waiting for more data to be appended.
   bool IsSeekPending() const;
 
   // Notifies the SourceBufferStream that the media duration has been changed to
   // |duration| so it should drop any data past that point.
@@ skipping 10 matching lines @@
   Status GetNextBuffer(scoped_refptr<StreamParserBuffer>* out_buffer);
 
   // Returns a list of the buffered time ranges.
   Ranges<base::TimeDelta> GetBufferedTime() const;
 
   // Returns the duration of the buffered ranges, which is equivalent
   // to the end timestamp of the last buffered range. If no data is buffered
   // then base::TimeDelta() is returned.
   base::TimeDelta GetBufferedDuration() const;
 
+  // Returns the size of the buffered data in bytes.
+  size_t GetBufferedSize() const;
+
   // Notifies this object that end of stream has been signalled.
   void MarkEndOfStream();
 
   // Clear the end of stream state set by MarkEndOfStream().
   void UnmarkEndOfStream();
 
   const AudioDecoderConfig& GetCurrentAudioDecoderConfig();
   const VideoDecoderConfig& GetCurrentVideoDecoderConfig();
   const TextTrackConfig& GetCurrentTextTrackConfig();
 
@@ skipping 10 matching lines @@
   // yet.
   base::TimeDelta GetMaxInterbufferDistance() const;
 
   void set_memory_limit(size_t memory_limit) {
     memory_limit_ = memory_limit;
   }
 
  private:
   friend class SourceBufferStreamTest;
 
-  // Frees up space if the SourceBufferStream is taking up too much memory.
-  void GarbageCollectIfNeeded();
-
   // Attempts to delete approximately |total_bytes_to_free| amount of data
   // |ranges_|, starting at the front of |ranges_| and moving linearly forward
   // through the buffers. Deletes starting from the back if |reverse_direction|
-  // is true. Returns the number of bytes freed.
-  size_t FreeBuffers(size_t total_bytes_to_free, bool reverse_direction);
+  // is true. |media_time| is current playback position.
+  // Returns the number of bytes freed.
+  size_t FreeBuffers(size_t total_bytes_to_free,
+                     DecodeTimestamp media_time,
+                     bool reverse_direction);
 
   // Attempts to delete approximately |total_bytes_to_free| amount of data from
   // |ranges_|, starting after the last appended buffer before the current
-  // playback position.
-  size_t FreeBuffersAfterLastAppended(size_t total_bytes_to_free);
+  // playback position |media_time|.
+  size_t FreeBuffersAfterLastAppended(size_t total_bytes_to_free,
+                                      DecodeTimestamp media_time);
 
   // Gets the removal range to secure |byte_to_free| from
   // [|start_timestamp|, |end_timestamp|).
   // Returns the size of buffers to secure if future
   // Remove(|start_timestamp|, |removal_end_timestamp|, duration) is called.
   // Will not update |removal_end_timestamp| if the returned size is 0.
   size_t GetRemovalRange(DecodeTimestamp start_timestamp,
                          DecodeTimestamp end_timestamp, size_t byte_to_free,
                          DecodeTimestamp* removal_end_timestamp);
 
@@ skipping 260 matching lines @@
   int num_splice_generation_warning_logs_ = 0;
   int num_splice_generation_success_logs_ = 0;
   int num_track_buffer_gap_warning_logs_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(SourceBufferStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_