Fix SourceBufferStream alt-ref frame handling.

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 107 matching lines @@
   // 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.
   int FreeBuffers(int total_bytes_to_free, bool reverse_direction);
 
   // Appends |new_buffers| into |range_for_new_buffers_itr|, handling start and
   // end overlaps if necessary.
   // |deleted_buffers| is an output parameter containing candidates for
   // |track_buffer_|.
-  void InsertIntoExistingRange(
+  // Returns true if the buffers were successfully inserted into the existing
+  // range.
+  // Returns false if the buffers being inserted triggered an error.
+  bool InsertIntoExistingRange(
       const RangeList::iterator& range_for_new_buffers_itr,
       const BufferQueue& new_buffers,
       BufferQueue* deleted_buffers);
 
   // Resolve overlapping ranges such that no ranges overlap anymore.
   // |range_with_new_buffers_itr| points to the range that has newly appended
   // buffers.
   // |deleted_buffers| is an output parameter containing candidates for
   // |track_buffer_|.
   void ResolveCompleteOverlaps(
@@ skipping 151 matching lines @@
 
   // Points to the range containing the current media segment being appended.
   RangeList::iterator range_for_next_append_;
 
   // True when the next call to Append() begins a new media segment.
   bool new_media_segment_;
 
   // The timestamp of the last buffer appended to the media segment, set to
   // kNoTimestamp() if the beginning of the segment.
   base::TimeDelta last_appended_buffer_timestamp_;
+  bool last_appended_buffer_is_keyframe_;
 
   // The decode timestamp on the last buffer returned by the most recent
   // GetNextBuffer() call. Set to kNoTimestamp() if GetNextBuffer() hasn't been
   // called yet or a seek has happened since the last GetNextBuffer() call.
   base::TimeDelta last_output_buffer_timestamp_;
 
   // Stores the largest distance between two adjacent buffers in this stream.
   base::TimeDelta max_interbuffer_distance_;
 
   // The maximum amount of data in bytes the stream will keep in memory.
   int memory_limit_;
 
   // Indicates that a kConfigChanged status has been reported by GetNextBuffer()
   // and GetCurrentXXXDecoderConfig() must be called to update the current
   // config. GetNextBuffer() must not be called again until
   // GetCurrentXXXDecoderConfig() has been called.
   bool config_change_pending_;
 
   DISALLOW_COPY_AND_ASSIGN(SourceBufferStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_