Fix SplitRange() logic in SourceBufferRange to transfer next buffer position appropriately

media/filters/source_buffer_stream.cc

 // 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.
 
 #include "media/filters/source_buffer_stream.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 804 matching lines @@
   BufferQueue::iterator starting_point = buffers_.begin() + keyframe_index;
   BufferQueue removed_buffers(starting_point, buffers_.end());
   keyframe_map_.erase(new_beginning_keyframe, keyframe_map_.end());
   buffers_.erase(starting_point, buffers_.end());
 
   // Create a new range with |removed_buffers|.
   SourceBufferRange* split_range =
       new SourceBufferRange(
           removed_buffers, kNoTimestamp(), interbuffer_distance_cb_);
 
-  // If |next_buffer_index_| points to a buffer in |split_range|, update the
-  // |next_buffer_index_| of this range and |split_range| accordingly.
+  // If the next buffer position is now in |split_range|, update the state of
+  // this range and |split_range| accordingly.
   if (next_buffer_index_ >= static_cast<int>(buffers_.size())) {
     split_range->next_buffer_index_ = next_buffer_index_ - keyframe_index;

[acolwell GONE FROM CHROMIUM, 2012/07/10 20:19:32]

DCHECK(!waiting_for_keyframe_) ?

[vrk (LEFT CHROMIUM), 2012/07/10 20:34:54]

Done.

-    next_buffer_index_ = -1;
+    ResetNextBufferPosition();
+  }  else if (waiting_for_keyframe_) {
+    split_range->waiting_for_keyframe_ = true;
+    split_range->next_keyframe_timestamp_ = next_keyframe_timestamp_;
+    ResetNextBufferPosition();
   }
+
   return split_range;
 }
 
 SourceBufferRange::KeyframeMap::iterator
 SourceBufferRange::GetFirstKeyframeAt(base::TimeDelta timestamp,
                                          bool skip_given_timestamp) {
   KeyframeMap::iterator result = keyframe_map_.lower_bound(timestamp);
   // lower_bound() returns the first element >= |timestamp|, so if we don't want
   // to include keyframes == |timestamp|, we have to increment the iterator
   // accordingly.
@@ skipping 34 matching lines @@
     base::TimeDelta next_buffer_timestamp = GetNextTimestamp();
     if (next_buffer_timestamp == kNoTimestamp() ||
         next_buffer_timestamp >= (*starting_point)->GetDecodeTimestamp()) {
       if (HasNextBuffer()) {
         int starting_offset = starting_point - buffers_.begin();
         int next_buffer_offset = next_buffer_index_ - starting_offset;
         DCHECK_GE(next_buffer_offset, 0);
         BufferQueue saved(starting_point + next_buffer_offset, buffers_.end());
         removed_buffers->swap(saved);
       }
-      next_buffer_index_ = -1;
+      ResetNextBufferPosition();
       removed_next_buffer = true;
     }
   }
 
   // Remove keyframes from |starting_point| onward.
   KeyframeMap::iterator starting_point_keyframe =
       keyframe_map_.lower_bound((*starting_point)->GetDecodeTimestamp());
   keyframe_map_.erase(starting_point_keyframe, keyframe_map_.end());
 
   // Remove everything from |starting_point| onward.
@@ skipping 123 matching lines @@
   return 2 * GetApproximateDuration();
 }
 
 base::TimeDelta SourceBufferRange::GetApproximateDuration() const {
   base::TimeDelta max_interbuffer_distance = interbuffer_distance_cb_.Run();
   DCHECK(max_interbuffer_distance != kNoTimestamp());
   return max_interbuffer_distance;
 }
 
 }  // namespace media