Update selected range after truncation

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 1050 matching lines @@
   for (itr = ranges_.begin(); itr != ranges_.end(); ++itr) {
     if ((*itr)->GetEndTimestamp() > duration)
       break;
   }
   if (itr == ranges_.end())
     return;
 
   // Need to partially truncate this range.
   if ((*itr)->GetStartTimestamp() < duration) {
     (*itr)->TruncateAt(duration, NULL, false);
+    if (selected_range_ && !selected_range_->HasNextBufferPosition())

[acolwell GONE FROM CHROMIUM, 2013/11/04 20:58:11]

nit: s/selected_range_ &&/(*itr == selected_range_) &&/  just so this is more
explicit.

[Jinsuk Kim, 2013/11/05 03:31:49]

Done.

+      SetSelectedRange(NULL);
     ++itr;
   }
 
   // Delete all ranges that begin after |duration|.
   while (itr != ranges_.end()) {
     // If we're about to delete the selected range, also reset the seek state.
     DCHECK((*itr)->GetStartTimestamp() >= duration);
     if (*itr == selected_range_)
       ResetSeekState();
     DeleteAndRemoveRange(&itr);
@@ skipping 747 matching lines @@
 
 int SourceBufferRange::GetNextConfigId() const {
   DCHECK(HasNextBuffer());
   return buffers_.at(next_buffer_index_)->GetConfigId();
 }
 
 base::TimeDelta SourceBufferRange::GetNextTimestamp() const {
   DCHECK(!buffers_.empty());
   DCHECK(HasNextBufferPosition());
 
   if (next_buffer_index_ >= static_cast<int>(buffers_.size())) {

[acolwell GONE FROM CHROMIUM, 2013/11/04 20:58:11]

With the change above do you really need this change?

[Jinsuk Kim, 2013/11/05 03:31:49]

Mine was already reverted. This code was already here.

     return kNoTimestamp();
   }
 
   return buffers_.at(next_buffer_index_)->GetDecodeTimestamp();
 }
 
 bool SourceBufferRange::HasNextBufferPosition() const {
   return next_buffer_index_ >= 0;
 }
 
@@ skipping 104 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