Fix SourceBufferStream::Remove() for buffers before the current play position.

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 453 matching lines @@
 
   GarbageCollectIfNeeded();
 
   DCHECK(IsRangeListSorted(ranges_));
   DCHECK(OnlySelectedRangeIsSeeked());
   return true;
 }
 
 void SourceBufferStream::Remove(base::TimeDelta start, base::TimeDelta end,
                                 base::TimeDelta duration) {
+  DVLOG(1) << __FUNCTION__ << "(" << start.InSecondsF()
+           << ", " << end.InSecondsF()
+           << ", " << duration.InSecondsF() << ")";
   DCHECK(start >= base::TimeDelta()) << start.InSecondsF();
   DCHECK(start < end) << "start " << start.InSecondsF()
                       << " end " << end.InSecondsF();
   DCHECK(duration != kNoTimestamp());
 
   base::TimeDelta remove_end_timestamp = duration;
   base::TimeDelta keyframe_timestamp = FindKeyframeAfterTimestamp(end);
   if (keyframe_timestamp != kNoTimestamp()) {
     remove_end_timestamp = keyframe_timestamp;
   } else if (end < remove_end_timestamp) {
     remove_end_timestamp = end;
   }
 
   RangeList::iterator itr = ranges_.begin();
 
   while (itr != ranges_.end()) {
     SourceBufferRange* range = *itr;
     if (range->GetStartTimestamp() >= remove_end_timestamp)
       break;
 
     // Split off any remaining end piece and add it to |ranges_|.
     SourceBufferRange* new_range =
         range->SplitRange(remove_end_timestamp, false);
     if (new_range) {
       itr = ranges_.insert(++itr, new_range);
       --itr;
+
+      // Update the selected range if the next buffer position was transferred
+      // to |new_range|.
+      if (new_range->HasNextBufferPosition())
+        SetSelectedRange(new_range);
     }
 
     // If the current range now is completely covered by the removal
     // range then delete it and move on.
     if (start <= range->GetStartTimestamp()) {
       if (selected_range_ == range)
-          SetSelectedRange(NULL);
+        SetSelectedRange(NULL);
 
-        delete range;
-        itr = ranges_.erase(itr);
-        continue;
+      delete range;
+      itr = ranges_.erase(itr);
+      continue;
     }
 
     // Truncate the current range so that it only contains data before
     // the removal range.
     BufferQueue saved_buffers;
     range->TruncateAt(start, &saved_buffers, false);
 
     // Check to see if the current playback position was removed and
     // update the selected range appropriately.
     if (!saved_buffers.empty()) {
+      DCHECK(!range->HasNextBufferPosition());
       SetSelectedRange(NULL);
       SetSelectedRangeIfNeeded(saved_buffers.front()->GetDecodeTimestamp());
     }
 
     // Move on to the next range.
     ++itr;
   }
+
+  DCHECK(IsRangeListSorted(ranges_));
+  DCHECK(OnlySelectedRangeIsSeeked());
 }
 
 void SourceBufferStream::ResetSeekState() {
   SetSelectedRange(NULL);
   track_buffer_.clear();
   config_change_pending_ = false;
   last_output_buffer_timestamp_ = kNoTimestamp();
 }
 
 bool SourceBufferStream::ShouldSeekToStartOfBuffered(
@@ skipping 708 matching lines @@
     current_config_index_ = track_buffer_.front()->GetConfigId();
     return;
   }
 
   if (selected_range_ && selected_range_->HasNextBuffer())
     current_config_index_ = selected_range_->GetNextConfigId();
 }
 
 void SourceBufferStream::SetSelectedRangeIfNeeded(
     const base::TimeDelta timestamp) {
+  DVLOG(1) << __FUNCTION__ << "(" << timestamp.InSecondsF() << ")";
+
   if (selected_range_) {
     DCHECK(track_buffer_.empty());
     return;
   }
 
   if (!track_buffer_.empty()) {
     DCHECK(!selected_range_);
     return;
   }
 
@@ skipping 561 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