Reland r145965 - Make sure previous seek points in SourceBufferStream are ignored during overlaps

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.
 
 #ifndef MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_
 #define MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_
 
 #include <deque>
 #include <list>
 #include <utility>
@@ skipping 137 matching lines @@
   RangeList::iterator FindExistingRangeFor(base::TimeDelta start_timestamp);
 
   // Inserts |new_range| into |ranges_| preserving sorted order. Returns an
   // iterator in |ranges_| that points to |new_range|.
   RangeList::iterator AddToRanges(SourceBufferRange* new_range);
 
   // Returns an iterator that points to the place in |ranges_| where
   // |selected_range_| lives.
   RangeList::iterator GetSelectedRangeItr();
 
+  // Sets the |selected_range_| to |range| and resets the next buffer position
+  // for the previous |selected_range_|.
+  void SetSelectedRange(SourceBufferRange* range);
+
   // Returns true if the timestamps of |buffers| are monotonically increasing
   // since the previous append to the media segment, false otherwise.
   bool IsMonotonicallyIncreasing(const BufferQueue& buffers);
 
+  // Returns true if |selected_range_| is the only range in |ranges_| that
+  // HasNextBufferPosition().
+  bool OnlySelectedRangeIsSeeked() const;
+
   // Measures the distances between buffer timestamps and tracks the max.
   void UpdateMaxInterbufferDistance(const BufferQueue& buffers);
 
   // List of disjoint buffered ranges, ordered by start time.
   RangeList ranges_;
 
   AudioDecoderConfig audio_config_;
   VideoDecoderConfig video_config_;
 
   // True if more data needs to be appended before the Seek() can complete,
@@ skipping 31 matching lines @@
 
   // Stores the largest distance between two adjacent buffers in this stream.
   base::TimeDelta max_interbuffer_distance_;
 
   DISALLOW_COPY_AND_ASSIGN(SourceBufferStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_