Prevent SourceBufferRange.waiting_for_keyframe_ from being lost on range merges.

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 1480 matching lines @@
   next_buffer_index_ = -1;
   waiting_for_keyframe_ = false;
   next_keyframe_timestamp_ = kNoTimestamp();
 }
 
 void SourceBufferRange::AppendRangeToEnd(const SourceBufferRange& range,
                                          bool transfer_current_position) {
   DCHECK(CanAppendRangeToEnd(range));
   DCHECK(!buffers_.empty());
 
-  if (transfer_current_position)
-    next_buffer_index_ = range.next_buffer_index_ + buffers_.size();
+  if (transfer_current_position) {
+    if (range.next_buffer_index_ >= 0)

[scherkus (not reviewing), 2013/01/07 23:34:06]

aside from not updating w_f_k_/n_k_t_, was there also a bug with
next_buffer_index_ potentially being -1? do we need a test for that too or
should it be a CHECK()?

[acolwell GONE FROM CHROMIUM, 2013/01/08 00:46:39]

The test exposes both problems. When waiting_for_keyframe_ is true the index was
negative. That is part of the reason why buffers were being returned out of
order when ranges were merged.

+      next_buffer_index_ = range.next_buffer_index_ + buffers_.size();
+
+    waiting_for_keyframe_ = range.waiting_for_keyframe_;
+    next_keyframe_timestamp_ = range.next_keyframe_timestamp_;
+  }
 
   AppendBuffersToEnd(range.buffers_);
 }
 
 bool SourceBufferRange::CanAppendRangeToEnd(
     const SourceBufferRange& range) const {
   return CanAppendBuffersToEnd(range.buffers_);
 }
 
 bool SourceBufferRange::CanAppendBuffersToEnd(
@@ skipping 60 matching lines @@
   return ComputeFudgeRoom(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